You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2012/06/26 17:20:25 UTC

[8/58] [partial] git commit: applying chip childers patch for AWSAPI license headers https://reviews.apache.org/r/5437/

applying chip childers patch for AWSAPI license headers
https://reviews.apache.org/r/5437/


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/e984c3c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/e984c3c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/e984c3c0

Branch: refs/heads/master
Commit: e984c3c098bea3c093727ddf19761959a758eb52
Parents: bc1c897
Author: David Nalley <da...@gnsa.us>
Authored: Tue Jun 26 11:07:48 2012 -0400
Committer: David Nalley <da...@gnsa.us>
Committed: Tue Jun 26 11:07:48 2012 -0400

----------------------------------------------------------------------
 awsapi/deploy-cloud-bridge.sh                      |   18 +-
 awsapi/install.sh                                  |   16 +
 awsapi/scripts/run.sh                              |   16 +
 awsapi/src/com/amazon/ec2/ActivateLicense.java     |   16 +
 .../com/amazon/ec2/ActivateLicenseResponse.java    |   16 +
 .../amazon/ec2/ActivateLicenseResponseType.java    |   16 +
 awsapi/src/com/amazon/ec2/ActivateLicenseType.java |   16 +
 awsapi/src/com/amazon/ec2/AllocateAddress.java     |   16 +
 .../com/amazon/ec2/AllocateAddressResponse.java    |   16 +
 .../amazon/ec2/AllocateAddressResponseType.java    |   16 +
 awsapi/src/com/amazon/ec2/AllocateAddressType.java |   16 +
 .../amazon/ec2/AmazonEC2MessageReceiverInOut.java  |   16 +
 awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java   |   16 +
 .../com/amazon/ec2/AmazonEC2SkeletonInterface.java |   16 +
 awsapi/src/com/amazon/ec2/AssociateAddress.java    |   16 +
 .../com/amazon/ec2/AssociateAddressResponse.java   |   16 +
 .../amazon/ec2/AssociateAddressResponseType.java   |   16 +
 .../src/com/amazon/ec2/AssociateAddressType.java   |   16 +
 .../src/com/amazon/ec2/AssociateDhcpOptions.java   |   16 +
 .../amazon/ec2/AssociateDhcpOptionsResponse.java   |   16 +
 .../ec2/AssociateDhcpOptionsResponseType.java      |   16 +
 .../com/amazon/ec2/AssociateDhcpOptionsType.java   |   16 +
 awsapi/src/com/amazon/ec2/AttachVolume.java        |   16 +
 .../src/com/amazon/ec2/AttachVolumeResponse.java   |   16 +
 .../com/amazon/ec2/AttachVolumeResponseType.java   |   16 +
 awsapi/src/com/amazon/ec2/AttachVolumeType.java    |   16 +
 awsapi/src/com/amazon/ec2/AttachVpnGateway.java    |   16 +
 .../com/amazon/ec2/AttachVpnGatewayResponse.java   |   16 +
 .../amazon/ec2/AttachVpnGatewayResponseType.java   |   16 +
 .../src/com/amazon/ec2/AttachVpnGatewayType.java   |   16 +
 .../amazon/ec2/AttachmentSetItemResponseType.java  |   16 +
 .../com/amazon/ec2/AttachmentSetResponseType.java  |   16 +
 awsapi/src/com/amazon/ec2/AttachmentSetType.java   |   16 +
 awsapi/src/com/amazon/ec2/AttachmentType.java      |   16 +
 .../com/amazon/ec2/AttributeBooleanValueType.java  |   16 +
 awsapi/src/com/amazon/ec2/AttributeValueType.java  |   16 +
 .../amazon/ec2/AuthorizeSecurityGroupIngress.java  |   16 +
 .../ec2/AuthorizeSecurityGroupIngressResponse.java |   16 +
 .../AuthorizeSecurityGroupIngressResponseType.java |   16 +
 .../ec2/AuthorizeSecurityGroupIngressType.java     |   16 +
 .../com/amazon/ec2/AvailabilityZoneItemType.java   |   16 +
 .../amazon/ec2/AvailabilityZoneMessageSetType.java |   16 +
 .../amazon/ec2/AvailabilityZoneMessageType.java    |   16 +
 .../com/amazon/ec2/AvailabilityZoneSetType.java    |   16 +
 .../com/amazon/ec2/BlockDeviceMappingItemType.java |   16 +
 .../BlockDeviceMappingItemTypeChoice_type0.java    |   16 +
 .../src/com/amazon/ec2/BlockDeviceMappingType.java |   16 +
 awsapi/src/com/amazon/ec2/BundleInstance.java      |   16 +
 .../src/com/amazon/ec2/BundleInstanceResponse.java |   16 +
 .../com/amazon/ec2/BundleInstanceResponseType.java |   16 +
 .../amazon/ec2/BundleInstanceS3StorageType.java    |   16 +
 .../amazon/ec2/BundleInstanceTaskErrorType.java    |   16 +
 .../amazon/ec2/BundleInstanceTaskStorageType.java  |   16 +
 .../src/com/amazon/ec2/BundleInstanceTaskType.java |   16 +
 .../com/amazon/ec2/BundleInstanceTasksSetType.java |   16 +
 awsapi/src/com/amazon/ec2/BundleInstanceType.java  |   16 +
 awsapi/src/com/amazon/ec2/CancelBundleTask.java    |   16 +
 .../com/amazon/ec2/CancelBundleTaskResponse.java   |   16 +
 .../amazon/ec2/CancelBundleTaskResponseType.java   |   16 +
 .../src/com/amazon/ec2/CancelBundleTaskType.java   |   16 +
 .../src/com/amazon/ec2/CancelConversionTask.java   |   16 +
 .../amazon/ec2/CancelConversionTaskResponse.java   |   16 +
 .../ec2/CancelConversionTaskResponseType.java      |   16 +
 .../com/amazon/ec2/CancelConversionTaskType.java   |   16 +
 .../com/amazon/ec2/CancelSpotInstanceRequests.java |   16 +
 .../ec2/CancelSpotInstanceRequestsResponse.java    |   16 +
 ...celSpotInstanceRequestsResponseSetItemType.java |   16 +
 .../CancelSpotInstanceRequestsResponseSetType.java |   16 +
 .../CancelSpotInstanceRequestsResponseType.java    |   16 +
 .../amazon/ec2/CancelSpotInstanceRequestsType.java |   16 +
 .../src/com/amazon/ec2/ConfirmProductInstance.java |   16 +
 .../amazon/ec2/ConfirmProductInstanceResponse.java |   16 +
 .../ec2/ConfirmProductInstanceResponseType.java    |   16 +
 .../com/amazon/ec2/ConfirmProductInstanceType.java |   16 +
 .../com/amazon/ec2/ConversionTaskIdItemType.java   |   16 +
 .../com/amazon/ec2/ConversionTaskIdSetType.java    |   16 +
 .../src/com/amazon/ec2/ConversionTaskSetType.java  |   16 +
 awsapi/src/com/amazon/ec2/ConversionTaskType.java  |   16 +
 .../amazon/ec2/ConversionTaskTypeChoice_type0.java |   16 +
 .../src/com/amazon/ec2/CreateCustomerGateway.java  |   16 +
 .../amazon/ec2/CreateCustomerGatewayResponse.java  |   16 +
 .../ec2/CreateCustomerGatewayResponseType.java     |   16 +
 .../com/amazon/ec2/CreateCustomerGatewayType.java  |   16 +
 awsapi/src/com/amazon/ec2/CreateDhcpOptions.java   |   16 +
 .../com/amazon/ec2/CreateDhcpOptionsResponse.java  |   16 +
 .../amazon/ec2/CreateDhcpOptionsResponseType.java  |   16 +
 .../src/com/amazon/ec2/CreateDhcpOptionsType.java  |   16 +
 awsapi/src/com/amazon/ec2/CreateImage.java         |   16 +
 awsapi/src/com/amazon/ec2/CreateImageResponse.java |   16 +
 .../com/amazon/ec2/CreateImageResponseType.java    |   16 +
 awsapi/src/com/amazon/ec2/CreateImageType.java     |   16 +
 awsapi/src/com/amazon/ec2/CreateKeyPair.java       |   16 +
 .../src/com/amazon/ec2/CreateKeyPairResponse.java  |   16 +
 .../com/amazon/ec2/CreateKeyPairResponseType.java  |   16 +
 awsapi/src/com/amazon/ec2/CreateKeyPairType.java   |   16 +
 .../src/com/amazon/ec2/CreatePlacementGroup.java   |   16 +
 .../amazon/ec2/CreatePlacementGroupResponse.java   |   16 +
 .../ec2/CreatePlacementGroupResponseType.java      |   16 +
 .../com/amazon/ec2/CreatePlacementGroupType.java   |   16 +
 awsapi/src/com/amazon/ec2/CreateSecurityGroup.java |   16 +
 .../amazon/ec2/CreateSecurityGroupResponse.java    |   16 +
 .../ec2/CreateSecurityGroupResponseType.java       |   16 +
 .../com/amazon/ec2/CreateSecurityGroupType.java    |   16 +
 awsapi/src/com/amazon/ec2/CreateSnapshot.java      |   16 +
 .../src/com/amazon/ec2/CreateSnapshotResponse.java |   16 +
 .../com/amazon/ec2/CreateSnapshotResponseType.java |   16 +
 awsapi/src/com/amazon/ec2/CreateSnapshotType.java  |   16 +
 .../amazon/ec2/CreateSpotDatafeedSubscription.java |   16 +
 .../CreateSpotDatafeedSubscriptionResponse.java    |   16 +
 ...CreateSpotDatafeedSubscriptionResponseType.java |   16 +
 .../ec2/CreateSpotDatafeedSubscriptionType.java    |   16 +
 awsapi/src/com/amazon/ec2/CreateSubnet.java        |   16 +
 .../src/com/amazon/ec2/CreateSubnetResponse.java   |   16 +
 .../com/amazon/ec2/CreateSubnetResponseType.java   |   16 +
 awsapi/src/com/amazon/ec2/CreateSubnetType.java    |   16 +
 awsapi/src/com/amazon/ec2/CreateTags.java          |   16 +
 awsapi/src/com/amazon/ec2/CreateTagsResponse.java  |   16 +
 .../src/com/amazon/ec2/CreateTagsResponseType.java |   16 +
 awsapi/src/com/amazon/ec2/CreateTagsType.java      |   16 +
 awsapi/src/com/amazon/ec2/CreateVolume.java        |   16 +
 .../amazon/ec2/CreateVolumePermissionItemType.java |   16 +
 .../amazon/ec2/CreateVolumePermissionListType.java |   16 +
 .../ec2/CreateVolumePermissionOperationType.java   |   16 +
 .../src/com/amazon/ec2/CreateVolumeResponse.java   |   16 +
 .../com/amazon/ec2/CreateVolumeResponseType.java   |   16 +
 awsapi/src/com/amazon/ec2/CreateVolumeType.java    |   16 +
 awsapi/src/com/amazon/ec2/CreateVpc.java           |   16 +
 awsapi/src/com/amazon/ec2/CreateVpcResponse.java   |   16 +
 .../src/com/amazon/ec2/CreateVpcResponseType.java  |   16 +
 awsapi/src/com/amazon/ec2/CreateVpcType.java       |   16 +
 awsapi/src/com/amazon/ec2/CreateVpnConnection.java |   16 +
 .../amazon/ec2/CreateVpnConnectionResponse.java    |   16 +
 .../ec2/CreateVpnConnectionResponseType.java       |   16 +
 .../com/amazon/ec2/CreateVpnConnectionType.java    |   16 +
 awsapi/src/com/amazon/ec2/CreateVpnGateway.java    |   16 +
 .../com/amazon/ec2/CreateVpnGatewayResponse.java   |   16 +
 .../amazon/ec2/CreateVpnGatewayResponseType.java   |   16 +
 .../src/com/amazon/ec2/CreateVpnGatewayType.java   |   16 +
 .../amazon/ec2/CustomerGatewayIdSetItemType.java   |   16 +
 .../com/amazon/ec2/CustomerGatewayIdSetType.java   |   16 +
 .../src/com/amazon/ec2/CustomerGatewaySetType.java |   16 +
 awsapi/src/com/amazon/ec2/CustomerGatewayType.java |   16 +
 awsapi/src/com/amazon/ec2/DeactivateLicense.java   |   16 +
 .../com/amazon/ec2/DeactivateLicenseResponse.java  |   16 +
 .../amazon/ec2/DeactivateLicenseResponseType.java  |   16 +
 .../src/com/amazon/ec2/DeactivateLicenseType.java  |   16 +
 .../src/com/amazon/ec2/DeleteCustomerGateway.java  |   16 +
 .../amazon/ec2/DeleteCustomerGatewayResponse.java  |   16 +
 .../ec2/DeleteCustomerGatewayResponseType.java     |   16 +
 .../com/amazon/ec2/DeleteCustomerGatewayType.java  |   16 +
 awsapi/src/com/amazon/ec2/DeleteDhcpOptions.java   |   16 +
 .../com/amazon/ec2/DeleteDhcpOptionsResponse.java  |   16 +
 .../amazon/ec2/DeleteDhcpOptionsResponseType.java  |   16 +
 .../src/com/amazon/ec2/DeleteDhcpOptionsType.java  |   16 +
 awsapi/src/com/amazon/ec2/DeleteKeyPair.java       |   16 +
 .../src/com/amazon/ec2/DeleteKeyPairResponse.java  |   16 +
 .../com/amazon/ec2/DeleteKeyPairResponseType.java  |   16 +
 awsapi/src/com/amazon/ec2/DeleteKeyPairType.java   |   16 +
 .../src/com/amazon/ec2/DeletePlacementGroup.java   |   16 +
 .../amazon/ec2/DeletePlacementGroupResponse.java   |   16 +
 .../ec2/DeletePlacementGroupResponseType.java      |   16 +
 .../com/amazon/ec2/DeletePlacementGroupType.java   |   16 +
 awsapi/src/com/amazon/ec2/DeleteSecurityGroup.java |   16 +
 .../amazon/ec2/DeleteSecurityGroupResponse.java    |   16 +
 .../ec2/DeleteSecurityGroupResponseType.java       |   16 +
 .../com/amazon/ec2/DeleteSecurityGroupType.java    |   16 +
 awsapi/src/com/amazon/ec2/DeleteSnapshot.java      |   16 +
 .../src/com/amazon/ec2/DeleteSnapshotResponse.java |   16 +
 .../com/amazon/ec2/DeleteSnapshotResponseType.java |   16 +
 awsapi/src/com/amazon/ec2/DeleteSnapshotType.java  |   16 +
 .../amazon/ec2/DeleteSpotDatafeedSubscription.java |   16 +
 .../DeleteSpotDatafeedSubscriptionResponse.java    |   16 +
 ...DeleteSpotDatafeedSubscriptionResponseType.java |   16 +
 .../ec2/DeleteSpotDatafeedSubscriptionType.java    |   16 +
 awsapi/src/com/amazon/ec2/DeleteSubnet.java        |   16 +
 .../src/com/amazon/ec2/DeleteSubnetResponse.java   |   16 +
 .../com/amazon/ec2/DeleteSubnetResponseType.java   |   16 +
 awsapi/src/com/amazon/ec2/DeleteSubnetType.java    |   16 +
 awsapi/src/com/amazon/ec2/DeleteTags.java          |   16 +
 awsapi/src/com/amazon/ec2/DeleteTagsResponse.java  |   16 +
 .../src/com/amazon/ec2/DeleteTagsResponseType.java |   16 +
 .../src/com/amazon/ec2/DeleteTagsSetItemType.java  |   16 +
 awsapi/src/com/amazon/ec2/DeleteTagsSetType.java   |   16 +
 awsapi/src/com/amazon/ec2/DeleteTagsType.java      |   16 +
 awsapi/src/com/amazon/ec2/DeleteVolume.java        |   16 +
 .../src/com/amazon/ec2/DeleteVolumeResponse.java   |   16 +
 .../com/amazon/ec2/DeleteVolumeResponseType.java   |   16 +
 awsapi/src/com/amazon/ec2/DeleteVolumeType.java    |   16 +
 awsapi/src/com/amazon/ec2/DeleteVpc.java           |   16 +
 awsapi/src/com/amazon/ec2/DeleteVpcResponse.java   |   16 +
 .../src/com/amazon/ec2/DeleteVpcResponseType.java  |   16 +
 awsapi/src/com/amazon/ec2/DeleteVpcType.java       |   16 +
 awsapi/src/com/amazon/ec2/DeleteVpnConnection.java |   16 +
 .../amazon/ec2/DeleteVpnConnectionResponse.java    |   16 +
 .../ec2/DeleteVpnConnectionResponseType.java       |   16 +
 .../com/amazon/ec2/DeleteVpnConnectionType.java    |   16 +
 awsapi/src/com/amazon/ec2/DeleteVpnGateway.java    |   16 +
 .../com/amazon/ec2/DeleteVpnGatewayResponse.java   |   16 +
 .../amazon/ec2/DeleteVpnGatewayResponseType.java   |   16 +
 .../src/com/amazon/ec2/DeleteVpnGatewayType.java   |   16 +
 awsapi/src/com/amazon/ec2/DeregisterImage.java     |   16 +
 .../com/amazon/ec2/DeregisterImageResponse.java    |   16 +
 .../amazon/ec2/DeregisterImageResponseType.java    |   16 +
 awsapi/src/com/amazon/ec2/DeregisterImageType.java |   16 +
 awsapi/src/com/amazon/ec2/DescribeAddresses.java   |   16 +
 .../com/amazon/ec2/DescribeAddressesInfoType.java  |   16 +
 .../com/amazon/ec2/DescribeAddressesItemType.java  |   16 +
 .../com/amazon/ec2/DescribeAddressesResponse.java  |   16 +
 .../ec2/DescribeAddressesResponseInfoType.java     |   16 +
 .../ec2/DescribeAddressesResponseItemType.java     |   16 +
 .../amazon/ec2/DescribeAddressesResponseType.java  |   16 +
 .../src/com/amazon/ec2/DescribeAddressesType.java  |   16 +
 .../com/amazon/ec2/DescribeAvailabilityZones.java  |   16 +
 .../ec2/DescribeAvailabilityZonesResponse.java     |   16 +
 .../ec2/DescribeAvailabilityZonesResponseType.java |   16 +
 .../ec2/DescribeAvailabilityZonesSetItemType.java  |   16 +
 .../ec2/DescribeAvailabilityZonesSetType.java      |   16 +
 .../amazon/ec2/DescribeAvailabilityZonesType.java  |   16 +
 awsapi/src/com/amazon/ec2/DescribeBundleTasks.java |   16 +
 .../amazon/ec2/DescribeBundleTasksInfoType.java    |   16 +
 .../amazon/ec2/DescribeBundleTasksItemType.java    |   16 +
 .../amazon/ec2/DescribeBundleTasksResponse.java    |   16 +
 .../ec2/DescribeBundleTasksResponseType.java       |   16 +
 .../com/amazon/ec2/DescribeBundleTasksType.java    |   16 +
 .../com/amazon/ec2/DescribeConversionTasks.java    |   16 +
 .../ec2/DescribeConversionTasksResponse.java       |   16 +
 .../ec2/DescribeConversionTasksResponseType.java   |   16 +
 .../amazon/ec2/DescribeConversionTasksType.java    |   16 +
 .../com/amazon/ec2/DescribeCustomerGateways.java   |   16 +
 .../ec2/DescribeCustomerGatewaysResponse.java      |   16 +
 .../ec2/DescribeCustomerGatewaysResponseType.java  |   16 +
 .../amazon/ec2/DescribeCustomerGatewaysType.java   |   16 +
 awsapi/src/com/amazon/ec2/DescribeDhcpOptions.java |   16 +
 .../amazon/ec2/DescribeDhcpOptionsResponse.java    |   16 +
 .../ec2/DescribeDhcpOptionsResponseType.java       |   16 +
 .../com/amazon/ec2/DescribeDhcpOptionsType.java    |   16 +
 .../src/com/amazon/ec2/DescribeImageAttribute.java |   16 +
 .../amazon/ec2/DescribeImageAttributeResponse.java |   16 +
 .../ec2/DescribeImageAttributeResponseType.java    |   16 +
 ...ribeImageAttributeResponseTypeChoice_type0.java |   16 +
 .../com/amazon/ec2/DescribeImageAttributeType.java |   16 +
 .../amazon/ec2/DescribeImageAttributesGroup.java   |   16 +
 awsapi/src/com/amazon/ec2/DescribeImages.java      |   16 +
 .../ec2/DescribeImagesExecutableBySetType.java     |   16 +
 .../amazon/ec2/DescribeImagesExecutableByType.java |   16 +
 .../src/com/amazon/ec2/DescribeImagesInfoType.java |   16 +
 .../src/com/amazon/ec2/DescribeImagesItemType.java |   16 +
 .../com/amazon/ec2/DescribeImagesOwnerType.java    |   16 +
 .../com/amazon/ec2/DescribeImagesOwnersType.java   |   16 +
 .../src/com/amazon/ec2/DescribeImagesResponse.java |   16 +
 .../amazon/ec2/DescribeImagesResponseInfoType.java |   16 +
 .../amazon/ec2/DescribeImagesResponseItemType.java |   16 +
 .../com/amazon/ec2/DescribeImagesResponseType.java |   16 +
 awsapi/src/com/amazon/ec2/DescribeImagesType.java  |   16 +
 .../com/amazon/ec2/DescribeInstanceAttribute.java  |   16 +
 .../ec2/DescribeInstanceAttributeResponse.java     |   16 +
 .../ec2/DescribeInstanceAttributeResponseType.java |   16 +
 ...eInstanceAttributeResponseTypeChoice_type0.java |   16 +
 .../amazon/ec2/DescribeInstanceAttributeType.java  |   16 +
 .../ec2/DescribeInstanceAttributesGroup.java       |   16 +
 awsapi/src/com/amazon/ec2/DescribeInstances.java   |   16 +
 .../com/amazon/ec2/DescribeInstancesInfoType.java  |   16 +
 .../com/amazon/ec2/DescribeInstancesItemType.java  |   16 +
 .../com/amazon/ec2/DescribeInstancesResponse.java  |   16 +
 .../amazon/ec2/DescribeInstancesResponseType.java  |   16 +
 .../src/com/amazon/ec2/DescribeInstancesType.java  |   16 +
 awsapi/src/com/amazon/ec2/DescribeKeyPairs.java    |   16 +
 .../com/amazon/ec2/DescribeKeyPairsInfoType.java   |   16 +
 .../com/amazon/ec2/DescribeKeyPairsItemType.java   |   16 +
 .../com/amazon/ec2/DescribeKeyPairsResponse.java   |   16 +
 .../ec2/DescribeKeyPairsResponseInfoType.java      |   16 +
 .../ec2/DescribeKeyPairsResponseItemType.java      |   16 +
 .../amazon/ec2/DescribeKeyPairsResponseType.java   |   16 +
 .../src/com/amazon/ec2/DescribeKeyPairsType.java   |   16 +
 awsapi/src/com/amazon/ec2/DescribeLicenses.java    |   16 +
 .../com/amazon/ec2/DescribeLicensesResponse.java   |   16 +
 .../amazon/ec2/DescribeLicensesResponseType.java   |   16 +
 .../src/com/amazon/ec2/DescribeLicensesType.java   |   16 +
 .../amazon/ec2/DescribePlacementGroupItemType.java |   16 +
 .../com/amazon/ec2/DescribePlacementGroups.java    |   16 +
 .../ec2/DescribePlacementGroupsInfoType.java       |   16 +
 .../ec2/DescribePlacementGroupsResponse.java       |   16 +
 .../ec2/DescribePlacementGroupsResponseType.java   |   16 +
 .../amazon/ec2/DescribePlacementGroupsType.java    |   16 +
 awsapi/src/com/amazon/ec2/DescribeRegions.java     |   16 +
 .../com/amazon/ec2/DescribeRegionsResponse.java    |   16 +
 .../amazon/ec2/DescribeRegionsResponseType.java    |   16 +
 .../com/amazon/ec2/DescribeRegionsSetItemType.java |   16 +
 .../src/com/amazon/ec2/DescribeRegionsSetType.java |   16 +
 awsapi/src/com/amazon/ec2/DescribeRegionsType.java |   16 +
 .../com/amazon/ec2/DescribeReservedInstances.java  |   16 +
 .../ec2/DescribeReservedInstancesOfferings.java    |   16 +
 ...DescribeReservedInstancesOfferingsResponse.java |   16 +
 ...ervedInstancesOfferingsResponseSetItemType.java |   16 +
 ...eReservedInstancesOfferingsResponseSetType.java |   16 +
 ...ribeReservedInstancesOfferingsResponseType.java |   16 +
 ...cribeReservedInstancesOfferingsSetItemType.java |   16 +
 .../DescribeReservedInstancesOfferingsSetType.java |   16 +
 .../DescribeReservedInstancesOfferingsType.java    |   16 +
 .../ec2/DescribeReservedInstancesResponse.java     |   16 +
 ...scribeReservedInstancesResponseSetItemType.java |   16 +
 .../DescribeReservedInstancesResponseSetType.java  |   16 +
 .../ec2/DescribeReservedInstancesResponseType.java |   16 +
 .../ec2/DescribeReservedInstancesSetItemType.java  |   16 +
 .../ec2/DescribeReservedInstancesSetType.java      |   16 +
 .../amazon/ec2/DescribeReservedInstancesType.java  |   16 +
 .../src/com/amazon/ec2/DescribeSecurityGroups.java |   16 +
 .../amazon/ec2/DescribeSecurityGroupsResponse.java |   16 +
 .../ec2/DescribeSecurityGroupsResponseType.java    |   16 +
 .../ec2/DescribeSecurityGroupsSetItemType.java     |   16 +
 .../amazon/ec2/DescribeSecurityGroupsSetType.java  |   16 +
 .../com/amazon/ec2/DescribeSecurityGroupsType.java |   16 +
 .../com/amazon/ec2/DescribeSnapshotAttribute.java  |   16 +
 .../ec2/DescribeSnapshotAttributeResponse.java     |   16 +
 .../ec2/DescribeSnapshotAttributeResponseType.java |   16 +
 .../amazon/ec2/DescribeSnapshotAttributeType.java  |   16 +
 .../ec2/DescribeSnapshotAttributesGroup.java       |   16 +
 awsapi/src/com/amazon/ec2/DescribeSnapshots.java   |   16 +
 .../com/amazon/ec2/DescribeSnapshotsOwnerType.java |   16 +
 .../amazon/ec2/DescribeSnapshotsOwnersType.java    |   16 +
 .../com/amazon/ec2/DescribeSnapshotsResponse.java  |   16 +
 .../amazon/ec2/DescribeSnapshotsResponseType.java  |   16 +
 .../ec2/DescribeSnapshotsRestorableBySetType.java  |   16 +
 .../ec2/DescribeSnapshotsRestorableByType.java     |   16 +
 .../ec2/DescribeSnapshotsSetItemResponseType.java  |   16 +
 .../amazon/ec2/DescribeSnapshotsSetItemType.java   |   16 +
 .../ec2/DescribeSnapshotsSetResponseType.java      |   16 +
 .../com/amazon/ec2/DescribeSnapshotsSetType.java   |   16 +
 .../src/com/amazon/ec2/DescribeSnapshotsType.java  |   16 +
 .../ec2/DescribeSpotDatafeedSubscription.java      |   16 +
 .../DescribeSpotDatafeedSubscriptionResponse.java  |   16 +
 ...scribeSpotDatafeedSubscriptionResponseType.java |   16 +
 .../ec2/DescribeSpotDatafeedSubscriptionType.java  |   16 +
 .../amazon/ec2/DescribeSpotInstanceRequests.java   |   16 +
 .../ec2/DescribeSpotInstanceRequestsResponse.java  |   16 +
 .../DescribeSpotInstanceRequestsResponseType.java  |   16 +
 .../ec2/DescribeSpotInstanceRequestsType.java      |   16 +
 .../com/amazon/ec2/DescribeSpotPriceHistory.java   |   16 +
 .../ec2/DescribeSpotPriceHistoryResponse.java      |   16 +
 .../ec2/DescribeSpotPriceHistoryResponseType.java  |   16 +
 .../amazon/ec2/DescribeSpotPriceHistoryType.java   |   16 +
 awsapi/src/com/amazon/ec2/DescribeSubnets.java     |   16 +
 .../com/amazon/ec2/DescribeSubnetsResponse.java    |   16 +
 .../amazon/ec2/DescribeSubnetsResponseType.java    |   16 +
 awsapi/src/com/amazon/ec2/DescribeSubnetsType.java |   16 +
 awsapi/src/com/amazon/ec2/DescribeTags.java        |   16 +
 .../src/com/amazon/ec2/DescribeTagsResponse.java   |   16 +
 .../com/amazon/ec2/DescribeTagsResponseType.java   |   16 +
 awsapi/src/com/amazon/ec2/DescribeTagsType.java    |   16 +
 awsapi/src/com/amazon/ec2/DescribeVolumes.java     |   16 +
 .../com/amazon/ec2/DescribeVolumesResponse.java    |   16 +
 .../amazon/ec2/DescribeVolumesResponseType.java    |   16 +
 .../ec2/DescribeVolumesSetItemResponseType.java    |   16 +
 .../com/amazon/ec2/DescribeVolumesSetItemType.java |   16 +
 .../amazon/ec2/DescribeVolumesSetResponseType.java |   16 +
 .../src/com/amazon/ec2/DescribeVolumesSetType.java |   16 +
 awsapi/src/com/amazon/ec2/DescribeVolumesType.java |   16 +
 awsapi/src/com/amazon/ec2/DescribeVpcs.java        |   16 +
 .../src/com/amazon/ec2/DescribeVpcsResponse.java   |   16 +
 .../com/amazon/ec2/DescribeVpcsResponseType.java   |   16 +
 awsapi/src/com/amazon/ec2/DescribeVpcsType.java    |   16 +
 .../src/com/amazon/ec2/DescribeVpnConnections.java |   16 +
 .../amazon/ec2/DescribeVpnConnectionsResponse.java |   16 +
 .../ec2/DescribeVpnConnectionsResponseType.java    |   16 +
 .../com/amazon/ec2/DescribeVpnConnectionsType.java |   16 +
 awsapi/src/com/amazon/ec2/DescribeVpnGateways.java |   16 +
 .../amazon/ec2/DescribeVpnGatewaysResponse.java    |   16 +
 .../ec2/DescribeVpnGatewaysResponseType.java       |   16 +
 .../com/amazon/ec2/DescribeVpnGatewaysType.java    |   16 +
 awsapi/src/com/amazon/ec2/DetachVolume.java        |   16 +
 .../src/com/amazon/ec2/DetachVolumeResponse.java   |   16 +
 .../com/amazon/ec2/DetachVolumeResponseType.java   |   16 +
 awsapi/src/com/amazon/ec2/DetachVolumeType.java    |   16 +
 awsapi/src/com/amazon/ec2/DetachVpnGateway.java    |   16 +
 .../com/amazon/ec2/DetachVpnGatewayResponse.java   |   16 +
 .../amazon/ec2/DetachVpnGatewayResponseType.java   |   16 +
 .../src/com/amazon/ec2/DetachVpnGatewayType.java   |   16 +
 .../amazon/ec2/DhcpConfigurationItemSetType.java   |   16 +
 .../com/amazon/ec2/DhcpConfigurationItemType.java  |   16 +
 .../com/amazon/ec2/DhcpOptionsIdSetItemType.java   |   16 +
 .../src/com/amazon/ec2/DhcpOptionsIdSetType.java   |   16 +
 awsapi/src/com/amazon/ec2/DhcpOptionsSetType.java  |   16 +
 awsapi/src/com/amazon/ec2/DhcpOptionsType.java     |   16 +
 awsapi/src/com/amazon/ec2/DhcpValueSetType.java    |   16 +
 awsapi/src/com/amazon/ec2/DhcpValueType.java       |   16 +
 awsapi/src/com/amazon/ec2/DisassociateAddress.java |   16 +
 .../amazon/ec2/DisassociateAddressResponse.java    |   16 +
 .../ec2/DisassociateAddressResponseType.java       |   16 +
 .../com/amazon/ec2/DisassociateAddressType.java    |   16 +
 .../com/amazon/ec2/DiskImageDescriptionType.java   |   16 +
 awsapi/src/com/amazon/ec2/DiskImageDetailType.java |   16 +
 awsapi/src/com/amazon/ec2/DiskImageSetType.java    |   16 +
 awsapi/src/com/amazon/ec2/DiskImageType.java       |   16 +
 .../amazon/ec2/DiskImageVolumeDescriptionType.java |   16 +
 awsapi/src/com/amazon/ec2/DiskImageVolumeType.java |   16 +
 awsapi/src/com/amazon/ec2/EbsBlockDeviceType.java  |   16 +
 .../EbsInstanceBlockDeviceMappingResponseType.java |   16 +
 awsapi/src/com/amazon/ec2/EmptyElementType.java    |   16 +
 awsapi/src/com/amazon/ec2/ExtensionMapper.java     |   16 +
 awsapi/src/com/amazon/ec2/FilterSetType.java       |   16 +
 awsapi/src/com/amazon/ec2/FilterType.java          |   16 +
 awsapi/src/com/amazon/ec2/GetConsoleOutput.java    |   16 +
 .../com/amazon/ec2/GetConsoleOutputResponse.java   |   16 +
 .../amazon/ec2/GetConsoleOutputResponseType.java   |   16 +
 .../src/com/amazon/ec2/GetConsoleOutputType.java   |   16 +
 awsapi/src/com/amazon/ec2/GetPasswordData.java     |   16 +
 .../com/amazon/ec2/GetPasswordDataResponse.java    |   16 +
 .../amazon/ec2/GetPasswordDataResponseType.java    |   16 +
 awsapi/src/com/amazon/ec2/GetPasswordDataType.java |   16 +
 awsapi/src/com/amazon/ec2/GroupItemType.java       |   16 +
 awsapi/src/com/amazon/ec2/GroupSetType.java        |   16 +
 awsapi/src/com/amazon/ec2/ImportInstance.java      |   16 +
 .../ec2/ImportInstanceLaunchSpecificationType.java |   16 +
 .../src/com/amazon/ec2/ImportInstanceResponse.java |   16 +
 .../com/amazon/ec2/ImportInstanceResponseType.java |   16 +
 .../amazon/ec2/ImportInstanceTaskDetailsType.java  |   16 +
 awsapi/src/com/amazon/ec2/ImportInstanceType.java  |   16 +
 .../ec2/ImportInstanceVolumeDetailItemType.java    |   16 +
 .../ec2/ImportInstanceVolumeDetailSetType.java     |   16 +
 awsapi/src/com/amazon/ec2/ImportKeyPair.java       |   16 +
 .../src/com/amazon/ec2/ImportKeyPairResponse.java  |   16 +
 .../com/amazon/ec2/ImportKeyPairResponseType.java  |   16 +
 awsapi/src/com/amazon/ec2/ImportKeyPairType.java   |   16 +
 awsapi/src/com/amazon/ec2/ImportVolume.java        |   16 +
 .../src/com/amazon/ec2/ImportVolumeResponse.java   |   16 +
 .../com/amazon/ec2/ImportVolumeResponseType.java   |   16 +
 .../amazon/ec2/ImportVolumeTaskDetailsType.java    |   16 +
 awsapi/src/com/amazon/ec2/ImportVolumeType.java    |   16 +
 .../ec2/InstanceBlockDeviceMappingItemType.java    |   16 +
 ...anceBlockDeviceMappingItemTypeChoice_type0.java |   16 +
 ...InstanceBlockDeviceMappingResponseItemType.java |   16 +
 ...kDeviceMappingResponseItemTypeChoice_type0.java |   16 +
 .../InstanceBlockDeviceMappingResponseType.java    |   16 +
 .../amazon/ec2/InstanceBlockDeviceMappingType.java |   16 +
 .../com/amazon/ec2/InstanceEbsBlockDeviceType.java |   16 +
 awsapi/src/com/amazon/ec2/InstanceIdSetType.java   |   16 +
 awsapi/src/com/amazon/ec2/InstanceIdType.java      |   16 +
 .../com/amazon/ec2/InstanceLicenseRequestType.java |   16 +
 .../amazon/ec2/InstanceLicenseResponseType.java    |   16 +
 .../amazon/ec2/InstanceMonitoringStateType.java    |   16 +
 .../src/com/amazon/ec2/InstancePlacementType.java  |   16 +
 .../com/amazon/ec2/InstanceStateChangeSetType.java |   16 +
 .../com/amazon/ec2/InstanceStateChangeType.java    |   16 +
 awsapi/src/com/amazon/ec2/InstanceStateType.java   |   16 +
 .../com/amazon/ec2/InstanceTypeSetItemType.java    |   16 +
 awsapi/src/com/amazon/ec2/InstanceTypeSetType.java |   16 +
 awsapi/src/com/amazon/ec2/IpPermissionSetType.java |   16 +
 awsapi/src/com/amazon/ec2/IpPermissionType.java    |   16 +
 awsapi/src/com/amazon/ec2/IpRangeItemType.java     |   16 +
 awsapi/src/com/amazon/ec2/IpRangeSetType.java      |   16 +
 .../com/amazon/ec2/LaunchPermissionItemType.java   |   16 +
 .../com/amazon/ec2/LaunchPermissionListType.java   |   16 +
 .../amazon/ec2/LaunchPermissionOperationType.java  |   16 +
 .../amazon/ec2/LaunchSpecificationRequestType.java |   16 +
 .../ec2/LaunchSpecificationResponseType.java       |   16 +
 .../com/amazon/ec2/LicenseCapacitySetItemType.java |   16 +
 .../src/com/amazon/ec2/LicenseCapacitySetType.java |   16 +
 .../src/com/amazon/ec2/LicenseIdSetItemType.java   |   16 +
 awsapi/src/com/amazon/ec2/LicenseIdSetType.java    |   16 +
 awsapi/src/com/amazon/ec2/LicenseSetItemType.java  |   16 +
 awsapi/src/com/amazon/ec2/LicenseSetType.java      |   16 +
 .../src/com/amazon/ec2/ModifyImageAttribute.java   |   16 +
 .../amazon/ec2/ModifyImageAttributeResponse.java   |   16 +
 .../ec2/ModifyImageAttributeResponseType.java      |   16 +
 .../com/amazon/ec2/ModifyImageAttributeType.java   |   16 +
 .../ec2/ModifyImageAttributeTypeChoice_type0.java  |   16 +
 .../com/amazon/ec2/ModifyInstanceAttribute.java    |   16 +
 .../ec2/ModifyInstanceAttributeResponse.java       |   16 +
 .../ec2/ModifyInstanceAttributeResponseType.java   |   16 +
 .../amazon/ec2/ModifyInstanceAttributeType.java    |   16 +
 .../ModifyInstanceAttributeTypeChoice_type0.java   |   16 +
 .../com/amazon/ec2/ModifySnapshotAttribute.java    |   16 +
 .../ec2/ModifySnapshotAttributeResponse.java       |   16 +
 .../ec2/ModifySnapshotAttributeResponseType.java   |   16 +
 .../amazon/ec2/ModifySnapshotAttributeType.java    |   16 +
 awsapi/src/com/amazon/ec2/MonitorInstances.java    |   16 +
 .../com/amazon/ec2/MonitorInstancesResponse.java   |   16 +
 .../ec2/MonitorInstancesResponseSetItemType.java   |   16 +
 .../ec2/MonitorInstancesResponseSetType.java       |   16 +
 .../amazon/ec2/MonitorInstancesResponseType.java   |   16 +
 .../amazon/ec2/MonitorInstancesSetItemType.java    |   16 +
 .../com/amazon/ec2/MonitorInstancesSetType.java    |   16 +
 .../src/com/amazon/ec2/MonitorInstancesType.java   |   16 +
 .../src/com/amazon/ec2/MonitoringInstanceType.java |   16 +
 .../ec2/NullableAttributeBooleanValueType.java     |   16 +
 .../com/amazon/ec2/NullableAttributeValueType.java |   16 +
 .../src/com/amazon/ec2/PlacementGroupInfoType.java |   16 +
 .../src/com/amazon/ec2/PlacementGroupSetType.java  |   16 +
 .../src/com/amazon/ec2/PlacementRequestType.java   |   16 +
 .../src/com/amazon/ec2/PlacementResponseType.java  |   16 +
 awsapi/src/com/amazon/ec2/ProductCodeItemType.java |   16 +
 awsapi/src/com/amazon/ec2/ProductCodeListType.java |   16 +
 awsapi/src/com/amazon/ec2/ProductCodeSetType.java  |   16 +
 awsapi/src/com/amazon/ec2/ProductCodeType.java     |   16 +
 .../com/amazon/ec2/ProductCodesSetItemType.java    |   16 +
 awsapi/src/com/amazon/ec2/ProductCodesSetType.java |   16 +
 .../amazon/ec2/ProductDescriptionSetItemType.java  |   16 +
 .../com/amazon/ec2/ProductDescriptionSetType.java  |   16 +
 .../ec2/PurchaseReservedInstancesOffering.java     |   16 +
 .../PurchaseReservedInstancesOfferingResponse.java |   16 +
 ...chaseReservedInstancesOfferingResponseType.java |   16 +
 .../ec2/PurchaseReservedInstancesOfferingType.java |   16 +
 awsapi/src/com/amazon/ec2/RebootInstances.java     |   16 +
 .../com/amazon/ec2/RebootInstancesInfoType.java    |   16 +
 .../com/amazon/ec2/RebootInstancesItemType.java    |   16 +
 .../com/amazon/ec2/RebootInstancesResponse.java    |   16 +
 .../amazon/ec2/RebootInstancesResponseType.java    |   16 +
 awsapi/src/com/amazon/ec2/RebootInstancesType.java |   16 +
 awsapi/src/com/amazon/ec2/RegionItemType.java      |   16 +
 awsapi/src/com/amazon/ec2/RegionSetType.java       |   16 +
 awsapi/src/com/amazon/ec2/RegisterImage.java       |   16 +
 .../src/com/amazon/ec2/RegisterImageResponse.java  |   16 +
 .../com/amazon/ec2/RegisterImageResponseType.java  |   16 +
 awsapi/src/com/amazon/ec2/RegisterImageType.java   |   16 +
 awsapi/src/com/amazon/ec2/ReleaseAddress.java      |   16 +
 .../src/com/amazon/ec2/ReleaseAddressResponse.java |   16 +
 .../com/amazon/ec2/ReleaseAddressResponseType.java |   16 +
 awsapi/src/com/amazon/ec2/ReleaseAddressType.java  |   16 +
 .../src/com/amazon/ec2/RequestSpotInstances.java   |   16 +
 .../amazon/ec2/RequestSpotInstancesResponse.java   |   16 +
 .../ec2/RequestSpotInstancesResponseType.java      |   16 +
 .../com/amazon/ec2/RequestSpotInstancesType.java   |   16 +
 awsapi/src/com/amazon/ec2/ReservationInfoType.java |   16 +
 awsapi/src/com/amazon/ec2/ReservationSetType.java  |   16 +
 awsapi/src/com/amazon/ec2/ResetImageAttribute.java |   16 +
 .../amazon/ec2/ResetImageAttributeResponse.java    |   16 +
 .../ec2/ResetImageAttributeResponseType.java       |   16 +
 .../com/amazon/ec2/ResetImageAttributeType.java    |   16 +
 .../com/amazon/ec2/ResetImageAttributesGroup.java  |   16 +
 .../src/com/amazon/ec2/ResetInstanceAttribute.java |   16 +
 .../amazon/ec2/ResetInstanceAttributeResponse.java |   16 +
 .../ec2/ResetInstanceAttributeResponseType.java    |   16 +
 .../com/amazon/ec2/ResetInstanceAttributeType.java |   16 +
 .../amazon/ec2/ResetInstanceAttributesGroup.java   |   16 +
 .../src/com/amazon/ec2/ResetSnapshotAttribute.java |   16 +
 .../amazon/ec2/ResetSnapshotAttributeResponse.java |   16 +
 .../ec2/ResetSnapshotAttributeResponseType.java    |   16 +
 .../com/amazon/ec2/ResetSnapshotAttributeType.java |   16 +
 .../amazon/ec2/ResetSnapshotAttributesGroup.java   |   16 +
 .../src/com/amazon/ec2/ResourceIdSetItemType.java  |   16 +
 awsapi/src/com/amazon/ec2/ResourceIdSetType.java   |   16 +
 .../src/com/amazon/ec2/ResourceTagSetItemType.java |   16 +
 awsapi/src/com/amazon/ec2/ResourceTagSetType.java  |   16 +
 .../com/amazon/ec2/RevokeSecurityGroupIngress.java |   16 +
 .../ec2/RevokeSecurityGroupIngressResponse.java    |   16 +
 .../RevokeSecurityGroupIngressResponseType.java    |   16 +
 .../amazon/ec2/RevokeSecurityGroupIngressType.java |   16 +
 awsapi/src/com/amazon/ec2/RunInstances.java        |   16 +
 .../src/com/amazon/ec2/RunInstancesResponse.java   |   16 +
 .../com/amazon/ec2/RunInstancesResponseType.java   |   16 +
 awsapi/src/com/amazon/ec2/RunInstancesType.java    |   16 +
 .../com/amazon/ec2/RunningInstancesItemType.java   |   16 +
 .../com/amazon/ec2/RunningInstancesSetType.java    |   16 +
 .../src/com/amazon/ec2/SecurityGroupItemType.java  |   16 +
 .../src/com/amazon/ec2/SecurityGroupSetType.java   |   16 +
 .../amazon/ec2/SpotDatafeedSubscriptionType.java   |   16 +
 .../ec2/SpotInstanceRequestIdSetItemType.java      |   16 +
 .../amazon/ec2/SpotInstanceRequestIdSetType.java   |   16 +
 .../amazon/ec2/SpotInstanceRequestSetItemType.java |   16 +
 .../com/amazon/ec2/SpotInstanceRequestSetType.java |   16 +
 .../com/amazon/ec2/SpotInstanceStateFaultType.java |   16 +
 .../amazon/ec2/SpotPriceHistorySetItemType.java    |   16 +
 .../com/amazon/ec2/SpotPriceHistorySetType.java    |   16 +
 awsapi/src/com/amazon/ec2/StartInstances.java      |   16 +
 .../src/com/amazon/ec2/StartInstancesResponse.java |   16 +
 .../com/amazon/ec2/StartInstancesResponseType.java |   16 +
 awsapi/src/com/amazon/ec2/StartInstancesType.java  |   16 +
 awsapi/src/com/amazon/ec2/StateReasonType.java     |   16 +
 awsapi/src/com/amazon/ec2/StopInstances.java       |   16 +
 .../src/com/amazon/ec2/StopInstancesResponse.java  |   16 +
 .../com/amazon/ec2/StopInstancesResponseType.java  |   16 +
 awsapi/src/com/amazon/ec2/StopInstancesType.java   |   16 +
 awsapi/src/com/amazon/ec2/SubnetIdSetItemType.java |   16 +
 awsapi/src/com/amazon/ec2/SubnetIdSetType.java     |   16 +
 awsapi/src/com/amazon/ec2/SubnetSetType.java       |   16 +
 awsapi/src/com/amazon/ec2/SubnetType.java          |   16 +
 awsapi/src/com/amazon/ec2/TagSetItemType.java      |   16 +
 awsapi/src/com/amazon/ec2/TagSetType.java          |   16 +
 awsapi/src/com/amazon/ec2/TerminateInstances.java  |   16 +
 .../com/amazon/ec2/TerminateInstancesResponse.java |   16 +
 .../amazon/ec2/TerminateInstancesResponseType.java |   16 +
 .../src/com/amazon/ec2/TerminateInstancesType.java |   16 +
 awsapi/src/com/amazon/ec2/UnmonitorInstances.java  |   16 +
 .../com/amazon/ec2/UnmonitorInstancesResponse.java |   16 +
 awsapi/src/com/amazon/ec2/UserDataType.java        |   16 +
 .../src/com/amazon/ec2/UserIdGroupPairSetType.java |   16 +
 awsapi/src/com/amazon/ec2/UserIdGroupPairType.java |   16 +
 awsapi/src/com/amazon/ec2/ValueSetType.java        |   16 +
 awsapi/src/com/amazon/ec2/ValueType.java           |   16 +
 awsapi/src/com/amazon/ec2/VpcIdSetItemType.java    |   16 +
 awsapi/src/com/amazon/ec2/VpcIdSetType.java        |   16 +
 awsapi/src/com/amazon/ec2/VpcSetType.java          |   16 +
 awsapi/src/com/amazon/ec2/VpcType.java             |   16 +
 .../com/amazon/ec2/VpnConnectionIdSetItemType.java |   16 +
 .../src/com/amazon/ec2/VpnConnectionIdSetType.java |   16 +
 .../src/com/amazon/ec2/VpnConnectionSetType.java   |   16 +
 awsapi/src/com/amazon/ec2/VpnConnectionType.java   |   16 +
 .../com/amazon/ec2/VpnGatewayIdSetItemType.java    |   16 +
 awsapi/src/com/amazon/ec2/VpnGatewayIdSetType.java |   16 +
 awsapi/src/com/amazon/ec2/VpnGatewaySetType.java   |   16 +
 awsapi/src/com/amazon/ec2/VpnGatewayType.java      |   16 +
 .../ec2/client/AmazonEC2CallbackHandler.java       |   16 +
 .../src/com/amazon/ec2/client/AmazonEC2Stub.java   |   16 +
 awsapi/src/com/amazon/s3/AccessControlList.java    | 1142 +-
 awsapi/src/com/amazon/s3/AccessControlPolicy.java  | 1040 +-
 .../src/com/amazon/s3/AmazonCustomerByEmail.java   |  978 +-
 .../amazon/s3/AmazonS3MessageReceiverInOut.java    | 2752 +-
 awsapi/src/com/amazon/s3/AmazonS3Skeleton.java     |  556 +-
 .../com/amazon/s3/AmazonS3SkeletonInterface.java   |  498 +-
 awsapi/src/com/amazon/s3/BucketLoggingStatus.java  |  944 +-
 awsapi/src/com/amazon/s3/CanonicalUser.java        | 1188 +-
 awsapi/src/com/amazon/s3/CopyObject.java           | 4380 +-
 awsapi/src/com/amazon/s3/CopyObjectResponse.java   |  920 +-
 awsapi/src/com/amazon/s3/CopyObjectResult.java     | 1164 +-
 awsapi/src/com/amazon/s3/CreateBucket.java         | 1760 +-
 .../com/amazon/s3/CreateBucketConfiguration.java   |  918 +-
 awsapi/src/com/amazon/s3/CreateBucketResponse.java |  920 +-
 awsapi/src/com/amazon/s3/CreateBucketResult.java   |  980 +-
 awsapi/src/com/amazon/s3/DeleteBucket.java         | 1822 +-
 awsapi/src/com/amazon/s3/DeleteBucketResponse.java |  920 +-
 awsapi/src/com/amazon/s3/DeleteMarkerEntry.java    | 1664 +-
 awsapi/src/com/amazon/s3/DeleteObject.java         | 2006 +-
 awsapi/src/com/amazon/s3/DeleteObjectResponse.java |  920 +-
 awsapi/src/com/amazon/s3/ExtensionMapper.java      |  824 +-
 .../amazon/s3/GetBucketAccessControlPolicy.java    | 1822 +-
 .../s3/GetBucketAccessControlPolicyResponse.java   |  920 +-
 .../src/com/amazon/s3/GetBucketLoggingStatus.java  | 1822 +-
 .../amazon/s3/GetBucketLoggingStatusResponse.java  |  920 +-
 awsapi/src/com/amazon/s3/GetObject.java            | 2510 +-
 .../amazon/s3/GetObjectAccessControlPolicy.java    | 2006 +-
 .../s3/GetObjectAccessControlPolicyResponse.java   |  920 +-
 awsapi/src/com/amazon/s3/GetObjectExtended.java    | 4322 +-
 .../com/amazon/s3/GetObjectExtendedResponse.java   |  920 +-
 awsapi/src/com/amazon/s3/GetObjectResponse.java    |  920 +-
 awsapi/src/com/amazon/s3/GetObjectResult.java      | 1770 +-
 awsapi/src/com/amazon/s3/Grant.java                | 1040 +-
 awsapi/src/com/amazon/s3/Grantee.java              |  786 +-
 awsapi/src/com/amazon/s3/Group.java                |  978 +-
 awsapi/src/com/amazon/s3/ListAllMyBuckets.java     | 1428 +-
 .../src/com/amazon/s3/ListAllMyBucketsEntry.java   | 1164 +-
 awsapi/src/com/amazon/s3/ListAllMyBucketsList.java | 1134 +-
 .../com/amazon/s3/ListAllMyBucketsResponse.java    |  920 +-
 .../src/com/amazon/s3/ListAllMyBucketsResult.java  | 1040 +-
 awsapi/src/com/amazon/s3/ListBucket.java           | 2652 +-
 awsapi/src/com/amazon/s3/ListBucketResponse.java   |  920 +-
 awsapi/src/com/amazon/s3/ListBucketResult.java     | 3118 +-
 awsapi/src/com/amazon/s3/ListEntry.java            | 1786 +-
 awsapi/src/com/amazon/s3/ListVersionsResponse.java |  920 +-
 awsapi/src/com/amazon/s3/ListVersionsResult.java   | 3500 +-
 .../amazon/s3/ListVersionsResultChoice_type0.java  |  980 +-
 awsapi/src/com/amazon/s3/LocationConstraint.java   |  984 +-
 awsapi/src/com/amazon/s3/LoggingSettings.java      | 1312 +-
 awsapi/src/com/amazon/s3/MetadataDirective.java    |  946 +-
 awsapi/src/com/amazon/s3/MetadataEntry.java        | 1164 +-
 awsapi/src/com/amazon/s3/MfaDeleteStatus.java      |  946 +-
 .../com/amazon/s3/NotificationConfiguration.java   | 1134 +-
 awsapi/src/com/amazon/s3/Payer.java                |  946 +-
 awsapi/src/com/amazon/s3/Permission.java           |  982 +-
 awsapi/src/com/amazon/s3/PostResponse.java         | 1534 +-
 awsapi/src/com/amazon/s3/PrefixEntry.java          |  980 +-
 awsapi/src/com/amazon/s3/PutObject.java            | 2816 +-
 awsapi/src/com/amazon/s3/PutObjectInline.java      | 3024 +-
 .../src/com/amazon/s3/PutObjectInlineResponse.java |  920 +-
 awsapi/src/com/amazon/s3/PutObjectResponse.java    |  920 +-
 awsapi/src/com/amazon/s3/PutObjectResult.java      | 1164 +-
 .../com/amazon/s3/RequestPaymentConfiguration.java |  918 +-
 awsapi/src/com/amazon/s3/Result.java               |  918 +-
 .../amazon/s3/SetBucketAccessControlPolicy.java    | 1970 +-
 .../s3/SetBucketAccessControlPolicyResponse.java   |  798 +-
 .../src/com/amazon/s3/SetBucketLoggingStatus.java  | 1944 +-
 .../amazon/s3/SetBucketLoggingStatusResponse.java  |  798 +-
 .../amazon/s3/SetObjectAccessControlPolicy.java    | 2128 +-
 .../s3/SetObjectAccessControlPolicyResponse.java   |  798 +-
 awsapi/src/com/amazon/s3/Status.java               | 1148 +-
 awsapi/src/com/amazon/s3/StorageClass.java         |  946 +-
 awsapi/src/com/amazon/s3/TopicConfiguration.java   | 1346 +-
 awsapi/src/com/amazon/s3/User.java                 |  784 +-
 awsapi/src/com/amazon/s3/VersionEntry.java         | 2138 +-
 .../src/com/amazon/s3/VersioningConfiguration.java | 1092 +-
 awsapi/src/com/amazon/s3/VersioningStatus.java     |  946 +-
 .../amazon/s3/client/AmazonS3CallbackHandler.java  |  626 +-
 awsapi/src/com/amazon/s3/client/AmazonS3Stub.java  |92182 ++++++++-------
 .../bridge/auth/ec2/AuthenticationHandler.java     |  320 +-
 .../bridge/auth/ec2/AuthenticationModule.java      |  128 +-
 awsapi/src/com/cloud/bridge/auth/ec2/module.xml    |   34 +-
 .../bridge/auth/s3/AuthenticationHandler.java      |   16 +
 .../cloud/bridge/auth/s3/AuthenticationModule.java |  132 +-
 awsapi/src/com/cloud/bridge/auth/s3/module.xml     |   34 +-
 .../cloud/bridge/io/DimeDelimitedInputStream.java  | 1250 +-
 .../com/cloud/bridge/io/FileRangeDataSource.java   |  138 +-
 .../com/cloud/bridge/io/FileRangeInputStream.java  |  208 +-
 .../bridge/io/MTOMAwareResultStreamWriter.java     |   16 +
 .../cloud/bridge/io/MultiPartDimeInputStream.java  |  358 +-
 .../cloud/bridge/io/S3FileSystemBucketAdapter.java |  512 +-
 .../bridge/lifecycle/ServiceEngineLifecycle.java   |  124 +-
 awsapi/src/com/cloud/bridge/model/MHost.hbm.xml    |   74 +-
 awsapi/src/com/cloud/bridge/model/MHost.java       |  242 +-
 .../src/com/cloud/bridge/model/MHostMount.hbm.xml  |   56 +-
 awsapi/src/com/cloud/bridge/model/MHostMount.java  |  204 +-
 awsapi/src/com/cloud/bridge/model/SAcl.hbm.xml     |   72 +-
 awsapi/src/com/cloud/bridge/model/SAcl.java        |  494 +-
 awsapi/src/com/cloud/bridge/model/SBucket.hbm.xml  |   76 +-
 awsapi/src/com/cloud/bridge/model/SBucket.java     |  272 +-
 awsapi/src/com/cloud/bridge/model/SHost.hbm.xml    |   84 +-
 awsapi/src/com/cloud/bridge/model/SHost.java       |  250 +-
 awsapi/src/com/cloud/bridge/model/SMeta.hbm.xml    |   46 +-
 awsapi/src/com/cloud/bridge/model/SMeta.java       |  208 +-
 awsapi/src/com/cloud/bridge/model/SObject.hbm.xml  |   82 +-
 awsapi/src/com/cloud/bridge/model/SObject.java     |  432 +-
 .../src/com/cloud/bridge/model/SObjectItem.hbm.xml |   88 +-
 awsapi/src/com/cloud/bridge/model/SObjectItem.java |  318 +-
 .../com/cloud/bridge/model/UserCredentials.hbm.xml |   40 +-
 .../com/cloud/bridge/model/UserCredentials.java    |  204 +-
 awsapi/src/com/cloud/bridge/persist/EntityDao.java |  252 +-
 .../cloud/bridge/persist/GMTDateTimeUserType.java  |  220 +-
 .../com/cloud/bridge/persist/PersistContext.java   |  734 +-
 .../com/cloud/bridge/persist/PersistException.java |   92 +-
 .../src/com/cloud/bridge/persist/dao/BaseDao.java  |  166 +-
 .../cloud/bridge/persist/dao/BucketPolicyDao.java  |   16 +
 .../bridge/persist/dao/CloudStackAccountDao.java   |   84 +-
 .../persist/dao/CloudStackConfigurationDao.java    |   98 +-
 .../persist/dao/CloudStackSvcOfferingDao.java      |   98 +-
 .../src/com/cloud/bridge/persist/dao/MHostDao.java |   80 +-
 .../cloud/bridge/persist/dao/MHostMountDao.java    |   80 +-
 .../cloud/bridge/persist/dao/MultipartLoadDao.java |   16 +
 .../com/cloud/bridge/persist/dao/OfferingDao.java  |   16 +
 .../src/com/cloud/bridge/persist/dao/SAclDao.java  |  172 +-
 .../com/cloud/bridge/persist/dao/SBucketDao.java   |   94 +-
 .../src/com/cloud/bridge/persist/dao/SHostDao.java |   90 +-
 .../src/com/cloud/bridge/persist/dao/SMetaDao.java |  130 +-
 .../com/cloud/bridge/persist/dao/SObjectDao.java   |  172 +-
 .../cloud/bridge/persist/dao/SObjectItemDao.java   |   80 +-
 .../bridge/persist/dao/UserCredentialsDao.java     |  352 +-
 .../com/cloud/bridge/service/EC2MainServlet.java   |   16 +
 .../com/cloud/bridge/service/EC2RestServlet.java   |   16 +
 .../com/cloud/bridge/service/EC2SoapService.java   |   16 +
 .../cloud/bridge/service/EC2SoapServiceImpl.java   |   16 +
 .../src/com/cloud/bridge/service/S3Constants.java  |   70 +-
 .../com/cloud/bridge/service/S3RestServlet.java    |   16 +
 .../src/com/cloud/bridge/service/UserContext.java  |  238 +-
 awsapi/src/com/cloud/bridge/service/UserInfo.java  |  138 +-
 .../service/controller/s3/S3BucketAction.java      |   16 +
 .../service/controller/s3/S3ObjectAction.java      |   16 +
 .../s3/S3SerializableServiceImplementation.java    | 1464 +-
 .../service/controller/s3/ServiceProvider.java     |   16 +
 .../service/controller/s3/ServletAction.java       |   74 +-
 .../com/cloud/bridge/service/core/ec2/Account.java |   16 +
 .../cloud/bridge/service/core/ec2/DiskOffer.java   |  180 +-
 .../bridge/service/core/ec2/DiskOfferings.java     |   86 +-
 .../cloud/bridge/service/core/ec2/EC2Address.java  |   16 +
 .../service/core/ec2/EC2AddressFilterSet.java      |   16 +
 .../service/core/ec2/EC2AssociateAddress.java      |   16 +
 .../core/ec2/EC2AuthorizeRevokeSecurityGroup.java  |   76 +-
 .../core/ec2/EC2AvailabilityZonesFilterSet.java    |   16 +
 .../bridge/service/core/ec2/EC2CreateImage.java    |  122 +-
 .../service/core/ec2/EC2CreateImageResponse.java   |   82 +-
 .../bridge/service/core/ec2/EC2CreateKeyPair.java  |   16 +
 .../bridge/service/core/ec2/EC2CreateVolume.java   |  168 +-
 .../bridge/service/core/ec2/EC2DeleteKeyPair.java  |   16 +
 .../service/core/ec2/EC2DescribeAddresses.java     |   16 +
 .../core/ec2/EC2DescribeAddressesResponse.java     |   16 +
 .../core/ec2/EC2DescribeAvailabilityZones.java     |   86 +-
 .../ec2/EC2DescribeAvailabilityZonesResponse.java  |  114 +-
 .../core/ec2/EC2DescribeImageAttribute.java        |  108 +-
 .../bridge/service/core/ec2/EC2DescribeImages.java |  122 +-
 .../core/ec2/EC2DescribeImagesResponse.java        |   86 +-
 .../service/core/ec2/EC2DescribeInstances.java     |  104 +-
 .../core/ec2/EC2DescribeInstancesResponse.java     |   86 +-
 .../service/core/ec2/EC2DescribeKeyPairs.java      |   16 +
 .../core/ec2/EC2DescribeKeyPairsResponse.java      |   16 +
 .../core/ec2/EC2DescribeSecurityGroups.java        |   74 +-
 .../ec2/EC2DescribeSecurityGroupsResponse.java     |   56 +-
 .../service/core/ec2/EC2DescribeSnapshots.java     |  104 +-
 .../core/ec2/EC2DescribeSnapshotsResponse.java     |   86 +-
 .../service/core/ec2/EC2DescribeVolumes.java       |  104 +-
 .../core/ec2/EC2DescribeVolumesResponse.java       |   94 +-
 .../service/core/ec2/EC2DisassociateAddress.java   |   16 +
 .../cloud/bridge/service/core/ec2/EC2Engine.java   |   16 +
 .../cloud/bridge/service/core/ec2/EC2Filter.java   |   16 +
 .../bridge/service/core/ec2/EC2GroupFilterSet.java |   16 +
 .../cloud/bridge/service/core/ec2/EC2Image.java    |  230 +-
 .../service/core/ec2/EC2ImageAttributes.java       |  188 +-
 .../bridge/service/core/ec2/EC2ImportKeyPair.java  |   16 +
 .../cloud/bridge/service/core/ec2/EC2Instance.java |  416 +-
 .../service/core/ec2/EC2InstanceFilterSet.java     |   16 +
 .../bridge/service/core/ec2/EC2IpPermission.java   |  256 +-
 .../service/core/ec2/EC2KeyPairFilterSet.java      |   16 +
 .../service/core/ec2/EC2ModifyImageAttribute.java  |  204 +-
 .../bridge/service/core/ec2/EC2PasswordData.java   |   16 +
 .../service/core/ec2/EC2RebootInstances.java       |   86 +-
 .../bridge/service/core/ec2/EC2RegisterImage.java  |  204 +-
 .../bridge/service/core/ec2/EC2ReleaseAddress.java |   16 +
 .../bridge/service/core/ec2/EC2RunInstances.java   |  266 +-
 .../service/core/ec2/EC2RunInstancesResponse.java  |   90 +-
 .../bridge/service/core/ec2/EC2SSHKeyPair.java     |   16 +
 .../bridge/service/core/ec2/EC2SecurityGroup.java  |  174 +-
 .../cloud/bridge/service/core/ec2/EC2Snapshot.java |  252 +-
 .../service/core/ec2/EC2SnapshotFilterSet.java     |   16 +
 .../bridge/service/core/ec2/EC2StartInstances.java |   86 +-
 .../core/ec2/EC2StartInstancesResponse.java        |   88 +-
 .../bridge/service/core/ec2/EC2StopInstances.java  |  108 +-
 .../service/core/ec2/EC2StopInstancesResponse.java |   86 +-
 .../cloud/bridge/service/core/ec2/EC2Volume.java   |  482 +-
 .../service/core/ec2/EC2VolumeFilterSet.java       |   16 +
 .../service/core/ec2/IpForwardingRuleResponse.java |   16 +
 .../bridge/service/core/ec2/OfferingBundle.java    |   84 +-
 .../bridge/service/core/ec2/ServiceOffer.java      |  190 +-
 .../bridge/service/core/ec2/ServiceOfferings.java  |   88 +-
 .../service/core/s3/S3AccessControlList.java       |  100 +-
 .../service/core/s3/S3AccessControlPolicy.java     |  104 +-
 .../cloud/bridge/service/core/s3/S3AuthParams.java |  100 +-
 .../bridge/service/core/s3/S3BucketAdapter.java    |   90 +-
 .../bridge/service/core/s3/S3BucketPolicy.java     |   16 +
 .../bridge/service/core/s3/S3CanonicalUser.java    |  114 +-
 .../bridge/service/core/s3/S3ConditionFactory.java |   16 +
 .../service/core/s3/S3ConditionalHeaders.java      |  350 +-
 .../service/core/s3/S3CopyObjectRequest.java       |   16 +
 .../service/core/s3/S3CopyObjectResponse.java      |   16 +
 .../core/s3/S3CreateBucketConfiguration.java       |  100 +-
 .../service/core/s3/S3CreateBucketRequest.java     |  140 +-
 .../service/core/s3/S3CreateBucketResponse.java    |   86 +-
 .../service/core/s3/S3DeleteBucketRequest.java     |   86 +-
 .../service/core/s3/S3DeleteObjectRequest.java     |  124 +-
 .../com/cloud/bridge/service/core/s3/S3Engine.java | 3774 +-
 .../s3/S3GetBucketAccessControlPolicyRequest.java  |   86 +-
 .../s3/S3GetObjectAccessControlPolicyRequest.java  |  122 +-
 .../bridge/service/core/s3/S3GetObjectRequest.java |  252 +-
 .../service/core/s3/S3GetObjectResponse.java       |  206 +-
 .../com/cloud/bridge/service/core/s3/S3Grant.java  |  184 +-
 .../service/core/s3/S3HostCallingFormat.java       |   16 +
 .../service/core/s3/S3ListAllMyBucketsEntry.java   |  132 +-
 .../service/core/s3/S3ListAllMyBucketsRequest.java |   66 +-
 .../core/s3/S3ListAllMyBucketsResponse.java        |  108 +-
 .../service/core/s3/S3ListBucketObjectEntry.java   |  298 +-
 .../service/core/s3/S3ListBucketPrefixEntry.java   |   94 +-
 .../service/core/s3/S3ListBucketRequest.java       |  176 +-
 .../service/core/s3/S3ListBucketResponse.java      |  264 +-
 .../bridge/service/core/s3/S3MetaDataEntry.java    |  102 +-
 .../bridge/service/core/s3/S3MultipartPart.java    |   16 +
 .../bridge/service/core/s3/S3MultipartUpload.java  |   16 +
 .../bridge/service/core/s3/S3PolicyAction.java     |   16 +
 .../service/core/s3/S3PolicyArnCondition.java      |   16 +
 .../service/core/s3/S3PolicyBoolCondition.java     |   16 +
 .../bridge/service/core/s3/S3PolicyCondition.java  |   16 +
 .../service/core/s3/S3PolicyConditionBlock.java    |   16 +
 .../bridge/service/core/s3/S3PolicyContext.java    |   16 +
 .../service/core/s3/S3PolicyDateCondition.java     |   16 +
 .../core/s3/S3PolicyIPAddressCondition.java        |   16 +
 .../service/core/s3/S3PolicyNumericCondition.java  |   16 +
 .../bridge/service/core/s3/S3PolicyPrincipal.java  |   16 +
 .../bridge/service/core/s3/S3PolicyStatement.java  |   16 +
 .../service/core/s3/S3PolicyStringCondition.java   |   16 +
 .../service/core/s3/S3PutObjectInlineRequest.java  |  238 +-
 .../service/core/s3/S3PutObjectInlineResponse.java |  150 +-
 .../bridge/service/core/s3/S3PutObjectRequest.java |  234 +-
 .../service/core/s3/S3PutObjectResponse.java       |  108 +-
 .../cloud/bridge/service/core/s3/S3Request.java    |  124 +-
 .../cloud/bridge/service/core/s3/S3Response.java   |  130 +-
 .../s3/S3SetBucketAccessControlPolicyRequest.java  |  104 +-
 .../s3/S3SetObjectAccessControlPolicyRequest.java  |  140 +-
 .../service/exception/ConfigurationException.java  |   92 +-
 .../service/exception/EC2ServiceException.java     |  318 +-
 .../service/exception/FileNotExistException.java   |   92 +-
 .../service/exception/HostNotMountedException.java |   92 +-
 .../service/exception/InternalErrorException.java  |   92 +-
 .../service/exception/InvalidBucketName.java       |   16 +
 .../exception/InvalidRequestContentException.java  |   92 +-
 .../service/exception/NetworkIOException.java      |   92 +-
 .../service/exception/NoSuchObjectException.java   |   94 +-
 .../exception/ObjectAlreadyExistsException.java    |   92 +-
 .../service/exception/OutOfServiceException.java   |   92 +-
 .../service/exception/OutOfStorageException.java   |   92 +-
 .../exception/PermissionDeniedException.java       |   92 +-
 .../service/exception/UnsupportedException.java    |   56 +-
 .../src/com/cloud/bridge/tool/CloudS3CmdTool.java  |  666 +-
 .../com/cloud/bridge/util/AuthenticationUtils.java |  108 +-
 .../com/cloud/bridge/util/CalendarDateParam.java   |   84 +-
 .../com/cloud/bridge/util/CloudSessionFactory.java |  232 +-
 .../bridge/util/CloudStackSessionFactory.java      |  234 +-
 .../com/cloud/bridge/util/ConfigurationHelper.java |  224 +-
 awsapi/src/com/cloud/bridge/util/Converter.java    |  152 +-
 awsapi/src/com/cloud/bridge/util/CryptoHelper.java |   60 +-
 .../bridge/util/DatabindingConverterUtil.java      |   16 +
 awsapi/src/com/cloud/bridge/util/DateHelper.java   |  208 +-
 awsapi/src/com/cloud/bridge/util/EC2RestAuth.java  |  562 +-
 .../util/EncryptionSecretKeyCheckerUtil.java       |  260 +-
 awsapi/src/com/cloud/bridge/util/EntityParam.java  |   78 +-
 awsapi/src/com/cloud/bridge/util/HeaderParam.java  |   82 +-
 .../bridge/util/ISO8601SimpleDateTimeFormat.java   |   16 +
 .../src/com/cloud/bridge/util/IpAddressRange.java  |   16 +
 .../src/com/cloud/bridge/util/IteratorHelper.java  |  128 +-
 awsapi/src/com/cloud/bridge/util/JsonAccessor.java |  518 +-
 awsapi/src/com/cloud/bridge/util/NetHelper.java    |  210 +-
 awsapi/src/com/cloud/bridge/util/OrderedPair.java  |  120 +-
 awsapi/src/com/cloud/bridge/util/PolicyParser.java |   16 +
 awsapi/src/com/cloud/bridge/util/QueryHelper.java  |  190 +-
 awsapi/src/com/cloud/bridge/util/RestAuth.java     |   16 +
 awsapi/src/com/cloud/bridge/util/S3SoapAuth.java   |  162 +-
 .../bridge/util/ServletRequestDataSource.java      |  138 +-
 awsapi/src/com/cloud/bridge/util/StringHelper.java |  238 +-
 awsapi/src/com/cloud/bridge/util/TextParam.java    |   78 +-
 awsapi/src/com/cloud/bridge/util/TimeParam.java    |   82 +-
 .../src/com/cloud/bridge/util/TimestampParam.java  |   82 +-
 awsapi/src/com/cloud/bridge/util/Triple.java       |   16 +
 awsapi/src/com/cloud/bridge/util/XElement.java     |   82 +-
 awsapi/src/com/cloud/bridge/util/XFlatten.java     |   76 +-
 awsapi/src/com/cloud/bridge/util/XOmitNull.java    |   76 +-
 .../src/com/cloud/bridge/util/XSerializable.java   |   72 +-
 awsapi/src/com/cloud/bridge/util/XSerializer.java  | 1012 +-
 .../com/cloud/bridge/util/XSerializerAdapter.java  |   80 +-
 .../cloud/bridge/util/XSerializerJsonAdapter.java  |  346 +-
 .../cloud/bridge/util/XSerializerXmlAdapter.java   |  362 +-
 awsapi/src/com/cloud/bridge/util/XmlHelper.java    |  366 +-
 awsapi/src/com/cloud/stack/CloudStackApi.java      |   16 +
 awsapi/src/com/cloud/stack/CloudStackClient.java   |  410 +-
 awsapi/src/com/cloud/stack/CloudStackCommand.java  |  314 +-
 .../src/com/cloud/stack/models/ApiConstants.java   | 1028 +-
 .../cloud/stack/models/CloudStackAccount.hbm.xml   |   32 +-
 .../com/cloud/stack/models/CloudStackAccount.java  |   16 +
 .../cloud/stack/models/CloudStackCapabilities.java |   16 +
 .../stack/models/CloudStackConfiguration.hbm.xml   |   38 +-
 .../stack/models/CloudStackConfiguration.java      |  128 +-
 .../cloud/stack/models/CloudStackDiskOffering.java |   16 +
 .../com/cloud/stack/models/CloudStackEvent.java    |   16 +
 .../cloud/stack/models/CloudStackEventType.java    |   16 +
 .../stack/models/CloudStackExtractTemplate.java    |   16 +
 .../cloud/stack/models/CloudStackIdentifier.java   |   16 +
 .../cloud/stack/models/CloudStackInfoResponse.java |  132 +-
 .../cloud/stack/models/CloudStackIngressRule.java  |  190 +-
 .../stack/models/CloudStackInstanceGroup.java      |   16 +
 .../cloud/stack/models/CloudStackIpAddress.java    |  318 +-
 .../com/cloud/stack/models/CloudStackKeyPair.java  |   16 +
 .../com/cloud/stack/models/CloudStackKeyValue.java |   16 +
 .../stack/models/CloudStackLoadBalancerRule.java   |   16 +
 .../com/cloud/stack/models/CloudStackNetwork.java  |   16 +
 .../stack/models/CloudStackNetworkOffering.java    |   16 +
 .../stack/models/CloudStackNetworkService.java     |   16 +
 .../models/CloudStackNetworkServiceCapability.java |   16 +
 .../src/com/cloud/stack/models/CloudStackNic.java  |  224 +-
 .../cloud/stack/models/CloudStackOsCategory.java   |   16 +
 .../com/cloud/stack/models/CloudStackOsType.java   |   16 +
 .../cloud/stack/models/CloudStackPasswordData.java |   16 +
 .../stack/models/CloudStackPortForwardingRule.java |   16 +
 .../stack/models/CloudStackResourceLimit.java      |  126 +-
 .../stack/models/CloudStackSecurityGroup.java      |  178 +-
 .../models/CloudStackSecurityGroupIngress.java     |   16 +
 .../stack/models/CloudStackServiceOffering.hbm.xml |   32 +-
 .../stack/models/CloudStackServiceOffering.java    |   16 +
 .../com/cloud/stack/models/CloudStackSnapshot.java |  232 +-
 .../stack/models/CloudStackSnapshotPolicy.java     |   16 +
 .../com/cloud/stack/models/CloudStackTemplate.java |   16 +
 .../stack/models/CloudStackTemplatePermission.java |   16 +
 .../src/com/cloud/stack/models/CloudStackUser.java |   16 +
 .../com/cloud/stack/models/CloudStackUserVm.java   |  810 +-
 .../com/cloud/stack/models/CloudStackVolume.java   |  688 +-
 .../src/com/cloud/stack/models/CloudStackZone.java |  370 +-
 .../test/com/cloud/gate/model/ModelTestCase.java   |  720 +-
 .../com/cloud/gate/persist/PersitTestCase.java     |  130 +-
 .../com/cloud/gate/service/ServiceTestCase.java    |  140 +-
 .../test/com/cloud/gate/testcase/BaseTestCase.java |  100 +-
 .../cloud/gate/util/CloudStackClientTestCase.java  |  124 +-
 .../com/cloud/gate/util/JsonAccessorTestCase.java  |  118 +-
 awsapi/test/com/cloud/gate/util/UtilTestCase.java  |  362 +-
 .../test/com/cloud/gate/util/Xml2JavaTestData.xml  |   72 +-
 964 files changed, 134127 insertions(+), 118945 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e984c3c0/awsapi/deploy-cloud-bridge.sh
----------------------------------------------------------------------
diff --git a/awsapi/deploy-cloud-bridge.sh b/awsapi/deploy-cloud-bridge.sh
index 4274360..d36c022 100644
--- a/awsapi/deploy-cloud-bridge.sh
+++ b/awsapi/deploy-cloud-bridge.sh
@@ -1,6 +1,20 @@
 #!/usr/bin/env bash
-# deploy.sh -- deploys a cloud-bridge
-#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 usage() {
   printf "Usage: %s: -d [tomcat directory to deploy to] -z [zip file to use]\n" $(basename $0) >&2

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e984c3c0/awsapi/install.sh
----------------------------------------------------------------------
diff --git a/awsapi/install.sh b/awsapi/install.sh
index fc0aa02..5362f41 100644
--- a/awsapi/install.sh
+++ b/awsapi/install.sh
@@ -1,4 +1,20 @@
 #!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # install.sh -- deploys cloud-bridge and the corresponding DB
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e984c3c0/awsapi/scripts/run.sh
----------------------------------------------------------------------
diff --git a/awsapi/scripts/run.sh b/awsapi/scripts/run.sh
index 82f810b..cc7c84a 100644
--- a/awsapi/scripts/run.sh
+++ b/awsapi/scripts/run.sh
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CP=. 
 for file in lib/*.jar
 do

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e984c3c0/awsapi/src/com/amazon/ec2/ActivateLicense.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ActivateLicense.java b/awsapi/src/com/amazon/ec2/ActivateLicense.java
index 133e370..14f2caa 100644
--- a/awsapi/src/com/amazon/ec2/ActivateLicense.java
+++ b/awsapi/src/com/amazon/ec2/ActivateLicense.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ActivateLicense.java

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e984c3c0/awsapi/src/com/amazon/ec2/ActivateLicenseResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ActivateLicenseResponse.java b/awsapi/src/com/amazon/ec2/ActivateLicenseResponse.java
index b682352..5c0af5f 100644
--- a/awsapi/src/com/amazon/ec2/ActivateLicenseResponse.java
+++ b/awsapi/src/com/amazon/ec2/ActivateLicenseResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ActivateLicenseResponse.java

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e984c3c0/awsapi/src/com/amazon/ec2/ActivateLicenseResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ActivateLicenseResponseType.java b/awsapi/src/com/amazon/ec2/ActivateLicenseResponseType.java
index c5c2018..e534e9a 100644
--- a/awsapi/src/com/amazon/ec2/ActivateLicenseResponseType.java
+++ b/awsapi/src/com/amazon/ec2/ActivateLicenseResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ActivateLicenseResponseType.java

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e984c3c0/awsapi/src/com/amazon/ec2/ActivateLicenseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/ActivateLicenseType.java b/awsapi/src/com/amazon/ec2/ActivateLicenseType.java
index beae7bc..9965457 100644
--- a/awsapi/src/com/amazon/ec2/ActivateLicenseType.java
+++ b/awsapi/src/com/amazon/ec2/ActivateLicenseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * ActivateLicenseType.java

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e984c3c0/awsapi/src/com/amazon/ec2/AllocateAddress.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AllocateAddress.java b/awsapi/src/com/amazon/ec2/AllocateAddress.java
index 7c4b632..318b5cc 100644
--- a/awsapi/src/com/amazon/ec2/AllocateAddress.java
+++ b/awsapi/src/com/amazon/ec2/AllocateAddress.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AllocateAddress.java

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e984c3c0/awsapi/src/com/amazon/ec2/AllocateAddressResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AllocateAddressResponse.java b/awsapi/src/com/amazon/ec2/AllocateAddressResponse.java
index 6e637ec..0452850 100644
--- a/awsapi/src/com/amazon/ec2/AllocateAddressResponse.java
+++ b/awsapi/src/com/amazon/ec2/AllocateAddressResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AllocateAddressResponse.java

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e984c3c0/awsapi/src/com/amazon/ec2/AllocateAddressResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AllocateAddressResponseType.java b/awsapi/src/com/amazon/ec2/AllocateAddressResponseType.java
index 898d39e..5218e08 100644
--- a/awsapi/src/com/amazon/ec2/AllocateAddressResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AllocateAddressResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AllocateAddressResponseType.java

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e984c3c0/awsapi/src/com/amazon/ec2/AllocateAddressType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AllocateAddressType.java b/awsapi/src/com/amazon/ec2/AllocateAddressType.java
index 9314836..2fb4fd9 100644
--- a/awsapi/src/com/amazon/ec2/AllocateAddressType.java
+++ b/awsapi/src/com/amazon/ec2/AllocateAddressType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AllocateAddressType.java

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e984c3c0/awsapi/src/com/amazon/ec2/AmazonEC2MessageReceiverInOut.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AmazonEC2MessageReceiverInOut.java b/awsapi/src/com/amazon/ec2/AmazonEC2MessageReceiverInOut.java
index 4cfd806..f552780 100644
--- a/awsapi/src/com/amazon/ec2/AmazonEC2MessageReceiverInOut.java
+++ b/awsapi/src/com/amazon/ec2/AmazonEC2MessageReceiverInOut.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AmazonEC2MessageReceiverInOut.java

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e984c3c0/awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java b/awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java
index 2003272..6b116f0 100644
--- a/awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java
+++ b/awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AmazonEC2Skeleton.java

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e984c3c0/awsapi/src/com/amazon/ec2/AmazonEC2SkeletonInterface.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AmazonEC2SkeletonInterface.java b/awsapi/src/com/amazon/ec2/AmazonEC2SkeletonInterface.java
index d0eb4ae..f870088 100644
--- a/awsapi/src/com/amazon/ec2/AmazonEC2SkeletonInterface.java
+++ b/awsapi/src/com/amazon/ec2/AmazonEC2SkeletonInterface.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AmazonEC2SkeletonInterface.java

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e984c3c0/awsapi/src/com/amazon/ec2/AssociateAddress.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateAddress.java b/awsapi/src/com/amazon/ec2/AssociateAddress.java
index 3e993ea..912f0a6 100644
--- a/awsapi/src/com/amazon/ec2/AssociateAddress.java
+++ b/awsapi/src/com/amazon/ec2/AssociateAddress.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AssociateAddress.java

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e984c3c0/awsapi/src/com/amazon/ec2/AssociateAddressResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateAddressResponse.java b/awsapi/src/com/amazon/ec2/AssociateAddressResponse.java
index 27488f5..583b405 100644
--- a/awsapi/src/com/amazon/ec2/AssociateAddressResponse.java
+++ b/awsapi/src/com/amazon/ec2/AssociateAddressResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AssociateAddressResponse.java

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e984c3c0/awsapi/src/com/amazon/ec2/AssociateAddressResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateAddressResponseType.java b/awsapi/src/com/amazon/ec2/AssociateAddressResponseType.java
index 62c02c4..6cce69b 100644
--- a/awsapi/src/com/amazon/ec2/AssociateAddressResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AssociateAddressResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AssociateAddressResponseType.java

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e984c3c0/awsapi/src/com/amazon/ec2/AssociateAddressType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateAddressType.java b/awsapi/src/com/amazon/ec2/AssociateAddressType.java
index 6bc6fe9..973776d 100644
--- a/awsapi/src/com/amazon/ec2/AssociateAddressType.java
+++ b/awsapi/src/com/amazon/ec2/AssociateAddressType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AssociateAddressType.java

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e984c3c0/awsapi/src/com/amazon/ec2/AssociateDhcpOptions.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateDhcpOptions.java b/awsapi/src/com/amazon/ec2/AssociateDhcpOptions.java
index 184d538..117aa2e 100644
--- a/awsapi/src/com/amazon/ec2/AssociateDhcpOptions.java
+++ b/awsapi/src/com/amazon/ec2/AssociateDhcpOptions.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AssociateDhcpOptions.java

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e984c3c0/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponse.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponse.java b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponse.java
index 54969e7..7bdb35c 100644
--- a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponse.java
+++ b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponse.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AssociateDhcpOptionsResponse.java

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e984c3c0/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponseType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponseType.java b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponseType.java
index 4c6f998..a2d95d0 100644
--- a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponseType.java
+++ b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponseType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AssociateDhcpOptionsResponseType.java

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e984c3c0/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsType.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsType.java b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsType.java
index 6530ecb..4fa96ab 100644
--- a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsType.java
+++ b/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsType.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AssociateDhcpOptionsType.java