cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahu...@apache.org
Subject [51/54] [abbrv] [partial] git commit: updated refs/heads/reformat to 170f32f
Date Thu, 21 Nov 2013 15:27:38 GMT
Reformatted all of the code.


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

Branch: refs/heads/reformat
Commit: d620df2bdd3711c06f1388f1c59bf09c96e7b32a
Parents: eaa250f
Author: Alex Huang <alex.huang@citrix.com>
Authored: Thu Nov 21 06:15:26 2013 -0800
Committer: Alex Huang <alex.huang@citrix.com>
Committed: Thu Nov 21 06:15:26 2013 -0800

----------------------------------------------------------------------
 agent/src/com/cloud/agent/Agent.java            |    27 +-
 agent/src/com/cloud/agent/AgentShell.java       |     3 +
 .../agent/dhcp/DhcpProtocolParserServer.java    |     2 +-
 agent/src/com/cloud/agent/dhcp/DhcpSnooper.java |     1 +
 agent/src/com/cloud/agent/mockvm/MockVmMgr.java |     5 +-
 agent/src/com/cloud/agent/mockvm/VmMgr.java     |     4 +-
 .../com/cloud/agent/resource/DummyResource.java |    29 +-
 .../com/cloud/agent/api/to/FirewallRuleTO.java  |     9 +-
 .../com/cloud/agent/api/to/LoadBalancerTO.java  |    41 +-
 .../com/cloud/agent/api/to/NetworkACLTO.java    |     5 +-
 .../agent/api/to/PortForwardingRuleTO.java      |     4 +-
 api/src/com/cloud/agent/api/to/S3TO.java        |     6 +-
 api/src/com/cloud/agent/api/to/SwiftTO.java     |     1 +
 api/src/com/cloud/agent/api/to/TemplateTO.java  |     1 +
 .../cloud/agent/api/to/VirtualMachineTO.java    |     4 +-
 api/src/com/cloud/agent/api/to/VolumeTO.java    |     1 +
 .../configuration/ConfigurationService.java     |     2 -
 api/src/com/cloud/dc/DedicatedResources.java    |     2 +
 .../cloud/deploy/DeploymentClusterPlanner.java  |    33 +-
 api/src/com/cloud/domain/Domain.java            |     1 +
 api/src/com/cloud/event/ActionEvents.java       |     5 +-
 api/src/com/cloud/event/UsageEvent.java         |     4 +-
 .../exception/AgentControlChannelException.java |     2 -
 api/src/com/cloud/host/Host.java                |    21 +-
 api/src/com/cloud/host/Status.java              |    13 +-
 api/src/com/cloud/network/GuestVlan.java        |     1 +
 .../com/cloud/network/MonitoringService.java    |     1 +
 .../network/NetworkMigrationResponder.java      |     1 -
 api/src/com/cloud/network/NetworkService.java   |    19 +-
 .../com/cloud/network/NetworkUsageService.java  |     5 +-
 api/src/com/cloud/network/PhysicalNetwork.java  |     3 +-
 .../network/PhysicalNetworkServiceProvider.java |     1 +
 .../cloud/network/Site2SiteVpnConnection.java   |     1 +
 .../network/VirtualNetworkApplianceService.java |     6 +-
 .../com/cloud/network/as/AutoScalePolicy.java   |     1 +
 .../com/cloud/network/as/AutoScaleVmGroup.java  |     1 +
 .../cloud/network/as/AutoScaleVmProfile.java    |     1 +
 .../network/element/DhcpServiceProvider.java    |     5 +-
 .../element/NetworkACLServiceProvider.java      |     1 -
 .../cloud/network/element/NetworkElement.java   |     7 +-
 .../element/UserDataServiceProvider.java        |     1 -
 api/src/com/cloud/network/guru/NetworkGuru.java |    11 +-
 api/src/com/cloud/network/lb/CertService.java   |     4 +-
 .../com/cloud/network/lb/LoadBalancingRule.java |    11 +-
 .../network/lb/LoadBalancingRulesService.java   |     4 +-
 .../cloud/network/rules/HealthCheckPolicy.java  |     3 -
 .../com/cloud/network/rules/RulesService.java   |     4 +-
 .../network/security/SecurityGroupService.java  |     1 -
 api/src/com/cloud/network/vpc/NetworkACL.java   |     2 +-
 .../com/cloud/network/vpc/NetworkACLItem.java   |     6 +-
 .../cloud/network/vpc/NetworkACLService.java    |     7 +-
 .../network/vpc/VpcProvisioningService.java     |     7 +-
 api/src/com/cloud/network/vpc/VpcService.java   |     3 +-
 api/src/com/cloud/projects/Project.java         |     2 +
 .../cloud/region/ha/GlobalLoadBalancerRule.java |     1 +
 .../ha/GlobalLoadBalancingRulesService.java     |    12 +-
 api/src/com/cloud/resource/ResourceState.java   |    13 +-
 .../resource/UnableDeleteHostException.java     |     2 +-
 api/src/com/cloud/server/ManagementService.java |     3 +-
 api/src/com/cloud/server/ResourceTag.java       |    28 +-
 api/src/com/cloud/storage/Snapshot.java         |     3 +
 api/src/com/cloud/storage/Storage.java          |    13 +-
 .../cloud/storage/StoragePoolDiscoverer.java    |     3 +-
 api/src/com/cloud/storage/Volume.java           |     1 +
 api/src/com/cloud/storage/VolumeApiService.java |     9 +-
 .../storage/snapshot/SnapshotSchedule.java      |     4 +-
 api/src/com/cloud/user/Account.java             |     1 +
 api/src/com/cloud/user/AccountService.java      |     7 +-
 api/src/com/cloud/user/User.java                |     1 +
 api/src/com/cloud/user/UserAccount.java         |     1 +
 api/src/com/cloud/vm/DiskProfile.java           |     3 +-
 api/src/com/cloud/vm/NicIpAlias.java            |     1 +
 api/src/com/cloud/vm/NicProfile.java            |     1 +
 api/src/com/cloud/vm/NicSecondaryIp.java        |     1 +
 api/src/com/cloud/vm/UserVmService.java         |    31 +-
 api/src/com/cloud/vm/VirtualMachine.java        |    19 +-
 api/src/com/cloud/vm/snapshot/VMSnapshot.java   |    15 +-
 .../affinity/AffinityGroupResponse.java         |    11 +-
 .../affinity/AffinityGroupTypeResponse.java     |     7 +-
 .../org/apache/cloudstack/api/ApiErrorCode.java |     1 +
 api/src/org/apache/cloudstack/api/BaseCmd.java  |    28 +-
 .../org/apache/cloudstack/api/BaseListCmd.java  |     1 +
 .../api/BaseListDomainResourcesCmd.java         |    16 +-
 .../BaseListTemplateOrIsoPermissionsCmd.java    |     4 +-
 .../org/apache/cloudstack/api/BaseResponse.java |     3 +-
 .../api/BaseUpdateTemplateOrIsoCmd.java         |     3 +-
 .../BaseUpdateTemplateOrIsoPermissionsCmd.java  |     3 +-
 .../command/admin/account/CreateAccountCmd.java |    17 +-
 .../command/admin/account/DeleteAccountCmd.java |     6 +-
 .../admin/account/DisableAccountCmd.java        |     4 +-
 .../command/admin/account/EnableAccountCmd.java |     3 +-
 .../command/admin/account/LockAccountCmd.java   |     3 +-
 .../command/admin/account/UpdateAccountCmd.java |     3 +-
 .../admin/autoscale/CreateCounterCmd.java       |     3 +-
 .../admin/autoscale/DeleteCounterCmd.java       |     3 +-
 .../command/admin/cluster/AddClusterCmd.java    |     3 +-
 .../command/admin/cluster/DeleteClusterCmd.java |     3 +-
 .../command/admin/cluster/ListClustersCmd.java  |     3 +-
 .../command/admin/cluster/UpdateClusterCmd.java |     3 +-
 .../api/command/admin/config/ListCfgsByCmd.java |    11 +-
 .../admin/config/ListDeploymentPlannersCmd.java |     3 +-
 .../config/ListHypervisorCapabilitiesCmd.java   |    12 +-
 .../api/command/admin/config/UpdateCfgCmd.java  |    10 +-
 .../config/UpdateHypervisorCapabilitiesCmd.java |    13 +-
 .../command/admin/domain/CreateDomainCmd.java   |     4 +-
 .../command/admin/domain/DeleteDomainCmd.java   |     4 +-
 .../admin/domain/ListDomainChildrenCmd.java     |     3 +-
 .../command/admin/domain/ListDomainsCmd.java    |     3 +-
 .../command/admin/domain/UpdateDomainCmd.java   |     5 +-
 .../api/command/admin/host/AddHostCmd.java      |     3 +-
 .../admin/host/AddSecondaryStorageCmd.java      |     3 +-
 .../admin/host/CancelMaintenanceCmd.java        |     4 +-
 .../api/command/admin/host/DeleteHostCmd.java   |     3 +-
 .../admin/host/FindHostsForMigrationCmd.java    |     7 +-
 .../api/command/admin/host/ListHostsCmd.java    |    13 +-
 .../admin/host/PrepareForMaintenanceCmd.java    |     4 +-
 .../command/admin/host/ReconnectHostCmd.java    |     6 +-
 .../admin/host/ReleaseHostReservationCmd.java   |     4 +-
 .../api/command/admin/host/UpdateHostCmd.java   |     3 +-
 .../admin/host/UpdateHostPasswordCmd.java       |     3 +-
 ...ConfigureInternalLoadBalancerElementCmd.java |    22 +-
 .../CreateInternalLoadBalancerElementCmd.java   |     4 +-
 .../admin/internallb/ListInternalLBVMsCmd.java  |     3 +-
 .../ListInternalLoadBalancerElementsCmd.java    |    11 +-
 .../admin/internallb/StartInternalLBVMCmd.java  |     6 +-
 .../admin/internallb/StopInternalLBVMCmd.java   |     4 +-
 .../admin/network/AddNetworkDeviceCmd.java      |     6 +-
 .../network/AddNetworkServiceProviderCmd.java   |    13 +-
 .../admin/network/CreateNetworkOfferingCmd.java |    19 +-
 .../admin/network/CreatePhysicalNetworkCmd.java |    20 +-
 .../network/CreateStorageNetworkIpRangeCmd.java |    17 +-
 .../network/DedicateGuestVlanRangeCmd.java      |    18 +-
 .../admin/network/DeleteNetworkDeviceCmd.java   |     6 +-
 .../admin/network/DeleteNetworkOfferingCmd.java |     9 +-
 .../DeleteNetworkServiceProviderCmd.java        |     9 +-
 .../admin/network/DeletePhysicalNetworkCmd.java |    10 +-
 .../network/DeleteStorageNetworkIpRangeCmd.java |     6 +-
 .../ListDedicatedGuestVlanRangesCmd.java        |    22 +-
 .../admin/network/ListNetworkDeviceCmd.java     |     6 +-
 .../network/ListNetworkIsolationMethodsCmd.java |     5 +-
 .../network/ListNetworkServiceProvidersCmd.java |     7 +-
 .../admin/network/ListPhysicalNetworksCmd.java  |     7 +-
 .../network/ListStorageNetworkIpRangeCmd.java   |     6 +-
 .../ListSupportedNetworkServicesCmd.java        |     3 +-
 .../ReleaseDedicatedGuestVlanRangeCmd.java      |    16 +-
 .../admin/network/UpdateNetworkOfferingCmd.java |    12 +-
 .../UpdateNetworkServiceProviderCmd.java        |     3 +-
 .../admin/network/UpdatePhysicalNetworkCmd.java |     3 +-
 .../network/UpdateStorageNetworkIpRangeCmd.java |    12 +-
 .../admin/offering/CreateDiskOfferingCmd.java   |     7 +-
 .../offering/CreateServiceOfferingCmd.java      |     3 +-
 .../admin/offering/DeleteDiskOfferingCmd.java   |     4 +-
 .../offering/DeleteServiceOfferingCmd.java      |     9 +-
 .../admin/offering/UpdateDiskOfferingCmd.java   |    12 +-
 .../offering/UpdateServiceOfferingCmd.java      |     3 +-
 .../api/command/admin/pod/CreatePodCmd.java     |     9 +-
 .../api/command/admin/pod/DeletePodCmd.java     |     4 +-
 .../api/command/admin/pod/ListPodsByCmd.java    |     3 +-
 .../api/command/admin/pod/UpdatePodCmd.java     |     3 +-
 .../api/command/admin/region/AddRegionCmd.java  |     3 +-
 .../admin/region/CreatePortableIpRangeCmd.java  |    19 +-
 .../admin/region/DeletePortableIpRangeCmd.java  |    16 +-
 .../admin/region/ListPortableIpRangesCmd.java   |    17 +-
 .../command/admin/region/RemoveRegionCmd.java   |     3 +-
 .../command/admin/region/UpdateRegionCmd.java   |     3 +-
 .../admin/resource/ArchiveAlertsCmd.java        |    19 +-
 .../admin/resource/CleanVMReservationsCmd.java  |     4 +-
 .../command/admin/resource/DeleteAlertsCmd.java |    19 +-
 .../command/admin/resource/ListAlertsCmd.java   |     3 +-
 .../command/admin/resource/ListCapacityCmd.java |    15 +-
 .../resource/UploadCustomCertificateCmd.java    |     9 +-
 .../ConfigureVirtualRouterElementCmd.java       |     6 +-
 .../router/CreateVirtualRouterElementCmd.java   |     4 +-
 .../command/admin/router/DestroyRouterCmd.java  |     4 +-
 .../command/admin/router/ListRoutersCmd.java    |     3 +-
 .../router/ListVirtualRouterElementsCmd.java    |     6 +-
 .../command/admin/router/RebootRouterCmd.java   |     6 +-
 .../command/admin/router/StartRouterCmd.java    |     6 +-
 .../api/command/admin/router/StopRouterCmd.java |     4 +-
 .../command/admin/router/UpgradeRouterCmd.java  |     3 +-
 .../admin/router/UpgradeRouterTemplateCmd.java  |    31 +-
 .../command/admin/storage/AddImageStoreCmd.java |     3 +-
 .../api/command/admin/storage/AddS3Cmd.java     |     7 +-
 .../CancelPrimaryStorageMaintenanceCmd.java     |     4 +-
 .../storage/CreateSecondaryStagingStoreCmd.java |    16 +-
 .../admin/storage/CreateStoragePoolCmd.java     |     3 +-
 .../admin/storage/DeleteImageStoreCmd.java      |     4 +-
 .../command/admin/storage/DeletePoolCmd.java    |     8 +-
 .../storage/DeleteSecondaryStagingStoreCmd.java |     3 +-
 .../FindStoragePoolsForMigrationCmd.java        |    13 +-
 .../admin/storage/ListImageStoresCmd.java       |     3 +-
 .../api/command/admin/storage/ListS3sCmd.java   |     5 +-
 .../storage/ListSecondaryStagingStoresCmd.java  |     3 +-
 .../admin/storage/ListStoragePoolsCmd.java      |     8 +-
 .../admin/storage/ListStorageProvidersCmd.java  |     7 +-
 .../PreparePrimaryStorageForMaintenanceCmd.java |     4 +-
 .../admin/storage/UpdateStoragePoolCmd.java     |     3 +-
 .../api/command/admin/swift/AddSwiftCmd.java    |     3 +-
 .../api/command/admin/swift/ListSwiftsCmd.java  |     3 +-
 .../admin/systemvm/DestroySystemVmCmd.java      |    10 +-
 .../admin/systemvm/ListSystemVMsCmd.java        |     8 +-
 .../admin/systemvm/MigrateSystemVMCmd.java      |    34 +-
 .../admin/systemvm/RebootSystemVmCmd.java       |    12 +-
 .../admin/systemvm/ScaleSystemVMCmd.java        |     6 +-
 .../admin/systemvm/StartSystemVMCmd.java        |    12 +-
 .../command/admin/systemvm/StopSystemVmCmd.java |    10 +-
 .../admin/systemvm/UpgradeSystemVMCmd.java      |     2 +-
 .../admin/template/PrepareTemplateCmd.java      |     3 +-
 .../admin/usage/AddTrafficMonitorCmd.java       |     3 +-
 .../command/admin/usage/AddTrafficTypeCmd.java  |     9 +-
 .../admin/usage/DeleteTrafficMonitorCmd.java    |     3 +-
 .../admin/usage/DeleteTrafficTypeCmd.java       |     3 +-
 .../admin/usage/GenerateUsageRecordsCmd.java    |     9 +-
 .../command/admin/usage/GetUsageRecordsCmd.java |     3 +-
 .../admin/usage/ListTrafficMonitorsCmd.java     |     3 +-
 .../usage/ListTrafficTypeImplementorsCmd.java   |     6 +-
 .../admin/usage/ListTrafficTypesCmd.java        |     3 +-
 .../command/admin/usage/ListUsageTypesCmd.java  |     4 +-
 .../admin/usage/UpdateTrafficTypeCmd.java       |     4 +-
 .../api/command/admin/user/CreateUserCmd.java   |     9 +-
 .../api/command/admin/user/DeleteUserCmd.java   |     4 +-
 .../api/command/admin/user/DisableUserCmd.java  |     5 +-
 .../api/command/admin/user/EnableUserCmd.java   |     4 +-
 .../api/command/admin/user/GetUserCmd.java      |     3 +-
 .../api/command/admin/user/ListUsersCmd.java    |     3 +-
 .../api/command/admin/user/LockUserCmd.java     |     3 +-
 .../api/command/admin/user/RegisterCmd.java     |     4 +-
 .../api/command/admin/user/UpdateUserCmd.java   |     4 +-
 .../admin/vlan/CreateVlanIpRangeCmd.java        |    11 +-
 .../admin/vlan/DedicatePublicIpRangeCmd.java    |    10 +-
 .../admin/vlan/DeleteVlanIpRangeCmd.java        |     3 +-
 .../command/admin/vlan/ListVlanIpRangesCmd.java |     3 +-
 .../admin/vlan/ReleasePublicIpRangeCmd.java     |     3 +-
 .../api/command/admin/vm/AssignVMCmd.java       |    10 +-
 .../api/command/admin/vm/ExpungeVMCmd.java      |     5 +-
 .../api/command/admin/vm/MigrateVMCmd.java      |    10 +-
 .../vm/MigrateVirtualMachineWithVolumeCmd.java  |    32 +-
 .../api/command/admin/vm/RecoverVMCmd.java      |     3 +-
 .../admin/vpc/CreatePrivateGatewayCmd.java      |     8 +-
 .../command/admin/vpc/CreateVPCOfferingCmd.java |     5 +-
 .../admin/vpc/DeletePrivateGatewayCmd.java      |     4 +-
 .../command/admin/vpc/DeleteVPCOfferingCmd.java |     3 +-
 .../command/admin/vpc/UpdateVPCOfferingCmd.java |     3 +-
 .../api/command/admin/zone/CreateZoneCmd.java   |     9 +-
 .../api/command/admin/zone/DeleteZoneCmd.java   |     4 +-
 .../zone/MarkDefaultZoneForAccountCmd.java      |     3 +-
 .../api/command/admin/zone/UpdateZoneCmd.java   |     4 +-
 .../user/account/AddAccountToProjectCmd.java    |     4 +-
 .../account/DeleteAccountFromProjectCmd.java    |     4 +-
 .../command/user/account/ListAccountsCmd.java   |     3 +-
 .../user/account/ListProjectAccountsCmd.java    |     3 +-
 .../user/address/AssociateIPAddrCmd.java        |    24 +-
 .../user/address/DisassociateIPAddrCmd.java     |     6 +-
 .../user/address/ListPublicIpAddressesCmd.java  |     4 +-
 .../affinitygroup/CreateAffinityGroupCmd.java   |     9 +-
 .../affinitygroup/DeleteAffinityGroupCmd.java   |     9 +-
 .../ListAffinityGroupTypesCmd.java              |     4 +-
 .../affinitygroup/ListAffinityGroupsCmd.java    |    13 +-
 .../affinitygroup/UpdateVMAffinityGroupCmd.java |    12 +-
 .../autoscale/CreateAutoScalePolicyCmd.java     |     3 +-
 .../autoscale/CreateAutoScaleVmGroupCmd.java    |     9 +-
 .../autoscale/CreateAutoScaleVmProfileCmd.java  |     4 +-
 .../user/autoscale/CreateConditionCmd.java      |     4 +-
 .../autoscale/DeleteAutoScalePolicyCmd.java     |    10 +-
 .../autoscale/DeleteAutoScaleVmGroupCmd.java    |    10 +-
 .../autoscale/DeleteAutoScaleVmProfileCmd.java  |    10 +-
 .../user/autoscale/DeleteConditionCmd.java      |     3 +-
 .../autoscale/DisableAutoScaleVmGroupCmd.java   |     9 +-
 .../autoscale/EnableAutoScaleVmGroupCmd.java    |     9 +-
 .../autoscale/ListAutoScalePoliciesCmd.java     |     7 +-
 .../autoscale/ListAutoScaleVmGroupsCmd.java     |     3 +-
 .../autoscale/ListAutoScaleVmProfilesCmd.java   |     3 +-
 .../user/autoscale/ListConditionsCmd.java       |    16 +-
 .../command/user/autoscale/ListCountersCmd.java |     3 +-
 .../autoscale/UpdateAutoScalePolicyCmd.java     |    10 +-
 .../autoscale/UpdateAutoScaleVmGroupCmd.java    |    10 +-
 .../autoscale/UpdateAutoScaleVmProfileCmd.java  |    15 +-
 .../command/user/event/ArchiveEventsCmd.java    |    20 +-
 .../api/command/user/event/DeleteEventsCmd.java |    20 +-
 .../command/user/event/ListEventTypesCmd.java   |     4 +-
 .../api/command/user/event/ListEventsCmd.java   |     3 +-
 .../firewall/CreateEgressFirewallRuleCmd.java   |    10 +-
 .../user/firewall/CreateFirewallRuleCmd.java    |    12 +-
 .../firewall/CreatePortForwardingRuleCmd.java   |    49 +-
 .../firewall/DeleteEgressFirewallRuleCmd.java   |     4 +-
 .../user/firewall/DeleteFirewallRuleCmd.java    |     4 +-
 .../firewall/DeletePortForwardingRuleCmd.java   |     6 +-
 .../firewall/ListEgressFirewallRulesCmd.java    |    13 +-
 .../user/firewall/ListFirewallRulesCmd.java     |    14 +-
 .../firewall/ListPortForwardingRulesCmd.java    |     3 +-
 .../firewall/UpdatePortForwardingRuleCmd.java   |     8 +-
 .../user/guest/ListGuestOsCategoriesCmd.java    |     3 +-
 .../api/command/user/guest/ListGuestOsCmd.java  |     3 +-
 .../api/command/user/iso/AttachIsoCmd.java      |    10 +-
 .../api/command/user/iso/CopyIsoCmd.java        |     3 +-
 .../api/command/user/iso/DeleteIsoCmd.java      |     6 +-
 .../api/command/user/iso/DetachIsoCmd.java      |    10 +-
 .../api/command/user/iso/ExtractIsoCmd.java     |     7 +-
 .../command/user/iso/ListIsoPermissionsCmd.java |     4 +-
 .../api/command/user/iso/ListIsosCmd.java       |    26 +-
 .../api/command/user/iso/RegisterIsoCmd.java    |     4 +-
 .../api/command/user/iso/UpdateIsoCmd.java      |     3 +-
 .../user/iso/UpdateIsoPermissionsCmd.java       |     5 +-
 .../user/job/QueryAsyncJobResultCmd.java        |     3 +-
 .../AssignCertToLoadBalancerCmd.java            |    39 +-
 .../AssignToLoadBalancerRuleCmd.java            |    10 +-
 .../CreateApplicationLoadBalancerCmd.java       |    19 +-
 .../CreateLBHealthCheckPolicyCmd.java           |    22 +-
 .../CreateLBStickinessPolicyCmd.java            |    10 +-
 .../loadbalancer/CreateLoadBalancerRuleCmd.java |    30 +-
 .../DeleteApplicationLoadBalancerCmd.java       |     4 +-
 .../DeleteLBHealthCheckPolicyCmd.java           |     5 +-
 .../DeleteLBStickinessPolicyCmd.java            |    10 +-
 .../loadbalancer/DeleteLoadBalancerRuleCmd.java |    10 +-
 .../user/loadbalancer/DeleteSslCertCmd.java     |    26 +-
 .../ListApplicationLoadBalancersCmd.java        |    11 +-
 .../ListLBHealthCheckPoliciesCmd.java           |    14 +-
 .../ListLBStickinessPoliciesCmd.java            |    10 +-
 .../ListLoadBalancerRuleInstancesCmd.java       |    10 +-
 .../loadbalancer/ListLoadBalancerRulesCmd.java  |     8 +-
 .../user/loadbalancer/ListSslCertsCmd.java      |    17 +-
 .../RemoveCertFromLoadBalancerCmd.java          |    31 +-
 .../RemoveFromLoadBalancerRuleCmd.java          |    10 +-
 .../loadbalancer/UpdateLoadBalancerRuleCmd.java |     4 +-
 .../user/loadbalancer/UploadSslCertCmd.java     |    25 +-
 .../user/nat/CreateIpForwardingRuleCmd.java     |     4 +-
 .../command/user/nat/DisableStaticNatCmd.java   |     3 +-
 .../command/user/nat/EnableStaticNatCmd.java    |    26 +-
 .../user/nat/ListIpForwardingRulesCmd.java      |    18 +-
 .../user/network/CreateNetworkACLCmd.java       |    16 +-
 .../command/user/network/CreateNetworkCmd.java  |    21 +-
 .../command/user/network/DeleteNetworkCmd.java  |     4 +-
 .../user/network/ListNetworkACLListsCmd.java    |    12 +-
 .../user/network/ListNetworkACLsCmd.java        |    12 +-
 .../user/network/ListNetworkOfferingsCmd.java   |     7 +-
 .../command/user/network/ListNetworksCmd.java   |    17 +-
 .../user/network/ReplaceNetworkACLListCmd.java  |    18 +-
 .../command/user/network/RestartNetworkCmd.java |     4 +-
 .../user/network/UpdateNetworkACLItemCmd.java   |    43 +-
 .../command/user/network/UpdateNetworkCmd.java  |    13 +-
 .../user/offering/ListDiskOfferingsCmd.java     |     7 +-
 .../user/offering/ListServiceOfferingsCmd.java  |    13 +-
 .../user/project/ActivateProjectCmd.java        |     4 +-
 .../command/user/project/CreateProjectCmd.java  |     4 +-
 .../command/user/project/DeleteProjectCmd.java  |     4 +-
 .../project/DeleteProjectInvitationCmd.java     |     4 +-
 .../user/project/ListProjectInvitationsCmd.java |     3 +-
 .../command/user/project/ListProjectsCmd.java   |     8 +-
 .../command/user/project/SuspendProjectCmd.java |     4 +-
 .../command/user/project/UpdateProjectCmd.java  |     4 +-
 .../project/UpdateProjectInvitationCmd.java     |     8 +-
 .../api/command/user/region/ListRegionsCmd.java |     3 +-
 .../gslb/AssignToGlobalLoadBalancerRuleCmd.java |    43 +-
 .../gslb/CreateGlobalLoadBalancerRuleCmd.java   |    26 +-
 .../gslb/DeleteGlobalLoadBalancerRuleCmd.java   |    22 +-
 .../ha/gslb/ListGlobalLoadBalancerRuleCmd.java  |    15 +-
 .../RemoveFromGlobalLoadBalancerRuleCmd.java    |    38 +-
 .../gslb/UpdateGlobalLoadBalancerRuleCmd.java   |    20 +-
 .../user/resource/GetCloudIdentifierCmd.java    |    10 +-
 .../user/resource/ListHypervisorsCmd.java       |     3 +-
 .../user/resource/ListResourceLimitsCmd.java    |    27 +-
 .../user/resource/UpdateResourceCountCmd.java   |    31 +-
 .../user/resource/UpdateResourceLimitCmd.java   |    16 +-
 .../AuthorizeSecurityGroupEgressCmd.java        |     4 +-
 .../AuthorizeSecurityGroupIngressCmd.java       |     9 +-
 .../securitygroup/CreateSecurityGroupCmd.java   |     4 +-
 .../securitygroup/DeleteSecurityGroupCmd.java   |     9 +-
 .../securitygroup/ListSecurityGroupsCmd.java    |     8 +-
 .../RevokeSecurityGroupEgressCmd.java           |     8 +-
 .../RevokeSecurityGroupIngressCmd.java          |     3 +-
 .../user/snapshot/CreateSnapshotCmd.java        |    14 +-
 .../user/snapshot/CreateSnapshotPolicyCmd.java  |    10 +-
 .../user/snapshot/DeleteSnapshotCmd.java        |     6 +-
 .../snapshot/DeleteSnapshotPoliciesCmd.java     |     3 +-
 .../user/snapshot/ListSnapshotPoliciesCmd.java  |     3 +-
 .../command/user/snapshot/ListSnapshotsCmd.java |     4 +-
 .../command/user/ssh/CreateSSHKeyPairCmd.java   |     4 +-
 .../command/user/ssh/DeleteSSHKeyPairCmd.java   |     4 +-
 .../command/user/ssh/ListSSHKeyPairsCmd.java    |     3 +-
 .../command/user/ssh/RegisterSSHKeyPairCmd.java |     4 +-
 .../api/command/user/tag/CreateTagsCmd.java     |     5 +-
 .../api/command/user/tag/DeleteTagsCmd.java     |     9 +-
 .../command/user/template/CopyTemplateCmd.java  |     7 +-
 .../user/template/CreateTemplateCmd.java        |    47 +-
 .../user/template/DeleteTemplateCmd.java        |     6 +-
 .../user/template/ExtractTemplateCmd.java       |     7 +-
 .../template/ListTemplatePermissionsCmd.java    |     4 +-
 .../command/user/template/ListTemplatesCmd.java |    27 +-
 .../user/template/RegisterTemplateCmd.java      |    13 +-
 .../user/template/UpdateTemplateCmd.java        |     3 +-
 .../template/UpdateTemplatePermissionsCmd.java  |    13 +-
 .../api/command/user/vm/AddIpToVmNicCmd.java    |     5 +-
 .../api/command/user/vm/AddNicToVMCmd.java      |    13 +-
 .../api/command/user/vm/DeployVMCmd.java        |    59 +-
 .../api/command/user/vm/DestroyVMCmd.java       |     5 +-
 .../api/command/user/vm/GetVMPasswordCmd.java   |     3 +-
 .../api/command/user/vm/ListNicsCmd.java        |     1 -
 .../api/command/user/vm/ListVMsCmd.java         |    12 +-
 .../api/command/user/vm/RebootVMCmd.java        |     7 +-
 .../command/user/vm/RemoveIpFromVmNicCmd.java   |     2 -
 .../api/command/user/vm/RemoveNicFromVMCmd.java |    13 +-
 .../api/command/user/vm/ResetVMPasswordCmd.java |    12 +-
 .../api/command/user/vm/ResetVMSSHKeyCmd.java   |    13 +-
 .../api/command/user/vm/RestoreVMCmd.java       |    12 +-
 .../api/command/user/vm/ScaleVMCmd.java         |    26 +-
 .../api/command/user/vm/StartVMCmd.java         |     6 +-
 .../api/command/user/vm/StopVMCmd.java          |    11 +-
 .../user/vm/UpdateDefaultNicForVMCmd.java       |    13 +-
 .../api/command/user/vm/UpdateVMCmd.java        |    13 +-
 .../api/command/user/vm/UpgradeVMCmd.java       |     3 +-
 .../command/user/vmgroup/CreateVMGroupCmd.java  |    10 +-
 .../command/user/vmgroup/DeleteVMGroupCmd.java  |     3 +-
 .../command/user/vmgroup/ListVMGroupsCmd.java   |     3 +-
 .../command/user/vmgroup/UpdateVMGroupCmd.java  |     3 +-
 .../user/vmsnapshot/DeleteVMSnapshotCmd.java    |    10 +-
 .../user/vmsnapshot/RevertToVMSnapshotCmd.java  |     6 +-
 .../command/user/volume/AttachVolumeCmd.java    |    12 +-
 .../command/user/volume/CreateVolumeCmd.java    |    10 +-
 .../command/user/volume/DeleteVolumeCmd.java    |     4 +-
 .../command/user/volume/DetachVolumeCmd.java    |     6 +-
 .../command/user/volume/ExtractVolumeCmd.java   |     6 +-
 .../user/volume/ListResourceDetailsCmd.java     |     2 +-
 .../api/command/user/volume/ListVolumesCmd.java |     3 +-
 .../command/user/volume/MigrateVolumeCmd.java   |     1 -
 .../user/volume/RemoveResourceDetailCmd.java    |    10 +-
 .../command/user/volume/ResizeVolumeCmd.java    |    13 +-
 .../command/user/volume/UpdateVolumeCmd.java    |     9 +-
 .../command/user/volume/UploadVolumeCmd.java    |    14 +-
 .../api/command/user/vpc/CreateVPCCmd.java      |    17 +-
 .../command/user/vpc/DeleteStaticRouteCmd.java  |     4 +-
 .../api/command/user/vpc/DeleteVPCCmd.java      |     3 +-
 .../user/vpc/ListPrivateGatewaysCmd.java        |     3 +-
 .../command/user/vpc/ListVPCOfferingsCmd.java   |    13 +-
 .../api/command/user/vpc/ListVPCsCmd.java       |    14 +-
 .../api/command/user/vpc/RestartVPCCmd.java     |     3 +-
 .../api/command/user/vpc/UpdateVPCCmd.java      |     3 +-
 .../api/command/user/vpn/AddVpnUserCmd.java     |     4 +-
 .../user/vpn/CreateRemoteAccessVpnCmd.java      |     3 +-
 .../user/vpn/CreateVpnCustomerGatewayCmd.java   |    16 +-
 .../command/user/vpn/CreateVpnGatewayCmd.java   |     6 +-
 .../user/vpn/DeleteRemoteAccessVpnCmd.java      |     4 +-
 .../user/vpn/DeleteVpnConnectionCmd.java        |     3 +-
 .../user/vpn/DeleteVpnCustomerGatewayCmd.java   |     9 +-
 .../command/user/vpn/DeleteVpnGatewayCmd.java   |     3 +-
 .../user/vpn/ListRemoteAccessVpnsCmd.java       |     3 +-
 .../command/user/vpn/ListVpnConnectionsCmd.java |     3 +-
 .../user/vpn/ListVpnCustomerGatewaysCmd.java    |     3 +-
 .../command/user/vpn/ListVpnGatewaysCmd.java    |     3 +-
 .../api/command/user/vpn/ListVpnUsersCmd.java   |     3 +-
 .../api/command/user/vpn/RemoveVpnUserCmd.java  |     4 +-
 .../command/user/vpn/ResetVpnConnectionCmd.java |     4 +-
 .../user/vpn/UpdateVpnCustomerGatewayCmd.java   |    22 +-
 .../api/command/user/zone/ListZonesByCmd.java   |     5 +-
 .../api/response/AddIpToVmNicResponse.java      |     4 +-
 .../cloudstack/api/response/AlertResponse.java  |    14 +-
 ...ApplicationLoadBalancerInstanceResponse.java |     3 +-
 .../ApplicationLoadBalancerResponse.java        |     7 +-
 .../ApplicationLoadBalancerRuleResponse.java    |     3 +-
 .../api/response/AutoScalePolicyResponse.java   |     3 +-
 .../api/response/AutoScaleVmGroupResponse.java  |     3 +-
 .../response/AutoScaleVmProfileResponse.java    |     3 +-
 .../api/response/CapabilityResponse.java        |     3 +-
 .../api/response/CapacityResponse.java          |     3 +-
 .../api/response/CloudIdentifierResponse.java   |     3 +-
 .../api/response/ClusterResponse.java           |    10 +-
 .../api/response/ConditionResponse.java         |     3 +-
 .../api/response/ConfigurationResponse.java     |     3 +-
 .../api/response/CounterResponse.java           |     3 +-
 .../api/response/CreateSSHKeyPairResponse.java  |     3 +-
 .../api/response/CustomCertificateResponse.java |     3 +-
 .../response/DeploymentPlannersResponse.java    |     3 +-
 .../api/response/DiskOfferingResponse.java      |     3 +-
 .../cloudstack/api/response/DomainResponse.java |     3 +-
 .../api/response/DomainRouterResponse.java      |     4 +-
 .../cloudstack/api/response/EventResponse.java  |     3 +-
 .../api/response/EventTypeResponse.java         |     3 +-
 .../api/response/ExceptionResponse.java         |     3 +-
 .../api/response/ExternalFirewallResponse.java  |     5 +-
 .../response/ExternalLoadBalancerResponse.java  |     5 +-
 .../api/response/ExtractResponse.java           |     3 +-
 .../api/response/FirewallResponse.java          |     3 +-
 .../api/response/FirewallRuleResponse.java      |     3 +-
 .../api/response/GetVMPasswordResponse.java     |     3 +-
 .../response/GlobalLoadBalancerResponse.java    |    10 +-
 .../api/response/GuestOSCategoryResponse.java   |     3 +-
 .../api/response/GuestOSResponse.java           |     3 +-
 .../api/response/GuestVlanRangeResponse.java    |     8 +-
 .../api/response/HostForMigrationResponse.java  |     3 +-
 .../cloudstack/api/response/HostResponse.java   |     3 +-
 .../HypervisorCapabilitiesResponse.java         |     3 +-
 .../api/response/HypervisorResponse.java        |     3 +-
 .../api/response/IPAddressResponse.java         |     3 +-
 .../api/response/ImageStoreDetailResponse.java  |     3 +-
 .../api/response/ImageStoreResponse.java        |     3 +-
 .../api/response/InstanceGroupResponse.java     |     3 +-
 .../InternalLoadBalancerElementResponse.java    |     3 +-
 .../api/response/IpForwardingRuleResponse.java  |     3 +-
 .../cloudstack/api/response/IsoVmResponse.java  |     3 +-
 .../api/response/IsolationMethodResponse.java   |     3 +-
 .../response/LBHealthCheckPolicyResponse.java   |     6 +-
 .../api/response/LBHealthCheckResponse.java     |    11 +-
 .../response/LBStickinessPolicyResponse.java    |     3 +-
 .../api/response/LBStickinessResponse.java      |     3 +-
 .../api/response/LoadBalancerResponse.java      |     5 +-
 .../api/response/NetworkACLItemResponse.java    |     7 +-
 .../api/response/NetworkACLResponse.java        |     6 +-
 .../api/response/NetworkDeviceResponse.java     |     3 +-
 .../api/response/NetworkOfferingResponse.java   |     3 +-
 .../api/response/NetworkResponse.java           |     5 +-
 .../api/response/NicDetailResponse.java         |     7 +-
 .../cloudstack/api/response/NicResponse.java    |     8 +-
 .../api/response/NicSecondaryIpResponse.java    |     5 +-
 .../api/response/PhysicalNetworkResponse.java   |     3 +-
 .../cloudstack/api/response/PodResponse.java    |     3 +-
 .../api/response/PortableIpRangeResponse.java   |     7 +-
 .../api/response/PortableIpResponse.java        |     8 +-
 .../api/response/PrivateGatewayResponse.java    |     3 +-
 .../api/response/ProjectAccountResponse.java    |     8 +-
 .../api/response/ProjectInvitationResponse.java |     8 +-
 .../api/response/ProviderResponse.java          |     3 +-
 .../cloudstack/api/response/RegionResponse.java |     3 +-
 .../api/response/RegisterResponse.java          |     3 +-
 .../api/response/RemoteAccessVpnResponse.java   |     5 +-
 .../api/response/ResourceCountResponse.java     |     3 +-
 .../api/response/ResourceDetailResponse.java    |     3 +-
 .../api/response/ResourceLimitResponse.java     |     3 +-
 .../api/response/ResourceTagResponse.java       |     3 +-
 .../api/response/SSHKeyPairResponse.java        |     3 +-
 .../api/response/SecurityGroupResponse.java     |     6 +-
 .../api/response/SecurityGroupRuleResponse.java |     3 +-
 .../api/response/ServiceOfferingResponse.java   |     3 +-
 .../api/response/ServiceResponse.java           |     6 +-
 .../Site2SiteCustomerGatewayResponse.java       |     3 +-
 .../Site2SiteVpnConnectionResponse.java         |     3 +-
 .../response/Site2SiteVpnGatewayResponse.java   |     3 +-
 .../api/response/SnapshotPolicyResponse.java    |     3 +-
 .../api/response/SnapshotResponse.java          |     3 +-
 .../api/response/SnapshotScheduleResponse.java  |     3 +-
 .../api/response/SslCertResponse.java           |     8 +-
 .../api/response/StaticRouteResponse.java       |     3 +-
 .../cloudstack/api/response/StatusResponse.java |     4 +-
 .../response/StorageNetworkIpRangeResponse.java |     3 +-
 .../api/response/StoragePoolResponse.java       |    12 +-
 .../api/response/StorageProviderResponse.java   |     3 +-
 .../api/response/SuccessResponse.java           |     3 +-
 .../api/response/SystemVmInstanceResponse.java  |     3 +-
 .../api/response/SystemVmResponse.java          |     3 +-
 .../response/TemplatePermissionsResponse.java   |     3 +-
 .../api/response/TemplateResponse.java          |     3 +-
 .../api/response/TemplateZoneResponse.java      |     3 +-
 .../api/response/TrafficMonitorResponse.java    |     3 +-
 .../TrafficTypeImplementorResponse.java         |     3 +-
 .../api/response/TrafficTypeResponse.java       |     3 +-
 .../response/UpgradeRouterTemplateResponse.java |     8 +-
 .../api/response/UpgradeVmResponse.java         |     3 +-
 .../api/response/UsageRecordResponse.java       |     3 +-
 .../api/response/UsageTypeResponse.java         |     3 +-
 .../cloudstack/api/response/UserResponse.java   |     3 +-
 .../cloudstack/api/response/UserVmResponse.java |     3 +-
 .../api/response/VMSnapshotResponse.java        |     3 +-
 .../response/VirtualRouterProviderResponse.java |     3 +-
 .../api/response/VlanIpRangeResponse.java       |     6 +-
 .../api/response/VolumeDetailResponse.java      |     8 +-
 .../cloudstack/api/response/VolumeResponse.java |     5 +-
 .../api/response/VpcOfferingResponse.java       |     3 +-
 .../cloudstack/api/response/VpcResponse.java    |     3 +-
 .../api/response/VpnUsersResponse.java          |     5 +-
 .../cloudstack/api/response/ZoneResponse.java   |     3 +-
 .../apache/cloudstack/context/CallContext.java  |    11 +-
 .../apache/cloudstack/query/QueryService.java   |    33 +-
 .../apache/cloudstack/region/PortableIp.java    |     1 -
 api/test/com/cloud/network/NetworksTest.java    |     1 -
 .../command/test/ActivateProjectCmdTest.java    |    11 +-
 .../test/AddAccountToProjectCmdTest.java        |     9 +-
 .../api/command/test/AddIpToVmNicTest.java      |    31 +-
 .../test/AddNetworkServiceProviderCmdTest.java  |    12 +-
 .../test/AddSecondaryStorageCmdTest.java        |    10 +-
 .../api/command/test/AddVpnUserCmdTest.java     |    15 +-
 .../api/command/test/ListCfgCmdTest.java        |    25 +-
 .../api/command/test/RegionCmdTest.java         |    17 +-
 .../api/command/test/ScaleVMCmdTest.java        |    19 +-
 .../api/command/test/UpdateCfgCmdTest.java      |    18 +-
 .../api/command/test/UsageCmdTest.java          |     8 +-
 awsapi/src/com/amazon/ec2/ActivateLicense.java  |    11 +-
 .../com/amazon/ec2/ActivateLicenseResponse.java |     8 +-
 .../amazon/ec2/ActivateLicenseResponseType.java |     8 +-
 .../src/com/amazon/ec2/ActivateLicenseType.java |     8 +-
 awsapi/src/com/amazon/ec2/AllocateAddress.java  |    11 +-
 .../com/amazon/ec2/AllocateAddressResponse.java |     8 +-
 .../amazon/ec2/AllocateAddressResponseType.java |     8 +-
 .../src/com/amazon/ec2/AllocateAddressType.java |     8 +-
 .../com/amazon/ec2/AllocationIdSetItemType.java |     8 +-
 .../src/com/amazon/ec2/AllocationIdSetType.java |     8 +-
 .../ec2/AmazonEC2MessageReceiverInOut.java      |  1434 +-
 .../src/com/amazon/ec2/AmazonEC2Skeleton.java   |    22 +-
 .../amazon/ec2/AmazonEC2SkeletonInterface.java  |    22 +-
 .../amazon/ec2/AssignPrivateIpAddresses.java    |     8 +-
 .../ec2/AssignPrivateIpAddressesResponse.java   |    11 +-
 .../AssignPrivateIpAddressesResponseType.java   |     8 +-
 ...ignPrivateIpAddressesSetItemRequestType.java |     8 +-
 .../AssignPrivateIpAddressesSetRequestType.java |    11 +-
 .../ec2/AssignPrivateIpAddressesType.java       |    14 +-
 awsapi/src/com/amazon/ec2/AssociateAddress.java |    11 +-
 .../amazon/ec2/AssociateAddressResponse.java    |     8 +-
 .../ec2/AssociateAddressResponseType.java       |     8 +-
 .../com/amazon/ec2/AssociateAddressType.java    |     8 +-
 .../ec2/AssociateAddressTypeChoice_type0.java   |     8 +-
 .../ec2/AssociateAddressTypeChoice_type1.java   |     8 +-
 .../com/amazon/ec2/AssociateDhcpOptions.java    |    11 +-
 .../ec2/AssociateDhcpOptionsResponse.java       |    11 +-
 .../ec2/AssociateDhcpOptionsResponseType.java   |     8 +-
 .../amazon/ec2/AssociateDhcpOptionsType.java    |     8 +-
 .../src/com/amazon/ec2/AssociateRouteTable.java |    11 +-
 .../amazon/ec2/AssociateRouteTableResponse.java |    11 +-
 .../ec2/AssociateRouteTableResponseType.java    |     8 +-
 .../com/amazon/ec2/AssociateRouteTableType.java |     8 +-
 .../com/amazon/ec2/AttachInternetGateway.java   |    11 +-
 .../ec2/AttachInternetGatewayResponse.java      |    11 +-
 .../ec2/AttachInternetGatewayResponseType.java  |     8 +-
 .../amazon/ec2/AttachInternetGatewayType.java   |     8 +-
 .../com/amazon/ec2/AttachNetworkInterface.java  |    11 +-
 .../ec2/AttachNetworkInterfaceResponse.java     |    11 +-
 .../ec2/AttachNetworkInterfaceResponseType.java |     8 +-
 .../amazon/ec2/AttachNetworkInterfaceType.java  |     8 +-
 awsapi/src/com/amazon/ec2/AttachVolume.java     |     8 +-
 .../com/amazon/ec2/AttachVolumeResponse.java    |    11 +-
 .../amazon/ec2/AttachVolumeResponseType.java    |     8 +-
 awsapi/src/com/amazon/ec2/AttachVolumeType.java |     8 +-
 awsapi/src/com/amazon/ec2/AttachVpnGateway.java |    11 +-
 .../amazon/ec2/AttachVpnGatewayResponse.java    |     8 +-
 .../ec2/AttachVpnGatewayResponseType.java       |     8 +-
 .../com/amazon/ec2/AttachVpnGatewayType.java    |     8 +-
 .../ec2/AttachmentSetItemResponseType.java      |     8 +-
 .../amazon/ec2/AttachmentSetResponseType.java   |     8 +-
 .../src/com/amazon/ec2/AttachmentSetType.java   |    11 +-
 awsapi/src/com/amazon/ec2/AttachmentType.java   |     8 +-
 .../amazon/ec2/AttributeBooleanValueType.java   |     8 +-
 .../src/com/amazon/ec2/AttributeValueType.java  |     8 +-
 .../ec2/AuthorizeSecurityGroupEgress.java       |    11 +-
 .../AuthorizeSecurityGroupEgressResponse.java   |    12 +-
 ...uthorizeSecurityGroupEgressResponseType.java |     8 +-
 .../ec2/AuthorizeSecurityGroupEgressType.java   |     8 +-
 .../ec2/AuthorizeSecurityGroupIngress.java      |    11 +-
 .../AuthorizeSecurityGroupIngressResponse.java  |    12 +-
 ...thorizeSecurityGroupIngressResponseType.java |     8 +-
 .../ec2/AuthorizeSecurityGroupIngressType.java  |     8 +-
 ...izeSecurityGroupIngressTypeChoice_type0.java |     8 +-
 .../amazon/ec2/AvailabilityZoneItemType.java    |     8 +-
 .../ec2/AvailabilityZoneMessageSetType.java     |     8 +-
 .../amazon/ec2/AvailabilityZoneMessageType.java |     8 +-
 .../com/amazon/ec2/AvailabilityZoneSetType.java |     8 +-
 .../amazon/ec2/BlockDeviceMappingItemType.java  |     8 +-
 .../BlockDeviceMappingItemTypeChoice_type0.java |     8 +-
 .../com/amazon/ec2/BlockDeviceMappingType.java  |     8 +-
 awsapi/src/com/amazon/ec2/BundleInstance.java   |    11 +-
 .../com/amazon/ec2/BundleInstanceResponse.java  |    11 +-
 .../amazon/ec2/BundleInstanceResponseType.java  |     8 +-
 .../amazon/ec2/BundleInstanceS3StorageType.java |    11 +-
 .../amazon/ec2/BundleInstanceTaskErrorType.java |     8 +-
 .../ec2/BundleInstanceTaskStorageType.java      |     8 +-
 .../com/amazon/ec2/BundleInstanceTaskType.java  |     8 +-
 .../amazon/ec2/BundleInstanceTasksSetType.java  |     8 +-
 .../src/com/amazon/ec2/BundleInstanceType.java  |     8 +-
 awsapi/src/com/amazon/ec2/CancelBundleTask.java |    11 +-
 .../amazon/ec2/CancelBundleTaskResponse.java    |     8 +-
 .../ec2/CancelBundleTaskResponseType.java       |     8 +-
 .../com/amazon/ec2/CancelBundleTaskType.java    |     8 +-
 .../com/amazon/ec2/CancelConversionTask.java    |    11 +-
 .../ec2/CancelConversionTaskResponse.java       |    11 +-
 .../ec2/CancelConversionTaskResponseType.java   |     8 +-
 .../amazon/ec2/CancelConversionTaskType.java    |     8 +-
 awsapi/src/com/amazon/ec2/CancelExportTask.java |    11 +-
 .../amazon/ec2/CancelExportTaskResponse.java    |     8 +-
 .../ec2/CancelExportTaskResponseType.java       |     8 +-
 .../com/amazon/ec2/CancelExportTaskType.java    |     8 +-
 .../ec2/CancelReservedInstancesListing.java     |    11 +-
 .../CancelReservedInstancesListingResponse.java |    12 +-
 ...celReservedInstancesListingResponseType.java |    14 +-
 .../ec2/CancelReservedInstancesListingType.java |    11 +-
 .../amazon/ec2/CancelSpotInstanceRequests.java  |    11 +-
 .../ec2/CancelSpotInstanceRequestsResponse.java |    11 +-
 ...SpotInstanceRequestsResponseSetItemType.java |    11 +-
 ...ncelSpotInstanceRequestsResponseSetType.java |    11 +-
 .../CancelSpotInstanceRequestsResponseType.java |    11 +-
 .../ec2/CancelSpotInstanceRequestsType.java     |    11 +-
 .../com/amazon/ec2/ConfirmProductInstance.java  |    11 +-
 .../ec2/ConfirmProductInstanceResponse.java     |    11 +-
 .../ec2/ConfirmProductInstanceResponseType.java |     8 +-
 .../amazon/ec2/ConfirmProductInstanceType.java  |     8 +-
 .../amazon/ec2/ConversionTaskIdItemType.java    |     8 +-
 .../com/amazon/ec2/ConversionTaskIdSetType.java |     8 +-
 .../com/amazon/ec2/ConversionTaskSetType.java   |    12 +-
 .../src/com/amazon/ec2/ConversionTaskType.java  |     8 +-
 .../ec2/ConversionTaskTypeChoice_type0.java     |     8 +-
 .../com/amazon/ec2/CreateCustomerGateway.java   |    11 +-
 .../ec2/CreateCustomerGatewayResponse.java      |    11 +-
 .../ec2/CreateCustomerGatewayResponseType.java  |     8 +-
 .../amazon/ec2/CreateCustomerGatewayType.java   |     8 +-
 .../src/com/amazon/ec2/CreateDhcpOptions.java   |    11 +-
 .../amazon/ec2/CreateDhcpOptionsResponse.java   |    11 +-
 .../ec2/CreateDhcpOptionsResponseType.java      |     8 +-
 .../com/amazon/ec2/CreateDhcpOptionsType.java   |     8 +-
 awsapi/src/com/amazon/ec2/CreateImage.java      |     8 +-
 .../src/com/amazon/ec2/CreateImageResponse.java |    11 +-
 .../com/amazon/ec2/CreateImageResponseType.java |     8 +-
 awsapi/src/com/amazon/ec2/CreateImageType.java  |     8 +-
 .../amazon/ec2/CreateInstanceExportTask.java    |     8 +-
 .../ec2/CreateInstanceExportTaskResponse.java   |    11 +-
 .../CreateInstanceExportTaskResponseType.java   |     8 +-
 .../ec2/CreateInstanceExportTaskType.java       |     8 +-
 ...reateInstanceExportTaskTypeChoice_type0.java |     8 +-
 .../com/amazon/ec2/CreateInternetGateway.java   |    11 +-
 .../ec2/CreateInternetGatewayResponse.java      |    11 +-
 .../ec2/CreateInternetGatewayResponseType.java  |     8 +-
 .../amazon/ec2/CreateInternetGatewayType.java   |     8 +-
 awsapi/src/com/amazon/ec2/CreateKeyPair.java    |    11 +-
 .../com/amazon/ec2/CreateKeyPairResponse.java   |    11 +-
 .../amazon/ec2/CreateKeyPairResponseType.java   |     8 +-
 .../src/com/amazon/ec2/CreateKeyPairType.java   |     8 +-
 awsapi/src/com/amazon/ec2/CreateNetworkAcl.java |    11 +-
 .../com/amazon/ec2/CreateNetworkAclEntry.java   |    11 +-
 .../ec2/CreateNetworkAclEntryResponse.java      |    11 +-
 .../ec2/CreateNetworkAclEntryResponseType.java  |     8 +-
 .../amazon/ec2/CreateNetworkAclEntryType.java   |     8 +-
 .../amazon/ec2/CreateNetworkAclResponse.java    |     8 +-
 .../ec2/CreateNetworkAclResponseType.java       |     8 +-
 .../com/amazon/ec2/CreateNetworkAclType.java    |     8 +-
 .../com/amazon/ec2/CreateNetworkInterface.java  |    11 +-
 .../ec2/CreateNetworkInterfaceResponse.java     |    11 +-
 .../ec2/CreateNetworkInterfaceResponseType.java |     8 +-
 .../amazon/ec2/CreateNetworkInterfaceType.java  |    14 +-
 .../com/amazon/ec2/CreatePlacementGroup.java    |    11 +-
 .../ec2/CreatePlacementGroupResponse.java       |    11 +-
 .../ec2/CreatePlacementGroupResponseType.java   |     8 +-
 .../amazon/ec2/CreatePlacementGroupType.java    |     8 +-
 .../ec2/CreateReservedInstancesListing.java     |    11 +-
 .../CreateReservedInstancesListingResponse.java |    12 +-
 ...ateReservedInstancesListingResponseType.java |    14 +-
 .../ec2/CreateReservedInstancesListingType.java |     8 +-
 awsapi/src/com/amazon/ec2/CreateRoute.java      |     8 +-
 .../src/com/amazon/ec2/CreateRouteResponse.java |    11 +-
 .../com/amazon/ec2/CreateRouteResponseType.java |     8 +-
 awsapi/src/com/amazon/ec2/CreateRouteTable.java |    11 +-
 .../amazon/ec2/CreateRouteTableResponse.java    |     8 +-
 .../ec2/CreateRouteTableResponseType.java       |     8 +-
 .../com/amazon/ec2/CreateRouteTableType.java    |     8 +-
 awsapi/src/com/amazon/ec2/CreateRouteType.java  |     8 +-
 .../amazon/ec2/CreateRouteTypeChoice_type0.java |     8 +-
 .../src/com/amazon/ec2/CreateSecurityGroup.java |    11 +-
 .../amazon/ec2/CreateSecurityGroupResponse.java |    11 +-
 .../ec2/CreateSecurityGroupResponseType.java    |     8 +-
 .../com/amazon/ec2/CreateSecurityGroupType.java |     8 +-
 awsapi/src/com/amazon/ec2/CreateSnapshot.java   |    11 +-
 .../com/amazon/ec2/CreateSnapshotResponse.java  |    11 +-
 .../amazon/ec2/CreateSnapshotResponseType.java  |     8 +-
 .../src/com/amazon/ec2/CreateSnapshotType.java  |     8 +-
 .../ec2/CreateSpotDatafeedSubscription.java     |    11 +-
 .../CreateSpotDatafeedSubscriptionResponse.java |    12 +-
 ...ateSpotDatafeedSubscriptionResponseType.java |    11 +-
 .../ec2/CreateSpotDatafeedSubscriptionType.java |     8 +-
 awsapi/src/com/amazon/ec2/CreateSubnet.java     |     8 +-
 .../com/amazon/ec2/CreateSubnetResponse.java    |    11 +-
 .../amazon/ec2/CreateSubnetResponseType.java    |     8 +-
 awsapi/src/com/amazon/ec2/CreateSubnetType.java |     8 +-
 awsapi/src/com/amazon/ec2/CreateTags.java       |     8 +-
 .../src/com/amazon/ec2/CreateTagsResponse.java  |    11 +-
 .../com/amazon/ec2/CreateTagsResponseType.java  |     8 +-
 awsapi/src/com/amazon/ec2/CreateTagsType.java   |     8 +-
 awsapi/src/com/amazon/ec2/CreateVolume.java     |     8 +-
 .../ec2/CreateVolumePermissionItemType.java     |     8 +-
 .../ec2/CreateVolumePermissionListType.java     |     8 +-
 .../CreateVolumePermissionOperationType.java    |     8 +-
 .../com/amazon/ec2/CreateVolumeResponse.java    |    11 +-
 .../amazon/ec2/CreateVolumeResponseType.java    |     8 +-
 awsapi/src/com/amazon/ec2/CreateVolumeType.java |     8 +-
 awsapi/src/com/amazon/ec2/CreateVpc.java        |     8 +-
 .../src/com/amazon/ec2/CreateVpcResponse.java   |    11 +-
 .../com/amazon/ec2/CreateVpcResponseType.java   |     8 +-
 awsapi/src/com/amazon/ec2/CreateVpcType.java    |     8 +-
 .../src/com/amazon/ec2/CreateVpnConnection.java |    11 +-
 .../amazon/ec2/CreateVpnConnectionResponse.java |    11 +-
 .../ec2/CreateVpnConnectionResponseType.java    |     8 +-
 .../amazon/ec2/CreateVpnConnectionRoute.java    |     8 +-
 .../ec2/CreateVpnConnectionRouteResponse.java   |    11 +-
 .../CreateVpnConnectionRouteResponseType.java   |     8 +-
 .../ec2/CreateVpnConnectionRouteType.java       |     8 +-
 .../com/amazon/ec2/CreateVpnConnectionType.java |     8 +-
 awsapi/src/com/amazon/ec2/CreateVpnGateway.java |    11 +-
 .../amazon/ec2/CreateVpnGatewayResponse.java    |     8 +-
 .../ec2/CreateVpnGatewayResponseType.java       |     8 +-
 .../com/amazon/ec2/CreateVpnGatewayType.java    |     8 +-
 .../ec2/CustomerGatewayIdSetItemType.java       |     8 +-
 .../amazon/ec2/CustomerGatewayIdSetType.java    |     8 +-
 .../com/amazon/ec2/CustomerGatewaySetType.java  |    12 +-
 .../src/com/amazon/ec2/CustomerGatewayType.java |     8 +-
 .../src/com/amazon/ec2/DeactivateLicense.java   |    11 +-
 .../amazon/ec2/DeactivateLicenseResponse.java   |    11 +-
 .../ec2/DeactivateLicenseResponseType.java      |     8 +-
 .../com/amazon/ec2/DeactivateLicenseType.java   |     8 +-
 .../com/amazon/ec2/DeleteCustomerGateway.java   |    11 +-
 .../ec2/DeleteCustomerGatewayResponse.java      |    11 +-
 .../ec2/DeleteCustomerGatewayResponseType.java  |     8 +-
 .../amazon/ec2/DeleteCustomerGatewayType.java   |     8 +-
 .../src/com/amazon/ec2/DeleteDhcpOptions.java   |    11 +-
 .../amazon/ec2/DeleteDhcpOptionsResponse.java   |    11 +-
 .../ec2/DeleteDhcpOptionsResponseType.java      |     8 +-
 .../com/amazon/ec2/DeleteDhcpOptionsType.java   |     8 +-
 .../com/amazon/ec2/DeleteInternetGateway.java   |    11 +-
 .../ec2/DeleteInternetGatewayResponse.java      |    11 +-
 .../ec2/DeleteInternetGatewayResponseType.java  |     8 +-
 .../amazon/ec2/DeleteInternetGatewayType.java   |     8 +-
 awsapi/src/com/amazon/ec2/DeleteKeyPair.java    |    11 +-
 .../com/amazon/ec2/DeleteKeyPairResponse.java   |    11 +-
 .../amazon/ec2/DeleteKeyPairResponseType.java   |     8 +-
 .../src/com/amazon/ec2/DeleteKeyPairType.java   |     8 +-
 awsapi/src/com/amazon/ec2/DeleteNetworkAcl.java |    11 +-
 .../com/amazon/ec2/DeleteNetworkAclEntry.java   |    11 +-
 .../ec2/DeleteNetworkAclEntryResponse.java      |    11 +-
 .../ec2/DeleteNetworkAclEntryResponseType.java  |     8 +-
 .../amazon/ec2/DeleteNetworkAclEntryType.java   |     8 +-
 .../amazon/ec2/DeleteNetworkAclResponse.java    |     8 +-
 .../ec2/DeleteNetworkAclResponseType.java       |     8 +-
 .../com/amazon/ec2/DeleteNetworkAclType.java    |     8 +-
 .../com/amazon/ec2/DeleteNetworkInterface.java  |    11 +-
 .../ec2/DeleteNetworkInterfaceResponse.java     |    11 +-
 .../ec2/DeleteNetworkInterfaceResponseType.java |     8 +-
 .../amazon/ec2/DeleteNetworkInterfaceType.java  |     8 +-
 .../com/amazon/ec2/DeletePlacementGroup.java    |    11 +-
 .../ec2/DeletePlacementGroupResponse.java       |    11 +-
 .../ec2/DeletePlacementGroupResponseType.java   |     8 +-
 .../amazon/ec2/DeletePlacementGroupType.java    |     8 +-
 awsapi/src/com/amazon/ec2/DeleteRoute.java      |     8 +-
 .../src/com/amazon/ec2/DeleteRouteResponse.java |    11 +-
 .../com/amazon/ec2/DeleteRouteResponseType.java |     8 +-
 awsapi/src/com/amazon/ec2/DeleteRouteTable.java |    11 +-
 .../amazon/ec2/DeleteRouteTableResponse.java    |     8 +-
 .../ec2/DeleteRouteTableResponseType.java       |     8 +-
 .../com/amazon/ec2/DeleteRouteTableType.java    |     8 +-
 awsapi/src/com/amazon/ec2/DeleteRouteType.java  |     8 +-
 .../src/com/amazon/ec2/DeleteSecurityGroup.java |    11 +-
 .../amazon/ec2/DeleteSecurityGroupResponse.java |    11 +-
 .../ec2/DeleteSecurityGroupResponseType.java    |     8 +-
 .../com/amazon/ec2/DeleteSecurityGroupType.java |     8 +-
 awsapi/src/com/amazon/ec2/DeleteSnapshot.java   |    11 +-
 .../com/amazon/ec2/DeleteSnapshotResponse.java  |    11 +-
 .../amazon/ec2/DeleteSnapshotResponseType.java  |     8 +-
 .../src/com/amazon/ec2/DeleteSnapshotType.java  |     8 +-
 .../ec2/DeleteSpotDatafeedSubscription.java     |    11 +-
 .../DeleteSpotDatafeedSubscriptionResponse.java |    12 +-
 ...eteSpotDatafeedSubscriptionResponseType.java |     8 +-
 .../ec2/DeleteSpotDatafeedSubscriptionType.java |     8 +-
 awsapi/src/com/amazon/ec2/DeleteSubnet.java     |     8 +-
 .../com/amazon/ec2/DeleteSubnetResponse.java    |    11 +-
 .../amazon/ec2/DeleteSubnetResponseType.java    |     8 +-
 awsapi/src/com/amazon/ec2/DeleteSubnetType.java |     8 +-
 awsapi/src/com/amazon/ec2/DeleteTags.java       |     8 +-
 .../src/com/amazon/ec2/DeleteTagsResponse.java  |    11 +-
 .../com/amazon/ec2/DeleteTagsResponseType.java  |     8 +-
 .../com/amazon/ec2/DeleteTagsSetItemType.java   |     8 +-
 .../src/com/amazon/ec2/DeleteTagsSetType.java   |     8 +-
 awsapi/src/com/amazon/ec2/DeleteTagsType.java   |     8 +-
 awsapi/src/com/amazon/ec2/DeleteVolume.java     |     8 +-
 .../com/amazon/ec2/DeleteVolumeResponse.java    |    11 +-
 .../amazon/ec2/DeleteVolumeResponseType.java    |     8 +-
 awsapi/src/com/amazon/ec2/DeleteVolumeType.java |     8 +-
 awsapi/src/com/amazon/ec2/DeleteVpc.java        |     8 +-
 .../src/com/amazon/ec2/DeleteVpcResponse.java   |    11 +-
 .../com/amazon/ec2/DeleteVpcResponseType.java   |     8 +-
 awsapi/src/com/amazon/ec2/DeleteVpcType.java    |     8 +-
 .../src/com/amazon/ec2/DeleteVpnConnection.java |    11 +-
 .../amazon/ec2/DeleteVpnConnectionResponse.java |    11 +-
 .../ec2/DeleteVpnConnectionResponseType.java    |     8 +-
 .../amazon/ec2/DeleteVpnConnectionRoute.java    |     8 +-
 .../ec2/DeleteVpnConnectionRouteResponse.java   |    11 +-
 .../DeleteVpnConnectionRouteResponseType.java   |     8 +-
 .../ec2/DeleteVpnConnectionRouteType.java       |     8 +-
 .../com/amazon/ec2/DeleteVpnConnectionType.java |     8 +-
 awsapi/src/com/amazon/ec2/DeleteVpnGateway.java |    11 +-
 .../amazon/ec2/DeleteVpnGatewayResponse.java    |     8 +-
 .../ec2/DeleteVpnGatewayResponseType.java       |     8 +-
 .../com/amazon/ec2/DeleteVpnGatewayType.java    |     8 +-
 awsapi/src/com/amazon/ec2/DeregisterImage.java  |    11 +-
 .../com/amazon/ec2/DeregisterImageResponse.java |     8 +-
 .../amazon/ec2/DeregisterImageResponseType.java |     8 +-
 .../src/com/amazon/ec2/DeregisterImageType.java |     8 +-
 .../src/com/amazon/ec2/DescribeAddresses.java   |    11 +-
 .../amazon/ec2/DescribeAddressesInfoType.java   |     8 +-
 .../amazon/ec2/DescribeAddressesItemType.java   |     8 +-
 .../amazon/ec2/DescribeAddressesResponse.java   |    11 +-
 .../ec2/DescribeAddressesResponseInfoType.java  |     8 +-
 .../ec2/DescribeAddressesResponseItemType.java  |    11 +-
 .../ec2/DescribeAddressesResponseType.java      |     8 +-
 .../com/amazon/ec2/DescribeAddressesType.java   |     8 +-
 .../amazon/ec2/DescribeAvailabilityZones.java   |    11 +-
 .../ec2/DescribeAvailabilityZonesResponse.java  |    11 +-
 .../DescribeAvailabilityZonesResponseType.java  |     8 +-
 .../DescribeAvailabilityZonesSetItemType.java   |     8 +-
 .../ec2/DescribeAvailabilityZonesSetType.java   |     8 +-
 .../ec2/DescribeAvailabilityZonesType.java      |     8 +-
 .../src/com/amazon/ec2/DescribeBundleTasks.java |    11 +-
 .../amazon/ec2/DescribeBundleTasksInfoType.java |     8 +-
 .../amazon/ec2/DescribeBundleTasksItemType.java |     8 +-
 .../amazon/ec2/DescribeBundleTasksResponse.java |    11 +-
 .../ec2/DescribeBundleTasksResponseType.java    |    11 +-
 .../com/amazon/ec2/DescribeBundleTasksType.java |     8 +-
 .../com/amazon/ec2/DescribeConversionTasks.java |     8 +-
 .../ec2/DescribeConversionTasksResponse.java    |    11 +-
 .../DescribeConversionTasksResponseType.java    |     8 +-
 .../amazon/ec2/DescribeConversionTasksType.java |     8 +-
 .../amazon/ec2/DescribeCustomerGateways.java    |     8 +-
 .../ec2/DescribeCustomerGatewaysResponse.java   |    11 +-
 .../DescribeCustomerGatewaysResponseType.java   |     8 +-
 .../ec2/DescribeCustomerGatewaysType.java       |     8 +-
 .../src/com/amazon/ec2/DescribeDhcpOptions.java |    11 +-
 .../amazon/ec2/DescribeDhcpOptionsResponse.java |    11 +-
 .../ec2/DescribeDhcpOptionsResponseType.java    |     8 +-
 .../com/amazon/ec2/DescribeDhcpOptionsType.java |     8 +-
 .../src/com/amazon/ec2/DescribeExportTasks.java |    11 +-
 .../amazon/ec2/DescribeExportTasksResponse.java |    11 +-
 .../ec2/DescribeExportTasksResponseType.java    |     8 +-
 .../com/amazon/ec2/DescribeExportTasksType.java |     8 +-
 .../com/amazon/ec2/DescribeImageAttribute.java  |    11 +-
 .../ec2/DescribeImageAttributeResponse.java     |    11 +-
 .../ec2/DescribeImageAttributeResponseType.java |     8 +-
 ...eImageAttributeResponseTypeChoice_type0.java |     8 +-
 .../amazon/ec2/DescribeImageAttributeType.java  |     8 +-
 .../ec2/DescribeImageAttributesGroup.java       |     8 +-
 awsapi/src/com/amazon/ec2/DescribeImages.java   |    11 +-
 .../ec2/DescribeImagesExecutableBySetType.java  |     8 +-
 .../ec2/DescribeImagesExecutableByType.java     |     8 +-
 .../com/amazon/ec2/DescribeImagesInfoType.java  |     8 +-
 .../com/amazon/ec2/DescribeImagesItemType.java  |     8 +-
 .../com/amazon/ec2/DescribeImagesOwnerType.java |     8 +-
 .../amazon/ec2/DescribeImagesOwnersType.java    |     8 +-
 .../com/amazon/ec2/DescribeImagesResponse.java  |    11 +-
 .../ec2/DescribeImagesResponseInfoType.java     |     8 +-
 .../ec2/DescribeImagesResponseItemType.java     |     8 +-
 .../amazon/ec2/DescribeImagesResponseType.java  |     8 +-
 .../src/com/amazon/ec2/DescribeImagesType.java  |     8 +-
 .../amazon/ec2/DescribeInstanceAttribute.java   |    11 +-
 .../ec2/DescribeInstanceAttributeResponse.java  |    11 +-
 .../DescribeInstanceAttributeResponseType.java  |     8 +-
 ...stanceAttributeResponseTypeChoice_type0.java |    18 +-
 .../ec2/DescribeInstanceAttributeType.java      |     8 +-
 .../ec2/DescribeInstanceAttributesGroup.java    |    15 +-
 .../com/amazon/ec2/DescribeInstanceStatus.java  |    11 +-
 .../ec2/DescribeInstanceStatusResponse.java     |    11 +-
 .../ec2/DescribeInstanceStatusResponseType.java |     8 +-
 .../amazon/ec2/DescribeInstanceStatusType.java  |     8 +-
 .../src/com/amazon/ec2/DescribeInstances.java   |    11 +-
 .../amazon/ec2/DescribeInstancesInfoType.java   |     8 +-
 .../amazon/ec2/DescribeInstancesItemType.java   |     8 +-
 .../amazon/ec2/DescribeInstancesResponse.java   |    11 +-
 .../ec2/DescribeInstancesResponseType.java      |     8 +-
 .../com/amazon/ec2/DescribeInstancesType.java   |     8 +-
 .../amazon/ec2/DescribeInternetGateways.java    |     8 +-
 .../ec2/DescribeInternetGatewaysResponse.java   |    11 +-
 .../DescribeInternetGatewaysResponseType.java   |     8 +-
 .../ec2/DescribeInternetGatewaysType.java       |     8 +-
 awsapi/src/com/amazon/ec2/DescribeKeyPairs.java |    11 +-
 .../amazon/ec2/DescribeKeyPairsInfoType.java    |     8 +-
 .../amazon/ec2/DescribeKeyPairsItemType.java    |     8 +-
 .../amazon/ec2/DescribeKeyPairsResponse.java    |     8 +-
 .../ec2/DescribeKeyPairsResponseInfoType.java   |     8 +-
 .../ec2/DescribeKeyPairsResponseItemType.java   |     8 +-
 .../ec2/DescribeKeyPairsResponseType.java       |     8 +-
 .../com/amazon/ec2/DescribeKeyPairsType.java    |     8 +-
 awsapi/src/com/amazon/ec2/DescribeLicenses.java |    11 +-
 .../amazon/ec2/DescribeLicensesResponse.java    |     8 +-
 .../ec2/DescribeLicensesResponseType.java       |     8 +-
 .../com/amazon/ec2/DescribeLicensesType.java    |     8 +-
 .../src/com/amazon/ec2/DescribeNetworkAcls.java |    11 +-
 .../amazon/ec2/DescribeNetworkAclsResponse.java |    11 +-
 .../ec2/DescribeNetworkAclsResponseType.java    |     8 +-
 .../com/amazon/ec2/DescribeNetworkAclsType.java |     8 +-
 .../ec2/DescribeNetworkInterfaceAttribute.java  |    11 +-
 ...scribeNetworkInterfaceAttributeResponse.java |    12 +-
 ...beNetworkInterfaceAttributeResponseType.java |     8 +-
 ...erfaceAttributeResponseTypeChoice_type0.java |    12 +-
 .../DescribeNetworkInterfaceAttributeType.java  |     8 +-
 ...DescribeNetworkInterfaceAttributesGroup.java |     8 +-
 .../amazon/ec2/DescribeNetworkInterfaces.java   |    11 +-
 .../ec2/DescribeNetworkInterfacesResponse.java  |    11 +-
 .../DescribeNetworkInterfacesResponseType.java  |     8 +-
 .../ec2/DescribeNetworkInterfacesType.java      |    11 +-
 .../ec2/DescribePlacementGroupItemType.java     |     8 +-
 .../com/amazon/ec2/DescribePlacementGroups.java |     8 +-
 .../ec2/DescribePlacementGroupsInfoType.java    |     8 +-
 .../ec2/DescribePlacementGroupsResponse.java    |    11 +-
 .../DescribePlacementGroupsResponseType.java    |     8 +-
 .../amazon/ec2/DescribePlacementGroupsType.java |     8 +-
 awsapi/src/com/amazon/ec2/DescribeRegions.java  |    11 +-
 .../com/amazon/ec2/DescribeRegionsResponse.java |     8 +-
 .../amazon/ec2/DescribeRegionsResponseType.java |     8 +-
 .../amazon/ec2/DescribeRegionsSetItemType.java  |     8 +-
 .../com/amazon/ec2/DescribeRegionsSetType.java  |     8 +-
 .../src/com/amazon/ec2/DescribeRegionsType.java |     8 +-
 .../amazon/ec2/DescribeReservedInstances.java   |    11 +-
 ...ribeReservedInstancesListingSetItemType.java |    11 +-
 ...DescribeReservedInstancesListingSetType.java |    11 +-
 .../ec2/DescribeReservedInstancesListings.java  |    11 +-
 ...scribeReservedInstancesListingsResponse.java |    12 +-
 ...vedInstancesListingsResponseSetItemType.java |    14 +-
 ...eservedInstancesListingsResponseSetType.java |    14 +-
 ...beReservedInstancesListingsResponseType.java |    14 +-
 .../DescribeReservedInstancesListingsType.java  |    14 +-
 .../ec2/DescribeReservedInstancesOfferings.java |    11 +-
 ...cribeReservedInstancesOfferingsResponse.java |     8 +-
 ...edInstancesOfferingsResponseSetItemType.java |    14 +-
 ...servedInstancesOfferingsResponseSetType.java |    14 +-
 ...eReservedInstancesOfferingsResponseType.java |    14 +-
 ...beReservedInstancesOfferingsSetItemType.java |    11 +-
 ...scribeReservedInstancesOfferingsSetType.java |    11 +-
 .../DescribeReservedInstancesOfferingsType.java |    15 +-
 .../ec2/DescribeReservedInstancesResponse.java  |    11 +-
 ...ibeReservedInstancesResponseSetItemType.java |     8 +-
 ...escribeReservedInstancesResponseSetType.java |    11 +-
 .../DescribeReservedInstancesResponseType.java  |     8 +-
 .../DescribeReservedInstancesSetItemType.java   |     8 +-
 .../ec2/DescribeReservedInstancesSetType.java   |     8 +-
 .../ec2/DescribeReservedInstancesType.java      |     8 +-
 .../src/com/amazon/ec2/DescribeRouteTables.java |    11 +-
 .../amazon/ec2/DescribeRouteTablesResponse.java |    11 +-
 .../ec2/DescribeRouteTablesResponseType.java    |     8 +-
 .../com/amazon/ec2/DescribeRouteTablesType.java |     8 +-
 .../com/amazon/ec2/DescribeSecurityGroups.java  |    11 +-
 .../DescribeSecurityGroupsIdSetItemType.java    |     8 +-
 .../ec2/DescribeSecurityGroupsIdSetType.java    |     8 +-
 .../ec2/DescribeSecurityGroupsResponse.java     |    11 +-
 .../ec2/DescribeSecurityGroupsResponseType.java |     8 +-
 .../ec2/DescribeSecurityGroupsSetItemType.java  |     8 +-
 .../ec2/DescribeSecurityGroupsSetType.java      |     8 +-
 .../amazon/ec2/DescribeSecurityGroupsType.java  |     8 +-
 .../amazon/ec2/DescribeSnapshotAttribute.java   |    11 +-
 .../ec2/DescribeSnapshotAttributeResponse.java  |    11 +-
 .../DescribeSnapshotAttributeResponseType.java  |     8 +-
 ...apshotAttributeResponseTypeChoice_type0.java |    14 +-
 .../ec2/DescribeSnapshotAttributeType.java      |     8 +-
 .../ec2/DescribeSnapshotAttributesGroup.java    |    11 +-
 .../src/com/amazon/ec2/DescribeSnapshots.java   |    11 +-
 .../amazon/ec2/DescribeSnapshotsOwnerType.java  |     8 +-
 .../amazon/ec2/DescribeSnapshotsOwnersType.java |     8 +-
 .../amazon/ec2/DescribeSnapshotsResponse.java   |    11 +-
 .../ec2/DescribeSnapshotsResponseType.java      |     8 +-
 .../DescribeSnapshotsRestorableBySetType.java   |     8 +-
 .../ec2/DescribeSnapshotsRestorableByType.java  |     8 +-
 .../DescribeSnapshotsSetItemResponseType.java   |     8 +-
 .../ec2/DescribeSnapshotsSetItemType.java       |     8 +-
 .../ec2/DescribeSnapshotsSetResponseType.java   |     8 +-
 .../amazon/ec2/DescribeSnapshotsSetType.java    |     8 +-
 .../com/amazon/ec2/DescribeSnapshotsType.java   |     8 +-
 .../ec2/DescribeSpotDatafeedSubscription.java   |    11 +-
 ...escribeSpotDatafeedSubscriptionResponse.java |    12 +-
 ...ibeSpotDatafeedSubscriptionResponseType.java |    11 +-
 .../DescribeSpotDatafeedSubscriptionType.java   |     8 +-
 .../ec2/DescribeSpotInstanceRequests.java       |    11 +-
 .../DescribeSpotInstanceRequestsResponse.java   |    12 +-
 ...escribeSpotInstanceRequestsResponseType.java |    11 +-
 .../ec2/DescribeSpotInstanceRequestsType.java   |    11 +-
 .../amazon/ec2/DescribeSpotPriceHistory.java    |     8 +-
 .../ec2/DescribeSpotPriceHistoryResponse.java   |    11 +-
 .../DescribeSpotPriceHistoryResponseType.java   |     8 +-
 .../ec2/DescribeSpotPriceHistoryType.java       |    11 +-
 awsapi/src/com/amazon/ec2/DescribeSubnets.java  |    11 +-
 .../com/amazon/ec2/DescribeSubnetsResponse.java |     8 +-
 .../amazon/ec2/DescribeSubnetsResponseType.java |     8 +-
 .../src/com/amazon/ec2/DescribeSubnetsType.java |     8 +-
 awsapi/src/com/amazon/ec2/DescribeTags.java     |     8 +-
 .../com/amazon/ec2/DescribeTagsResponse.java    |    11 +-
 .../amazon/ec2/DescribeTagsResponseType.java    |     8 +-
 awsapi/src/com/amazon/ec2/DescribeTagsType.java |     8 +-
 .../com/amazon/ec2/DescribeVolumeAttribute.java |     8 +-
 .../ec2/DescribeVolumeAttributeResponse.java    |    11 +-
 .../DescribeVolumeAttributeResponseType.java    |     8 +-
 ...VolumeAttributeResponseTypeChoice_type0.java |    11 +-
 .../amazon/ec2/DescribeVolumeAttributeType.java |     8 +-
 .../ec2/DescribeVolumeAttributesGroup.java      |     8 +-
 .../com/amazon/ec2/DescribeVolumeStatus.java    |    11 +-
 .../ec2/DescribeVolumeStatusResponse.java       |    11 +-
 .../ec2/DescribeVolumeStatusResponseType.java   |     8 +-
 .../amazon/ec2/DescribeVolumeStatusType.java    |     8 +-
 awsapi/src/com/amazon/ec2/DescribeVolumes.java  |    11 +-
 .../com/amazon/ec2/DescribeVolumesResponse.java |     8 +-
 .../amazon/ec2/DescribeVolumesResponseType.java |     8 +-
 .../ec2/DescribeVolumesSetItemResponseType.java |     8 +-
 .../amazon/ec2/DescribeVolumesSetItemType.java  |     8 +-
 .../ec2/DescribeVolumesSetResponseType.java     |     8 +-
 .../com/amazon/ec2/DescribeVolumesSetType.java  |     8 +-
 .../src/com/amazon/ec2/DescribeVolumesType.java |     8 +-
 awsapi/src/com/amazon/ec2/DescribeVpcs.java     |     8 +-
 .../com/amazon/ec2/DescribeVpcsResponse.java    |    11 +-
 .../amazon/ec2/DescribeVpcsResponseType.java    |     8 +-
 awsapi/src/com/amazon/ec2/DescribeVpcsType.java |     8 +-
 .../com/amazon/ec2/DescribeVpnConnections.java  |    11 +-
 .../ec2/DescribeVpnConnectionsResponse.java     |    11 +-
 .../ec2/DescribeVpnConnectionsResponseType.java |     8 +-
 .../amazon/ec2/DescribeVpnConnectionsType.java  |     8 +-
 .../src/com/amazon/ec2/DescribeVpnGateways.java |    11 +-
 .../amazon/ec2/DescribeVpnGatewaysResponse.java |    11 +-
 .../ec2/DescribeVpnGatewaysResponseType.java    |     8 +-
 .../com/amazon/ec2/DescribeVpnGatewaysType.java |     8 +-
 .../com/amazon/ec2/DetachInternetGateway.java   |    11 +-
 .../ec2/DetachInternetGatewayResponse.java      |    11 +-
 .../ec2/DetachInternetGatewayResponseType.java  |     8 +-
 .../amazon/ec2/DetachInternetGatewayType.java   |     8 +-
 .../com/amazon/ec2/DetachNetworkInterface.java  |    11 +-
 .../ec2/DetachNetworkInterfaceResponse.java     |    11 +-
 .../ec2/DetachNetworkInterfaceResponseType.java |     8 +-
 .../amazon/ec2/DetachNetworkInterfaceType.java  |     8 +-
 awsapi/src/com/amazon/ec2/DetachVolume.java     |     8 +-
 .../com/amazon/ec2/DetachVolumeResponse.java    |    11 +-
 .../amazon/ec2/DetachVolumeResponseType.java    |     8 +-
 awsapi/src/com/amazon/ec2/DetachVolumeType.java |     8 +-
 awsapi/src/com/amazon/ec2/DetachVpnGateway.java |    11 +-
 .../amazon/ec2/DetachVpnGatewayResponse.java    |     8 +-
 .../ec2/DetachVpnGatewayResponseType.java       |     8 +-
 .../com/amazon/ec2/DetachVpnGatewayType.java    |     8 +-
 .../ec2/DhcpConfigurationItemSetType.java       |     8 +-
 .../amazon/ec2/DhcpConfigurationItemType.java   |     8 +-
 .../amazon/ec2/DhcpOptionsIdSetItemType.java    |     8 +-
 .../com/amazon/ec2/DhcpOptionsIdSetType.java    |     8 +-
 .../src/com/amazon/ec2/DhcpOptionsSetType.java  |    11 +-
 awsapi/src/com/amazon/ec2/DhcpOptionsType.java  |     8 +-
 awsapi/src/com/amazon/ec2/DhcpValueSetType.java |    11 +-
 awsapi/src/com/amazon/ec2/DhcpValueType.java    |     8 +-
 .../amazon/ec2/DisableVgwRoutePropagation.java  |    11 +-
 .../DisableVgwRoutePropagationRequestType.java  |     8 +-
 .../ec2/DisableVgwRoutePropagationResponse.java |    11 +-
 .../DisableVgwRoutePropagationResponseType.java |     8 +-
 .../src/com/amazon/ec2/DisassociateAddress.java |    11 +-
 .../amazon/ec2/DisassociateAddressResponse.java |    11 +-
 .../ec2/DisassociateAddressResponseType.java    |     8 +-
 .../com/amazon/ec2/DisassociateAddressType.java |    11 +-
 .../com/amazon/ec2/DisassociateRouteTable.java  |    11 +-
 .../ec2/DisassociateRouteTableResponse.java     |    11 +-
 .../ec2/DisassociateRouteTableResponseType.java |     8 +-
 .../amazon/ec2/DisassociateRouteTableType.java  |     8 +-
 .../amazon/ec2/DiskImageDescriptionType.java    |     8 +-
 .../src/com/amazon/ec2/DiskImageDetailType.java |     8 +-
 awsapi/src/com/amazon/ec2/DiskImageSetType.java |    11 +-
 awsapi/src/com/amazon/ec2/DiskImageType.java    |     8 +-
 .../ec2/DiskImageVolumeDescriptionType.java     |     8 +-
 .../src/com/amazon/ec2/DiskImageVolumeType.java |     8 +-
 .../src/com/amazon/ec2/EbsBlockDeviceType.java  |     8 +-
 ...sInstanceBlockDeviceMappingResponseType.java |     8 +-
 awsapi/src/com/amazon/ec2/EmptyElementType.java |     8 +-
 .../amazon/ec2/EnableVgwRoutePropagation.java   |    11 +-
 .../EnableVgwRoutePropagationRequestType.java   |     8 +-
 .../ec2/EnableVgwRoutePropagationResponse.java  |    11 +-
 .../EnableVgwRoutePropagationResponseType.java  |     8 +-
 awsapi/src/com/amazon/ec2/EnableVolumeIO.java   |    11 +-
 .../com/amazon/ec2/EnableVolumeIOResponse.java  |    11 +-
 .../amazon/ec2/EnableVolumeIOResponseType.java  |     8 +-
 .../src/com/amazon/ec2/EnableVolumeIOType.java  |     8 +-
 .../src/com/amazon/ec2/ExportTaskIdSetType.java |    11 +-
 awsapi/src/com/amazon/ec2/ExportTaskIdType.java |     8 +-
 .../com/amazon/ec2/ExportTaskResponseType.java  |     8 +-
 .../ec2/ExportTaskResponseTypeChoice_type0.java |     8 +-
 .../ec2/ExportTaskResponseTypeChoice_type1.java |     8 +-
 .../amazon/ec2/ExportTaskSetResponseType.java   |     8 +-
 .../amazon/ec2/ExportToS3TaskResponseType.java  |     8 +-
 .../src/com/amazon/ec2/ExportToS3TaskType.java  |     8 +-
 awsapi/src/com/amazon/ec2/ExtensionMapper.java  |     3 +-
 awsapi/src/com/amazon/ec2/FilterSetType.java    |     8 +-
 awsapi/src/com/amazon/ec2/FilterType.java       |     8 +-
 awsapi/src/com/amazon/ec2/GetConsoleOutput.java |    11 +-
 .../amazon/ec2/GetConsoleOutputResponse.java    |     8 +-
 .../ec2/GetConsoleOutputResponseType.java       |     8 +-
 .../com/amazon/ec2/GetConsoleOutputType.java    |     8 +-
 awsapi/src/com/amazon/ec2/GetPasswordData.java  |    11 +-
 .../com/amazon/ec2/GetPasswordDataResponse.java |     8 +-
 .../amazon/ec2/GetPasswordDataResponseType.java |     8 +-
 .../src/com/amazon/ec2/GetPasswordDataType.java |     8 +-
 awsapi/src/com/amazon/ec2/GroupItemType.java    |     8 +-
 awsapi/src/com/amazon/ec2/GroupSetType.java     |    11 +-
 .../ec2/IamInstanceProfileRequestType.java      |     8 +-
 .../ec2/IamInstanceProfileResponseType.java     |     8 +-
 awsapi/src/com/amazon/ec2/IcmpTypeCodeType.java |     8 +-
 awsapi/src/com/amazon/ec2/ImportInstance.java   |    11 +-
 .../amazon/ec2/ImportInstanceGroupItemType.java |     8 +-
 .../amazon/ec2/ImportInstanceGroupSetType.java  |     8 +-
 .../ImportInstanceLaunchSpecificationType.java  |     8 +-
 .../com/amazon/ec2/ImportInstanceResponse.java  |    11 +-
 .../amazon/ec2/ImportInstanceResponseType.java  |     8 +-
 .../ec2/ImportInstanceTaskDetailsType.java      |     8 +-
 .../src/com/amazon/ec2/ImportInstanceType.java  |     8 +-
 .../ec2/ImportInstanceVolumeDetailItemType.java |     8 +-
 .../ec2/ImportInstanceVolumeDetailSetType.java  |     8 +-
 awsapi/src/com/amazon/ec2/ImportKeyPair.java    |    11 +-
 .../com/amazon/ec2/ImportKeyPairResponse.java   |    11 +-
 .../amazon/ec2/ImportKeyPairResponseType.java   |     8 +-
 .../src/com/amazon/ec2/ImportKeyPairType.java   |     8 +-
 awsapi/src/com/amazon/ec2/ImportVolume.java     |     8 +-
 .../com/amazon/ec2/ImportVolumeResponse.java    |    11 +-
 .../amazon/ec2/ImportVolumeResponseType.java    |     8 +-
 .../amazon/ec2/ImportVolumeTaskDetailsType.java |     8 +-
 awsapi/src/com/amazon/ec2/ImportVolumeType.java |     8 +-
 .../ec2/InstanceBlockDeviceMappingItemType.java |     8 +-
 ...eBlockDeviceMappingItemTypeChoice_type0.java |     8 +-
 ...tanceBlockDeviceMappingResponseItemType.java |     8 +-
 ...viceMappingResponseItemTypeChoice_type0.java |    11 +-
 .../InstanceBlockDeviceMappingResponseType.java |    11 +-
 .../ec2/InstanceBlockDeviceMappingType.java     |     8 +-
 .../amazon/ec2/InstanceCountsSetItemType.java   |     8 +-
 .../com/amazon/ec2/InstanceCountsSetType.java   |     8 +-
 .../amazon/ec2/InstanceEbsBlockDeviceType.java  |     8 +-
 .../ec2/InstanceExportTaskResponseType.java     |     8 +-
 .../src/com/amazon/ec2/InstanceIdSetType.java   |    11 +-
 awsapi/src/com/amazon/ec2/InstanceIdType.java   |     8 +-
 .../amazon/ec2/InstanceLicenseRequestType.java  |     8 +-
 .../amazon/ec2/InstanceLicenseResponseType.java |     8 +-
 .../amazon/ec2/InstanceMonitoringStateType.java |     8 +-
 ...InstanceNetworkInterfaceAssociationType.java |     8 +-
 .../InstanceNetworkInterfaceAttachmentType.java |     8 +-
 ...tanceNetworkInterfaceSetItemRequestType.java |    14 +-
 .../InstanceNetworkInterfaceSetItemType.java    |    11 +-
 .../InstanceNetworkInterfaceSetRequestType.java |    11 +-
 .../ec2/InstanceNetworkInterfaceSetType.java    |     8 +-
 .../com/amazon/ec2/InstancePlacementType.java   |     8 +-
 .../InstancePrivateIpAddressesSetItemType.java  |     8 +-
 .../ec2/InstancePrivateIpAddressesSetType.java  |     8 +-
 .../amazon/ec2/InstanceStateChangeSetType.java  |     8 +-
 .../com/amazon/ec2/InstanceStateChangeType.java |     8 +-
 .../src/com/amazon/ec2/InstanceStateType.java   |     8 +-
 .../ec2/InstanceStatusDetailsSetItemType.java   |     8 +-
 .../ec2/InstanceStatusDetailsSetType.java       |     8 +-
 .../com/amazon/ec2/InstanceStatusEventType.java |     8 +-
 .../amazon/ec2/InstanceStatusEventsSetType.java |     8 +-
 .../com/amazon/ec2/InstanceStatusItemType.java  |     8 +-
 .../com/amazon/ec2/InstanceStatusSetType.java   |     8 +-
 .../src/com/amazon/ec2/InstanceStatusType.java  |     8 +-
 .../com/amazon/ec2/InstanceTypeSetItemType.java |     8 +-
 .../src/com/amazon/ec2/InstanceTypeSetType.java |     8 +-
 .../ec2/InternetGatewayAttachmentSetType.java   |     8 +-
 .../ec2/InternetGatewayAttachmentType.java      |     8 +-
 .../ec2/InternetGatewayIdSetItemType.java       |     8 +-
 .../amazon/ec2/InternetGatewayIdSetType.java    |     8 +-
 .../com/amazon/ec2/InternetGatewaySetType.java  |    12 +-
 .../src/com/amazon/ec2/InternetGatewayType.java |     8 +-
 .../src/com/amazon/ec2/IpPermissionSetType.java |    11 +-
 awsapi/src/com/amazon/ec2/IpPermissionType.java |     8 +-
 awsapi/src/com/amazon/ec2/IpRangeItemType.java  |     8 +-
 awsapi/src/com/amazon/ec2/IpRangeSetType.java   |    11 +-
 .../amazon/ec2/LaunchPermissionItemType.java    |     8 +-
 .../amazon/ec2/LaunchPermissionListType.java    |     8 +-
 .../ec2/LaunchPermissionOperationType.java      |     8 +-
 .../ec2/LaunchSpecificationRequestType.java     |     8 +-
 .../ec2/LaunchSpecificationResponseType.java    |     8 +-
 .../amazon/ec2/LicenseCapacitySetItemType.java  |     8 +-
 .../com/amazon/ec2/LicenseCapacitySetType.java  |     8 +-
 .../com/amazon/ec2/LicenseIdSetItemType.java    |     8 +-
 awsapi/src/com/amazon/ec2/LicenseIdSetType.java |     8 +-
 .../src/com/amazon/ec2/LicenseSetItemType.java  |     8 +-
 awsapi/src/com/amazon/ec2/LicenseSetType.java   |    12 +-
 .../com/amazon/ec2/ModifyImageAttribute.java    |    11 +-
 .../ec2/ModifyImageAttributeResponse.java       |    11 +-
 .../ec2/ModifyImageAttributeResponseType.java   |     8 +-
 .../amazon/ec2/ModifyImageAttributeType.java    |     8 +-
 .../ModifyImageAttributeTypeChoice_type0.java   |     8 +-
 .../com/amazon/ec2/ModifyInstanceAttribute.java |     8 +-
 .../ec2/ModifyInstanceAttributeResponse.java    |    11 +-
 .../ModifyInstanceAttributeResponseType.java    |     8 +-
 .../amazon/ec2/ModifyInstanceAttributeType.java |     8 +-
 ...ModifyInstanceAttributeTypeChoice_type0.java |    15 +-
 .../ModifyNetworkInterfaceAttachmentType.java   |     8 +-
 .../ec2/ModifyNetworkInterfaceAttribute.java    |    11 +-
 ...ModifyNetworkInterfaceAttributeResponse.java |    12 +-
 ...fyNetworkInterfaceAttributeResponseType.java |     8 +-
 .../ModifyNetworkInterfaceAttributeType.java    |     8 +-
 ...tworkInterfaceAttributeTypeChoice_type0.java |    11 +-
 .../com/amazon/ec2/ModifySnapshotAttribute.java |     8 +-
 .../ec2/ModifySnapshotAttributeResponse.java    |    11 +-
 .../ModifySnapshotAttributeResponseType.java    |     8 +-
 .../amazon/ec2/ModifySnapshotAttributeType.java |    11 +-
 .../com/amazon/ec2/ModifyVolumeAttribute.java   |    11 +-
 .../ec2/ModifyVolumeAttributeResponse.java      |    11 +-
 .../ec2/ModifyVolumeAttributeResponseType.java  |     8 +-
 .../amazon/ec2/ModifyVolumeAttributeType.java   |     8 +-
 .../ModifyVolumeAttributeTypeChoice_type0.java  |     8 +-
 awsapi/src/com/amazon/ec2/MonitorInstances.java |    11 +-
 .../amazon/ec2/MonitorInstancesResponse.java    |     8 +-
 .../MonitorInstancesResponseSetItemType.java    |     8 +-
 .../ec2/MonitorInstancesResponseSetType.java    |     8 +-
 .../ec2/MonitorInstancesResponseType.java       |     8 +-
 .../amazon/ec2/MonitorInstancesSetItemType.java |     8 +-
 .../com/amazon/ec2/MonitorInstancesSetType.java |     8 +-
 .../com/amazon/ec2/MonitorInstancesType.java    |     8 +-
 .../com/amazon/ec2/MonitoringInstanceType.java  |     8 +-
 .../ec2/NetworkAclAssociationSetType.java       |     8 +-
 .../amazon/ec2/NetworkAclAssociationType.java   |    11 +-
 .../com/amazon/ec2/NetworkAclEntrySetType.java  |    12 +-
 .../src/com/amazon/ec2/NetworkAclEntryType.java |     8 +-
 .../com/amazon/ec2/NetworkAclIdSetItemType.java |     8 +-
 .../src/com/amazon/ec2/NetworkAclIdSetType.java |     8 +-
 .../src/com/amazon/ec2/NetworkAclSetType.java   |    11 +-
 awsapi/src/com/amazon/ec2/NetworkAclType.java   |     8 +-
 .../ec2/NetworkInterfaceAssociationType.java    |     8 +-
 .../ec2/NetworkInterfaceAttachmentType.java     |     8 +-
 .../ec2/NetworkInterfaceIdSetItemType.java      |     8 +-
 .../amazon/ec2/NetworkInterfaceIdSetType.java   |     8 +-
 ...kInterfacePrivateIpAddressesSetItemType.java |     8 +-
 ...tworkInterfacePrivateIpAddressesSetType.java |    11 +-
 .../com/amazon/ec2/NetworkInterfaceSetType.java |     8 +-
 .../com/amazon/ec2/NetworkInterfaceType.java    |    11 +-
 .../ec2/NullableAttributeBooleanValueType.java  |     8 +-
 .../amazon/ec2/NullableAttributeValueType.java  |     8 +-
 .../com/amazon/ec2/PlacementGroupInfoType.java  |     8 +-
 .../com/amazon/ec2/PlacementGroupSetType.java   |     8 +-
 .../com/amazon/ec2/PlacementRequestType.java    |     8 +-
 .../com/amazon/ec2/PlacementResponseType.java   |     8 +-
 awsapi/src/com/amazon/ec2/PortRangeType.java    |     8 +-
 .../ec2/PriceScheduleRequestSetItemType.java    |     8 +-
 .../amazon/ec2/PriceScheduleRequestSetType.java |     8 +-
 .../amazon/ec2/PriceScheduleSetItemType.java    |     8 +-
 .../com/amazon/ec2/PriceScheduleSetType.java    |     8 +-
 .../amazon/ec2/PricingDetailsSetItemType.java   |     8 +-
 .../com/amazon/ec2/PricingDetailsSetType.java   |     8 +-
 .../PrivateIpAddressesSetItemRequestType.java   |     8 +-
 .../ec2/PrivateIpAddressesSetRequestType.java   |     8 +-
 .../src/com/amazon/ec2/ProductCodeItemType.java |     8 +-
 .../src/com/amazon/ec2/ProductCodeListType.java |    12 +-
 .../com/amazon/ec2/ProductCodesSetItemType.java |     8 +-
 .../src/com/amazon/ec2/ProductCodesSetType.java |     8 +-
 .../ec2/ProductDescriptionSetItemType.java      |     8 +-
 .../amazon/ec2/ProductDescriptionSetType.java   |     8 +-
 .../com/amazon/ec2/PropagatingVgwSetType.java   |    12 +-
 .../src/com/amazon/ec2/PropagatingVgwType.java  |     8 +-
 .../ec2/PurchaseReservedInstancesOffering.java  |    11 +-
 ...rchaseReservedInstancesOfferingResponse.java |    12 +-
 ...seReservedInstancesOfferingResponseType.java |     8 +-
 .../PurchaseReservedInstancesOfferingType.java  |    11 +-
 awsapi/src/com/amazon/ec2/RebootInstances.java  |    11 +-
 .../com/amazon/ec2/RebootInstancesInfoType.java |     8 +-
 .../com/amazon/ec2/RebootInstancesItemType.java |     8 +-
 .../com/amazon/ec2/RebootInstancesResponse.java |     8 +-
 .../amazon/ec2/RebootInstancesResponseType.java |     8 +-
 .../src/com/amazon/ec2/RebootInstancesType.java |     8 +-
 .../amazon/ec2/RecurringChargesSetItemType.java |     8 +-
 .../com/amazon/ec2/RecurringChargesSetType.java |     8 +-
 awsapi/src/com/amazon/ec2/RegionItemType.java   |     8 +-
 awsapi/src/com/amazon/ec2/RegionSetType.java    |    11 +-
 awsapi/src/com/amazon/ec2/RegisterImage.java    |    11 +-
 .../com/amazon/ec2/RegisterImageResponse.java   |    11 +-
 .../amazon/ec2/RegisterImageResponseType.java   |     8 +-
 .../src/com/amazon/ec2/RegisterImageType.java   |     8 +-
 awsapi/src/com/amazon/ec2/ReleaseAddress.java   |    11 +-
 .../com/amazon/ec2/ReleaseAddressResponse.java  |    11 +-
 .../amazon/ec2/ReleaseAddressResponseType.java  |     8 +-
 .../src/com/amazon/ec2/ReleaseAddressType.java  |     8 +-
 .../ec2/ReleaseAddressTypeChoice_type0.java     |     8 +-
 .../ec2/ReplaceNetworkAclAssociation.java       |    11 +-
 .../ReplaceNetworkAclAssociationResponse.java   |    12 +-
 ...eplaceNetworkAclAssociationResponseType.java |     8 +-
 .../ec2/ReplaceNetworkAclAssociationType.java   |     8 +-
 .../com/amazon/ec2/ReplaceNetworkAclEntry.java  |    11 +-
 .../ec2/ReplaceNetworkAclEntryResponse.java     |    11 +-
 .../ec2/ReplaceNetworkAclEntryResponseType.java |     8 +-
 .../amazon/ec2/ReplaceNetworkAclEntryType.java  |     8 +-
 awsapi/src/com/amazon/ec2/ReplaceRoute.java     |     8 +-
 .../com/amazon/ec2/ReplaceRouteResponse.java    |    11 +-
 .../amazon/ec2/ReplaceRouteResponseType.java    |     8 +-
 .../ec2/ReplaceRouteTableAssociation.java       |    11 +-
 .../ReplaceRouteTableAssociationResponse.java   |    12 +-
 ...eplaceRouteTableAssociationResponseType.java |     8 +-
 .../ec2/ReplaceRouteTableAssociationType.java   |     8 +-
 awsapi/src/com/amazon/ec2/ReplaceRouteType.java |     8 +-
 .../ec2/ReplaceRouteTypeChoice_type0.java       |     8 +-
 .../com/amazon/ec2/ReportInstanceStatus.java    |    11 +-
 ...portInstanceStatusReasonCodeSetItemType.java |     8 +-
 .../ReportInstanceStatusReasonCodesSetType.java |    11 +-
 .../ec2/ReportInstanceStatusResponse.java       |    11 +-
 .../ec2/ReportInstanceStatusResponseType.java   |     8 +-
 .../amazon/ec2/ReportInstanceStatusType.java    |     8 +-
 .../com/amazon/ec2/RequestSpotInstances.java    |    11 +-
 .../ec2/RequestSpotInstancesResponse.java       |    11 +-
 .../ec2/RequestSpotInstancesResponseType.java   |    11 +-
 .../amazon/ec2/RequestSpotInstancesType.java    |    11 +-
 .../src/com/amazon/ec2/ReservationInfoType.java |     8 +-
 .../src/com/amazon/ec2/ReservationSetType.java  |    12 +-
 .../ec2/ReservedInstanceLimitPriceType.java     |     8 +-
 .../src/com/amazon/ec2/ResetImageAttribute.java |    11 +-
 .../amazon/ec2/ResetImageAttributeResponse.java |    11 +-
 .../ec2/ResetImageAttributeResponseType.java    |     8 +-
 .../com/amazon/ec2/ResetImageAttributeType.java |     8 +-
 .../amazon/ec2/ResetImageAttributesGroup.java   |     8 +-
 .../com/amazon/ec2/ResetInstanceAttribute.java  |    11 +-
 .../ec2/ResetInstanceAttributeResponse.java     |    11 +-
 .../ec2/ResetInstanceAttributeResponseType.java |     8 +-
 .../amazon/ec2/ResetInstanceAttributeType.java  |     8 +-
 .../ec2/ResetInstanceAttributesGroup.java       |     8 +-
 .../ec2/ResetNetworkInterfaceAttribute.java     |    11 +-
 .../ResetNetworkInterfaceAttributeResponse.java |    12 +-
 ...etNetworkInterfaceAttributeResponseType.java |     8 +-
 .../ec2/ResetNetworkInterfaceAttributeType.java |     8 +-
 .../ResetNetworkInterfaceAttributesGroup.java   |     8 +-
 .../com/amazon/ec2/ResetSnapshotAttribute.java  |    11 +-
 .../ec2/ResetSnapshotAttributeResponse.java     |    11 +-
 .../ec2/ResetSnapshotAttributeResponseType.java |     8 +-
 .../amazon/ec2/ResetSnapshotAttributeType.java  |     8 +-
 .../ec2/ResetSnapshotAttributesGroup.java       |    11 +-
 .../com/amazon/ec2/ResourceIdSetItemType.java   |     8 +-
 .../src/com/amazon/ec2/ResourceIdSetType.java   |     8 +-
 .../com/amazon/ec2/ResourceTagSetItemType.java  |     8 +-
 .../src/com/amazon/ec2/ResourceTagSetType.java  |     8 +-
 .../amazon/ec2/RevokeSecurityGroupEgress.java   |    11 +-
 .../ec2/RevokeSecurityGroupEgressResponse.java  |    11 +-
 .../RevokeSecurityGroupEgressResponseType.java  |     8 +-
 .../ec2/RevokeSecurityGroupEgressType.java      |     8 +-
 .../amazon/ec2/RevokeSecurityGroupIngress.java  |    11 +-
 .../ec2/RevokeSecurityGroupIngressResponse.java |    11 +-
 .../RevokeSecurityGroupIngressResponseType.java |     8 +-
 .../ec2/RevokeSecurityGroupIngressType.java     |     8 +-
 ...okeSecurityGroupIngressTypeChoice_type0.java |     8 +-
 awsapi/src/com/amazon/ec2/RouteSetType.java     |     8 +-
 .../ec2/RouteTableAssociationSetType.java       |     8 +-
 .../amazon/ec2/RouteTableAssociationType.java   |    11 +-
 .../RouteTableAssociationTypeChoice_type0.java  |     8 +-
 .../com/amazon/ec2/RouteTableIdSetItemType.java |     8 +-
 .../src/com/amazon/ec2/RouteTableIdSetType.java |     8 +-
 .../src/com/amazon/ec2/RouteTableSetType.java   |    11 +-
 awsapi/src/com/amazon/ec2/RouteTableType.java   |     8 +-
 awsapi/src/com/amazon/ec2/RouteType.java        |     8 +-
 awsapi/src/com/amazon/ec2/RunInstances.java     |     8 +-
 .../com/amazon/ec2/RunInstancesResponse.java    |    11 +-
 .../amazon/ec2/RunInstancesResponseType.java    |     8 +-
 awsapi/src/com/amazon/ec2/RunInstancesType.java |    11 +-
 .../amazon/ec2/RunningInstancesItemType.java    |    11 +-
 .../com/amazon/ec2/RunningInstancesSetType.java |     8 +-
 .../amazon/ec2/SecurityGroupIdSetItemType.java  |     8 +-
 .../com/amazon/ec2/SecurityGroupIdSetType.java  |     8 +-
 .../com/amazon/ec2/SecurityGroupItemType.java   |     8 +-
 .../com/amazon/ec2/SecurityGroupSetType.java    |     8 +-
 .../ec2/SpotDatafeedSubscriptionType.java       |     8 +-
 .../ec2/SpotInstanceRequestIdSetItemType.java   |    11 +-
 .../ec2/SpotInstanceRequestIdSetType.java       |     8 +-
 .../ec2/SpotInstanceRequestSetItemType.java     |    17 +-
 .../amazon/ec2/SpotInstanceRequestSetType.java  |     8 +-
 .../amazon/ec2/SpotInstanceStateFaultType.java  |     8 +-
 .../amazon/ec2/SpotPlacementRequestType.java    |     8 +-
 .../amazon/ec2/SpotPriceHistorySetItemType.java |     8 +-
 .../com/amazon/ec2/SpotPriceHistorySetType.java |     8 +-
 awsapi/src/com/amazon/ec2/StartInstances.java   |    11 +-
 .../com/amazon/ec2/StartInstancesResponse.java  |    11 +-
 .../amazon/ec2/StartInstancesResponseType.java  |     8 +-
 .../src/com/amazon/ec2/StartInstancesType.java  |     8 +-
 awsapi/src/com/amazon/ec2/StateReasonType.java  |     8 +-
 awsapi/src/com/amazon/ec2/StopInstances.java    |    11 +-
 .../com/amazon/ec2/StopInstancesResponse.java   |    11 +-
 .../amazon/ec2/StopInstancesResponseType.java   |     8 +-
 .../src/com/amazon/ec2/StopInstancesType.java   |     8 +-
 .../src/com/amazon/ec2/SubnetIdSetItemType.java |     8 +-
 awsapi/src/com/amazon/ec2/SubnetIdSetType.java  |    12 +-
 awsapi/src/com/amazon/ec2/SubnetSetType.java    |     8 +-
 awsapi/src/com/amazon/ec2/SubnetType.java       |    11 +-
 awsapi/src/com/amazon/ec2/TagSetItemType.java   |     8 +-
 awsapi/src/com/amazon/ec2/TagSetType.java       |    11 +-
 .../src/com/amazon/ec2/TerminateInstances.java  |    11 +-
 .../amazon/ec2/TerminateInstancesResponse.java  |    11 +-
 .../ec2/TerminateInstancesResponseType.java     |     8 +-
 .../com/amazon/ec2/TerminateInstancesType.java  |     8 +-
 .../amazon/ec2/UnassignPrivateIpAddresses.java  |    11 +-
 .../ec2/UnassignPrivateIpAddressesResponse.java |    11 +-
 .../UnassignPrivateIpAddressesResponseType.java |     8 +-
 .../ec2/UnassignPrivateIpAddressesType.java     |    11 +-
 .../src/com/amazon/ec2/UnmonitorInstances.java  |    11 +-
 .../amazon/ec2/UnmonitorInstancesResponse.java  |    11 +-
 awsapi/src/com/amazon/ec2/UserDataType.java     |    12 +-
 .../com/amazon/ec2/UserIdGroupPairSetType.java  |    12 +-
 .../src/com/amazon/ec2/UserIdGroupPairType.java |     8 +-
 awsapi/src/com/amazon/ec2/ValueSetType.java     |     8 +-
 awsapi/src/com/amazon/ec2/ValueType.java        |     8 +-
 awsapi/src/com/amazon/ec2/VgwTelemetryType.java |     8 +-
 .../amazon/ec2/VolumeStatusActionItemType.java  |     8 +-
 .../amazon/ec2/VolumeStatusActionsSetType.java  |     8 +-
 .../amazon/ec2/VolumeStatusDetailsItemType.java |     8 +-
 .../amazon/ec2/VolumeStatusDetailsSetType.java  |     8 +-
 .../amazon/ec2/VolumeStatusEventItemType.java   |     8 +-
 .../amazon/ec2/VolumeStatusEventsSetType.java   |     8 +-
 .../com/amazon/ec2/VolumeStatusInfoType.java    |     8 +-
 .../com/amazon/ec2/VolumeStatusItemType.java    |     8 +-
 .../src/com/amazon/ec2/VolumeStatusSetType.java |     8 +-
 awsapi/src/com/amazon/ec2/VpcIdSetItemType.java |     8 +-
 awsapi/src/com/amazon/ec2/VpcIdSetType.java     |    11 +-
 awsapi/src/com/amazon/ec2/VpcSetType.java       |     8 +-
 awsapi/src/com/amazon/ec2/VpcType.java          |     8 +-
 .../amazon/ec2/VpnConnectionIdSetItemType.java  |     8 +-
 .../com/amazon/ec2/VpnConnectionIdSetType.java  |     8 +-
 .../ec2/VpnConnectionOptionsRequestType.java    |     8 +-
 .../ec2/VpnConnectionOptionsResponseType.java   |     8 +-
 .../com/amazon/ec2/VpnConnectionSetType.java    |    12 +-
 .../src/com/amazon/ec2/VpnConnectionType.java   |    11 +-
 .../com/amazon/ec2/VpnGatewayIdSetItemType.java |     8 +-
 .../src/com/amazon/ec2/VpnGatewayIdSetType.java |     8 +-
 .../src/com/amazon/ec2/VpnGatewaySetType.java   |    11 +-
 awsapi/src/com/amazon/ec2/VpnGatewayType.java   |     8 +-
 .../src/com/amazon/ec2/VpnStaticRouteType.java  |     8 +-
 .../com/amazon/ec2/VpnStaticRoutesSetType.java  |    12 +-
 .../com/amazon/ec2/VpnTunnelTelemetryType.java  |     8 +-
 .../com/amazon/ec2/client/AmazonEC2Stub.java    | 14098 ++++++++++-------
 awsapi/src/com/amazon/s3/AccessControlList.java |     8 +-
 .../src/com/amazon/s3/AccessControlPolicy.java  |     8 +-
 .../com/amazon/s3/AmazonCustomerByEmail.java    |     8 +-
 .../amazon/s3/AmazonS3MessageReceiverInOut.java |   139 +-
 .../src/com/amazon/s3/BucketLoggingStatus.java  |     8 +-
 awsapi/src/com/amazon/s3/CanonicalUser.java     |     8 +-
 awsapi/src/com/amazon/s3/CopyObject.java        |    17 +-
 .../src/com/amazon/s3/CopyObjectResponse.java   |     8 +-
 awsapi/src/com/amazon/s3/CopyObjectResult.java  |     8 +-
 awsapi/src/com/amazon/s3/CreateBucket.java      |     8 +-
 .../amazon/s3/CreateBucketConfiguration.java    |     8 +-
 .../src/com/amazon/s3/CreateBucketResponse.java |     8 +-
 .../src/com/amazon/s3/CreateBucketResult.java   |     8 +-
 awsapi/src/com/amazon/s3/DeleteBucket.java      |     8 +-
 .../src/com/amazon/s3/DeleteBucketResponse.java |     8 +-
 awsapi/src/com/amazon/s3/DeleteMarkerEntry.java |     8 +-
 awsapi/src/com/amazon/s3/DeleteObject.java      |     8 +-
 .../src/com/amazon/s3/DeleteObjectResponse.java |     8 +-
 awsapi/src/com/amazon/s3/ExtensionMapper.java   |     3 +-
 .../amazon/s3/GetBucketAccessControlPolicy.java |    11 +-
 .../GetBucketAccessControlPolicyResponse.java   |    15 +-
 .../com/amazon/s3/GetBucketLoggingStatus.java   |     8 +-
 .../s3/GetBucketLoggingStatusResponse.java      |    18 +-
 awsapi/src/com/amazon/s3/GetObject.java         |     8 +-
 .../amazon/s3/GetObjectAccessControlPolicy.java |    11 +-
 .../GetObjectAccessControlPolicyResponse.java   |    15 +-
 awsapi/src/com/amazon/s3/GetObjectExtended.java |     8 +-
 .../amazon/s3/GetObjectExtendedResponse.java    |     8 +-
 awsapi/src/com/amazon/s3/GetObjectResponse.java |     8 +-
 awsapi/src/com/amazon/s3/GetObjectResult.java   |    14 +-
 awsapi/src/com/amazon/s3/Grant.java             |     8 +-
 awsapi/src/com/amazon/s3/Grantee.java           |     8 +-
 awsapi/src/com/amazon/s3/Group.java             |     8 +-
 awsapi/src/com/amazon/s3/ListAllMyBuckets.java  |     8 +-
 .../com/amazon/s3/ListAllMyBucketsEntry.java    |     8 +-
 .../src/com/amazon/s3/ListAllMyBucketsList.java |     8 +-
 .../com/amazon/s3/ListAllMyBucketsResponse.java |    11 +-
 .../com/amazon/s3/ListAllMyBucketsResult.java   |     8 +-
 awsapi/src/com/amazon/s3/ListBucket.java        |     8 +-
 .../src/com/amazon/s3/ListBucketResponse.java   |     8 +-
 awsapi/src/com/amazon/s3/ListBucketResult.java  |    14 +-
 awsapi/src/com/amazon/s3/ListEntry.java         |     8 +-
 .../src/com/amazon/s3/ListVersionsResponse.java |     8 +-
 .../src/com/amazon/s3/ListVersionsResult.java   |    17 +-
 .../s3/ListVersionsResultChoice_type0.java      |     8 +-
 .../src/com/amazon/s3/LocationConstraint.java   |     8 +-
 awsapi/src/com/amazon/s3/LoggingSettings.java   |     8 +-
 awsapi/src/com/amazon/s3/MetadataDirective.java |    16 +-
 awsapi/src/com/amazon/s3/MetadataEntry.java     |     8 +-
 awsapi/src/com/amazon/s3/MfaDeleteStatus.java   |    14 +-
 .../amazon/s3/NotificationConfiguration.java    |    11 +-
 awsapi/src/com/amazon/s3/Payer.java             |    13 +-
 awsapi/src/com/amazon/s3/Permission.java        |    15 +-
 awsapi/src/com/amazon/s3/PostResponse.java      |     8 +-
 awsapi/src/com/amazon/s3/PrefixEntry.java       |     8 +-
 awsapi/src/com/amazon/s3/PutObject.java         |    11 +-
 awsapi/src/com/amazon/s3/PutObjectInline.java   |    14 +-
 .../com/amazon/s3/PutObjectInlineResponse.java  |    11 +-
 awsapi/src/com/amazon/s3/PutObjectResponse.java |     8 +-
 awsapi/src/com/amazon/s3/PutObjectResult.java   |     8 +-
 .../amazon/s3/RequestPaymentConfiguration.java  |     8 +-
 awsapi/src/com/amazon/s3/Result.java            |     8 +-
 .../amazon/s3/SetBucketAccessControlPolicy.java |    11 +-
 .../SetBucketAccessControlPolicyResponse.java   |    11 +-
 .../com/amazon/s3/SetBucketLoggingStatus.java   |     8 +-
 .../s3/SetBucketLoggingStatusResponse.java      |    11 +-
 .../amazon/s3/SetObjectAccessControlPolicy.java |    11 +-
 .../SetObjectAccessControlPolicyResponse.java   |    11 +-
 awsapi/src/com/amazon/s3/Status.java            |     8 +-
 awsapi/src/com/amazon/s3/StorageClass.java      |    14 +-
 .../src/com/amazon/s3/TopicConfiguration.java   |     8 +-
 awsapi/src/com/amazon/s3/User.java              |     8 +-
 awsapi/src/com/amazon/s3/VersionEntry.java      |     8 +-
 .../com/amazon/s3/VersioningConfiguration.java  |     8 +-
 awsapi/src/com/amazon/s3/VersioningStatus.java  |    16 +-
 .../src/com/amazon/s3/client/AmazonS3Stub.java  |  1170 +-
 .../bridge/auth/ec2/AuthenticationHandler.java  |     1 -
 .../bridge/auth/ec2/AuthenticationModule.java   |     5 +-
 .../bridge/auth/s3/AuthenticationModule.java    |     5 +-
 .../bridge/io/DimeDelimitedInputStream.java     |    10 +-
 .../bridge/io/MTOMAwareResultStreamWriter.java  |     4 +-
 .../bridge/io/MultiPartDimeInputStream.java     |     6 +-
 .../cloud/bridge/io/S3CAStorBucketAdapter.java  |    48 +-
 .../bridge/io/S3FileSystemBucketAdapter.java    |     5 +-
 .../lifecycle/ServiceEngineLifecycle.java       |     1 -
 .../model/CloudStackServiceOfferingVO.java      |     2 -
 awsapi/src/com/cloud/bridge/model/SAcl.java     |     7 -
 awsapi/src/com/cloud/bridge/model/SBucket.java  |     5 -
 .../src/com/cloud/bridge/model/SBucketVO.java   |     1 -
 awsapi/src/com/cloud/bridge/model/SHost.java    |     4 -
 .../com/cloud/bridge/model/SObjectItemVO.java   |     1 -
 .../cloud/bridge/model/UserCredentialsVO.java   |     2 -
 .../persist/dao/CloudStackAccountDaoImpl.java   |     1 -
 .../dao/CloudStackConfigurationDaoImpl.java     |     1 -
 .../dao/CloudStackSvcOfferingDaoImpl.java       |     4 -
 .../persist/dao/CloudStackUserDaoImpl.java      |     3 +-
 .../cloud/bridge/persist/dao/MHostDaoImpl.java  |     1 -
 .../bridge/persist/dao/MHostMountDaoImpl.java   |     1 -
 .../persist/dao/MultiPartPartsDaoImpl.java      |     1 -
 .../persist/dao/MultiPartUploadsDaoImpl.java    |     4 -
 .../bridge/persist/dao/MultipartLoadDao.java    |     4 +-
 .../persist/dao/MultipartMetaDaoImpl.java       |     1 -
 .../bridge/persist/dao/OfferingDaoImpl.java     |     3 -
 .../cloud/bridge/persist/dao/SAclDaoImpl.java   |     1 -
 .../bridge/persist/dao/SBucketDaoImpl.java      |     2 -
 .../cloud/bridge/persist/dao/SHostDaoImpl.java  |     1 -
 .../cloud/bridge/persist/dao/SMetaDaoImpl.java  |     1 -
 .../bridge/persist/dao/SObjectDaoImpl.java      |     1 -
 .../bridge/persist/dao/SObjectItemDaoImpl.java  |     1 -
 .../persist/dao/UserCredentialsDaoImpl.java     |     3 -
 .../cloud/bridge/service/EC2MainServlet.java    |     1 -
 .../cloud/bridge/service/EC2RestServlet.java    |    51 +-
 .../cloud/bridge/service/EC2SoapService.java    |   291 +-
 .../bridge/service/EC2SoapServiceImpl.java      |   481 +-
 .../com/cloud/bridge/service/S3RestServlet.java |     5 +-
 .../service/controller/s3/S3BucketAction.java   |     5 +-
 .../service/controller/s3/S3ObjectAction.java   |    15 +-
 .../s3/S3SerializableServiceImplementation.java |     5 +-
 .../service/controller/s3/ServiceProvider.java  |     5 +-
 .../bridge/service/core/ec2/EC2Engine.java      |    67 +-
 .../service/core/ec2/EC2RegisterImage.java      |     3 +-
 .../core/ec2/EC2RunInstancesResponse.java       |     2 -
 .../service/core/ec2/EC2SnapshotFilterSet.java  |     1 -
 .../service/core/ec2/EC2VolumeFilterSet.java    |     2 +-
 .../cloud/bridge/service/core/s3/S3Engine.java  |    24 +-
 .../cloud/bridge/service/core/s3/S3Grant.java   |     3 -
 .../core/s3/S3ListAllMyBucketsEntry.java        |     1 -
 .../service/core/s3/S3PolicyArnCondition.java   |     2 +-
 .../service/core/s3/S3PolicyCondition.java      |    17 +-
 .../service/core/s3/S3PolicyDateCondition.java  |     4 +-
 .../core/s3/S3PolicyIPAddressCondition.java     |     2 +-
 .../core/s3/S3PolicyNumericCondition.java       |     4 +-
 .../core/s3/S3PolicyStringCondition.java        |     4 +-
 .../com/cloud/bridge/tool/CloudS3CmdTool.java   |     2 +-
 .../cloud/bridge/util/AuthenticationUtils.java  |     7 +-
 .../util/ISO8601SimpleDateTimeFormat.java       |     5 +-
 .../com/cloud/bridge/util/IpAddressRange.java   |     2 -
 .../src/com/cloud/bridge/util/JsonAccessor.java |     3 +-
 .../src/com/cloud/bridge/util/PolicyParser.java |    10 +-
 awsapi/src/com/cloud/bridge/util/RestAuth.java  |    11 +-
 .../bridge/util/XSerializerJsonAdapter.java     |     3 +-
 .../bridge/util/XSerializerXmlAdapter.java      |     3 +-
 awsapi/src/com/cloud/bridge/util/XmlHelper.java |    16 +-
 awsapi/src/com/cloud/stack/CloudStackApi.java   |   117 +-
 .../src/com/cloud/stack/CloudStackClient.java   |    12 +-
 .../com/cloud/gate/service/ServiceTestCase.java |     1 +
 .../gate/util/CloudStackClientTestCase.java     |     8 +-
 .../cloud/gate/util/JsonAccessorTestCase.java   |    10 +-
 .../test/com/cloud/gate/util/UtilTestCase.java  |     4 +-
 .../cloud/agent/api/AgentControlCommand.java    |     1 +
 .../cloud/agent/api/AttachVolumeCommand.java    |     4 +-
 .../cloud/agent/api/BackupSnapshotCommand.java  |     4 +-
 ...reatePrivateTemplateFromSnapshotCommand.java |     4 +-
 .../CreatePrivateTemplateFromVolumeCommand.java |     9 +-
 .../cloud/agent/api/CreateVMSnapshotAnswer.java |     4 +-
 .../agent/api/CreateVMSnapshotCommand.java      |     5 +-
 .../api/CreateVolumeFromVMSnapshotCommand.java  |     3 +-
 .../cloud/agent/api/DeleteVMSnapshotAnswer.java |     4 +-
 .../agent/api/DeleteVMSnapshotCommand.java      |     1 -
 .../src/com/cloud/agent/api/HostStatsEntry.java |     4 +-
 .../agent/api/MigrateWithStorageCommand.java    |     3 +-
 .../api/MigrateWithStorageReceiveAnswer.java    |     6 +-
 .../api/MigrateWithStorageReceiveCommand.java   |     3 +-
 .../agent/api/MigrateWithStorageSendAnswer.java |     1 +
 .../api/MigrateWithStorageSendCommand.java      |     3 +-
 .../agent/api/ModifyStoragePoolAnswer.java      |     3 +-
 .../agent/api/PingRoutingWithOvsCommand.java    |     3 +-
 .../agent/api/RecurringNetworkUsageCommand.java |     1 +
 .../agent/api/RevertToVMSnapshotAnswer.java     |     5 +-
 .../agent/api/SetupGuestNetworkCommand.java     |     3 +-
 .../cloud/agent/api/StartupRoutingCommand.java  |    14 +-
 .../cloud/agent/api/StartupVMMAgentCommand.java |     1 -
 .../cloud/agent/api/VMSnapshotBaseCommand.java  |     2 -
 .../com/cloud/agent/api/VmDiskStatsEntry.java   |     4 +
 core/src/com/cloud/agent/api/VmStatsEntry.java  |     7 +
 .../api/proxy/WatchConsoleProxyLoadCommand.java |     1 +
 .../agent/api/routing/DnsMasqConfigCommand.java |     4 +-
 .../GlobalLoadBalancerConfigCommand.java        |     4 +-
 .../api/routing/SetMonitorServiceCommand.java   |     3 +-
 .../agent/api/storage/CopyVolumeCommand.java    |     3 +-
 .../storage/CreatePrivateTemplateAnswer.java    |     3 +-
 .../cloud/agent/api/storage/DestroyCommand.java |     5 +-
 .../virtualnetwork/VirtualRoutingResource.java  |    10 +-
 .../cloud/agent/transport/ArrayTypeAdaptor.java |     3 +-
 .../agent/transport/InterfaceTypeAdaptor.java   |     3 +-
 .../transport/LoggingExclusionStrategy.java     |     5 +-
 .../com/cloud/network/HAProxyConfigurator.java  |    23 +-
 .../resource/TrafficSentinelResource.java       |     5 +-
 .../com/cloud/resource/ResourceListener.java    |     4 +-
 .../com/cloud/resource/ServerResourceBase.java  |     2 +-
 core/src/com/cloud/serializer/GsonHelper.java   |     7 +-
 .../com/cloud/serializer/SerializerHelper.java  |     5 +-
 .../storage/resource/StorageProcessor.java      |     2 -
 .../StorageSubsystemCommandHandlerBase.java     |     7 +-
 .../template/HttpTemplateDownloader.java        |     5 +-
 .../cloud/storage/template/IsoProcessor.java    |     2 +-
 .../com/cloud/storage/template/Processor.java   |     4 +-
 .../cloud/storage/template/QCOW2Processor.java  |     1 +
 .../storage/template/S3TemplateDownloader.java  |     4 +-
 .../template/TemplateDownloaderBase.java        |     4 +-
 .../storage/template/TemplateLocation.java      |     3 +-
 .../cloud/storage/template/VhdProcessor.java    |     2 +-
 .../cloud/storage/template/VmdkProcessor.java   |     3 +-
 .../storage/to/PrimaryDataStoreTO.java          |     1 -
 .../cloudstack/storage/to/SnapshotObjectTO.java |     2 +-
 .../cloudstack/storage/to/TemplateObjectTO.java |     2 +-
 .../cloudstack/storage/to/VolumeObjectTO.java   |     2 +-
 .../cloud/network/HAProxyConfiguratorTest.java  |     3 +-
 .../agent/test/BackupSnapshotAnswerTest.java    |     5 +-
 .../agent/test/BackupSnapshotCommandTest.java   |     8 +-
 .../api/agent/test/CheckNetworkAnswerTest.java  |    18 +-
 .../api/agent/test/CheckOnHostCommandTest.java  |    39 +
 .../api/agent/test/SnapshotCommandTest.java     |    19 +
 .../src/com/cloud/vm/VirtualMachineManager.java |     9 +-
 .../cloud/entity/api/VirtualMachineEntity.java  |     3 +-
 .../entity/api/DataCenterResourceEntity.java    |     1 -
 .../engine/datacenter/entity/api/PodEntity.java |     1 -
 .../engine/entity/api/CloudStackEntity.java     |     1 -
 .../service/NetworkOrchestrationService.java    |    14 +-
 .../service/VolumeOrchestrationService.java     |     7 +-
 .../service/api/OrchestrationService.java       |    13 +-
 .../subsystem/api/storage/DataStoreDriver.java  |     7 +-
 .../api/storage/DataStoreProviderManager.java   |     2 -
 .../storage/ObjectInDataStoreStateMachine.java  |    10 +-
 .../subsystem/api/storage/PrimaryDataStore.java |     6 -
 .../api/storage/PrimaryDataStoreInfo.java       |     2 +
 .../subsystem/api/storage/TemplateInfo.java     |     1 +
 .../engine/subsystem/api/storage/ScopeTest.java |     1 -
 .../src/com/cloud/agent/AgentManager.java       |     3 +-
 .../src/com/cloud/alert/AlertManager.java       |    12 +-
 .../src/com/cloud/capacity/CapacityManager.java |    14 +-
 .../configuration/ConfigurationManager.java     |    18 +-
 .../src/com/cloud/event/UsageEventUtils.java    |    21 +-
 .../src/com/cloud/network/IpAddressManager.java |    26 +-
 .../com/cloud/network/NetworkStateListener.java |     4 +-
 .../network/lb/LoadBalancingRulesManager.java   |     2 +-
 .../cloud/network/rules/FirewallManager.java    |     8 +-
 .../cloud/network/vpc/NetworkACLManager.java    |     5 +-
 .../src/com/cloud/network/vpc/VpcManager.java   |     9 +-
 .../cloud/resource/ResourceStateAdapter.java    |     5 +-
 .../com/cloud/agent/manager/AgentAttache.java   |     9 +-
 .../cloud/agent/manager/AgentManagerImpl.java   |    49 +-
 .../agent/manager/ClusteredAgentAttache.java    |     5 +-
 .../manager/ClusteredAgentManagerImpl.java      |    64 +-
 .../manager/ClusteredDirectAgentAttache.java    |     4 +-
 .../cloud/agent/manager/DirectAgentAttache.java |     9 +-
 .../agent/manager/SynchronousListener.java      |     3 +-
 .../ClusterBasedAgentLoadBalancerPlanner.java   |     7 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java |   190 +-
 .../cloud/entity/api/VMEntityManager.java       |     8 +-
 .../cloud/entity/api/VMEntityManagerImpl.java   |    22 +-
 .../entity/api/VirtualMachineEntityImpl.java    |    13 +-
 .../entity/api/ClusterEntityImpl.java           |     1 +
 .../api/DataCenterResourceManagerImpl.java      |     3 +-
 .../datacenter/entity/api/ZoneEntityImpl.java   |     3 +
 .../entity/api/db/EngineDataCenterVO.java       |     4 +-
 .../datacenter/entity/api/db/EngineHostVO.java  |    15 +-
 .../entity/api/db/dao/DcDetailsDaoImpl.java     |     3 +-
 .../entity/api/db/dao/EngineClusterDaoImpl.java |    15 +-
 .../api/db/dao/EngineDataCenterDaoImpl.java     |     5 +-
 .../entity/api/db/dao/EngineHostDao.java        |     4 +-
 .../entity/api/db/dao/EngineHostDaoImpl.java    |    24 +-
 .../entity/api/db/dao/EngineHostPodDaoImpl.java |     9 +-
 .../entity/api/db/dao/HostTagsDao.java          |     1 +
 .../engine/orchestration/CloudOrchestrator.java |    17 +-
 .../orchestration/NetworkOrchestrator.java      |   239 +-
 .../orchestration/VolumeOrchestrator.java       |    63 +-
 .../service/api/ProvisioningServiceImpl.java    |     5 +-
 .../cloud/vm/VirtualMachineManagerImplTest.java |    19 +-
 .../test/ChildTestConfiguration.java            |     5 +-
 .../provisioning/test/ProvisioningTest.java     |    49 +-
 .../src/com/cloud/capacity/CapacityVO.java      |     3 +-
 .../com/cloud/capacity/dao/CapacityDaoImpl.java |   164 +-
 .../com/cloud/certificate/CertificateVO.java    |     5 +-
 .../cluster/agentlb/HostTransferMapVO.java      |     4 +-
 .../cloud/configuration/ResourceCountVO.java    |     2 -
 .../cloud/configuration/ResourceLimitVO.java    |     2 -
 .../configuration/dao/ResourceCountDaoImpl.java |     2 -
 .../src/com/cloud/dc/AccountVlanMapVO.java      |     4 +-
 .../src/com/cloud/dc/ClusterDetailsVO.java      |     5 +-
 engine/schema/src/com/cloud/dc/ClusterVO.java   |    12 +-
 .../src/com/cloud/dc/DataCenterIpAddressVO.java |     5 +-
 .../dc/DataCenterLinkLocalIpAddressVO.java      |     5 +-
 .../schema/src/com/cloud/dc/DataCenterVO.java   |     7 +-
 .../src/com/cloud/dc/DataCenterVnetVO.java      |     5 +-
 engine/schema/src/com/cloud/dc/HostPodVO.java   |     7 +-
 .../schema/src/com/cloud/dc/PodVlanMapVO.java   |     5 +-
 engine/schema/src/com/cloud/dc/PodVlanVO.java   |     5 +-
 .../com/cloud/dc/StorageNetworkIpAddressVO.java |     5 +-
 .../com/cloud/dc/StorageNetworkIpRangeVO.java   |    12 +-
 engine/schema/src/com/cloud/dc/VlanVO.java      |    38 +-
 .../src/com/cloud/dc/dao/ClusterDaoImpl.java    |     3 +-
 .../com/cloud/dc/dao/ClusterVSMMapDaoImpl.java  |     2 +
 .../src/com/cloud/dc/dao/DataCenterDaoImpl.java |     1 -
 .../dc/dao/DataCenterIpAddressDaoImpl.java      |     9 +-
 .../DataCenterLinkLocalIpAddressDaoImpl.java    |     7 +
 .../src/com/cloud/dc/dao/DataCenterVnetDao.java |     1 -
 .../com/cloud/dc/dao/DataCenterVnetDaoImpl.java |    11 +
 .../schema/src/com/cloud/dc/dao/HostPodDao.java |     1 -
 .../src/com/cloud/dc/dao/PodVlanDaoImpl.java    |     6 +-
 .../dc/dao/StorageNetworkIpAddressDaoImpl.java  |     2 -
 engine/schema/src/com/cloud/dc/dao/VlanDao.java |     4 +-
 .../src/com/cloud/dc/dao/VlanDaoImpl.java       |    27 +-
 .../schema/src/com/cloud/domain/DomainVO.java   |     8 +-
 .../src/com/cloud/domain/dao/DomainDaoImpl.java |     6 +-
 engine/schema/src/com/cloud/event/EventVO.java  |     1 +
 .../src/com/cloud/event/UsageEventVO.java       |     1 -
 .../src/com/cloud/event/dao/EventDaoImpl.java   |     2 +-
 .../com/cloud/event/dao/UsageEventDaoImpl.java  |    10 +-
 .../event/dao/UsageEventDetailsDaoImpl.java     |    16 +-
 engine/schema/src/com/cloud/host/DetailVO.java  |     5 +-
 engine/schema/src/com/cloud/host/HostTagVO.java |     5 +-
 engine/schema/src/com/cloud/host/HostVO.java    |    17 +-
 .../src/com/cloud/host/dao/HostDaoImpl.java     |    24 +-
 .../src/com/cloud/host/dao/HostTagsDao.java     |     1 +
 .../hypervisor/HypervisorCapabilitiesVO.java    |     6 +-
 .../dao/HypervisorCapabilitiesDaoImpl.java      |    12 +-
 .../src/com/cloud/keystore/KeystoreDaoImpl.java |     3 +-
 .../src/com/cloud/keystore/KeystoreVO.java      |     5 +-
 .../cloud/network/LBHealthCheckPolicyVO.java    |    15 +-
 .../com/cloud/network/UserIpv6AddressVO.java    |     2 +-
 .../schema/src/com/cloud/network/VpnUserVO.java |     2 -
 .../as/AutoScalePolicyConditionMapVO.java       |     5 +-
 .../com/cloud/network/as/AutoScalePolicyVO.java |     4 +-
 .../network/as/AutoScaleVmGroupPolicyMapVO.java |     5 +-
 .../cloud/network/as/AutoScaleVmGroupVO.java    |     6 +-
 .../cloud/network/as/AutoScaleVmProfileVO.java  |     3 +-
 .../src/com/cloud/network/as/ConditionVO.java   |     3 +-
 .../src/com/cloud/network/as/CounterVO.java     |     3 +-
 .../dao/AutoScalePolicyConditionMapDaoImpl.java |     1 +
 .../network/as/dao/AutoScalePolicyDaoImpl.java  |     1 +
 .../cloud/network/as/dao/ConditionDaoImpl.java  |     1 +
 .../network/dao/AccountGuestVlanMapDao.java     |     5 +-
 .../network/dao/AccountGuestVlanMapDaoImpl.java |     5 +-
 .../network/dao/AccountGuestVlanMapVO.java      |    12 +-
 .../dao/ExternalFirewallDeviceDaoImpl.java      |     4 +-
 .../network/dao/ExternalFirewallDeviceVO.java   |     8 +-
 .../dao/ExternalLoadBalancerDeviceDao.java      |     4 +-
 .../dao/ExternalLoadBalancerDeviceDaoImpl.java  |    11 +-
 .../dao/ExternalLoadBalancerDeviceVO.java       |    19 +-
 .../cloud/network/dao/FirewallRulesCidrsVO.java |     5 +-
 .../cloud/network/dao/FirewallRulesDaoImpl.java |     3 +-
 .../src/com/cloud/network/dao/IPAddressDao.java |     6 +-
 .../com/cloud/network/dao/IPAddressDaoImpl.java |    30 +-
 .../src/com/cloud/network/dao/IPAddressVO.java  |     2 +
 .../network/dao/InlineLoadBalancerNicMapVO.java |     5 +-
 .../cloud/network/dao/LBStickinessPolicyVO.java |     9 +-
 .../network/dao/LoadBalancerCertMapDao.java     |     5 +-
 .../network/dao/LoadBalancerCertMapDaoImpl.java |     9 +-
 .../network/dao/LoadBalancerCertMapVO.java      |     5 +-
 .../cloud/network/dao/LoadBalancerVMMapVO.java  |     5 +-
 .../com/cloud/network/dao/LoadBalancerVO.java   |     5 +-
 .../cloud/network/dao/MonitoringServiceDao.java |     4 +-
 .../network/dao/MonitoringServiceDaoImpl.java   |    10 +-
 .../cloud/network/dao/MonitoringServiceVO.java  |    13 +-
 .../com/cloud/network/dao/NetworkAccountVO.java |     3 +-
 .../src/com/cloud/network/dao/NetworkDao.java   |     2 +-
 .../com/cloud/network/dao/NetworkDaoImpl.java   |    21 +-
 .../network/dao/NetworkDetailsDaoImpl.java      |     3 +-
 .../cloud/network/dao/NetworkDomainDaoImpl.java |     2 +-
 .../com/cloud/network/dao/NetworkDomainVO.java  |     3 +-
 .../network/dao/NetworkExternalFirewallVO.java  |     4 +-
 .../dao/NetworkExternalLoadBalancerVO.java      |     4 +-
 .../com/cloud/network/dao/NetworkOpDaoImpl.java |     7 +-
 .../src/com/cloud/network/dao/NetworkOpVO.java  |     5 +-
 .../network/dao/NetworkRuleConfigDaoImpl.java   |     2 +
 .../cloud/network/dao/NetworkServiceMapVO.java  |     6 +-
 .../src/com/cloud/network/dao/NetworkVO.java    |    18 +-
 .../PhysicalNetworkIsolationMethodDaoImpl.java  |     3 +-
 .../dao/PhysicalNetworkIsolationMethodVO.java   |     5 +-
 .../dao/PhysicalNetworkServiceProviderVO.java   |     3 +-
 .../cloud/network/dao/PhysicalNetworkTagVO.java |     5 +-
 .../dao/PhysicalNetworkTrafficTypeVO.java       |     5 +-
 .../com/cloud/network/dao/PortProfileDao.java   |     1 +
 .../cloud/network/dao/PortProfileDaoImpl.java   |     9 +-
 .../com/cloud/network/dao/PortProfileVO.java    |     5 +-
 .../cloud/network/dao/RouterNetworkDaoImpl.java |     3 +-
 .../com/cloud/network/dao/RouterNetworkVO.java  |     4 +-
 .../network/dao/Site2SiteCustomerGatewayVO.java |     6 +-
 .../network/dao/Site2SiteVpnConnectionVO.java   |     6 +-
 .../network/dao/Site2SiteVpnGatewayVO.java      |     2 +-
 .../src/com/cloud/network/dao/SslCertDao.java   |     4 +-
 .../com/cloud/network/dao/SslCertDaoImpl.java   |     7 +-
 .../src/com/cloud/network/dao/SslCertVO.java    |     9 +-
 .../cloud/network/dao/UserIpv6AddressDao.java   |     1 -
 .../network/dao/UserIpv6AddressDaoImpl.java     |     6 -
 .../network/dao/VirtualRouterProviderDao.java   |     3 +-
 .../dao/VirtualRouterProviderDaoImpl.java       |     2 +-
 .../element/VirtualRouterProviderVO.java        |     2 +-
 .../com/cloud/network/rules/FirewallRuleVO.java |    12 +-
 .../rules/dao/PortForwardingRulesDaoImpl.java   |     3 -
 .../network/security/SecurityGroupRulesVO.java  |     5 +-
 .../network/security/SecurityGroupVMMapVO.java  |     8 +-
 .../cloud/network/security/SecurityGroupVO.java |     3 -
 .../network/security/SecurityGroupWork.java     |     2 -
 .../network/security/SecurityGroupWorkVO.java   |     8 +-
 .../cloud/network/security/VmRulesetLogVO.java  |     4 +-
 .../security/dao/SecurityGroupDaoImpl.java      |     2 -
 .../security/dao/SecurityGroupRuleDaoImpl.java  |     2 +
 .../security/dao/SecurityGroupVMMapDaoImpl.java |     5 -
 .../security/dao/SecurityGroupWorkDao.java      |     2 +-
 .../security/dao/VmRulesetLogDaoImpl.java       |     2 +-
 .../cloud/network/vpc/NetworkACLItemDao.java    |     4 +-
 .../com/cloud/network/vpc/NetworkACLItemVO.java |    22 +-
 .../src/com/cloud/network/vpc/NetworkACLVO.java |     8 +-
 .../src/com/cloud/network/vpc/PrivateIpVO.java  |     5 +-
 .../com/cloud/network/vpc/StaticRouteVO.java    |     2 -
 .../src/com/cloud/network/vpc/VpcGatewayVO.java |     4 +-
 .../network/vpc/VpcOfferingServiceMapVO.java    |     5 +-
 .../com/cloud/network/vpc/VpcOfferingVO.java    |     1 -
 .../com/cloud/network/vpc/VpcServiceMapVO.java  |     1 +
 .../network/vpc/dao/NetworkACLDaoImpl.java      |     7 +-
 .../network/vpc/dao/NetworkACLItemDaoImpl.java  |    16 +-
 .../network/vpc/dao/StaticRouteDaoImpl.java     |     2 -
 .../com/cloud/network/vpc/dao/VpcDaoImpl.java   |     5 +-
 .../network/vpc/dao/VpcGatewayDaoImpl.java      |     4 +-
 .../network/vpc/dao/VpcServiceMapDaoImpl.java   |     3 +-
 .../offerings/NetworkOfferingDetailsVO.java     |     1 +
 .../offerings/NetworkOfferingServiceMapVO.java  |     5 +-
 .../com/cloud/offerings/NetworkOfferingVO.java  |    16 +-
 .../com/cloud/projects/ProjectAccountVO.java    |     4 +-
 .../com/cloud/projects/ProjectInvitationVO.java |     2 -
 .../src/com/cloud/projects/ProjectVO.java       |     3 +-
 .../com/cloud/projects/dao/ProjectDaoImpl.java  |     2 -
 .../com/cloud/secstorage/CommandExecLogVO.java  |     4 +-
 .../com/cloud/service/ServiceOfferingVO.java    |    27 +-
 .../cloud/service/dao/ServiceOfferingDao.java   |     1 -
 .../service/dao/ServiceOfferingDaoImpl.java     |     9 +-
 .../dao/ServiceOfferingDetailsDaoImpl.java      |     3 +-
 .../src/com/cloud/storage/DiskOfferingVO.java   |    12 +-
 .../com/cloud/storage/GuestOSHypervisorVO.java  |     5 -
 .../schema/src/com/cloud/storage/GuestOSVO.java |     1 +
 .../com/cloud/storage/LaunchPermissionVO.java   |     5 +-
 .../src/com/cloud/storage/SnapshotPolicyVO.java |    12 +
 .../com/cloud/storage/SnapshotScheduleVO.java   |    10 +
 .../src/com/cloud/storage/SnapshotVO.java       |    19 +-
 .../com/cloud/storage/StoragePoolHostAssoc.java |     4 +-
 .../com/cloud/storage/StoragePoolWorkVO.java    |     6 +-
 .../src/com/cloud/storage/VMTemplateHostVO.java |     4 +-
 .../cloud/storage/VMTemplateStoragePoolVO.java  |     4 +-
 .../src/com/cloud/storage/VMTemplateVO.java     |    57 +-
 .../src/com/cloud/storage/VMTemplateZoneVO.java |     4 +-
 .../src/com/cloud/storage/VolumeHostVO.java     |    10 +-
 .../schema/src/com/cloud/storage/VolumeVO.java  |     8 +-
 .../storage/dao/LaunchPermissionDaoImpl.java    |    19 +-
 .../src/com/cloud/storage/dao/SnapshotDao.java  |     4 +-
 .../com/cloud/storage/dao/SnapshotDaoImpl.java  |     8 +-
 .../cloud/storage/dao/SnapshotDetailsDao.java   |     3 +-
 .../cloud/storage/dao/SnapshotDetailsVO.java    |     9 +-
 .../storage/dao/StoragePoolHostDaoImpl.java     |     5 +-
 .../storage/dao/StoragePoolWorkDaoImpl.java     |     6 +-
 .../src/com/cloud/storage/dao/UploadDao.java    |     4 +-
 .../com/cloud/storage/dao/UploadDaoImpl.java    |    12 +-
 .../com/cloud/storage/dao/VMTemplateDao.java    |     4 -
 .../cloud/storage/dao/VMTemplateDaoImpl.java    |    24 +-
 .../storage/dao/VMTemplateDetailsDaoImpl.java   |     3 +-
 .../storage/dao/VMTemplateHostDaoImpl.java      |    15 +-
 .../storage/dao/VMTemplatePoolDaoImpl.java      |    19 +-
 .../com/cloud/storage/dao/VolumeDaoImpl.java    |    13 +-
 .../cloud/storage/dao/VolumeDetailsDaoImpl.java |     3 +-
 .../com/cloud/storage/dao/VolumeHostDao.java    |     3 +-
 .../cloud/storage/dao/VolumeHostDaoImpl.java    |     5 +-
 .../src/com/cloud/tags/ResourceTagVO.java       |     2 -
 .../src/com/cloud/upgrade/DatabaseCreator.java  |     8 +-
 .../cloud/upgrade/DatabaseIntegrityChecker.java |    13 +-
 .../cloud/upgrade/DatabaseUpgradeChecker.java   |   113 +-
 .../upgrade/PremiumDatabaseUpgradeChecker.java  |    71 +-
 .../com/cloud/upgrade/dao/Upgrade218to22.java   |   245 +-
 .../upgrade/dao/Upgrade218to22Premium.java      |    14 +-
 .../cloud/upgrade/dao/Upgrade2211to2212.java    |     2 -
 .../cloud/upgrade/dao/Upgrade2212to2213.java    |     3 +-
 .../cloud/upgrade/dao/Upgrade2213to2214.java    |    36 +-
 .../com/cloud/upgrade/dao/Upgrade2214to30.java  |    81 +-
 .../com/cloud/upgrade/dao/Upgrade222to224.java  |    14 +-
 .../upgrade/dao/Upgrade222to224Premium.java     |     9 +-
 .../com/cloud/upgrade/dao/Upgrade224to225.java  |    12 +-
 .../com/cloud/upgrade/dao/Upgrade227to228.java  |     9 +-
 .../com/cloud/upgrade/dao/Upgrade228to229.java  |     6 +-
 .../com/cloud/upgrade/dao/Upgrade229to2210.java |    16 +-
 .../com/cloud/upgrade/dao/Upgrade301to302.java  |    23 +-
 .../com/cloud/upgrade/dao/Upgrade302to303.java  |    42 +-
 .../com/cloud/upgrade/dao/Upgrade302to40.java   |   169 +-
 .../com/cloud/upgrade/dao/Upgrade303to304.java  |    74 +-
 .../com/cloud/upgrade/dao/Upgrade304to305.java  |    55 +-
 .../com/cloud/upgrade/dao/Upgrade305to306.java  |    12 +-
 .../com/cloud/upgrade/dao/Upgrade30to301.java   |     5 +-
 .../com/cloud/upgrade/dao/Upgrade30xBase.java   |    29 +-
 .../com/cloud/upgrade/dao/Upgrade40to41.java    |    28 +-
 .../com/cloud/upgrade/dao/Upgrade410to420.java  |   256 +-
 .../com/cloud/upgrade/dao/Upgrade420to421.java  |    38 +-
 .../src/com/cloud/upgrade/dao/VersionVO.java    |     5 +-
 .../usage/ExternalPublicIpStatisticsVO.java     |     6 +-
 .../src/com/cloud/usage/UsageIPAddressVO.java   |     5 +-
 .../schema/src/com/cloud/usage/UsageJobVO.java  |     5 +-
 .../cloud/usage/UsageLoadBalancerPolicyVO.java  |     5 +-
 .../com/cloud/usage/UsageNetworkOfferingVO.java |     3 +-
 .../src/com/cloud/usage/UsageNetworkVO.java     |     4 +-
 .../cloud/usage/UsagePortForwardingRuleVO.java  |     5 +-
 .../src/com/cloud/usage/UsageStorageVO.java     |     5 +-
 .../src/com/cloud/usage/UsageVMInstanceVO.java  |     4 +-
 .../src/com/cloud/usage/UsageVMSnapshotVO.java  |     1 +
 engine/schema/src/com/cloud/usage/UsageVO.java  |    27 +-
 .../src/com/cloud/usage/UsageVmDiskVO.java      |     4 +-
 .../src/com/cloud/usage/UsageVolumeVO.java      |     5 +-
 .../dao/ExternalPublicIpStatisticsDao.java      |     1 -
 .../dao/ExternalPublicIpStatisticsDaoImpl.java  |     5 +-
 .../src/com/cloud/usage/dao/UsageDaoImpl.java   |    25 +-
 .../cloud/usage/dao/UsageIPAddressDaoImpl.java  |    22 +-
 .../com/cloud/usage/dao/UsageJobDaoImpl.java    |     3 +-
 .../dao/UsageLoadBalancerPolicyDaoImpl.java     |    11 +-
 .../cloud/usage/dao/UsageNetworkDaoImpl.java    |    21 +-
 .../usage/dao/UsageNetworkOfferingDaoImpl.java  |    23 +-
 .../dao/UsagePortForwardingRuleDaoImpl.java     |    11 +-
 .../usage/dao/UsageSecurityGroupDaoImpl.java    |    16 +-
 .../cloud/usage/dao/UsageStorageDaoImpl.java    |    17 +-
 .../cloud/usage/dao/UsageVMInstanceDaoImpl.java |    17 +-
 .../cloud/usage/dao/UsageVMSnapshotDaoImpl.java |    28 +-
 .../cloud/usage/dao/UsageVPNUserDaoImpl.java    |    10 +-
 .../com/cloud/usage/dao/UsageVmDiskDaoImpl.java |    23 +-
 .../com/cloud/usage/dao/UsageVolumeDaoImpl.java |    13 +-
 .../src/com/cloud/user/AccountDetailVO.java     |     4 +-
 .../schema/src/com/cloud/user/SSHKeyPairVO.java |     2 -
 .../src/com/cloud/user/UserAccountVO.java       |     4 +-
 .../src/com/cloud/user/UserStatisticsVO.java    |     5 +-
 .../src/com/cloud/user/UserStatsLogVO.java      |     4 +-
 .../src/com/cloud/user/dao/AccountDaoImpl.java  |     5 +-
 .../cloud/user/dao/UserStatisticsDaoImpl.java   |    11 +-
 .../cloud/user/dao/VmDiskStatisticsDaoImpl.java |    13 +-
 .../schema/src/com/cloud/vm/ConsoleProxyVO.java |   186 +-
 .../schema/src/com/cloud/vm/DomainRouterVO.java |     4 +-
 .../src/com/cloud/vm/InstanceGroupVMMapVO.java  |     7 +-
 .../src/com/cloud/vm/InstanceGroupVO.java       |     4 +-
 engine/schema/src/com/cloud/vm/NicVO.java       |    11 +-
 .../src/com/cloud/vm/SecondaryStorageVmVO.java  |     4 +-
 engine/schema/src/com/cloud/vm/UserVmVO.java    |     4 +-
 .../schema/src/com/cloud/vm/VMInstanceVO.java   |     1 +
 .../com/cloud/vm/dao/ConsoleProxyDaoImpl.java   |    42 +-
 .../com/cloud/vm/dao/DomainRouterDaoImpl.java   |    13 +-
 engine/schema/src/com/cloud/vm/dao/NicDao.java  |     6 +-
 .../src/com/cloud/vm/dao/NicDetailsDaoImpl.java |     3 +-
 .../src/com/cloud/vm/dao/NicIpAliasDao.java     |     1 +
 .../src/com/cloud/vm/dao/NicIpAliasDaoImpl.java |    12 +-
 .../src/com/cloud/vm/dao/NicIpAliasVO.java      |    23 +-
 .../src/com/cloud/vm/dao/NicSecondaryIpDao.java |     1 +
 .../src/com/cloud/vm/dao/NicSecondaryIpVO.java  |     8 +
 .../cloud/vm/dao/SecondaryStorageVmDaoImpl.java |    14 +-
 .../cloud/vm/dao/UserVmCloneSettingDaoImpl.java |     2 +-
 .../src/com/cloud/vm/dao/UserVmDaoImpl.java     |    50 +-
 .../schema/src/com/cloud/vm/dao/UserVmData.java |     1 +
 .../com/cloud/vm/dao/UserVmDetailsDaoImpl.java  |     3 +-
 .../src/com/cloud/vm/dao/VMInstanceDaoImpl.java |    20 +-
 .../src/com/cloud/vm/snapshot/VMSnapshotVO.java |    11 +-
 .../affinity/AffinityGroupDomainMapVO.java      |     3 +-
 .../affinity/AffinityGroupVMMapVO.java          |     4 +-
 .../affinity/dao/AffinityGroupDao.java          |     1 +
 .../affinity/dao/AffinityGroupDaoImpl.java      |     8 +-
 .../dao/AffinityGroupDomainMapDaoImpl.java      |     3 +-
 .../affinity/dao/AffinityGroupVMMapDaoImpl.java |     1 +
 .../cloud/entity/api/db/VMComputeTagVO.java     |     1 +
 .../engine/cloud/entity/api/db/VMEntityVO.java  |     1 +
 .../cloud/entity/api/db/VMNetworkMapVO.java     |     2 +
 .../cloud/entity/api/db/VMReservationVO.java    |     1 +
 .../cloud/entity/api/db/VMRootDiskTagVO.java    |     1 +
 .../entity/api/db/VolumeReservationVO.java      |     2 +
 .../entity/api/db/dao/VMComputeTagDaoImpl.java  |     4 +-
 .../cloud/entity/api/db/dao/VMEntityDao.java    |    10 -
 .../entity/api/db/dao/VMEntityDaoImpl.java      |     9 +-
 .../entity/api/db/dao/VMNetworkMapDaoImpl.java  |     6 +-
 .../entity/api/db/dao/VMReservationDao.java     |     2 -
 .../entity/api/db/dao/VMReservationDaoImpl.java |     9 +-
 .../entity/api/db/dao/VMRootDiskTagDaoImpl.java |     4 +-
 .../api/db/dao/VolumeReservationDaoImpl.java    |     6 +-
 .../dao/ApplicationLoadBalancerRuleDaoImpl.java |     3 +-
 .../apache/cloudstack/region/PortableIpDao.java |     3 -
 .../cloudstack/region/PortableIpDaoImpl.java    |    18 -
 .../cloudstack/region/PortableIpRangeDao.java   |     3 -
 .../region/PortableIpRangeDaoImpl.java          |    18 -
 .../cloudstack/region/PortableIpRangeVO.java    |     5 -
 .../apache/cloudstack/region/PortableIpVO.java  |    13 +-
 .../apache/cloudstack/region/RegionSyncVO.java  |     4 +
 .../org/apache/cloudstack/region/RegionVO.java  |     4 +
 .../cloudstack/region/dao/RegionDaoImpl.java    |     3 +-
 .../region/gslb/GlobalLoadBalancerDaoImpl.java  |    10 +-
 .../gslb/GlobalLoadBalancerLbRuleMapDao.java    |     4 +-
 .../GlobalLoadBalancerLbRuleMapDaoImpl.java     |    10 +-
 .../gslb/GlobalLoadBalancerLbRuleMapVO.java     |     5 +-
 .../region/gslb/GlobalLoadBalancerRuleDao.java  |     4 +-
 .../region/gslb/GlobalLoadBalancerRuleVO.java   |    18 +-
 .../dao/FirewallRuleDetailsDaoImpl.java         |     3 +-
 .../dao/RemoteAccessVpnDetailsDaoImpl.java      |     3 +-
 .../dao/UserIpAddressDetailsDaoImpl.java        |     3 +-
 .../datastore/db/ImageStoreDetailVO.java        |     5 +-
 .../storage/datastore/db/ImageStoreVO.java      |     6 +
 .../datastore/db/PrimaryDataStoreDaoImpl.java   |    20 +-
 .../datastore/db/SnapshotDataStoreVO.java       |     9 +-
 .../storage/datastore/db/StoragePoolVO.java     |    36 +-
 .../storage/datastore/db/VolumeDataStoreVO.java |     4 +-
 .../allocator/StorageCacheRandomAllocator.java  |     5 +-
 .../motion/AncientDataMotionStrategy.java       |     6 +-
 .../storage/motion/DataMotionServiceImpl.java   |     9 +-
 .../storage/image/TemplateServiceImpl.java      |    33 +-
 .../storage/image/store/ImageStoreImpl.java     |     3 +-
 .../vm/snapshot/dao/VmSnapshotDaoTest.java      |     3 +-
 .../MockLocalNfsSecondaryStorageResource.java   |    20 +-
 .../storage/allocator/StorageAllocatorTest.java |     9 +-
 .../StorageAllocatorTestConfiguration.java      |     9 +-
 ...StorageCacheReplacementAlgorithmLRUTest.java |    34 +-
 .../cloudstack/storage/test/AopTestAdvice.java  |     1 -
 .../storage/test/ChildTestConfiguration.java    |    60 +-
 .../storage/test/CloudStackTestNGBase.java      |    11 +-
 .../test/DirectAgentManagerSimpleImpl.java      |     8 +-
 .../storage/test/DirectAgentTest.java           |     5 +-
 .../storage/test/EndpointSelectorTest.java      |    13 +-
 .../test/FakeDriverTestConfiguration.java       |    15 +-
 .../storage/test/MockRpcCallBack.java           |     3 +-
 .../cloudstack/storage/test/S3TemplateTest.java |    24 +-
 .../cloudstack/storage/test/SnapshotTest.java   |   110 +-
 .../storage/test/SnapshotTestWithFakeData.java  |    38 +-
 .../cloudstack/storage/test/StorageTest.java    |     2 +-
 .../cloudstack/storage/test/TemplateTest.java   |    18 +-
 .../cloudstack/storage/test/TestHttp.java       |     1 +
 .../cloudstack/storage/test/VolumeTest.java     |    24 +-
 .../storage/test/VolumeTestVmware.java          |    22 +-
 .../storage/test/volumeServiceTest.java         |    18 +-
 .../storage/snapshot/SnapshotObject.java        |     7 +-
 .../storage/snapshot/SnapshotServiceImpl.java   |    21 +-
 .../snapshot/XenserverSnapshotStrategy.java     |     8 +-
 .../vmsnapshot/DefaultVMSnapshotStrategy.java   |    17 +-
 .../test/src/SnapshotDataFactoryTest.java       |     3 +-
 .../test/src/VMSnapshotStrategyTest.java        |    64 +-
 .../cloudstack/storage/RemoteHostEndPoint.java  |     3 +-
 .../allocator/AbstractStoragePoolAllocator.java |     1 -
 .../GarbageCollectingStoragePoolAllocator.java  |     8 +-
 .../allocator/LocalStoragePoolAllocator.java    |    10 +-
 .../allocator/UseLocalForRootAllocator.java     |     1 -
 .../allocator/ZoneWideStoragePoolAllocator.java |     8 +-
 .../datastore/DataObjectManagerImpl.java        |     5 +-
 .../datastore/ObjectInDataStoreManagerImpl.java |    10 +-
 .../provider/DataStoreProviderManagerImpl.java  |    33 +-
 .../storage/db/ObjectInDataStoreDaoImpl.java    |     5 +-
 .../endpoint/DefaultEndPointSelector.java       |     5 +-
 .../storage/helper/HypervisorHelperImpl.java    |     5 +-
 .../storage/helper/VMSnapshotHelperImpl.java    |     3 +-
 .../storage/image/BaseImageStoreDriverImpl.java |    22 +-
 .../image/db/ImageStoreDetailsDaoImpl.java      |     3 +-
 .../image/db/SnapshotDataStoreDaoImpl.java      |     2 +-
 .../storage/image/format/BAREMETAL.java         |     3 +-
 .../cloudstack/storage/image/format/OVA.java    |     3 +-
 .../cloudstack/storage/image/format/QCOW2.java  |     3 +-
 .../cloudstack/storage/image/format/RAW.java    |     3 +-
 .../storage/image/format/Unknown.java           |     3 +-
 .../cloudstack/storage/image/format/VHD.java    |     3 +-
 .../cloudstack/storage/image/format/VHDX.java   |     3 +-
 .../volume/TemplateOnPrimaryDataStoreInfo.java  |     2 +-
 .../datastore/PrimaryDataStoreHelper.java       |     7 +-
 .../db/PrimaryDataStoreDetailsDaoImpl.java      |     3 +-
 .../volume/db/TemplatePrimaryDataStoreVO.java   |    17 +-
 .../api/storage/StrategyPriorityTest.java       |    14 +-
 .../storage/datastore/PrimaryDataStoreImpl.java |    21 +-
 .../PrimaryDataStoreProviderManagerImpl.java    |     5 +-
 .../datastore/provider/DefaultHostListener.java |     8 +-
 .../storage/datastore/type/ISCSI.java           |     3 +-
 .../datastore/type/NetworkFileSystem.java       |     3 +-
 .../cloudstack/storage/volume/VolumeObject.java |    13 +-
 .../storage/volume/VolumeServiceImpl.java       |    51 +-
 .../storage/volume/test/ConfiguratorTest.java   |     5 +-
 .../storage/volume/test/TestConfiguration.java  |     4 +-
 .../com/cloud/cluster/ClusterManagerImpl.java   |    48 +-
 .../cluster/ClusterServiceServletAdapter.java   |     3 +-
 .../cluster/ClusterServiceServletContainer.java |     4 +-
 .../cluster/ClusterServiceServletImpl.java      |     5 +-
 .../cloud/cluster/ManagementServerHostVO.java   |     1 +
 .../dao/ManagementServerHostDaoImpl.java        |     6 +-
 .../framework/config/dao/ConfigurationDao.java  |     1 -
 .../framework/config/impl/ConfigDepotImpl.java  |     9 +-
 .../config/impl/ConfigDepotAdminTest.java       |     2 -
 .../utils/crypt/EncryptionSecretKeyChanger.java |     8 +-
 .../db/src/com/cloud/utils/db/Attribute.java    |    24 +-
 .../com/cloud/utils/db/ConnectionConcierge.java |     3 +-
 framework/db/src/com/cloud/utils/db/EcInfo.java |     3 +-
 .../src/com/cloud/utils/db/GenericDaoBase.java  |     3 +-
 .../db/src/com/cloud/utils/db/GlobalLock.java   |     2 +-
 .../db/src/com/cloud/utils/db/Merovingian2.java |     5 +-
 .../src/com/cloud/utils/db/SearchCriteria.java  |     3 +-
 .../db/src/com/cloud/utils/db/SqlGenerator.java |     3 +-
 .../src/com/cloud/utils/db/StaticStrategy.java  |     7 +-
 .../com/cloud/utils/db/TransactionLegacy.java   |    74 +-
 .../db/test/com/cloud/utils/DbUtilTest.java     |    11 +-
 .../db/test/com/cloud/utils/db/DbTestDao.java   |     3 -
 .../cloud/utils/db/ElementCollectionTest.java   |     3 +-
 .../com/cloud/utils/db/TestTransaction.java     |     7 +-
 .../utils/db/TransactionContextBuilderTest.java |     1 -
 .../com/cloud/utils/db/TransactionTest.java     |     5 +-
 .../framework/rpc/RpcClientCallImpl.java        |     2 -
 .../server/ServerTransportProvider.java         |     3 +-
 .../framework/transport/TransportAddress.java   |     2 +-
 .../AsyncSampleEventDrivenStyleCaller.java      |    11 +-
 .../AsyncSampleListenerStyleCaller.java         |     2 -
 .../codestyle/ClientOnlyEventDrivenStyle.java   |     8 +-
 .../sampleserver/SampleManagerComponent.java    |    33 +-
 .../sampleserver/SampleManagerComponent2.java   |     5 +-
 .../cloudstack/messagebus/TestMessageBus.java   |     9 +-
 .../jobs/AsyncJobExecutionContext.java          |     1 +
 .../framework/jobs/dao/AsyncJobDaoImpl.java     |     5 +-
 .../jobs/dao/AsyncJobJoinMapDaoImpl.java        |     3 +-
 .../jobs/dao/SyncQueueItemDaoImpl.java          |     5 +-
 .../framework/jobs/impl/AsyncJobJournalVO.java  |     1 -
 .../jobs/impl/AsyncJobManagerImpl.java          |    51 +-
 .../framework/jobs/impl/AsyncJobMonitor.java    |     5 +-
 .../framework/jobs/impl/SyncQueueItemVO.java    |     6 +-
 .../jobs/impl/SyncQueueManagerImpl.java         |     1 +
 .../framework/jobs/impl/SyncQueueVO.java        |     7 +-
 .../framework/jobs/impl/VmWorkJobVO.java        |     2 -
 .../managed/context/ManagedContextRunnable.java |     3 +-
 .../context/impl/DefaultManagedContext.java     |     5 +-
 .../managed/threadlocal/ManagedThreadLocal.java |     3 +-
 .../context/impl/DefaultManagedContextTest.java |    10 +-
 .../spring/lifecycle/AbstractBeanCollector.java |    18 +-
 .../lifecycle/CloudStackExtendedLifeCycle.java  |    19 +-
 .../spring/lifecycle/ConfigDepotLifeCycle.java  |     7 +-
 .../spring/lifecycle/registry/DumpRegistry.java |    16 +-
 .../lifecycle/registry/ExtensionRegistry.java   |    57 +-
 .../registry/PluggableServiceLifecycle.java     |     5 +-
 .../lifecycle/registry/RegistryLifecycle.java   |    22 +-
 .../lifecycle/registry/RegistryUtils.java       |     4 +-
 .../context/ResourceApplicationContext.java     |     3 +-
 .../module/factory/CloudStackSpringContext.java |    25 +-
 .../factory/ModuleBasedContextFactory.java      |    19 +-
 .../module/factory/QuietLoaderFactory.java      |     4 +-
 .../impl/ClasspathModuleDefinitionLocator.java  |    12 +-
 .../model/impl/DefaultModuleDefinition.java     |    34 +-
 .../model/impl/DefaultModuleDefinitionSet.java  |    65 +-
 .../cloudstack/spring/module/util/Main.java     |     5 +-
 .../web/CloudStackContextLoaderListener.java    |     8 +-
 .../spring/module/web/ModuleBasedFilter.java    |    12 +-
 .../factory/ModuleBasedContextFactoryTest.java  |    27 +-
 ...ClasspathModuleDefinitionSetLocatorTest.java |     5 +-
 .../model/impl/DefaultModuleDefinitionTest.java |    24 +-
 .../acl/StaticRoleBasedAPIAccessChecker.java    |    11 +-
 .../affinity/ExplicitDedicationProcessor.java   |     3 +-
 .../affinity/HostAntiAffinityProcessor.java     |    13 +-
 .../alert/snmp/SnmpEnhancedPatternLayout.java   |     6 +-
 .../cloudstack/alert/snmp/SnmpHelper.java       |     5 +-
 .../cloudstack/alert/snmp/SnmpTrapAppender.java |    13 +-
 .../snmp/SnmpEnhancedPatternLayoutTest.java     |    18 +-
 .../alert/snmp/SnmpTrapAppenderTest.java        |    12 +-
 .../cloudstack/syslog/AlertsSyslogAppender.java |    11 +-
 .../syslog/AlertsSyslogAppenderTest.java        |    10 +-
 .../api/command/user/discovery/ListApisCmd.java |     4 +-
 .../api/response/ApiDiscoveryResponse.java      |    10 +-
 .../api/response/ApiParameterResponse.java      |     6 +-
 .../api/response/ApiResponseResponse.java       |     8 +-
 .../discovery/ApiDiscoveryService.java          |     5 +-
 .../discovery/ApiDiscoveryServiceImpl.java      |     8 +-
 .../cloudstack/discovery/ApiDiscoveryTest.java  |    32 +-
 .../admin/ratelimit/ResetApiLimitCmd.java       |     8 +-
 .../command/user/ratelimit/GetApiLimitCmd.java  |    27 +-
 .../api/response/ApiLimitResponse.java          |     6 +-
 .../ratelimit/ApiRateLimitService.java          |     1 +
 .../ratelimit/ApiRateLimitServiceImpl.java      |     3 +-
 .../apache/cloudstack/ratelimit/LimitStore.java |     2 -
 .../cloudstack/ratelimit/ApiRateLimitTest.java  |    16 +-
 .../ratelimit/integration/APITest.java          |     3 +-
 .../ratelimit/integration/LoginResponse.java    |     3 +-
 .../integration/RateLimitIntegrationTest.java   |     8 +-
 .../api/commands/DedicateClusterCmd.java        |    11 +-
 .../api/commands/DedicateHostCmd.java           |    11 +-
 .../cloudstack/api/commands/DedicatePodCmd.java |    11 +-
 .../api/commands/DedicateZoneCmd.java           |    11 +-
 .../api/commands/ListDedicatedClustersCmd.java  |    16 +-
 .../api/commands/ListDedicatedHostsCmd.java     |    11 +-
 .../api/commands/ListDedicatedPodsCmd.java      |    11 +-
 .../api/commands/ListDedicatedZonesCmd.java     |    11 +-
 .../commands/ReleaseDedicatedClusterCmd.java    |     4 +-
 .../api/commands/ReleaseDedicatedHostCmd.java   |     4 +-
 .../api/commands/ReleaseDedicatedPodCmd.java    |     4 +-
 .../api/commands/ReleaseDedicatedZoneCmd.java   |     4 +-
 .../api/response/DedicateClusterResponse.java   |     3 +-
 .../api/response/DedicateHostResponse.java      |     3 +-
 .../api/response/DedicatePodResponse.java       |     3 +-
 .../api/response/DedicateZoneResponse.java      |     3 +-
 .../dedicated/DedicatedResourceManagerImpl.java |    21 +-
 .../cloudstack/dedicated/DedicatedService.java  |    11 +-
 .../dedicated/manager/DedicatedApiUnitTest.java |     6 +-
 .../cloud/deploy/ImplicitDedicationPlanner.java |     6 +-
 .../implicitplanner/ImplicitPlannerTest.java    |     9 +-
 .../deploy/UserConcentratedPodPlanner.java      |     4 +-
 .../com/cloud/deploy/UserDispersingPlanner.java |     4 +-
 .../mom/rabbitmq/RabbitMQEventBus.java          |    51 +-
 .../api/commands/netapp/AssociateLunCmd.java    |     4 +-
 .../cloud/api/commands/netapp/CreateLunCmd.java |     7 +-
 .../commands/netapp/CreateVolumeOnFilerCmd.java |     7 +-
 .../commands/netapp/CreateVolumePoolCmd.java    |     7 +-
 .../commands/netapp/DeleteVolumePoolCmd.java    |     6 +-
 .../api/commands/netapp/DestroyLunCmd.java      |     7 +-
 .../netapp/DestroyVolumeOnFilerCmd.java         |    10 +-
 .../api/commands/netapp/DissociateLunCmd.java   |    11 +-
 .../cloud/api/commands/netapp/ListLunsCmd.java  |     7 +-
 .../api/commands/netapp/ListVolumePoolsCmd.java |     7 +-
 .../commands/netapp/ListVolumesOnFilerCmd.java  |    11 +-
 .../commands/netapp/ModifyVolumePoolCmd.java    |     6 +-
 .../netapp/src/com/cloud/netapp/LunVO.java      |     5 +-
 .../netapp/NetappDefaultAllocatorImpl.java      |     6 +-
 .../src/com/cloud/netapp/NetappManagerImpl.java |    46 +-
 .../src/com/cloud/netapp/NetappVolumeVO.java    |     5 +-
 .../netapp/src/com/cloud/netapp/PoolVO.java     |     5 +-
 .../netapp/src/com/cloud/netapp/dao/LunDao.java |     2 -
 .../src/com/cloud/netapp/dao/LunDaoImpl.java    |     2 -
 .../database/BaremetalDhcpDaoImpl.java          |     4 -
 .../baremetal/database/BaremetalDhcpVO.java     |     2 -
 .../baremetal/database/BaremetalPxeDao.java     |     1 -
 .../baremetal/database/BaremetalPxeDaoImpl.java |     4 -
 .../baremetal/manager/BareMetalDiscoverer.java  |    15 +-
 .../baremetal/manager/BareMetalPlanner.java     |     2 +-
 .../manager/BareMetalTemplateAdapter.java       |    14 +-
 .../baremetal/manager/BaremetalManager.java     |     1 -
 .../baremetal/manager/BaremetalManagerImpl.java |    14 +-
 .../BareMetalPingServiceImpl.java               |    12 +-
 .../networkservice/BareMetalPxeServiceBase.java |     3 -
 .../networkservice/BareMetalResourceBase.java   |     8 +-
 .../networkservice/BaremetaNetworkGuru.java     |     1 +
 .../networkservice/BaremetalDhcpElement.java    |    14 +-
 .../networkservice/BaremetalDhcpManager.java    |     3 -
 .../BaremetalDhcpManagerImpl.java               |    22 +-
 .../BaremetalDhcpResourceBase.java              |     4 -
 .../networkservice/BaremetalDhcpResponse.java   |     4 +-
 .../networkservice/BaremetalDhcpdResource.java  |     9 +-
 .../BaremetalDnsmasqResource.java               |     5 +-
 .../BaremetalKickStartPxeResource.java          |     7 +-
 .../BaremetalKickStartServiceImpl.java          |    20 +-
 .../BaremetalPingPxeResource.java               |    13 +-
 .../networkservice/BaremetalPxeElement.java     |    10 +-
 .../BaremetalPxeKickStartResponse.java          |     3 +-
 .../networkservice/BaremetalPxeManagerImpl.java |     4 +-
 .../BaremetalPxePingResponse.java               |     3 +-
 .../networkservice/BaremetalPxeResponse.java    |     3 +-
 .../BaremetalUserdataElement.java               |    19 +-
 .../cloudstack/api/AddBaremetalDhcpCmd.java     |    17 +-
 .../cloudstack/api/AddBaremetalHostCmd.java     |     3 -
 .../api/AddBaremetalKickStartPxeCmd.java        |     5 -
 .../cloudstack/api/AddBaremetalPxeCmd.java      |    18 +-
 .../api/AddBaremetalPxePingServerCmd.java       |     4 -
 .../cloudstack/api/ListBaremetalDhcpCmd.java    |    15 +-
 .../api/ListBaremetalPxeServersCmd.java         |     9 +-
 .../discoverer/HypervServerDiscoverer.java      |   170 +-
 .../hypervisor/hyperv/guru/HypervGuru.java      |    10 +-
 .../resource/HypervDirectConnectResource.java   |   339 +-
 .../test/HypervDirectConnectResourceTest.java   |   551 +-
 .../kvm/src/com/cloud/ha/KVMInvestigator.java   |    12 +-
 .../kvm/resource/BridgeVifDriver.java           |     6 +-
 .../kvm/resource/DirectVifDriver.java           |    10 +-
 .../hypervisor/kvm/resource/KVMHABase.java      |     5 -
 .../hypervisor/kvm/resource/KVMHAMonitor.java   |    12 +-
 .../kvm/resource/LibvirtComputingResource.java  |   125 +-
 .../kvm/resource/LibvirtDomainXMLParser.java    |     4 +-
 .../kvm/resource/LibvirtSecretDef.java          |     4 +-
 .../resource/LibvirtStoragePoolXMLParser.java   |     7 +-
 .../resource/LibvirtStorageVolumeXMLParser.java |     2 +-
 .../hypervisor/kvm/resource/LibvirtVMDef.java   |     4 +-
 .../hypervisor/kvm/resource/OvsVifDriver.java   |     2 +-
 .../hypervisor/kvm/resource/VifDriver.java      |    10 +-
 .../hypervisor/kvm/resource/VifDriverBase.java  |    12 +-
 .../hypervisor/kvm/storage/KVMStoragePool.java  |     1 +
 .../kvm/storage/KVMStoragePoolManager.java      |    17 +-
 .../kvm/storage/KVMStorageProcessor.java        |    48 +-
 .../kvm/storage/KVMStorageResource.java         |    14 +-
 .../kvm/storage/LibvirtStorageAdaptor.java      |    60 +-
 .../kvm/storage/LibvirtStoragePool.java         |     7 +-
 .../hypervisor/kvm/storage/StorageAdaptor.java  |     1 +
 .../kvm/storage/iScsiAdmStorageAdaptor.java     |     3 +-
 .../apache/cloudstack/utils/qemu/QemuImg.java   |    12 +-
 .../resource/LibvirtComputingResourceTest.java  |     8 +-
 .../kvm/resource/LibvirtVMDefTest.java          |    10 +-
 .../kvm/resource/LibvirtVifDriverTest.java      |    16 +-
 .../kvm/storage/KVMStorageProcessorTest.java    |     6 +-
 .../cloudstack/utils/qemu/QemuImgFileTest.java  |     5 +-
 .../cloudstack/utils/qemu/QemuImgTest.java      |    14 +-
 .../com/cloud/ovm/hypervisor/OvmDiscoverer.java |     7 +-
 .../cloud/ovm/hypervisor/OvmResourceBase.java   |    30 +-
 .../ovm/src/com/cloud/ovm/object/Coder.java     |     3 +-
 .../ovm/src/com/cloud/ovm/object/OvmHost.java   |     1 -
 .../com/cloud/ovm/object/OvmSecurityGroup.java  |     4 +-
 .../com/cloud/ovm/object/OvmStoragePool.java    |     8 +-
 .../ovm/src/com/cloud/ovm/object/OvmVm.java     |     2 -
 .../ovm/src/com/cloud/ovm/object/Test.java      |     8 +-
 .../cloud/agent/manager/MockAgentManager.java   |    11 +-
 .../agent/manager/MockAgentManagerImpl.java     |     4 +-
 .../agent/manager/MockNetworkManagerImpl.java   |     7 +-
 .../agent/manager/MockStorageManagerImpl.java   |    78 +-
 .../com/cloud/agent/manager/MockVmManager.java  |     6 +-
 .../cloud/agent/manager/MockVmManagerImpl.java  |    40 +-
 .../agent/manager/SimulatorManagerImpl.java     |    31 +-
 .../api/commands/ConfigureSimulatorCmd.java     |    21 +-
 .../com/cloud/resource/AgentResourceBase.java   |    29 +-
 .../cloud/resource/AgentRoutingResource.java    |     5 +-
 .../cloud/resource/AgentStorageResource.java    |     4 +-
 .../com/cloud/resource/SimulatorDiscoverer.java |    12 +-
 .../resource/SimulatorSecondaryDiscoverer.java  |    10 +-
 .../resource/SimulatorStorageProcessor.java     |     3 +-
 .../cloud/simulator/MockConfigurationVO.java    |     1 +
 .../src/com/cloud/simulator/MockHostVO.java     |    20 +
 .../cloud/simulator/MockSecurityRulesVO.java    |     1 +
 .../src/com/cloud/simulator/MockVMVO.java       |    16 +
 .../simulator/dao/MockConfigurationDaoImpl.java |    18 +-
 .../cloud/simulator/dao/MockHostDaoImpl.java    |     7 +-
 .../simulator/dao/MockSecStorageDaoImpl.java    |     7 +-
 .../simulator/dao/MockSecurityRulesDaoImpl.java |    14 +-
 .../cloud/simulator/dao/MockStoragePoolDao.java |     1 +
 .../simulator/dao/MockStoragePoolDaoImpl.java   |     7 +-
 .../com/cloud/simulator/dao/MockVMDaoImpl.java  |    18 +-
 .../cloud/simulator/dao/MockVolumeDaoImpl.java  |    10 +-
 .../SimulatorImageStoreProviderImpl.java        |    17 +-
 .../src/com/cloud/ucs/database/UcsBladeVO.java  |     2 +
 .../com/cloud/ucs/database/UcsManagerDao.java   |    10 -
 .../src/com/cloud/ucs/manager/UcsCommands.java  |    64 +-
 .../com/cloud/ucs/manager/UcsManagerImpl.java   |     5 +-
 .../apache/cloudstack/api/AddUcsManagerCmd.java |    15 +-
 .../api/AssociateUcsProfileToBladeCmd.java      |    13 +-
 .../cloudstack/api/DeleteUcsManagerCmd.java     |    23 +-
 .../apache/cloudstack/api/ListUcsBladeCmd.java  |    14 +-
 .../cloudstack/api/ListUcsManagerCmd.java       |    17 +-
 .../cloudstack/api/ListUcsProfileCmd.java       |    22 +-
 .../api/response/UcsBladeResponse.java          |     3 +-
 .../api/response/UcsManagerResponse.java        |     6 +-
 .../api/response/UcsProfileResponse.java        |     3 +-
 .../api/commands/DeleteCiscoNexusVSMCmd.java    |     6 +-
 .../api/commands/DisableCiscoNexusVSMCmd.java   |    12 +-
 .../api/commands/EnableCiscoNexusVSMCmd.java    |    14 +-
 .../api/commands/ListCiscoNexusVSMsCmd.java     |    23 +-
 .../api/response/CiscoNexusVSMResponse.java     |     5 +-
 .../com/cloud/hypervisor/guru/VMwareGuru.java   |    28 +-
 .../com/cloud/hypervisor/vmware/LegacyZone.java |     1 +
 .../hypervisor/vmware/VmwareDatacenter.java     |     1 +
 .../vmware/VmwareDatacenterZoneMap.java         |     1 +
 .../vmware/VmwareServerDiscoverer.java          |    42 +-
 .../vmware/manager/VmwareHostService.java       |     3 +-
 .../vmware/manager/VmwareManager.java           |     5 +-
 .../vmware/manager/VmwareManagerImpl.java       |    19 +-
 .../vmware/manager/VmwareStorageManager.java    |     4 +-
 .../manager/VmwareStorageManagerImpl.java       |    62 +-
 .../vmware/resource/VmwareContextFactory.java   |     2 +-
 .../vmware/resource/VmwareResource.java         |   288 +-
 .../com/cloud/network/CiscoNexusVSMDevice.java  |     1 +
 .../network/CiscoNexusVSMDeviceManagerImpl.java |    11 +-
 .../cloud/network/CiscoNexusVSMDeviceVO.java    |     2 -
 .../network/dao/CiscoNexusVSMDeviceDao.java     |     1 +
 .../network/dao/CiscoNexusVSMDeviceDaoImpl.java |     7 +
 .../network/element/CiscoNexusVSMElement.java   |    17 +-
 .../PremiumSecondaryStorageResource.java        |     3 +-
 .../VmwareSecondaryStorageContextFactory.java   |     2 -
 .../VmwareSecondaryStorageResourceHandler.java  |    26 +-
 .../resource/VmwareStorageLayoutHelper.java     |     3 +-
 .../resource/VmwareStorageProcessor.java        |    93 +-
 .../VmwareStorageSubsystemCommandHandler.java   |    20 +-
 .../api/command/admin/zone/AddVmwareDcCmd.java  |     3 +-
 .../command/admin/zone/ListVmwareDcsCmd.java    |     3 +-
 .../command/admin/zone/RemoveVmwareDcCmd.java   |     2 +-
 .../motion/VmwareStorageMotionStrategy.java     |     5 +-
 .../vmware/VmwareDatacenterApiUnitTest.java     |    18 +-
 .../vmware/resource/VmwareResourceTest.java     |    21 +-
 .../motion/VmwareStorageMotionStrategyTest.java |    40 +-
 .../xen/discoverer/XcpServerDiscoverer.java     |    24 +-
 .../hypervisor/xen/resource/CitrixHelper.java   |     4 +-
 .../xen/resource/CitrixResourceBase.java        |   457 +-
 .../hypervisor/xen/resource/XcpOssResource.java |    14 +-
 .../xen/resource/XcpServerResource.java         |    27 +-
 .../xen/resource/XenServer56FP1Resource.java    |    21 +-
 .../xen/resource/XenServer56Resource.java       |    19 +-
 .../xen/resource/XenServer56SP2Resource.java    |     3 +-
 .../xen/resource/XenServer600Resource.java      |     2 +-
 .../xen/resource/XenServer602Resource.java      |     2 +-
 .../xen/resource/XenServer610Resource.java      |    28 +-
 .../xen/resource/XenServer620Resource.java      |     2 +-
 .../xen/resource/XenServerConnectionPool.java   |    15 +-
 .../xen/resource/XenServerPoolVms.java          |     7 +-
 .../xen/resource/XenServerStorageProcessor.java |   114 +-
 .../motion/XenServerStorageMotionStrategy.java  |     8 +-
 .../xen/resource/CitrixResourceBaseTest.java    |    42 +-
 .../api/commands/AddBigSwitchVnsDeviceCmd.java  |     3 +-
 .../commands/DeleteBigSwitchVnsDeviceCmd.java   |     3 +-
 .../commands/ListBigSwitchVnsDevicesCmd.java    |    11 +-
 .../response/BigSwitchVnsDeviceResponse.java    |     4 +-
 .../com/cloud/network/BigSwitchVnsDeviceVO.java |     1 +
 .../network/element/BigSwitchVnsElement.java    |    25 +-
 .../guru/BigSwitchVnsGuestNetworkGuru.java      |    11 +-
 .../network/resource/BigSwitchVnsResource.java  |     4 +-
 .../network/bigswitch/BigSwitchApiTest.java     |     6 +-
 .../resource/BigSwitchVnsResourceTest.java      |    15 +-
 .../commands/AddCiscoAsa1000vResourceCmd.java   |     7 +-
 .../api/commands/AddCiscoVnmcResourceCmd.java   |     7 +-
 .../DeleteCiscoAsa1000vResourceCmd.java         |     7 +-
 .../commands/DeleteCiscoVnmcResourceCmd.java    |    13 +-
 .../commands/ListCiscoAsa1000vResourcesCmd.java |     6 +-
 .../api/commands/ListCiscoVnmcResourcesCmd.java |     6 +-
 .../response/CiscoAsa1000vResourceResponse.java |     3 +-
 .../api/response/CiscoVnmcResourceResponse.java |     3 +-
 .../network/cisco/CiscoAsa1000vDevice.java      |     2 +
 .../network/cisco/CiscoVnmcConnection.java      |     7 +-
 .../network/cisco/CiscoVnmcConnectionImpl.java  |    18 +-
 .../network/cisco/CiscoVnmcController.java      |     2 +
 .../cloud/network/cisco/NetworkAsa1000vMap.java |     1 +
 .../cloud/network/element/CiscoVnmcElement.java |    58 +-
 .../network/resource/CiscoVnmcResource.java     |    22 +-
 .../network/cisco/CiscoVnmcConnectionTest.java  |     1 -
 .../network/resource/CiscoVnmcResourceTest.java |    22 +-
 .../cloudstack/network/element/DnsNotifier.java |    12 +-
 .../src/com/cloud/network/ElasticLbVmMapVO.java |     4 +-
 .../element/ElasticLoadBalancerElement.java     |    12 +-
 .../lb/ElasticLoadBalancerManagerImpl.java      |    48 +-
 .../network/lb/dao/ElasticLbVmMapDaoImpl.java   |     9 +-
 .../commands/AddExternalLoadBalancerCmd.java    |     7 +-
 .../api/commands/AddF5LoadBalancerCmd.java      |    12 +-
 .../commands/ConfigureF5LoadBalancerCmd.java    |    10 +-
 .../commands/DeleteExternalLoadBalancerCmd.java |    15 +-
 .../api/commands/DeleteF5LoadBalancerCmd.java   |     8 +-
 .../commands/ListExternalLoadBalancersCmd.java  |     7 +-
 .../commands/ListF5LoadBalancerNetworksCmd.java |     7 +-
 .../api/commands/ListF5LoadBalancersCmd.java    |    19 +-
 .../api/response/F5LoadBalancerResponse.java    |     7 +-
 .../element/F5ExternalLoadBalancerElement.java  |    28 +-
 .../F5ExternalLoadBalancerElementService.java   |     4 +-
 .../cloud/network/resource/F5BigIpResource.java |    11 +-
 .../element/InternalLoadBalancerElement.java    |    17 +-
 .../lb/InternalLoadBalancerVMManagerImpl.java   |    58 +-
 .../InternalLbElementServiceTest.java           |     6 +-
 .../InternalLbElementTest.java                  |     5 +-
 .../InternalLBVMManagerTest.java                |    23 +-
 .../InternalLBVMServiceTest.java                |    18 +-
 .../api/command/CreateServiceInstanceCmd.java   |    73 +-
 .../api/response/ServiceInstanceResponse.java   |    30 +-
 .../management/ContrailElementImpl.java         |    90 +-
 .../contrail/management/ContrailGuru.java       |    82 +-
 .../contrail/management/ContrailManager.java    |    48 +-
 .../management/ContrailManagerImpl.java         |   166 +-
 .../contrail/management/DBSyncGeneric.java      |    46 +-
 .../network/contrail/management/EventUtils.java |    41 +-
 .../management/ManagementNetworkGuru.java       |    11 +-
 .../contrail/management/ModelDatabase.java      |     5 +-
 .../contrail/management/ServerDBSync.java       |     7 +-
 .../contrail/management/ServerDBSyncImpl.java   |   233 +-
 .../management/ServerEventHandlerImpl.java      |    45 +-
 .../contrail/management/ServiceManager.java     |     5 +-
 .../contrail/management/ServiceManagerImpl.java |    85 +-
 .../management/ServiceVirtualMachine.java       |     8 +-
 .../network/contrail/model/FloatingIpModel.java |    22 +-
 .../contrail/model/FloatingIpPoolModel.java     |    19 +-
 .../network/contrail/model/InstanceIpModel.java |    22 +-
 .../network/contrail/model/ModelController.java |    13 +-
 .../network/contrail/model/ModelObject.java     |    10 +-
 .../network/contrail/model/ModelObjectBase.java |    15 +-
 .../contrail/model/ServiceInstanceModel.java    |    56 +-
 .../contrail/model/VMInterfaceModel.java        |    53 +-
 .../contrail/model/VirtualMachineModel.java     |    98 +-
 .../contrail/model/VirtualNetworkModel.java     |    74 +-
 .../management/ApiConnectorMockito.java         |    37 +-
 .../IntegrationTestConfiguration.java           |   469 +-
 .../management/ManagementServerMock.java        |   195 +-
 .../contrail/management/MockAccountManager.java |   105 +-
 .../management/NetworkProviderTest.java         |   113 +-
 .../contrail/management/PublicNetworkTest.java  |    31 +-
 .../contrail/management/TestDbSetup.java        |    83 +-
 .../management/VirtualNetworkModelTest.java     |    24 +-
 .../api/commands/AddExternalFirewallCmd.java    |     7 +-
 .../cloud/api/commands/AddSrxFirewallCmd.java   |     9 +-
 .../api/commands/ConfigureSrxFirewallCmd.java   |    12 +-
 .../api/commands/DeleteExternalFirewallCmd.java |     5 +-
 .../api/commands/DeleteSrxFirewallCmd.java      |    12 +-
 .../api/commands/ListExternalFirewallsCmd.java  |     9 +-
 .../commands/ListSrxFirewallNetworksCmd.java    |    10 +-
 .../cloud/api/commands/ListSrxFirewallsCmd.java |    12 +-
 .../cloud/api/response/SrxFirewallResponse.java |     7 +-
 .../JuniperSRXExternalFirewallElement.java      |    19 +-
 .../JuniperSRXFirewallElementService.java       |     4 +-
 .../network/resource/JuniperSrxResource.java    |    52 +-
 .../cloud/network/element/MidoNetElement.java   |   159 +-
 .../network/element/SimpleFirewallRule.java     |    18 +-
 .../network/guru/MidoNetGuestNetworkGuru.java   |    33 +-
 .../network/guru/MidoNetPublicNetworkGuru.java  |    14 +-
 .../network/resource/MidoNetVifDriver.java      |    30 +-
 .../network/element/MidoNetElementTest.java     |    43 +-
 .../commands/AddNetscalerLoadBalancerCmd.java   |    35 +-
 .../ConfigureNetscalerLoadBalancerCmd.java      |    16 +-
 .../DeleteNetscalerLoadBalancerCmd.java         |     6 +-
 .../ListNetscalerLoadBalancerNetworksCmd.java   |    11 +-
 .../commands/ListNetscalerLoadBalancersCmd.java |     9 +-
 .../response/NetscalerLoadBalancerResponse.java |    11 +-
 .../src/com/cloud/network/NetScalerPodVO.java   |     7 +-
 .../cloud/network/element/NetscalerElement.java |    70 +-
 .../NetscalerLoadBalancerElementService.java    |     1 +
 .../network/resource/NetscalerResource.java     |   179 +-
 .../api/commands/AddNiciraNvpDeviceCmd.java     |     3 +-
 .../api/commands/DeleteNiciraNvpDeviceCmd.java  |    14 +-
 .../ListNiciraNvpDeviceNetworksCmd.java         |    14 +-
 .../api/commands/ListNiciraNvpDevicesCmd.java   |     4 +-
 .../api/response/NiciraNvpDeviceResponse.java   |     8 +-
 .../cloud/network/element/NiciraNvpElement.java |    54 +-
 .../network/guru/NiciraNvpGuestNetworkGuru.java |     9 +-
 .../com/cloud/network/nicira/NiciraNvpApi.java  |    14 +-
 .../network/resource/NiciraNvpResource.java     |     7 +-
 .../com/cloud/network/nicira/NatRuleTest.java   |     7 +-
 .../com/cloud/network/nicira/NiciraTagTest.java |     3 +-
 .../network/resource/NiciraNvpResourceTest.java |     2 +-
 .../com/cloud/network/element/OvsElement.java   |    11 +-
 .../cloud/network/guru/OvsGuestNetworkGuru.java |    10 +-
 .../cloud/network/ovs/OvsTunnelManagerImpl.java |     8 +-
 .../network/ovs/dao/OvsTunnelInterfaceVO.java   |     5 +-
 .../network/ovs/dao/OvsTunnelNetworkVO.java     |     5 +-
 .../api/commands/AddExternalFirewallCmd.java    |    29 +-
 .../api/commands/AddPaloAltoFirewallCmd.java    |    31 +-
 .../commands/ConfigurePaloAltoFirewallCmd.java  |    28 +-
 .../api/commands/DeleteExternalFirewallCmd.java |    21 +-
 .../api/commands/DeletePaloAltoFirewallCmd.java |    23 +-
 .../api/commands/ListExternalFirewallsCmd.java  |    19 +-
 .../ListPaloAltoFirewallNetworksCmd.java        |    26 +-
 .../api/commands/ListPaloAltoFirewallsCmd.java  |    25 +-
 .../api/response/PaloAltoFirewallResponse.java  |    57 +-
 .../PaloAltoExternalFirewallElement.java        |    44 +-
 .../element/PaloAltoFirewallElementService.java |    31 +-
 .../network/resource/PaloAltoResource.java      |  1471 +-
 .../cloud/network/utils/HttpClientWrapper.java  |    12 +-
 .../resource/MockablePaloAltoResource.java      |   213 +-
 .../network/resource/PaloAltoResourceTest.java  |   119 +-
 .../cloudstack/api/commands/AddSspCmd.java      |     6 +-
 .../cloudstack/api/commands/DeleteSspCmd.java   |     8 +-
 .../cloudstack/api/response/SspResponse.java    |     3 +-
 .../cloudstack/network/dao/SspUuidDaoImpl.java  |     1 +
 .../cloudstack/network/element/SspElement.java  |    21 +-
 .../network/guru/SspGuestNetworkGuru.java       |     7 +-
 .../network/element/SspClientTest.java          |     9 +-
 .../network/element/SspElementTest.java         |    16 +-
 .../network/guru/VxlanGuestNetworkGuru.java     |    21 +-
 .../network/guru/VxlanGuestNetworkGuruTest.java |    26 +-
 .../allocator/RandomStoragePoolAllocator.java   |     4 +-
 .../driver/CloudStackImageStoreDriverImpl.java  |     7 +-
 .../CloudStackImageStoreProviderImpl.java       |     4 +-
 .../driver/S3ImageStoreDriverImpl.java          |    14 +-
 .../provider/S3ImageStoreProviderImpl.java      |     4 +-
 .../driver/SampleImageStoreDriverImpl.java      |     1 +
 .../provider/SwiftImageStoreProviderImpl.java   |     4 +-
 .../CloudStackPrimaryDataStoreDriverImpl.java   |    27 +-
 ...CloudStackPrimaryDataStoreLifeCycleImpl.java |    11 +-
 .../SamplePrimaryDataStoreDriverImpl.java       |     5 +-
 .../driver/SolidfirePrimaryDataStoreDriver.java |    21 +-
 .../SolidFirePrimaryDataStoreLifeCycle.java     |     2 +-
 .../provider/SolidFireHostListener.java         |     7 +-
 .../SolidfirePrimaryDataStoreProvider.java      |     5 +-
 .../storage/datastore/util/SolidFireUtil.java   |    23 +-
 .../storage/test/ChildTestConfiguration.java    |     3 +-
 .../storage/test/TestConfiguration.java         |     5 +-
 .../cloudstack/storage/test/VolumeTest.java     |    10 +-
 .../api/command/LdapCreateAccountCmd.java       |     9 +-
 .../api/command/LdapDeleteConfigurationCmd.java |     3 +-
 .../api/command/LdapImportUsersCmd.java         |    35 +-
 .../api/command/LdapListConfigurationCmd.java   |     3 +-
 .../api/command/LdapListUsersCmd.java           |     8 +-
 .../api/command/LdapUserSearchCmd.java          |     3 +-
 .../api/response/LdapConfigurationResponse.java |     3 +-
 .../api/response/LdapUserResponse.java          |     4 +-
 .../cloudstack/ldap/LdapConfiguration.java      |     2 +-
 .../cloudstack/ldap/LdapContextFactory.java     |     3 +-
 .../apache/cloudstack/ldap/LdapManagerImpl.java |    13 +-
 .../apache/cloudstack/ldap/LdapUserManager.java |     6 +-
 .../ldap/dao/LdapConfigurationDaoImpl.java      |     3 +-
 .../cloud/server/auth/MD5UserAuthenticator.java |     1 +
 pom.xml                                         |     2 +-
 .../cloud/acl/AffinityGroupAccessChecker.java   |     6 +-
 server/src/com/cloud/acl/DomainChecker.java     |     7 +-
 .../allocator/impl/FirstFitAllocator.java       |    10 +-
 .../impl/FirstFitRoutingAllocator.java          |     3 +-
 .../allocator/impl/RecreateHostAllocator.java   |    10 +-
 .../impl/UserConcentratedAllocator.java         |    22 +-
 .../src/com/cloud/alert/AlertManagerImpl.java   |    62 +-
 .../cloud/alert/ConsoleProxyAlertAdapter.java   |    70 +-
 .../alert/SecondaryStorageVmAlertAdapter.java   |    96 +-
 server/src/com/cloud/api/ApiDBUtils.java        |     4 +-
 server/src/com/cloud/api/ApiDispatcher.java     |    36 +-
 server/src/com/cloud/api/ApiGsonHelper.java     |     5 +-
 .../com/cloud/api/ApiResponseGsonHelper.java    |     1 +
 server/src/com/cloud/api/ApiResponseHelper.java |     8 +-
 server/src/com/cloud/api/ApiServer.java         |    91 +-
 server/src/com/cloud/api/ApiServerService.java  |     4 +-
 server/src/com/cloud/api/ApiServlet.java        |    28 +-
 .../com/cloud/api/EncodedStringTypeAdapter.java |     3 +-
 .../cloud/api/ResponseObjectTypeAdapter.java    |     9 +-
 .../src/com/cloud/api/doc/ApiXmlDocWriter.java  |    10 +-
 server/src/com/cloud/api/doc/Argument.java      |     1 +
 .../com/cloud/api/query/QueryManagerImpl.java   |   119 +-
 .../com/cloud/api/query/ViewResponseHelper.java |    58 +-
 .../cloud/api/query/dao/AccountJoinDaoImpl.java |    16 +-
 .../api/query/dao/AffinityGroupJoinDao.java     |     2 +-
 .../api/query/dao/AffinityGroupJoinDaoImpl.java |     4 +-
 .../api/query/dao/DataCenterJoinDaoImpl.java    |     5 +-
 .../api/query/dao/DiskOfferingJoinDao.java      |     1 +
 .../api/query/dao/DomainRouterJoinDaoImpl.java  |    10 +-
 .../com/cloud/api/query/dao/HostJoinDao.java    |     3 +-
 .../cloud/api/query/dao/HostJoinDaoImpl.java    |     8 +-
 .../cloud/api/query/dao/ImageStoreJoinDao.java  |     1 +
 .../api/query/dao/ImageStoreJoinDaoImpl.java    |     6 +-
 .../api/query/dao/InstanceGroupJoinDaoImpl.java |     7 +-
 .../query/dao/ProjectAccountJoinDaoImpl.java    |     2 +-
 .../query/dao/ProjectInvitationJoinDaoImpl.java |     2 +-
 .../cloud/api/query/dao/ProjectJoinDaoImpl.java |     6 +-
 .../api/query/dao/ResourceTagJoinDaoImpl.java   |     5 +-
 .../api/query/dao/SecurityGroupJoinDaoImpl.java |     6 +-
 .../query/dao/ServiceOfferingJoinDaoImpl.java   |     3 +-
 .../cloud/api/query/dao/StoragePoolJoinDao.java |     7 +-
 .../api/query/dao/StoragePoolJoinDaoImpl.java   |     6 +-
 .../api/query/dao/TemplateJoinDaoImpl.java      |     6 +-
 .../api/query/dao/UserAccountJoinDaoImpl.java   |     5 +-
 .../cloud/api/query/dao/UserVmJoinDaoImpl.java  |     9 +-
 .../cloud/api/query/dao/VolumeJoinDaoImpl.java  |     6 +-
 .../api/query/vo/ControlledViewEntity.java      |     1 -
 .../api/query/vo/ServiceOfferingJoinVO.java     |     4 +-
 .../com/cloud/api/query/vo/VolumeJoinVO.java    |     4 +-
 .../api/response/ApiResponseSerializer.java     |    38 +-
 .../response/EmptyFieldExclusionStrategy.java   |     3 +-
 .../api/response/SecurityGroupResultObject.java |     9 +-
 .../response/SecurityGroupRuleResultObject.java |     3 +-
 .../com/cloud/capacity/CapacityManagerImpl.java |   118 +-
 .../cloud/capacity/ComputeCapacityListener.java |     3 -
 .../cloud/capacity/StorageCapacityListener.java |    12 +-
 server/src/com/cloud/configuration/Config.java  |   303 +-
 .../configuration/ConfigurationManagerImpl.java |   258 +-
 .../AgentBasedConsoleProxyManager.java          |     3 +-
 ...AgentBasedStandaloneConsoleProxyManager.java |     5 +-
 .../com/cloud/consoleproxy/AgentHookBase.java   |    25 +-
 .../consoleproxy/ConsoleProxyManagerImpl.java   |    36 +-
 .../src/com/cloud/dc/DedicatedResourceVO.java   |    10 +-
 .../cloud/dc/dao/DedicatedResourceDaoImpl.java  |     3 +-
 .../deploy/DeploymentPlanningManagerImpl.java   |   116 +-
 .../src/com/cloud/deploy/FirstFitPlanner.java   |    45 +-
 .../cloud/deploy/PlannerHostReservationVO.java  |     1 +
 .../com/cloud/event/ActionEventInterceptor.java |     7 +-
 .../src/com/cloud/event/ActionEventUtils.java   |     9 +-
 server/src/com/cloud/event/AlertGenerator.java  |    32 +-
 .../com/cloud/event/dao/EventJoinDaoImpl.java   |     8 +-
 server/src/com/cloud/ha/HaWorkVO.java           |     4 +-
 .../ha/HighAvailabilityManagerExtImpl.java      |     1 -
 .../cloud/ha/HighAvailabilityManagerImpl.java   |    45 +-
 .../ha/ManagementIPSystemVMInvestigator.java    |     3 +-
 .../com/cloud/ha/UserVmDomRInvestigator.java    |     5 +-
 .../cloud/ha/dao/HighAvailabilityDaoImpl.java   |     1 -
 .../hypervisor/CloudZonesStartupProcessor.java  |     7 +-
 .../cloud/hypervisor/HypervisorGuruBase.java    |     7 +-
 .../hypervisor/HypervisorGuruManagerImpl.java   |     7 +-
 .../kvm/discoverer/KvmDummyResourceBase.java    |     5 +-
 .../kvm/discoverer/KvmServerDiscoverer.java     |     9 +-
 .../kvm/discoverer/LibvirtServerDiscoverer.java |     9 +-
 .../kvm/discoverer/LxcServerDiscoverer.java     |     8 +-
 .../com/cloud/keystore/KeystoreManagerImpl.java |     5 +-
 .../metadata/ResourceMetaDataManagerImpl.java   |     8 +-
 .../network/ExternalDeviceUsageManagerImpl.java |    21 +-
 .../ExternalFirewallDeviceManagerImpl.java      |    50 +-
 .../ExternalLoadBalancerDeviceManager.java      |     4 +-
 .../ExternalLoadBalancerDeviceManagerImpl.java  |    92 +-
 .../ExternalNetworkDeviceManagerImpl.java       |     6 +-
 .../com/cloud/network/IpAddressManagerImpl.java |   107 +-
 .../cloud/network/Ipv6AddressManagerImpl.java   |     5 +-
 .../src/com/cloud/network/NetworkModelImpl.java |    99 +-
 .../com/cloud/network/NetworkServiceImpl.java   |   259 +-
 .../com/cloud/network/NetworkUsageManager.java  |     1 -
 .../cloud/network/NetworkUsageManagerImpl.java  |    24 +-
 .../cloud/network/PortProfileManagerImpl.java   |     4 +-
 .../network/StorageNetworkManagerImpl.java      |    16 +-
 .../cloud/network/as/AutoScaleManagerImpl.java  |    30 +-
 .../element/CloudZonesNetworkElement.java       |     8 +-
 .../network/element/SecurityGroupElement.java   |    11 +-
 .../network/element/VirtualRouterElement.java   |   113 +-
 .../element/VpcVirtualRouterElement.java        |    30 +-
 .../network/firewall/FirewallManagerImpl.java   |    77 +-
 .../cloud/network/guru/ControlNetworkGuru.java  |    11 +-
 .../cloud/network/guru/DirectNetworkGuru.java   |    20 +-
 .../network/guru/DirectPodBasedNetworkGuru.java |     9 +-
 .../network/guru/ExternalGuestNetworkGuru.java  |    20 +-
 .../cloud/network/guru/GuestNetworkGuru.java    |    48 +-
 .../cloud/network/guru/PodBasedNetworkGuru.java |    12 +-
 .../cloud/network/guru/PrivateNetworkGuru.java  |    14 +-
 .../cloud/network/guru/PublicNetworkGuru.java   |    10 +-
 .../cloud/network/guru/StorageNetworkGuru.java  |    11 +-
 .../network/lb/LBHealthCheckManagerImpl.java    |     1 +
 .../lb/LoadBalancingRulesManagerImpl.java       |    86 +-
 .../router/VirtualNetworkApplianceManager.java  |    15 +-
 .../VirtualNetworkApplianceManagerImpl.java     |   496 +-
 .../VpcVirtualNetworkApplianceManager.java      |     6 +-
 .../VpcVirtualNetworkApplianceManagerImpl.java  |   116 +-
 .../cloud/network/rules/RulesManagerImpl.java   |    82 +-
 .../security/LocalSecurityGroupWorkQueue.java   |     1 -
 .../network/security/SecurityGroupListener.java |     8 +-
 .../security/SecurityGroupManagerImpl.java      |    37 +-
 .../security/SecurityGroupManagerImpl2.java     |    22 +-
 .../security/SecurityGroupManagerMBean.java     |     2 +-
 .../security/SecurityManagerMBeanImpl.java      |     1 -
 .../network/vpc/NetworkACLManagerImpl.java      |    13 +-
 .../network/vpc/NetworkACLServiceImpl.java      |    28 +-
 .../com/cloud/network/vpc/VpcManagerImpl.java   |    73 +-
 .../network/vpn/RemoteAccessVpnManagerImpl.java |    34 +-
 .../network/vpn/Site2SiteVpnManagerImpl.java    |    34 +-
 .../com/cloud/projects/ProjectManagerImpl.java  |    27 +-
 .../com/cloud/resource/ResourceManagerImpl.java |    70 +-
 .../resourcelimit/ResourceLimitManagerImpl.java |    59 +-
 .../PremiumSecondaryStorageManagerImpl.java     |    10 +-
 .../cloud/server/ConfigurationServerImpl.java   |   170 +-
 .../com/cloud/server/ManagementServerImpl.java  |    97 +-
 server/src/com/cloud/server/StatsCollector.java |    62 +-
 .../api/response/BaremetalTemplateResponse.java |     4 +-
 .../api/response/NwDeviceDhcpResponse.java      |     6 +-
 .../api/response/NwDevicePxeServerResponse.java |     6 +-
 .../server/api/response/PxePingResponse.java    |     4 +-
 .../netapp/AssociateLunCmdResponse.java         |     4 +-
 .../response/netapp/CreateLunCmdResponse.java   |     4 +-
 .../response/netapp/ListLunsCmdResponse.java    |     4 +-
 .../netapp/ListVolumePoolsCmdResponse.java      |     4 +-
 .../netapp/ListVolumesOnFilerCmdResponse.java   |     4 +-
 .../com/cloud/servlet/CloudStartupServlet.java  |     1 -
 .../com/cloud/servlet/ConsoleProxyServlet.java  |    11 +-
 .../cloud/storage/LocalStoragePoolListener.java |     3 +-
 server/src/com/cloud/storage/OCFS2Manager.java  |     1 -
 .../src/com/cloud/storage/OCFS2ManagerImpl.java |     5 +-
 .../com/cloud/storage/StorageManagerImpl.java   |    69 +-
 .../storage/StoragePoolAutomationImpl.java      |     2 +-
 .../src/com/cloud/storage/TemplateProfile.java  |    10 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java |    35 +-
 .../storage/download/DownloadActiveState.java   |     3 +-
 .../storage/download/DownloadErrorState.java    |     3 +-
 .../storage/download/DownloadListener.java      |     2 +-
 .../storage/download/DownloadMonitorImpl.java   |    11 +-
 .../storage/listener/SnapshotStateListener.java |    24 +-
 .../storage/listener/StoragePoolMonitor.java    |    10 +-
 .../storage/listener/VolumeStateListener.java   |    26 +-
 .../resource/DummySecondaryStorageResource.java |    11 +-
 .../secondary/SecondaryStorageManagerImpl.java  |    40 +-
 .../SecondaryStorageVmDefaultAllocator.java     |     1 -
 .../cloud/storage/snapshot/SnapshotManager.java |     7 -
 .../storage/snapshot/SnapshotManagerImpl.java   |    38 +-
 .../storage/snapshot/SnapshotSchedulerImpl.java |    12 +-
 .../cloud/storage/upload/UploadActiveState.java |     3 -
 .../storage/upload/UploadInactiveState.java     |     1 -
 .../cloud/storage/upload/UploadListener.java    |     5 +-
 .../com/cloud/storage/upload/UploadMonitor.java |     3 +-
 .../cloud/storage/upload/UploadMonitorImpl.java |    25 +-
 .../com/cloud/storage/upload/UploadState.java   |     1 -
 .../cloud/tags/TaggedResourceManagerImpl.java   |     8 +-
 .../template/HypervisorTemplateAdapter.java     |    23 +-
 .../src/com/cloud/template/TemplateAdapter.java |    14 +-
 .../com/cloud/template/TemplateAdapterBase.java |    49 +-
 .../com/cloud/template/TemplateManagerImpl.java |    46 +-
 server/src/com/cloud/test/DatabaseConfig.java   |    37 +-
 server/src/com/cloud/test/IPRangeConfig.java    |     7 +-
 server/src/com/cloud/test/PodZoneConfig.java    |    31 +-
 .../src/com/cloud/usage/UsageServiceImpl.java   |    11 +-
 .../src/com/cloud/user/AccountManagerImpl.java  |    43 +-
 .../src/com/cloud/user/DomainManagerImpl.java   |    29 +-
 .../cloud/uuididentity/IdentityServiceImpl.java |     7 +-
 .../cloud/uuididentity/dao/IdentityDaoImpl.java |    13 +-
 .../src/com/cloud/vm/SystemVmLoadScanner.java   |     1 +
 server/src/com/cloud/vm/UserVmManager.java      |     4 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java  |   335 +-
 .../src/com/cloud/vm/UserVmStateListener.java   |    46 +-
 .../vm/snapshot/VMSnapshotManagerImpl.java      |    29 +-
 .../affinity/AffinityGroupServiceImpl.java      |    31 +-
 .../lb/ApplicationLoadBalancerManagerImpl.java  |    32 +-
 .../cloudstack/network/lb/CertServiceImpl.java  |    91 +-
 .../apache/cloudstack/region/RegionManager.java |     1 -
 .../cloudstack/region/RegionManagerImpl.java    |    47 +-
 .../cloudstack/region/RegionServiceImpl.java    |    31 +-
 .../cloudstack/region/RegionsApiUtil.java       |     5 +-
 .../GlobalLoadBalancingRulesServiceImpl.java    |    69 +-
 .../region/gslb/GslbServiceProvider.java        |     3 +-
 server/test/com/cloud/api/APITest.java          |     3 +-
 .../test/com/cloud/api/ApiDispatcherTest.java   |    14 +-
 server/test/com/cloud/api/ListPerfTest.java     |     7 -
 server/test/com/cloud/api/LoginResponse.java    |     3 +-
 .../com/cloud/capacity/CapacityManagerTest.java |    19 +-
 .../configuration/ConfigurationManagerTest.java |    28 +-
 .../configuration/ValidateIpRangeTest.java      |    26 +-
 .../com/cloud/event/EventControlsUnitTest.java  |     6 +-
 server/test/com/cloud/ha/KVMFencerTest.java     |     7 +-
 .../test/com/cloud/keystore/KeystoreTest.java   |    56 +-
 .../cloud/network/CreatePrivateNetworkTest.java |    19 +-
 .../network/DedicateGuestVlanRangesTest.java    |     2 +-
 .../cloud/network/MockFirewallManagerImpl.java  |     3 +-
 .../network/UpdatePhysicalNetworkTest.java      |    32 +-
 .../SecurityGroupManagerTestConfiguration.java  |    25 +-
 .../security/SecurityGroupQueueTest.java        |     6 +-
 .../cloud/projects/MockProjectManagerImpl.java  |     5 -
 .../ResourceLimitManagerImplTest.java           |     1 +
 .../server/ConfigurationServerImplTest.java     |     6 +-
 .../com/cloud/snapshot/SnapshotDaoTest.java     |     6 +-
 .../snapshot/SnapshotDaoTestConfiguration.java  |     5 +-
 .../cloud/storage/dao/StoragePoolDaoTest.java   |     5 +-
 .../dao/StoragePoolDaoTestConfiguration.java    |     5 +-
 .../com/cloud/user/MockAccountManagerImpl.java  |    10 +-
 .../com/cloud/user/MockDomainManagerImpl.java   |     4 +-
 .../vm/DeploymentPlanningManagerImplTest.java   |   114 +-
 server/test/com/cloud/vm/UserVmManagerTest.java |    15 +-
 .../vm/dao/UserVmCloneSettingDaoImplTest.java   |     2 +-
 .../UserVmCloneSettingDaoTestConfiguration.java |     3 +-
 .../com/cloud/vm/dao/UserVmDaoImplTest.java     |     9 +-
 .../vm/dao/UserVmDaoTestConfiguration.java      |     3 +-
 .../vm/snapshot/VMSnapshotManagerTest.java      |    16 +-
 .../cloud/vpc/MockConfigurationManagerImpl.java |    10 +-
 .../com/cloud/vpc/MockNetworkManagerImpl.java   |    46 +-
 .../cloud/vpc/MockSite2SiteVpnManagerImpl.java  |     4 +-
 .../MockVpcVirtualNetworkApplianceManager.java  |    39 +-
 .../com/cloud/vpc/NetworkACLManagerTest.java    |    18 +-
 .../com/cloud/vpc/NetworkACLServiceTest.java    |    25 +-
 .../com/cloud/vpc/VpcTestConfiguration.java     |    37 +-
 .../com/cloud/vpc/dao/MockNetworkDaoImpl.java   |    11 +-
 .../vpc/dao/MockNetworkOfferingDaoImpl.java     |    30 +-
 .../affinity/AffinityApiUnitTest.java           |    30 +-
 .../network/lb/ApplicationLoadBalancerTest.java |    38 +-
 .../cloudstack/network/lb/CertServiceTest.java  |     7 +-
 .../networkoffering/ChildTestConfiguration.java |    33 +-
 .../CreateNetworkOfferingTest.java              |    65 +-
 .../privategw/AclOnPrivateGwTest.java           |    71 +-
 .../cloudstack/region/RegionManagerTest.java    |     6 +-
 ...GlobalLoadBalancingRulesServiceImplTest.java |    34 +-
 .../service/ServiceOfferingVOTest.java          |     7 +-
 .../src/main/java/common/AwtBellAdapter.java    |    71 +-
 .../src/main/java/common/AwtCanvasAdapter.java  |   224 +-
 .../main/java/common/AwtClipboardAdapter.java   |    51 +-
 .../src/main/java/common/AwtKeyEventSource.java |    38 +-
 .../main/java/common/AwtMouseEventSource.java   |    70 +-
 .../src/main/java/common/BitmapOrder.java       |    32 +-
 .../src/main/java/common/BitmapRectangle.java   |    76 +-
 .../main/java/common/BufferedImageCanvas.java   |    70 +-
 .../common/BufferedImageCopyRectAdapter.java    |   188 +-
 .../java/common/BufferedImagePixelsAdapter.java |   177 +-
 .../rdpconsole/src/main/java/common/Client.java |   185 +-
 .../src/main/java/common/CopyRectOrder.java     |    27 +-
 .../src/main/java/common/KeyOrder.java          |    29 +-
 .../src/main/java/common/MouseOrder.java        |    29 +-
 .../src/main/java/common/OrderType.java         |     2 +-
 .../src/main/java/common/ScreenDescription.java |   264 +-
 .../main/java/common/SizeChangeListener.java    |     2 +-
 .../java/rdpclient/AwtRdpKeyboardAdapter.java   |   591 +-
 .../main/java/rdpclient/AwtRdpMouseAdapter.java |   294 +-
 .../java/rdpclient/ClientConfirmActivePDU.java  |  1037 +-
 .../main/java/rdpclient/ClientFastPathPDU.java  |    38 +-
 .../src/main/java/rdpclient/ClientInfoPDU.java  |   393 +-
 .../rdpclient/ClientMCSAttachUserRequest.java   |    79 +-
 ...JoinRequest_ServerMCSChannelConfirmPDUs.java |   166 +-
 .../java/rdpclient/ClientMCSConnectInitial.java |    82 +-
 .../rdpclient/ClientMCSErectDomainRequest.java  |    91 +-
 .../java/rdpclient/ClientPacketSniffer.java     |    11 +-
 .../java/rdpclient/ClientSynchronizePDU.java    |    86 +-
 .../src/main/java/rdpclient/ClientTpkt.java     |    56 +-
 .../ClientX224ConnectionRequestPDU.java         |   242 +-
 .../main/java/rdpclient/ClientX224DataPdu.java  |    42 +-
 .../src/main/java/rdpclient/HandshakeEnd.java   |     6 +-
 .../src/main/java/rdpclient/MockServer.java     |   223 +-
 .../src/main/java/rdpclient/PacketSniffer.java  |    70 +-
 .../java/rdpclient/RLEBitmapDecompression.java  |  1871 ++-
 .../src/main/java/rdpclient/RdpClient.java      |   230 +-
 .../src/main/java/rdpclient/RdpConstants.java   |    96 +-
 .../src/main/java/rdpclient/RdpState.java       |    12 +-
 .../main/java/rdpclient/ServerBitmapUpdate.java |   307 +-
 .../java/rdpclient/ServerChannel1003Router.java |   985 +-
 .../rdpclient/ServerControlPDUCooperate.java    |    28 +-
 .../ServerControlPDUGrantedControl.java         |    28 +-
 .../java/rdpclient/ServerDemandActivePDU.java   |   737 +-
 .../src/main/java/rdpclient/ServerFastPath.java |   391 +-
 .../ServerLicenseErrorPDUValidClient.java       |    28 +-
 .../ServerMCSAttachUserConfirmPDU.java          |   155 +-
 .../ServerMCSChannelJoinConfirmPDU.java         |    32 +-
 .../rdpclient/ServerMCSConnectResponse.java     |    28 +-
 .../src/main/java/rdpclient/ServerMCSPDU.java   |   210 +-
 .../java/rdpclient/ServerPacketSniffer.java     |    14 +-
 .../java/rdpclient/ServerPaletteUpdate.java     |    73 +-
 .../java/rdpclient/ServerSynchronizePDU.java    |    28 +-
 .../src/main/java/rdpclient/ServerTpkt.java     |    66 +-
 .../ServerX224ConnectionConfirmPDU.java         |   342 +-
 .../main/java/rdpclient/ServerX224DataPdu.java  |    54 +-
 .../rdpclient/TrustAllX509TrustManager.java     |    26 +-
 .../main/java/rdpclient/UpgradeSocketToSSL.java |    24 +-
 .../main/java/streamer/AssertingByteBuffer.java |   138 +-
 .../src/main/java/streamer/BaseElement.java     |   714 +-
 .../src/main/java/streamer/BufferPool.java      |    30 +-
 .../src/main/java/streamer/ByteBuffer.java      |  1593 +-
 .../src/main/java/streamer/DataSink.java        |     4 +-
 .../src/main/java/streamer/DataSource.java      |    72 +-
 .../src/main/java/streamer/Direction.java       |     2 +-
 .../src/main/java/streamer/Element.java         |   162 +-
 .../src/main/java/streamer/Event.java           |    19 +-
 .../src/main/java/streamer/FakeSink.java        |    72 +-
 .../src/main/java/streamer/FakeSource.java      |   160 +-
 .../main/java/streamer/InputStreamSource.java   |   280 +-
 .../rdpconsole/src/main/java/streamer/Link.java |    68 +-
 .../src/main/java/streamer/MockSink.java        |   170 +-
 .../src/main/java/streamer/MockSource.java      |   117 +-
 .../src/main/java/streamer/OneTimeSwitch.java   |   200 +-
 .../src/main/java/streamer/Order.java           |     2 +-
 .../main/java/streamer/OutputStreamSink.java    |   238 +-
 .../src/main/java/streamer/Pipeline.java        |   118 +-
 .../src/main/java/streamer/PipelineImpl.java    |   484 +-
 .../src/main/java/streamer/Queue.java           |   212 +-
 .../src/main/java/streamer/SocketWrapper.java   |   316 +-
 .../src/main/java/streamer/SyncLink.java        |   661 +-
 .../vncclient/AwtKeyboardEventToVncAdapter.java |   631 +-
 .../vncclient/AwtMouseEventToVncAdapter.java    |    73 +-
 .../main/java/vncclient/EncodingsMessage.java   |    52 +-
 .../vncclient/FrameBufferUpdateRequest.java     |   173 +-
 .../vncclient/RGB888LE32PixelFormatRequest.java |   129 +-
 .../src/main/java/vncclient/RfbConstants.java   |   124 +-
 .../src/main/java/vncclient/VncClient.java      |   105 +-
 .../src/main/java/vncclient/VncInitializer.java |   423 +-
 .../main/java/vncclient/VncMessageHandler.java  |   695 +-
 .../java/vncclient/Vnc_3_3_Authentication.java  |   451 +-
 .../src/main/java/vncclient/Vnc_3_3_Hello.java  |   111 +-
 .../src/test/java/rdpclient/MockServerTest.java |   262 +-
 .../com/cloud/consoleproxy/ConsoleProxy.java    |    17 +-
 .../consoleproxy/ConsoleProxyAjaxHandler.java   |     7 +-
 .../ConsoleProxyAjaxImageHandler.java           |     4 +-
 .../ConsoleProxyBaseServerFactoryImpl.java      |     3 +-
 .../consoleproxy/ConsoleProxyClientBase.java    |    22 +-
 .../consoleproxy/ConsoleProxyCmdHandler.java    |     4 +-
 .../consoleproxy/ConsoleProxyLoggerFactory.java |    14 +
 .../ConsoleProxyResourceHandler.java            |     4 +-
 .../ConsoleProxySecureServerFactoryImpl.java    |     2 +
 .../ConsoleProxyThumbnailHandler.java           |     4 +-
 .../consoleproxy/ConsoleProxyVncClient.java     |     9 +-
 .../com/cloud/consoleproxy/util/RawHTTP.java    |     3 +
 .../com/cloud/consoleproxy/vnc/VncClient.java   |     1 +
 .../consoleproxy/vnc/VncClientPacketSender.java |     9 +-
 .../consoleproxy/vnc/VncScreenDescription.java  |     9 +-
 .../vnc/VncServerPacketReceiver.java            |     4 +-
 .../packet/server/FramebufferUpdatePacket.java  |     6 +-
 .../consoleproxy/vnc/packet/server/RawRect.java |     2 +-
 .../LocalNfsSecondaryStorageResource.java       |    30 +-
 .../resource/LocalSecondaryStorageResource.java |     6 +-
 .../resource/NfsSecondaryStorageResource.java   |    53 +-
 .../resource/SecondaryStorageDiscoverer.java    |     3 +-
 .../storage/template/DownloadManager.java       |    10 +-
 .../storage/template/DownloadManagerImpl.java   |    36 +-
 .../storage/template/UploadManagerImpl.java     |    17 +-
 .../com/cloud/sample/UserCloudAPIExecutor.java  |     4 +-
 .../cloud/test/longrun/BuildGuestNetwork.java   |     4 +-
 .../cloud/test/longrun/PerformanceWithAPI.java  |    45 +-
 test/src/com/cloud/test/longrun/User.java       |    54 +-
 .../com/cloud/test/longrun/VirtualMachine.java  |    37 +-
 .../com/cloud/test/longrun/guestNetwork.java    |    18 +-
 .../com/cloud/test/regression/ApiCommand.java   |    69 +-
 .../com/cloud/test/regression/ConfigTest.java   |    41 +-
 .../test/regression/DelegatedAdminTest.java     |    37 +-
 test/src/com/cloud/test/regression/Deploy.java  |     7 +-
 .../cloud/test/regression/EventsApiTest.java    |    45 +-
 test/src/com/cloud/test/regression/HA.java      |    15 +-
 .../test/regression/LoadBalancingTest.java      |    22 +-
 .../test/regression/PortForwardingTest.java     |    22 +-
 .../com/cloud/test/regression/SanityTest.java   |    32 +-
 test/src/com/cloud/test/regression/Test.java    |     6 +-
 .../cloud/test/regression/TestCaseEngine.java   |    47 +-
 .../com/cloud/test/regression/VMApiTest.java    |    27 +-
 .../test/stress/StressTestDirectAttach.java     |   451 +-
 .../cloud/test/stress/TestClientWithAPI.java    |   108 +-
 test/src/com/cloud/test/stress/WgetTest.java    |    20 +-
 .../cloud/test/ui/AbstractSeleniumTestCase.java |     9 +-
 .../src/com/cloud/test/ui/AddAndDeleteAISO.java |    21 +-
 .../cloud/test/ui/AddAndDeleteATemplate.java    |    24 +-
 test/src/com/cloud/test/ui/UIScenarioTest.java  |    14 +-
 test/src/com/cloud/test/utils/ConsoleProxy.java |    14 +-
 .../com/cloud/test/utils/IpSqlGenerator.java    |     8 +-
 .../src/com/cloud/test/utils/ProxyLoadTemp.java |    24 +-
 test/src/com/cloud/test/utils/SignEC2.java      |     3 +-
 test/src/com/cloud/test/utils/SubmitCert.java   |     7 +-
 test/src/com/cloud/test/utils/TestClient.java   |    11 +-
 test/src/com/cloud/test/utils/UtilsForTest.java |    45 +-
 .../com/cloud/usage/UsageAlertManagerImpl.java  |    30 +-
 usage/src/com/cloud/usage/UsageManager.java     |     1 -
 usage/src/com/cloud/usage/UsageManagerImpl.java |   150 +-
 .../src/com/cloud/usage/UsageSanityChecker.java |    43 +-
 .../usage/parser/IPAddressUsageParser.java      |    17 +-
 .../usage/parser/LoadBalancerUsageParser.java   |    13 +-
 .../parser/NetworkOfferingUsageParser.java      |    16 +-
 .../cloud/usage/parser/NetworkUsageParser.java  |    20 +-
 .../usage/parser/PortForwardingUsageParser.java |    13 +-
 .../usage/parser/SecurityGroupUsageParser.java  |    13 +-
 .../cloud/usage/parser/StorageUsageParser.java  |    17 +-
 .../src/com/cloud/usage/parser/UsageParser.java |     4 +-
 .../usage/parser/VMInstanceUsageParser.java     |    13 +-
 .../usage/parser/VMSnapshotUsageParser.java     |    15 +-
 .../cloud/usage/parser/VPNUserUsageParser.java  |    15 +-
 .../cloud/usage/parser/VmDiskUsageParser.java   |    29 +-
 .../cloud/usage/parser/VolumeUsageParser.java   |    19 +-
 .../test/com/cloud/usage/UsageManagerTest.java  |    47 +-
 .../usage/UsageManagerTestConfiguration.java    |    57 +-
 utils/src/com/cloud/utils/IteratorUtil.java     |     6 +
 utils/src/com/cloud/utils/MethodCapturer.java   |     3 +-
 .../src/com/cloud/utils/PasswordGenerator.java  |     4 +-
 utils/src/com/cloud/utils/Profiler.java         |     1 +
 utils/src/com/cloud/utils/PropertiesUtil.java   |     2 +-
 utils/src/com/cloud/utils/S3Utils.java          |    18 +-
 utils/src/com/cloud/utils/SwiftUtil.java        |    24 +-
 utils/src/com/cloud/utils/UriUtils.java         |     6 +-
 .../utils/cisco/n1kv/vsm/NetconfHelper.java     |    16 +-
 .../cloud/utils/cisco/n1kv/vsm/VsmCommand.java  |     1 +
 .../utils/cisco/n1kv/vsm/VsmOkResponse.java     |     1 +
 .../cisco/n1kv/vsm/VsmPolicyMapResponse.java    |     2 +-
 .../cisco/n1kv/vsm/VsmPortProfileResponse.java  |     9 +-
 .../cloud/utils/cisco/n1kv/vsm/VsmResponse.java |    12 +-
 .../utils/component/ComponentNamingPolicy.java  |     3 +
 .../cloud/utils/component/PluggableService.java |     1 -
 .../com/cloud/utils/encoding/URLEncoder.java    |     6 +-
 .../com/cloud/utils/events/SubscriptionMgr.java |     4 +-
 .../utils/exception/ExecutionException.java     |     1 -
 utils/src/com/cloud/utils/fsm/StateMachine.java |     2 +-
 .../src/com/cloud/utils/fsm/StateMachine2.java  |     2 +-
 utils/src/com/cloud/utils/mgmt/JmxUtil.java     |     3 +-
 .../utils/mgmt/PropertyMapDynamicBean.java      |     2 +-
 utils/src/com/cloud/utils/net/MacAddress.java   |     4 +-
 utils/src/com/cloud/utils/net/NetUtils.java     |     2 +-
 .../com/cloud/utils/nio/TrustAllManager.java    |     3 +
 utils/src/com/cloud/utils/script/Script.java    |     1 +
 utils/src/com/cloud/utils/script/Script2.java   |     1 +
 .../src/com/cloud/utils/ssh/SSHKeysHelper.java  |     4 +-
 utils/src/com/cloud/utils/ssh/SshHelper.java    |    13 +-
 .../cloud/utils/storage/encoding/Decoder.java   |    10 +-
 .../ssl/EasySSLProtocolSocketFactory.java       |    10 +-
 utils/test/com/cloud/utils/NumbersUtilTest.java |     8 +-
 utils/test/com/cloud/utils/ReflectUtilTest.java |    12 +-
 utils/test/com/cloud/utils/ScriptTest.java      |     5 +-
 utils/test/com/cloud/utils/StringUtilsTest.java |     4 +-
 .../com/cloud/utils/crypto/RSAHelperTest.java   |    27 +-
 .../utils/exception/ExceptionUtilTest.java      |     2 +-
 .../test/com/cloud/utils/net/NetUtilsTest.java  |     3 +-
 .../com/cloud/utils/ssh/SSHKeysHelperTest.java  |    52 +-
 .../utils/testcase/Log4jEnabledTestCase.java    |     5 +-
 .../test/com/cloud/utils/testcase/NioTest.java  |    16 +-
 .../cloud/utils/xmlobject/TestXmlObject.java    |     4 -
 .../cloud/utils/xmlobject/TestXmlObject2.java   |     9 +-
 .../com/cloud/hypervisor/vmware/mo/BaseMO.java  |     3 +-
 .../cloud/hypervisor/vmware/mo/ClusterMO.java   |    31 +-
 .../vmware/mo/CustomFieldsManagerMO.java        |     4 +-
 .../hypervisor/vmware/mo/DatacenterMO.java      |    12 +-
 .../cloud/hypervisor/vmware/mo/DatastoreMO.java |     8 +-
 .../vmware/mo/DistributedVirtualSwitchMO.java   |     3 +-
 .../vmware/mo/HostDatastoreBrowserMO.java       |     3 +-
 .../vmware/mo/HostDatastoreSystemMO.java        |     3 +-
 .../vmware/mo/HostFirewallSystemMO.java         |     3 +-
 .../com/cloud/hypervisor/vmware/mo/HostMO.java  |    69 +-
 .../vmware/mo/HostNetworkSystemMO.java          |     3 +-
 .../vmware/mo/HostStorageSystemMO.java          |     4 +-
 .../hypervisor/vmware/mo/HttpNfcLeaseMO.java    |     8 +-
 .../vmware/mo/HypervisorHostHelper.java         |    48 +-
 .../cloud/hypervisor/vmware/mo/NetworkMO.java   |     3 +-
 .../hypervisor/vmware/mo/PerfManagerMO.java     |     7 +-
 .../vmware/mo/SnapshotDescriptor.java           |     5 +-
 .../com/cloud/hypervisor/vmware/mo/TaskMO.java  |     3 +-
 .../vmware/mo/VirtualDiskManagerMO.java         |     7 +-
 .../hypervisor/vmware/mo/VirtualMachineMO.java  |    44 +-
 .../vmware/mo/VmwareHypervisorHost.java         |     5 +-
 .../hypervisor/vmware/util/VmwareClient.java    |     5 +-
 .../hypervisor/vmware/util/VmwareContext.java   |    64 +-
 .../vmware/util/VmwareContextPool.java          |     8 +-
 .../hypervisor/vmware/util/VmwareHelper.java    |    12 +-
 .../vmware/mo/TestVmwareContextFactory.java     |     2 +-
 .../hypervisor/vmware/mo/VmwareMOTest.java      |     2 -
 3156 files changed, 43769 insertions(+), 36087 deletions(-)
----------------------------------------------------------------------



Mime
View raw message