cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject [50/50] [abbrv] git commit: updated refs/heads/rbac to 929fbab
Date Fri, 17 Jan 2014 22:40:52 GMT
Merge branch 'master' into rbac.


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

Branch: refs/heads/rbac
Commit: 929fbabaa27731abd285c6e3c92fccfec5f3d535
Parents: b725035 da8ee45
Author: Min Chen <min.chen@citrix.com>
Authored: Fri Jan 17 14:37:08 2014 -0800
Committer: Min Chen <min.chen@citrix.com>
Committed: Fri Jan 17 14:37:08 2014 -0800

----------------------------------------------------------------------
 .gitignore                                      |      4 +
 CHANGES                                         |      1 +
 LICENSE.header                                  |     16 +
 agent/pom.xml                                   |     35 +-
 agent/src/com/cloud/agent/Agent.java            |    170 +-
 agent/src/com/cloud/agent/AgentShell.java       |    110 +-
 .../com/cloud/agent/dao/StorageComponent.java   |      2 +-
 .../cloud/agent/dao/impl/PropertiesStorage.java |     15 +-
 .../agent/dhcp/DhcpProtocolParserServer.java    |     12 +-
 agent/src/com/cloud/agent/dhcp/DhcpSnooper.java |      1 +
 .../com/cloud/agent/dhcp/FakeDhcpSnooper.java   |     74 +-
 agent/src/com/cloud/agent/mockvm/MockVm.java    |      5 +-
 agent/src/com/cloud/agent/mockvm/MockVmMgr.java |     33 +-
 agent/src/com/cloud/agent/mockvm/VmMgr.java     |      7 +-
 .../com/cloud/agent/resource/DummyResource.java |    140 +-
 .../ConsoleProxyAuthenticationResult.java       |      2 +-
 .../consoleproxy/ConsoleProxyResource.java      |    209 +-
 .../com/cloud/agent/vmdata/VmDataServer.java    |      2 +-
 agent/test/com/cloud/agent/AgentShellTest.java  |      4 +-
 .../agent/dao/impl/PropertiesStorageTest.java   |      6 +-
 api/pom.xml                                     |      2 +-
 .../cloud/agent/api/HostVmStateReportEntry.java |     58 +
 api/src/com/cloud/agent/api/LogLevel.java       |      6 +-
 .../com/cloud/agent/api/PvlanSetupCommand.java  |    192 +-
 .../com/cloud/agent/api/StoragePoolInfo.java    |    108 +-
 .../CopyTemplateToPrimaryStorageAnswer.java     |      1 +
 .../api/storage/CreateVolumeOVAAnswer.java      |     52 +-
 .../api/storage/CreateVolumeOVACommand.java     |    120 +-
 .../cloud/agent/api/storage/PasswordAuth.java   |      4 +
 .../api/storage/PrepareOVAPackingAnswer.java    |     52 +-
 .../api/storage/PrepareOVAPackingCommand.java   |     94 +-
 .../com/cloud/agent/api/to/DataObjectType.java  |      4 +-
 api/src/com/cloud/agent/api/to/DataStoreTO.java |      2 +
 api/src/com/cloud/agent/api/to/DataTO.java      |      3 +
 api/src/com/cloud/agent/api/to/DhcpTO.java      |     13 +-
 api/src/com/cloud/agent/api/to/DiskTO.java      |      4 +-
 .../com/cloud/agent/api/to/FirewallRuleTO.java  |    131 +-
 api/src/com/cloud/agent/api/to/IpAddressTO.java |      7 +-
 .../com/cloud/agent/api/to/LoadBalancerTO.java  |     95 +-
 .../cloud/agent/api/to/MonitorServiceTO.java    |     71 +
 .../com/cloud/agent/api/to/NetworkACLTO.java    |     39 +-
 api/src/com/cloud/agent/api/to/NetworkTO.java   |      2 +-
 api/src/com/cloud/agent/api/to/NfsTO.java       |      8 +-
 api/src/com/cloud/agent/api/to/NicTO.java       |      2 +-
 .../agent/api/to/PortForwardingRuleTO.java      |      9 +-
 api/src/com/cloud/agent/api/to/S3TO.java        |     64 +-
 .../com/cloud/agent/api/to/StaticNatRuleTO.java |     40 +-
 api/src/com/cloud/agent/api/to/SwiftTO.java     |      4 +-
 api/src/com/cloud/agent/api/to/TemplateTO.java  |      1 +
 .../cloud/agent/api/to/VirtualMachineTO.java    |     18 +-
 api/src/com/cloud/agent/api/to/VolumeTO.java    |     21 +-
 .../agent/manager/allocator/HostAllocator.java  |     88 +-
 .../agent/manager/allocator/PodAllocator.java   |      2 +-
 api/src/com/cloud/alert/Alert.java              |     10 +
 .../ListRecurringSnapshotScheduleCmd.java       |      6 +-
 api/src/com/cloud/capacity/CapacityState.java   |      4 +-
 .../configuration/ConfigurationService.java     |      5 +-
 api/src/com/cloud/dc/DataCenter.java            |      3 +-
 api/src/com/cloud/dc/DedicatedResources.java    |     12 +-
 api/src/com/cloud/dc/Vlan.java                  |      9 +-
 api/src/com/cloud/deploy/DeployDestination.java |     23 +-
 .../cloud/deploy/DeploymentClusterPlanner.java  |     29 +-
 api/src/com/cloud/deploy/DeploymentPlanner.java |     39 +-
 api/src/com/cloud/deploy/HAPlanner.java         |     21 +
 api/src/com/cloud/domain/Domain.java            |      5 +-
 api/src/com/cloud/event/ActionEvent.java        |      2 +-
 api/src/com/cloud/event/ActionEvents.java       |      7 +-
 api/src/com/cloud/event/Event.java              |     13 +-
 api/src/com/cloud/event/EventCategory.java      |      6 +-
 api/src/com/cloud/event/EventTypes.java         |     50 +-
 api/src/com/cloud/event/UsageEvent.java         |     10 +-
 .../exception/AffinityConflictException.java    |     68 +-
 .../exception/AgentControlChannelException.java |     12 +-
 api/src/com/cloud/exception/CloudException.java |     51 +-
 .../InsufficientCapacityException.java          |      3 +-
 .../MissingParameterValueException.java         |      1 +
 .../exception/NetworkRuleConflictException.java |      3 +-
 .../exception/OperationTimedoutException.java   |     26 +-
 .../exception/PermissionDeniedException.java    |      2 +-
 .../cloud/exception/ResourceInUseException.java |      3 +-
 .../exception/StorageUnavailableException.java  |      1 +
 api/src/com/cloud/ha/FenceBuilder.java          |     12 +-
 api/src/com/cloud/ha/Investigator.java          |      2 +-
 api/src/com/cloud/host/Host.java                |     39 +-
 api/src/com/cloud/host/HostEnvironment.java     |      1 -
 api/src/com/cloud/host/HostStats.java           |      7 +
 api/src/com/cloud/host/Status.java              |     17 +-
 api/src/com/cloud/hypervisor/Hypervisor.java    |      4 +-
 .../hypervisor/HypervisorCapabilities.java      |      4 +-
 .../com/cloud/hypervisor/HypervisorGuru.java    |      4 +-
 .../com/cloud/info/ConsoleProxyLoadInfo.java    |     56 +-
 .../com/cloud/info/RunningHostCountInfo.java    |     56 +-
 api/src/com/cloud/network/GuestVlan.java        |      1 +
 api/src/com/cloud/network/IpAddress.java        |      3 +-
 .../com/cloud/network/MonitoringService.java    |     45 +
 api/src/com/cloud/network/Network.java          |     92 +-
 .../network/NetworkMigrationResponder.java      |     17 +-
 api/src/com/cloud/network/NetworkModel.java     |     28 +-
 api/src/com/cloud/network/NetworkProfile.java   |     17 +-
 .../com/cloud/network/NetworkRuleApplier.java   |      2 +-
 api/src/com/cloud/network/NetworkService.java   |     61 +-
 .../com/cloud/network/NetworkUsageService.java  |      5 +-
 api/src/com/cloud/network/Networks.java         |     70 +-
 api/src/com/cloud/network/OvsProvider.java      |     26 +
 api/src/com/cloud/network/PhysicalNetwork.java  |     20 +-
 .../network/PhysicalNetworkServiceProvider.java |      5 +-
 .../network/PhysicalNetworkTrafficType.java     |      2 +
 api/src/com/cloud/network/RemoteAccessVpn.java  |     10 +-
 .../cloud/network/Site2SiteCustomerGateway.java |      9 +
 .../cloud/network/Site2SiteVpnConnection.java   |     14 +-
 .../com/cloud/network/Site2SiteVpnGateway.java  |      2 +
 api/src/com/cloud/network/UserIpv6Address.java  |      4 +-
 .../network/VirtualNetworkApplianceService.java |     14 +-
 .../cloud/network/VirtualRouterProvider.java    |      5 +-
 .../VpcVirtualNetworkApplianceService.java      |      9 +-
 api/src/com/cloud/network/VpnUser.java          |      4 +-
 .../com/cloud/network/as/AutoScaleCounter.java  |      5 +-
 .../com/cloud/network/as/AutoScalePolicy.java   |      5 +
 .../com/cloud/network/as/AutoScaleVmGroup.java  |      6 +-
 .../cloud/network/as/AutoScaleVmProfile.java    |      1 +
 api/src/com/cloud/network/as/Counter.java       |      5 +-
 .../network/element/DhcpServiceProvider.java    |     11 +-
 .../com/cloud/network/element/IpDeployer.java   |      4 +-
 .../element/NetworkACLServiceProvider.java      |      3 +-
 .../cloud/network/element/NetworkElement.java   |     30 +-
 .../element/UserDataServiceProvider.java        |      9 +-
 .../element/VirtualRouterElementService.java    |     12 +-
 .../com/cloud/network/element/VpcProvider.java  |      9 +-
 .../cloud/network/firewall/FirewallService.java |      7 +-
 api/src/com/cloud/network/guru/NetworkGuru.java |      9 +-
 api/src/com/cloud/network/lb/CertService.java   |     33 +
 .../com/cloud/network/lb/LoadBalancingRule.java |     84 +-
 .../network/lb/LoadBalancingRulesService.java   |     19 +-
 api/src/com/cloud/network/lb/SslCert.java       |     35 +
 .../com/cloud/network/router/VirtualRouter.java |     19 +-
 .../com/cloud/network/rules/FirewallRule.java   |     12 +-
 .../cloud/network/rules/HealthCheckPolicy.java  |      3 -
 .../cloud/network/rules/LbStickinessMethod.java |      9 +-
 .../com/cloud/network/rules/LoadBalancer.java   |      2 +-
 .../network/rules/LoadBalancerContainer.java    |      8 +-
 .../cloud/network/rules/PortForwardingRule.java |      1 -
 .../com/cloud/network/rules/RulesService.java   |      3 +-
 api/src/com/cloud/network/rules/StaticNat.java  |      3 +-
 .../network/security/SecurityGroupRules.java    |      1 +
 .../network/security/SecurityGroupService.java  |      8 +-
 .../cloud/network/security/SecurityRule.java    |      3 +-
 api/src/com/cloud/network/vpc/NetworkACL.java   |      4 +-
 .../com/cloud/network/vpc/NetworkACLItem.java   |     12 +-
 .../cloud/network/vpc/NetworkACLService.java    |     19 +-
 api/src/com/cloud/network/vpc/PrivateIp.java    |      1 +
 .../cloud/network/vpc/StaticRouteProfile.java   |     24 +-
 api/src/com/cloud/network/vpc/Vpc.java          |     81 +-
 api/src/com/cloud/network/vpc/VpcGateway.java   |      9 +-
 api/src/com/cloud/network/vpc/VpcOffering.java  |     11 +-
 .../network/vpc/VpcProvisioningService.java     |     17 +-
 api/src/com/cloud/network/vpc/VpcService.java   |     55 +-
 .../network/vpn/RemoteAccessVpnService.java     |      9 +-
 .../cloud/network/vpn/Site2SiteVpnService.java  |     12 +
 api/src/com/cloud/offering/DiskOffering.java    |     25 +-
 api/src/com/cloud/offering/NetworkOffering.java |     15 +-
 api/src/com/cloud/offering/ServiceOffering.java |     11 +-
 api/src/com/cloud/org/Cluster.java              |      3 +-
 api/src/com/cloud/org/Grouping.java             |      3 +-
 api/src/com/cloud/org/Managed.java              |      5 +-
 api/src/com/cloud/org/RunningIn.java            |      3 +
 api/src/com/cloud/projects/Project.java         |      2 +
 api/src/com/cloud/projects/ProjectService.java  |      2 -
 .../cloud/region/ha/GlobalLoadBalancerRule.java |     27 +-
 .../ha/GlobalLoadBalancingRulesService.java     |     16 +-
 api/src/com/cloud/resource/ResourceState.java   |      8 +-
 .../resource/UnableDeleteHostException.java     |      4 +-
 api/src/com/cloud/server/ManagementService.java |     33 +-
 .../cloud/server/ResourceMetaDataService.java   |      4 +-
 api/src/com/cloud/server/ResourceTag.java       |     67 +-
 .../com/cloud/server/TaggedResourceService.java |      6 +-
 .../storage/DataStoreProviderApiService.java    |      2 +-
 api/src/com/cloud/storage/DataStoreRole.java    |     16 +-
 api/src/com/cloud/storage/GuestOsCategory.java  |      2 +-
 api/src/com/cloud/storage/ImageStore.java       |     21 +-
 api/src/com/cloud/storage/ScopeType.java        |      6 +-
 api/src/com/cloud/storage/Snapshot.java         |     30 +-
 api/src/com/cloud/storage/Storage.java          |     17 +-
 api/src/com/cloud/storage/StoragePool.java      |     12 +-
 .../cloud/storage/StoragePoolDiscoverer.java    |      3 +-
 .../com/cloud/storage/StoragePoolStatus.java    |      3 +-
 api/src/com/cloud/storage/StorageService.java   |     42 +-
 api/src/com/cloud/storage/StorageStats.java     |      1 +
 api/src/com/cloud/storage/Upload.java           |     14 +-
 api/src/com/cloud/storage/Volume.java           |     39 +-
 api/src/com/cloud/storage/VolumeApiService.java |     27 +-
 .../storage/snapshot/SnapshotApiService.java    |      2 -
 .../storage/snapshot/SnapshotSchedule.java      |      4 +-
 .../com/cloud/template/TemplateApiService.java  |      6 +-
 .../cloud/template/VirtualMachineTemplate.java  |      4 +-
 api/src/com/cloud/user/Account.java             |     14 +-
 api/src/com/cloud/user/AccountService.java      |      7 +-
 api/src/com/cloud/user/DomainService.java       |      9 +-
 .../com/cloud/user/ResourceLimitService.java    |     42 +
 api/src/com/cloud/user/User.java                |      3 +-
 api/src/com/cloud/user/UserAccount.java         |      1 +
 api/src/com/cloud/vm/BareMetalVmService.java    |      1 -
 api/src/com/cloud/vm/ConsoleProxy.java          |      4 +-
 api/src/com/cloud/vm/DiskProfile.java           |     38 +-
 api/src/com/cloud/vm/Nic.java                   |     12 +-
 api/src/com/cloud/vm/NicIpAlias.java            |     18 +-
 api/src/com/cloud/vm/NicProfile.java            |    165 +-
 api/src/com/cloud/vm/NicSecondaryIp.java        |      8 +-
 api/src/com/cloud/vm/SecondaryStorageVm.java    |      7 +-
 api/src/com/cloud/vm/SystemVm.java              |      3 +
 api/src/com/cloud/vm/UserVmService.java         |    103 +-
 api/src/com/cloud/vm/VirtualMachine.java        |     43 +-
 api/src/com/cloud/vm/VirtualMachineName.java    |     81 +-
 api/src/com/cloud/vm/VirtualMachineProfile.java |      2 -
 api/src/com/cloud/vm/VmDetailConstants.java     |     10 +-
 api/src/com/cloud/vm/VmDiskStats.java           |      2 +-
 api/src/com/cloud/vm/VmStats.java               |      4 +-
 api/src/com/cloud/vm/snapshot/VMSnapshot.java   |     49 +-
 .../cloud/vm/snapshot/VMSnapshotService.java    |      6 +-
 .../apache/cloudstack/acl/AclEntityType.java    |      4 +-
 .../apache/cloudstack/acl/ControlledEntity.java |      3 +-
 api/src/org/apache/cloudstack/acl/RoleType.java |      7 +-
 .../apache/cloudstack/acl/SecurityChecker.java  |      4 +-
 .../cloudstack/affinity/AffinityGroup.java      |     66 +-
 .../affinity/AffinityGroupProcessor.java        |    177 +-
 .../affinity/AffinityGroupResponse.java         |     35 +-
 .../affinity/AffinityGroupService.java          |    167 +-
 .../affinity/AffinityGroupTypeResponse.java     |      8 +-
 .../affinity/AffinityProcessorBase.java         |    140 +-
 .../apache/cloudstack/alert/AlertService.java   |    103 +
 api/src/org/apache/cloudstack/api/ACL.java      |      3 +-
 .../org/apache/cloudstack/api/APICommand.java   |      2 +-
 .../org/apache/cloudstack/api/ApiConstants.java |     30 +-
 .../org/apache/cloudstack/api/ApiErrorCode.java |      6 +-
 .../org/apache/cloudstack/api/BaseAsyncCmd.java |      1 -
 .../api/BaseAsyncCreateCustomIdCmd.java         |     28 +
 .../cloudstack/api/BaseAsyncCustomIdCmd.java    |     28 +
 api/src/org/apache/cloudstack/api/BaseCmd.java  |    167 +-
 .../apache/cloudstack/api/BaseCustomIdCmd.java  |     29 +
 .../org/apache/cloudstack/api/BaseListCmd.java  |     33 +-
 .../api/BaseListDomainResourcesCmd.java         |     14 +-
 .../BaseListProjectAndAccountResourcesCmd.java  |      3 +-
 .../api/BaseListTaggedResourcesCmd.java         |      4 +-
 .../BaseListTemplateOrIsoPermissionsCmd.java    |     15 +-
 .../org/apache/cloudstack/api/BaseResponse.java |      9 +-
 .../api/BaseUpdateTemplateOrIsoCmd.java         |     28 +-
 .../BaseUpdateTemplateOrIsoPermissionsCmd.java  |     48 +-
 .../apache/cloudstack/api/IdentityService.java  |     22 -
 .../apache/cloudstack/api/InternalIdentity.java |      4 +-
 .../org/apache/cloudstack/api/Parameter.java    |      4 +-
 .../apache/cloudstack/api/ResourceDetail.java   |     12 +-
 .../cloudstack/api/ResponseGenerator.java       |     18 +-
 .../apache/cloudstack/api/ResponseObject.java   |      1 -
 .../cloudstack/api/ServerApiException.java      |     11 +-
 api/src/org/apache/cloudstack/api/Validate.java |      3 +-
 .../command/admin/account/CreateAccountCmd.java |     46 +-
 .../command/admin/account/DeleteAccountCmd.java |     22 +-
 .../admin/account/DisableAccountCmd.java        |     21 +-
 .../command/admin/account/EnableAccountCmd.java |     15 +-
 .../command/admin/account/LockAccountCmd.java   |     16 +-
 .../command/admin/account/UpdateAccountCmd.java |     25 +-
 .../command/admin/alert/GenerateAlertCmd.java   |    120 +
 .../admin/autoscale/CreateCounterCmd.java       |      4 +-
 .../admin/autoscale/DeleteCounterCmd.java       |      6 +-
 .../command/admin/cluster/AddClusterCmd.java    |     50 +-
 .../command/admin/cluster/DeleteClusterCmd.java |     10 +-
 .../command/admin/cluster/ListClustersCmd.java  |     32 +-
 .../command/admin/cluster/UpdateClusterCmd.java |     31 +-
 .../api/command/admin/config/ListCfgsByCmd.java |     66 +-
 .../admin/config/ListDeploymentPlannersCmd.java |    141 +-
 .../config/ListHypervisorCapabilitiesCmd.java   |     23 +-
 .../api/command/admin/config/UpdateCfgCmd.java  |     68 +-
 .../config/UpdateHypervisorCapabilitiesCmd.java |     25 +-
 .../command/admin/domain/CreateDomainCmd.java   |     22 +-
 .../command/admin/domain/DeleteDomainCmd.java   |     22 +-
 .../admin/domain/ListDomainChildrenCmd.java     |     20 +-
 .../command/admin/domain/ListDomainsCmd.java    |     18 +-
 .../command/admin/domain/UpdateDomainCmd.java   |     25 +-
 .../api/command/admin/host/AddHostCmd.java      |     30 +-
 .../admin/host/AddSecondaryStorageCmd.java      |     23 +-
 .../admin/host/CancelMaintenanceCmd.java        |     15 +-
 .../api/command/admin/host/DeleteHostCmd.java   |     14 +-
 .../admin/host/FindHostsForMigrationCmd.java    |     20 +-
 .../api/command/admin/host/ListHostsCmd.java    |     76 +-
 .../admin/host/PrepareForMaintenanceCmd.java    |     15 +-
 .../command/admin/host/ReconnectHostCmd.java    |     17 +-
 .../admin/host/ReleaseHostReservationCmd.java   |      9 +-
 .../api/command/admin/host/UpdateHostCmd.java   |     24 +-
 .../admin/host/UpdateHostPasswordCmd.java       |     13 +-
 ...ConfigureInternalLoadBalancerElementCmd.java |     46 +-
 .../CreateInternalLoadBalancerElementCmd.java   |     25 +-
 .../admin/internallb/ListInternalLBVMsCmd.java  |     35 +-
 .../ListInternalLoadBalancerElementsCmd.java    |     30 +-
 .../admin/internallb/StartInternalLBVMCmd.java  |     24 +-
 .../admin/internallb/StopInternalLBVMCmd.java   |     13 +-
 .../command/admin/iso/ListIsosCmdByAdmin.java   |      1 -
 .../admin/network/AddNetworkDeviceCmd.java      |     17 +-
 .../network/AddNetworkServiceProviderCmd.java   |     41 +-
 .../admin/network/CreateNetworkOfferingCmd.java |     97 +-
 .../admin/network/CreatePhysicalNetworkCmd.java |     50 +-
 .../network/CreateStorageNetworkIpRangeCmd.java |     29 +-
 .../network/DedicateGuestVlanRangeCmd.java      |     39 +-
 .../admin/network/DeleteNetworkDeviceCmd.java   |     13 +-
 .../admin/network/DeleteNetworkOfferingCmd.java |     17 +-
 .../DeleteNetworkServiceProviderCmd.java        |     22 +-
 .../admin/network/DeletePhysicalNetworkCmd.java |     18 +-
 .../network/DeleteStorageNetworkIpRangeCmd.java |     14 +-
 .../ListDedicatedGuestVlanRangesCmd.java        |     55 +-
 .../admin/network/ListNetworkDeviceCmd.java     |     14 +-
 .../network/ListNetworkIsolationMethodsCmd.java |     14 +-
 .../network/ListNetworkServiceProvidersCmd.java |     26 +-
 .../admin/network/ListNetworksCmdByAdmin.java   |      8 +-
 .../admin/network/ListPhysicalNetworksCmd.java  |     21 +-
 .../network/ListStorageNetworkIpRangeCmd.java   |     29 +-
 .../ListSupportedNetworkServicesCmd.java        |     29 +-
 .../ReleaseDedicatedGuestVlanRangeCmd.java      |     26 +-
 .../admin/network/UpdateNetworkCmdByAdmin.java  |      2 +-
 .../admin/network/UpdateNetworkOfferingCmd.java |     36 +-
 .../UpdateNetworkServiceProviderCmd.java        |     25 +-
 .../admin/network/UpdatePhysicalNetworkCmd.java |     22 +-
 .../network/UpdateStorageNetworkIpRangeCmd.java |     26 +-
 .../admin/offering/CreateDiskOfferingCmd.java   |     57 +-
 .../offering/CreateServiceOfferingCmd.java      |     81 +-
 .../admin/offering/DeleteDiskOfferingCmd.java   |     13 +-
 .../offering/DeleteServiceOfferingCmd.java      |     18 +-
 .../admin/offering/UpdateDiskOfferingCmd.java   |     28 +-
 .../offering/UpdateServiceOfferingCmd.java      |     24 +-
 .../api/command/admin/pod/CreatePodCmd.java     |     26 +-
 .../api/command/admin/pod/DeletePodCmd.java     |     11 +-
 .../api/command/admin/pod/ListPodsByCmd.java    |     19 +-
 .../api/command/admin/pod/UpdatePodCmd.java     |     25 +-
 .../api/command/admin/region/AddRegionCmd.java  |     28 +-
 .../admin/region/CreatePortableIpRangeCmd.java  |     33 +-
 .../admin/region/DeletePortableIpRangeCmd.java  |     22 +-
 .../admin/region/ListPortableIpRangesCmd.java   |     29 +-
 .../command/admin/region/RemoveRegionCmd.java   |     16 +-
 .../command/admin/region/UpdateRegionCmd.java   |     42 +-
 .../admin/resource/ArchiveAlertsCmd.java        |     20 +-
 .../admin/resource/CleanVMReservationsCmd.java  |      8 +-
 .../command/admin/resource/DeleteAlertsCmd.java |     20 +-
 .../command/admin/resource/ListAlertsCmd.java   |     11 +-
 .../command/admin/resource/ListCapacityCmd.java |     39 +-
 .../resource/UploadCustomCertificateCmd.java    |     28 +-
 .../admin/router/ConfigureOvsElementCmd.java    |    132 +
 .../ConfigureVirtualRouterElementCmd.java       |     23 +-
 .../router/CreateVirtualRouterElementCmd.java   |     36 +-
 .../command/admin/router/DestroyRouterCmd.java  |      9 +-
 .../admin/router/ListOvsElementsCmd.java        |    109 +
 .../command/admin/router/ListRoutersCmd.java    |     50 +-
 .../router/ListVirtualRouterElementsCmd.java    |     23 +-
 .../command/admin/router/RebootRouterCmd.java   |     20 +-
 .../command/admin/router/StartRouterCmd.java    |     20 +-
 .../api/command/admin/router/StopRouterCmd.java |     11 +-
 .../command/admin/router/UpgradeRouterCmd.java  |     21 +-
 .../admin/router/UpgradeRouterTemplateCmd.java  |    139 +
 .../command/admin/storage/AddImageStoreCmd.java |     35 +-
 .../api/command/admin/storage/AddS3Cmd.java     |    144 +-
 .../CancelPrimaryStorageMaintenanceCmd.java     |     15 +-
 .../storage/CreateSecondaryStagingStoreCmd.java |     35 +-
 .../admin/storage/CreateStoragePoolCmd.java     |     50 +-
 .../admin/storage/DeleteImageStoreCmd.java      |      9 +-
 .../command/admin/storage/DeletePoolCmd.java    |     13 +-
 .../storage/DeleteSecondaryStagingStoreCmd.java |      8 +-
 .../FindStoragePoolsForMigrationCmd.java        |     22 +-
 .../admin/storage/ListImageStoresCmd.java       |     25 +-
 .../api/command/admin/storage/ListS3sCmd.java   |      6 +-
 .../storage/ListSecondaryStagingStoresCmd.java  |     17 +-
 .../admin/storage/ListStoragePoolsCmd.java      |     32 +-
 .../admin/storage/ListStorageProvidersCmd.java  |     19 +-
 .../PreparePrimaryStorageForMaintenanceCmd.java |     15 +-
 .../PrepareSecondaryStorageForMigrationCmd.java |    109 -
 .../storage/UpdateCloudToUseObjectStoreCmd.java |    142 +
 .../admin/storage/UpdateStoragePoolCmd.java     |     20 +-
 .../api/command/admin/swift/AddSwiftCmd.java    |     30 +-
 .../api/command/admin/swift/ListSwiftsCmd.java  |      8 +-
 .../admin/systemvm/DestroySystemVmCmd.java      |     24 +-
 .../admin/systemvm/ListSystemVMsCmd.java        |     35 +-
 .../admin/systemvm/MigrateSystemVMCmd.java      |     48 +-
 .../admin/systemvm/RebootSystemVmCmd.java       |     26 +-
 .../admin/systemvm/ScaleSystemVMCmd.java        |     41 +-
 .../admin/systemvm/StartSystemVMCmd.java        |     26 +-
 .../command/admin/systemvm/StopSystemVmCmd.java |     24 +-
 .../admin/systemvm/UpgradeSystemVMCmd.java      |     39 +-
 .../admin/template/PrepareTemplateCmd.java      |     18 +-
 .../admin/usage/AddTrafficMonitorCmd.java       |     35 +-
 .../command/admin/usage/AddTrafficTypeCmd.java  |     51 +-
 .../admin/usage/DeleteTrafficMonitorCmd.java    |     18 +-
 .../admin/usage/DeleteTrafficTypeCmd.java       |     15 +-
 .../admin/usage/GenerateUsageRecordsCmd.java    |     30 +-
 .../command/admin/usage/GetUsageRecordsCmd.java |     34 +-
 .../admin/usage/ListTrafficMonitorsCmd.java     |     13 +-
 .../usage/ListTrafficTypeImplementorsCmd.java   |     20 +-
 .../admin/usage/ListTrafficTypesCmd.java        |     18 +-
 .../command/admin/usage/ListUsageTypesCmd.java  |      4 +-
 .../admin/usage/UpdateTrafficTypeCmd.java       |     37 +-
 .../api/command/admin/user/CreateUserCmd.java   |     44 +-
 .../api/command/admin/user/DeleteUserCmd.java   |     15 +-
 .../api/command/admin/user/DisableUserCmd.java  |     22 +-
 .../api/command/admin/user/EnableUserCmd.java   |     18 +-
 .../api/command/admin/user/GetUserCmd.java      |     11 +-
 .../api/command/admin/user/ListUsersCmd.java    |     18 +-
 .../api/command/admin/user/LockUserCmd.java     |     12 +-
 .../api/command/admin/user/RegisterCmd.java     |     13 +-
 .../api/command/admin/user/UpdateUserCmd.java   |     38 +-
 .../admin/vlan/CreateVlanIpRangeCmd.java        |     90 +-
 .../admin/vlan/DedicatePublicIpRangeCmd.java    |     22 +-
 .../admin/vlan/DeleteVlanIpRangeCmd.java        |     10 +-
 .../command/admin/vlan/ListVlanIpRangesCmd.java |     45 +-
 .../admin/vlan/ReleasePublicIpRangeCmd.java     |     10 +-
 .../api/command/admin/vm/AssignVMCmd.java       |     53 +-
 .../api/command/admin/vm/ExpungeVMCmd.java      |     16 +-
 .../api/command/admin/vm/MigrateVMCmd.java      |     36 +-
 .../vm/MigrateVirtualMachineWithVolumeCmd.java  |     33 +-
 .../api/command/admin/vm/RecoverVMCmd.java      |      7 +-
 .../admin/volume/ListVolumesCmdByAdmin.java     |      4 +-
 .../admin/volume/MigrateVolumeCmdByAdmin.java   |     16 +-
 .../admin/volume/ResizeVolumeCmdByAdmin.java    |      4 +-
 .../admin/volume/UpdateVolumeCmdByAdmin.java    |      2 +-
 .../admin/vpc/CreatePrivateGatewayCmd.java      |     54 +-
 .../command/admin/vpc/CreateVPCOfferingCmd.java |     64 +-
 .../admin/vpc/DeletePrivateGatewayCmd.java      |     12 +-
 .../command/admin/vpc/DeleteVPCOfferingCmd.java |     16 +-
 .../command/admin/vpc/UpdateVPCOfferingCmd.java |     24 +-
 .../api/command/admin/zone/CreateZoneCmd.java   |     42 +-
 .../api/command/admin/zone/DeleteZoneCmd.java   |     15 +-
 .../zone/MarkDefaultZoneForAccountCmd.java      |     28 +-
 .../api/command/admin/zone/UpdateZoneCmd.java   |     41 +-
 .../user/account/AddAccountToProjectCmd.java    |     30 +-
 .../account/DeleteAccountFromProjectCmd.java    |     27 +-
 .../command/user/account/ListAccountsCmd.java   |     16 +-
 .../user/account/ListProjectAccountsCmd.java    |     21 +-
 .../user/address/AssociateIPAddrCmd.java        |     64 +-
 .../user/address/DisassociateIPAddrCmd.java     |     21 +-
 .../user/address/ListPublicIpAddressesCmd.java  |     39 +-
 .../affinitygroup/CreateAffinityGroupCmd.java   |     21 +-
 .../affinitygroup/DeleteAffinityGroupCmd.java   |     24 +-
 .../ListAffinityGroupTypesCmd.java              |      5 +-
 .../affinitygroup/ListAffinityGroupsCmd.java    |     14 +-
 .../affinitygroup/UpdateVMAffinityGroupCmd.java |     37 +-
 .../autoscale/CreateAutoScalePolicyCmd.java     |     38 +-
 .../autoscale/CreateAutoScaleVmGroupCmd.java    |     51 +-
 .../autoscale/CreateAutoScaleVmProfileCmd.java  |     58 +-
 .../user/autoscale/CreateConditionCmd.java      |     16 +-
 .../autoscale/DeleteAutoScalePolicyCmd.java     |     11 +-
 .../autoscale/DeleteAutoScaleVmGroupCmd.java    |     11 +-
 .../autoscale/DeleteAutoScaleVmProfileCmd.java  |     11 +-
 .../user/autoscale/DeleteConditionCmd.java      |      6 +-
 .../autoscale/DisableAutoScaleVmGroupCmd.java   |     10 +-
 .../autoscale/EnableAutoScaleVmGroupCmd.java    |     12 +-
 .../autoscale/ListAutoScalePoliciesCmd.java     |     17 +-
 .../autoscale/ListAutoScaleVmGroupsCmd.java     |     23 +-
 .../autoscale/ListAutoScaleVmProfilesCmd.java   |     12 +-
 .../user/autoscale/ListConditionsCmd.java       |     24 +-
 .../command/user/autoscale/ListCountersCmd.java |      6 +-
 .../autoscale/UpdateAutoScalePolicyCmd.java     |     23 +-
 .../autoscale/UpdateAutoScaleVmGroupCmd.java    |     37 +-
 .../autoscale/UpdateAutoScaleVmProfileCmd.java  |     31 +-
 .../user/config/ListCapabilitiesCmd.java        |      9 +-
 .../command/user/event/ArchiveEventsCmd.java    |     21 +-
 .../api/command/user/event/DeleteEventsCmd.java |     21 +-
 .../command/user/event/ListEventTypesCmd.java   |      4 +-
 .../api/command/user/event/ListEventsCmd.java   |     26 +-
 .../firewall/CreateEgressFirewallRuleCmd.java   |     33 +-
 .../user/firewall/CreateFirewallRuleCmd.java    |     27 +-
 .../firewall/CreatePortForwardingRuleCmd.java   |     77 +-
 .../firewall/DeleteEgressFirewallRuleCmd.java   |     15 +-
 .../user/firewall/DeleteFirewallRuleCmd.java    |     16 +-
 .../firewall/DeletePortForwardingRuleCmd.java   |     24 +-
 .../firewall/ListEgressFirewallRulesCmd.java    |     33 +-
 .../user/firewall/ListFirewallRulesCmd.java     |     34 +-
 .../firewall/ListPortForwardingRulesCmd.java    |     28 +-
 .../firewall/UpdatePortForwardingRuleCmd.java   |     35 +-
 .../user/guest/ListGuestOsCategoriesCmd.java    |     14 +-
 .../api/command/user/guest/ListGuestOsCmd.java  |     16 +-
 .../api/command/user/iso/AttachIsoCmd.java      |     14 +-
 .../api/command/user/iso/CopyIsoCmd.java        |      6 +-
 .../api/command/user/iso/DeleteIsoCmd.java      |     22 +-
 .../api/command/user/iso/DetachIsoCmd.java      |      2 +-
 .../api/command/user/iso/ExtractIsoCmd.java     |     28 +-
 .../api/command/user/iso/ListIsosCmd.java       |     48 +-
 .../api/command/user/iso/RegisterIsoCmd.java    |     48 +-
 .../api/command/user/iso/UpdateIsoCmd.java      |      2 +-
 .../user/iso/UpdateIsoPermissionsCmd.java       |      7 +-
 .../api/command/user/job/ListAsyncJobsCmd.java  |      7 +-
 .../user/job/QueryAsyncJobResultCmd.java        |     10 +-
 .../AssignCertToLoadBalancerCmd.java            |    104 +
 .../AssignToLoadBalancerRuleCmd.java            |     29 +-
 .../CreateApplicationLoadBalancerCmd.java       |     77 +-
 .../CreateLBHealthCheckPolicyCmd.java           |     51 +-
 .../CreateLBStickinessPolicyCmd.java            |     25 +-
 .../loadbalancer/CreateLoadBalancerRuleCmd.java |     84 +-
 .../DeleteApplicationLoadBalancerCmd.java       |     16 +-
 .../DeleteLBHealthCheckPolicyCmd.java           |     19 +-
 .../DeleteLBStickinessPolicyCmd.java            |     16 +-
 .../loadbalancer/DeleteLoadBalancerRuleCmd.java |     22 +-
 .../user/loadbalancer/DeleteSslCertCmd.java     |     92 +
 .../ListApplicationLoadBalancersCmd.java        |     32 +-
 .../ListLBHealthCheckPoliciesCmd.java           |     20 +-
 .../ListLBStickinessPoliciesCmd.java            |     16 +-
 .../ListLoadBalancerRuleInstancesCmd.java       |     17 +-
 .../loadbalancer/ListLoadBalancerRulesCmd.java  |     28 +-
 .../user/loadbalancer/ListSslCertsCmd.java      |    105 +
 .../RemoveCertFromLoadBalancerCmd.java          |     92 +
 .../RemoveFromLoadBalancerRuleCmd.java          |     31 +-
 .../loadbalancer/UpdateLoadBalancerRuleCmd.java |     27 +-
 .../user/loadbalancer/UploadSslCertCmd.java     |    112 +
 .../user/nat/CreateIpForwardingRuleCmd.java     |     43 +-
 .../user/nat/DeleteIpForwardingRuleCmd.java     |     15 +-
 .../command/user/nat/DisableStaticNatCmd.java   |     15 +-
 .../command/user/nat/EnableStaticNatCmd.java    |     37 +-
 .../user/nat/ListIpForwardingRulesCmd.java      |     28 +-
 .../user/network/CreateNetworkACLCmd.java       |     49 +-
 .../user/network/CreateNetworkACLListCmd.java   |     13 +-
 .../command/user/network/CreateNetworkCmd.java  |    113 +-
 .../user/network/DeleteNetworkACLCmd.java       |      8 +-
 .../user/network/DeleteNetworkACLListCmd.java   |      8 +-
 .../command/user/network/DeleteNetworkCmd.java  |     24 +-
 .../user/network/ListNetworkACLListsCmd.java    |     38 +-
 .../user/network/ListNetworkACLsCmd.java        |     37 +-
 .../user/network/ListNetworkOfferingsCmd.java   |     62 +-
 .../command/user/network/ListNetworksCmd.java   |     45 +-
 .../user/network/ReplaceNetworkACLListCmd.java  |     34 +-
 .../command/user/network/RestartNetworkCmd.java |     18 +-
 .../user/network/UpdateNetworkACLItemCmd.java   |     60 +-
 .../command/user/network/UpdateNetworkCmd.java  |     28 +-
 .../user/offering/ListDiskOfferingsCmd.java     |     19 +-
 .../user/offering/ListServiceOfferingsCmd.java  |     40 +-
 .../user/project/ActivateProjectCmd.java        |     19 +-
 .../command/user/project/CreateProjectCmd.java  |      8 +-
 .../command/user/project/DeleteProjectCmd.java  |     16 +-
 .../project/DeleteProjectInvitationCmd.java     |      7 +-
 .../user/project/ListProjectInvitationsCmd.java |     18 +-
 .../command/user/project/ListProjectsCmd.java   |     22 +-
 .../command/user/project/SuspendProjectCmd.java |     16 +-
 .../command/user/project/UpdateProjectCmd.java  |     22 +-
 .../project/UpdateProjectInvitationCmd.java     |     11 +-
 .../api/command/user/region/ListRegionsCmd.java |     30 +-
 .../gslb/AssignToGlobalLoadBalancerRuleCmd.java |     89 +-
 .../gslb/CreateGlobalLoadBalancerRuleCmd.java   |     61 +-
 .../gslb/DeleteGlobalLoadBalancerRuleCmd.java   |     35 +-
 .../ha/gslb/ListGlobalLoadBalancerRuleCmd.java  |     17 +-
 .../RemoveFromGlobalLoadBalancerRuleCmd.java    |     62 +-
 .../gslb/UpdateGlobalLoadBalancerRuleCmd.java   |     45 +-
 .../user/resource/GetCloudIdentifierCmd.java    |     15 +-
 .../user/resource/ListHypervisorsCmd.java       |      6 +-
 .../user/resource/ListResourceLimitsCmd.java    |     35 +-
 .../user/resource/UpdateResourceCountCmd.java   |     56 +-
 .../user/resource/UpdateResourceLimitCmd.java   |     44 +-
 .../AuthorizeSecurityGroupEgressCmd.java        |     29 +-
 .../AuthorizeSecurityGroupIngressCmd.java       |     29 +-
 .../securitygroup/CreateSecurityGroupCmd.java   |     13 +-
 .../securitygroup/DeleteSecurityGroupCmd.java   |     24 +-
 .../securitygroup/ListSecurityGroupsCmd.java    |     19 +-
 .../RevokeSecurityGroupEgressCmd.java           |      6 +-
 .../RevokeSecurityGroupIngressCmd.java          |      5 +-
 .../user/snapshot/CreateSnapshotCmd.java        |     47 +-
 .../user/snapshot/CreateSnapshotPolicyCmd.java  |     32 +-
 .../user/snapshot/DeleteSnapshotCmd.java        |     12 +-
 .../snapshot/DeleteSnapshotPoliciesCmd.java     |     17 +-
 .../user/snapshot/ListSnapshotPoliciesCmd.java  |     10 +-
 .../command/user/snapshot/ListSnapshotsCmd.java |     21 +-
 .../user/snapshot/RevertSnapshotCmd.java        |      7 +-
 .../command/user/ssh/CreateSSHKeyPairCmd.java   |     21 +-
 .../command/user/ssh/DeleteSSHKeyPairCmd.java   |     16 +-
 .../command/user/ssh/ListSSHKeyPairsCmd.java    |     12 +-
 .../command/user/ssh/RegisterSSHKeyPairCmd.java |     21 +-
 .../api/command/user/tag/CreateTagsCmd.java     |     32 +-
 .../api/command/user/tag/DeleteTagsCmd.java     |     26 +-
 .../api/command/user/tag/ListTagsCmd.java       |     19 +-
 .../command/user/template/CopyTemplateCmd.java  |     20 +-
 .../user/template/CreateTemplateCmd.java        |     51 +-
 .../user/template/DeleteTemplateCmd.java        |     22 +-
 .../user/template/ExtractTemplateCmd.java       |     27 +-
 .../command/user/template/ListTemplatesCmd.java |     43 +-
 .../user/template/RegisterTemplateCmd.java      |     71 +-
 .../user/template/UpdateTemplateCmd.java        |      2 +-
 .../template/UpdateTemplatePermissionsCmd.java  |     13 +-
 .../api/command/user/vm/AddIpToVmNicCmd.java    |     75 +-
 .../api/command/user/vm/AddNicToVMCmd.java      |      8 +-
 .../api/command/user/vm/DeployVMCmd.java        |    149 +-
 .../api/command/user/vm/DestroyVMCmd.java       |     11 +-
 .../api/command/user/vm/GetVMPasswordCmd.java   |      8 +-
 .../api/command/user/vm/ListNicsCmd.java        |     26 +-
 .../api/command/user/vm/ListVMsCmd.java         |     70 +-
 .../api/command/user/vm/RebootVMCmd.java        |      5 +-
 .../command/user/vm/RemoveIpFromVmNicCmd.java   |     15 +-
 .../api/command/user/vm/RemoveNicFromVMCmd.java |      9 +-
 .../api/command/user/vm/ResetVMPasswordCmd.java |      5 +-
 .../api/command/user/vm/ResetVMSSHKeyCmd.java   |     14 +-
 .../api/command/user/vm/RestoreVMCmd.java       |      6 +-
 .../api/command/user/vm/ScaleVMCmd.java         |     29 +-
 .../api/command/user/vm/StartVMCmd.java         |     12 +-
 .../api/command/user/vm/StopVMCmd.java          |      4 +-
 .../user/vm/UpdateDefaultNicForVMCmd.java       |     10 +-
 .../api/command/user/vm/UpdateVMCmd.java        |     33 +-
 .../api/command/user/vm/UpgradeVMCmd.java       |     28 +-
 .../command/user/vmgroup/CreateVMGroupCmd.java  |     19 +-
 .../command/user/vmgroup/DeleteVMGroupCmd.java  |     12 +-
 .../command/user/vmgroup/ListVMGroupsCmd.java   |     12 +-
 .../command/user/vmgroup/UpdateVMGroupCmd.java  |     16 +-
 .../user/vmsnapshot/CreateVMSnapshotCmd.java    |     22 +-
 .../user/vmsnapshot/DeleteVMSnapshotCmd.java    |     16 +-
 .../user/vmsnapshot/ListVMSnapshotCmd.java      |     15 +-
 .../user/vmsnapshot/RevertToVMSnapshotCmd.java  |     14 +-
 .../user/volume/AddResourceDetailCmd.java       |     22 +-
 .../command/user/volume/AttachVolumeCmd.java    |     30 +-
 .../command/user/volume/CreateVolumeCmd.java    |     67 +-
 .../command/user/volume/DeleteVolumeCmd.java    |     15 +-
 .../command/user/volume/DetachVolumeCmd.java    |     19 +-
 .../command/user/volume/ExtractVolumeCmd.java   |     26 +-
 .../user/volume/ListResourceDetailsCmd.java     |     24 +-
 .../api/command/user/volume/ListVolumesCmd.java |     32 +-
 .../command/user/volume/MigrateVolumeCmd.java   |     38 +-
 .../user/volume/RemoveResourceDetailCmd.java    |     23 +-
 .../command/user/volume/ResizeVolumeCmd.java    |     32 +-
 .../command/user/volume/UpdateVolumeCmd.java    |     32 +-
 .../command/user/volume/UploadVolumeCmd.java    |     41 +-
 .../command/user/vpc/CreateStaticRouteCmd.java  |     20 +-
 .../api/command/user/vpc/CreateVPCCmd.java      |     65 +-
 .../command/user/vpc/DeleteStaticRouteCmd.java  |     20 +-
 .../api/command/user/vpc/DeleteVPCCmd.java      |     12 +-
 .../user/vpc/ListPrivateGatewaysCmd.java        |     20 +-
 .../command/user/vpc/ListStaticRoutesCmd.java   |     14 +-
 .../command/user/vpc/ListVPCOfferingsCmd.java   |     38 +-
 .../api/command/user/vpc/ListVPCsCmd.java       |     25 +-
 .../api/command/user/vpc/RestartVPCCmd.java     |     18 +-
 .../api/command/user/vpc/UpdateVPCCmd.java      |     15 +-
 .../api/command/user/vpn/AddVpnUserCmd.java     |     25 +-
 .../user/vpn/CreateRemoteAccessVpnCmd.java      |     33 +-
 .../user/vpn/CreateVpnConnectionCmd.java        |     33 +-
 .../user/vpn/CreateVpnCustomerGatewayCmd.java   |     44 +-
 .../command/user/vpn/CreateVpnGatewayCmd.java   |     12 +-
 .../user/vpn/DeleteRemoteAccessVpnCmd.java      |     18 +-
 .../user/vpn/DeleteVpnConnectionCmd.java        |     12 +-
 .../user/vpn/DeleteVpnCustomerGatewayCmd.java   |     16 +-
 .../command/user/vpn/DeleteVpnGatewayCmd.java   |     12 +-
 .../user/vpn/ListRemoteAccessVpnsCmd.java       |     36 +-
 .../command/user/vpn/ListVpnConnectionsCmd.java |     16 +-
 .../user/vpn/ListVpnCustomerGatewaysCmd.java    |     13 +-
 .../command/user/vpn/ListVpnGatewaysCmd.java    |     14 +-
 .../api/command/user/vpn/ListVpnUsersCmd.java   |     14 +-
 .../api/command/user/vpn/RemoveVpnUserCmd.java  |     23 +-
 .../command/user/vpn/ResetVpnConnectionCmd.java |     22 +-
 .../user/vpn/UpdateVpnCustomerGatewayCmd.java   |     52 +-
 .../api/command/user/zone/ListZonesCmd.java     |     38 +-
 .../api/response/AccountResponse.java           |    188 +-
 .../api/response/AddIpToVmNicResponse.java      |     23 +-
 .../cloudstack/api/response/AlertResponse.java  |     37 +-
 ...ApplicationLoadBalancerInstanceResponse.java |     27 +-
 .../ApplicationLoadBalancerResponse.java        |     65 +-
 .../ApplicationLoadBalancerRuleResponse.java    |     18 +-
 .../api/response/AsyncJobResponse.java          |     33 +-
 .../api/response/AutoScalePolicyResponse.java   |     23 +-
 .../api/response/AutoScaleVmGroupResponse.java  |     23 +-
 .../response/AutoScaleVmProfileResponse.java    |     15 +-
 .../api/response/CapabilitiesResponse.java      |     43 +-
 .../api/response/CapabilityResponse.java        |     12 +-
 .../api/response/CapacityResponse.java          |     33 +-
 .../api/response/CloudIdentifierResponse.java   |     12 +-
 .../api/response/ClusterResponse.java           |     61 +-
 .../api/response/ConditionResponse.java         |      6 +-
 .../api/response/ConfigurationResponse.java     |     22 +-
 .../response/ControlledViewEntityResponse.java  |      1 -
 .../api/response/CounterResponse.java           |      6 +-
 .../api/response/CreateSSHKeyPairResponse.java  |      9 +-
 .../api/response/CustomCertificateResponse.java |      6 +-
 .../response/DeploymentPlannersResponse.java    |      3 +-
 .../api/response/DiskOfferingResponse.java      |     71 +-
 .../cloudstack/api/response/DomainResponse.java |     27 +-
 .../api/response/DomainRouterResponse.java      |    190 +-
 .../cloudstack/api/response/EventResponse.java  |     46 +-
 .../api/response/EventTypeResponse.java         |      6 +-
 .../api/response/ExceptionResponse.java         |     19 +-
 .../api/response/ExternalFirewallResponse.java  |     82 +-
 .../response/ExternalLoadBalancerResponse.java  |     56 +-
 .../api/response/ExtractResponse.java           |     51 +-
 .../api/response/FirewallResponse.java          |     39 +-
 .../api/response/FirewallRuleResponse.java      |     58 +-
 .../api/response/GetVMPasswordResponse.java     |      9 +-
 .../response/GlobalLoadBalancerResponse.java    |     20 +-
 .../api/response/GuestOSCategoryResponse.java   |     11 +-
 .../api/response/GuestOSResponse.java           |     14 +-
 .../api/response/GuestVlanRangeResponse.java    |     38 +-
 .../api/response/HostForMigrationResponse.java  |    140 +-
 .../cloudstack/api/response/HostResponse.java   |    144 +-
 .../HypervisorCapabilitiesResponse.java         |     30 +-
 .../api/response/HypervisorResponse.java        |      6 +-
 .../api/response/IPAddressResponse.java         |    104 +-
 .../api/response/ImageStoreDetailResponse.java  |     19 +-
 .../api/response/ImageStoreResponse.java        |     40 +-
 .../api/response/InstanceGroupResponse.java     |     29 +-
 .../InternalLoadBalancerElementResponse.java    |     15 +-
 .../api/response/IpForwardingRuleResponse.java  |     33 +-
 .../cloudstack/api/response/IsoVmResponse.java  |     37 +-
 .../api/response/IsolationMethodResponse.java   |      8 +-
 .../response/LBHealthCheckPolicyResponse.java   |      6 +-
 .../api/response/LBHealthCheckResponse.java     |     16 +-
 .../response/LBStickinessPolicyResponse.java    |     14 +-
 .../api/response/LBStickinessResponse.java      |      5 +-
 .../cloudstack/api/response/ListResponse.java   |      1 -
 .../api/response/LoadBalancerResponse.java      |     31 +-
 .../api/response/NetworkACLItemResponse.java    |     47 +-
 .../api/response/NetworkACLResponse.java        |     18 +-
 .../api/response/NetworkDeviceResponse.java     |      3 +-
 .../api/response/NetworkOfferingResponse.java   |     77 +-
 .../api/response/NetworkResponse.java           |    166 +-
 .../api/response/NicDetailResponse.java         |     13 +-
 .../cloudstack/api/response/NicResponse.java    |     94 +-
 .../api/response/NicSecondaryIpResponse.java    |     26 +-
 .../api/response/OvsProviderResponse.java       |     93 +
 .../api/response/PhysicalNetworkResponse.java   |     42 +-
 .../cloudstack/api/response/PodResponse.java    |     33 +-
 .../api/response/PortableIpRangeResponse.java   |     26 +-
 .../api/response/PortableIpResponse.java        |     37 +-
 .../api/response/PrivateGatewayResponse.java    |     56 +-
 .../api/response/ProjectAccountResponse.java    |     10 +-
 .../api/response/ProjectInvitationResponse.java |     36 +-
 .../api/response/ProjectResponse.java           |    172 +-
 .../api/response/ProviderResponse.java          |     23 +-
 .../cloudstack/api/response/RegionResponse.java |     54 +-
 .../api/response/RegisterResponse.java          |      9 +-
 .../api/response/RemoteAccessVpnResponse.java   |     46 +-
 .../api/response/ResourceCountResponse.java     |     27 +-
 .../api/response/ResourceDetailResponse.java    |     11 +-
 .../response/ResourceLimitAndCountResponse.java |      9 +-
 .../api/response/ResourceLimitResponse.java     |     24 +-
 .../api/response/ResourceTagResponse.java       |     26 +-
 .../api/response/SSHKeyPairResponse.java        |     12 +-
 .../api/response/SecurityGroupResponse.java     |     58 +-
 .../api/response/SecurityGroupRuleResponse.java |     34 +-
 .../api/response/ServiceOfferingResponse.java   |    110 +-
 .../api/response/ServiceResponse.java           |     15 +-
 .../Site2SiteCustomerGatewayResponse.java       |     58 +-
 .../Site2SiteVpnConnectionResponse.java         |     85 +-
 .../response/Site2SiteVpnGatewayResponse.java   |     32 +-
 .../api/response/SnapshotPolicyResponse.java    |     23 +-
 .../api/response/SnapshotResponse.java          |     16 +-
 .../api/response/SnapshotScheduleResponse.java  |     15 +-
 .../api/response/SslCertResponse.java           |     93 +
 .../api/response/StaticRouteResponse.java       |     33 +-
 .../cloudstack/api/response/StatusResponse.java |     12 +-
 .../response/StorageNetworkIpRangeResponse.java |     32 +-
 .../api/response/StoragePoolResponse.java       |     90 +-
 .../api/response/StorageProviderResponse.java   |     14 +-
 .../api/response/SuccessResponse.java           |     20 +-
 .../api/response/SystemVmInstanceResponse.java  |     23 +-
 .../api/response/SystemVmResponse.java          |     91 +-
 .../response/TemplatePermissionsResponse.java   |     21 +-
 .../api/response/TemplateResponse.java          |    123 +-
 .../api/response/TemplateZoneResponse.java      |     33 +-
 .../api/response/TrafficMonitorResponse.java    |     38 +-
 .../TrafficTypeImplementorResponse.java         |     25 +-
 .../api/response/TrafficTypeResponse.java       |     34 +-
 .../response/UpgradeRouterTemplateResponse.java |     42 +
 .../api/response/UpgradeVmResponse.java         |     75 +-
 .../api/response/UsageRecordResponse.java       |     86 +-
 .../api/response/UsageTypeResponse.java         |     18 +-
 .../cloudstack/api/response/UserResponse.java   |     59 +-
 .../cloudstack/api/response/UserVmResponse.java |   1056 +-
 .../api/response/VMSnapshotResponse.java        |     43 +-
 .../response/VirtualRouterProviderResponse.java |     29 +-
 .../api/response/VlanIpRangeResponse.java       |    111 +-
 .../api/response/VolumeDetailResponse.java      |     14 +-
 .../cloudstack/api/response/VolumeResponse.java |     43 +-
 .../api/response/VpcOfferingResponse.java       |     27 +-
 .../cloudstack/api/response/VpcResponse.java    |     64 +-
 .../api/response/VpnUsersResponse.java          |     31 +-
 .../cloudstack/api/response/ZoneResponse.java   |    112 +-
 .../apache/cloudstack/context/CallContext.java  |     58 +-
 .../cloudstack/context/CallContextListener.java |     10 +-
 api/src/org/apache/cloudstack/jobs/JobInfo.java |      9 +-
 .../network/ExternalNetworkDeviceManager.java   |      2 +
 .../InternalLoadBalancerElementService.java     |      9 +-
 .../lb/ApplicationLoadBalancerContainer.java    |      6 +-
 .../network/lb/ApplicationLoadBalancerRule.java |      2 +-
 .../lb/ApplicationLoadBalancerService.java      |     16 +-
 .../lb/InternalLoadBalancerVMService.java       |      9 +-
 .../apache/cloudstack/query/QueryService.java   |      3 +-
 .../apache/cloudstack/region/PortableIp.java    |      3 +-
 .../org/apache/cloudstack/region/Region.java    |     12 +-
 .../apache/cloudstack/region/RegionService.java |    135 +-
 .../apache/cloudstack/region/RegionSync.java    |     12 +-
 api/src/org/apache/cloudstack/usage/Usage.java  |     22 +-
 .../apache/cloudstack/usage/UsageService.java   |      8 +-
 .../org/apache/cloudstack/usage/UsageTypes.java |     36 +-
 api/test/com/cloud/network/NetworksTest.java    |     46 +-
 .../command/test/ActivateProjectCmdTest.java    |     17 +-
 .../test/AddAccountToProjectCmdTest.java        |     52 +-
 .../api/command/test/AddClusterCmdTest.java     |     11 +-
 .../api/command/test/AddHostCmdTest.java        |     13 +-
 .../api/command/test/AddIpToVmNicTest.java      |     36 +-
 .../test/AddNetworkServiceProviderCmdTest.java  |     30 +-
 .../test/AddSecondaryStorageCmdTest.java        |     35 +-
 .../api/command/test/AddVpnUserCmdTest.java     |     48 +-
 .../api/command/test/ListCfgCmdTest.java        |     37 +-
 .../api/command/test/RegionCmdTest.java         |     39 +-
 .../api/command/test/ScaleVMCmdTest.java        |     26 +-
 .../api/command/test/UpdateCfgCmdTest.java      |     39 +-
 .../api/command/test/UsageCmdTest.java          |     11 +-
 awsapi/pom.xml                                  |     56 +-
 awsapi/src/com/amazon/ec2/ActivateLicense.java  |    517 +-
 .../com/amazon/ec2/ActivateLicenseResponse.java |    517 +-
 .../amazon/ec2/ActivateLicenseResponseType.java |    875 +-
 .../src/com/amazon/ec2/ActivateLicenseType.java |    875 +-
 awsapi/src/com/amazon/ec2/AllocateAddress.java  |    517 +-
 .../com/amazon/ec2/AllocateAddressResponse.java |    517 +-
 .../amazon/ec2/AllocateAddressResponseType.java |   1255 +-
 .../src/com/amazon/ec2/AllocateAddressType.java |    732 +-
 .../com/amazon/ec2/AllocationIdSetItemType.java |    712 +-
 .../src/com/amazon/ec2/AllocationIdSetType.java |    845 +-
 .../ec2/AmazonEC2MessageReceiverInOut.java      |  20146 +-
 .../src/com/amazon/ec2/AmazonEC2Skeleton.java   |   3916 +-
 .../amazon/ec2/AmazonEC2SkeletonInterface.java  |   3195 +-
 .../amazon/ec2/AssignPrivateIpAddresses.java    |    517 +-
 .../ec2/AssignPrivateIpAddressesResponse.java   |    518 +-
 .../AssignPrivateIpAddressesResponseType.java   |    875 +-
 ...ignPrivateIpAddressesSetItemRequestType.java |    712 +-
 .../AssignPrivateIpAddressesSetRequestType.java |    811 +-
 .../ec2/AssignPrivateIpAddressesType.java       |   1226 +-
 awsapi/src/com/amazon/ec2/AssociateAddress.java |    517 +-
 .../amazon/ec2/AssociateAddressResponse.java    |    517 +-
 .../ec2/AssociateAddressResponseType.java       |   1068 +-
 .../com/amazon/ec2/AssociateAddressType.java    |   1114 +-
 .../ec2/AssociateAddressTypeChoice_type0.java   |    846 +-
 .../ec2/AssociateAddressTypeChoice_type1.java   |    846 +-
 .../com/amazon/ec2/AssociateDhcpOptions.java    |    517 +-
 .../ec2/AssociateDhcpOptionsResponse.java       |    518 +-
 .../ec2/AssociateDhcpOptionsResponseType.java   |    875 +-
 .../amazon/ec2/AssociateDhcpOptionsType.java    |    890 +-
 .../src/com/amazon/ec2/AssociateRouteTable.java |    517 +-
 .../amazon/ec2/AssociateRouteTableResponse.java |    518 +-
 .../ec2/AssociateRouteTableResponseType.java    |    890 +-
 .../com/amazon/ec2/AssociateRouteTableType.java |    890 +-
 .../com/amazon/ec2/AttachInternetGateway.java   |    517 +-
 .../ec2/AttachInternetGatewayResponse.java      |    518 +-
 .../ec2/AttachInternetGatewayResponseType.java  |    875 +-
 .../amazon/ec2/AttachInternetGatewayType.java   |    890 +-
 .../com/amazon/ec2/AttachNetworkInterface.java  |    517 +-
 .../ec2/AttachNetworkInterfaceResponse.java     |    518 +-
 .../ec2/AttachNetworkInterfaceResponseType.java |    890 +-
 .../amazon/ec2/AttachNetworkInterfaceType.java  |   1049 +-
 awsapi/src/com/amazon/ec2/AttachVolume.java     |    516 +-
 .../com/amazon/ec2/AttachVolumeResponse.java    |    517 +-
 .../amazon/ec2/AttachVolumeResponseType.java    |   1582 +-
 awsapi/src/com/amazon/ec2/AttachVolumeType.java |   1062 +-
 awsapi/src/com/amazon/ec2/AttachVpnGateway.java |    517 +-
 .../amazon/ec2/AttachVpnGatewayResponse.java    |    517 +-
 .../ec2/AttachVpnGatewayResponseType.java       |    829 +-
 .../com/amazon/ec2/AttachVpnGatewayType.java    |    890 +-
 .../ec2/AttachmentSetItemResponseType.java      |   1567 +-
 .../amazon/ec2/AttachmentSetResponseType.java   |    845 +-
 .../src/com/amazon/ec2/AttachmentSetType.java   |    845 +-
 awsapi/src/com/amazon/ec2/AttachmentType.java   |    890 +-
 .../amazon/ec2/AttributeBooleanValueType.java   |    699 +-
 .../src/com/amazon/ec2/AttributeValueType.java  |    712 +-
 .../ec2/AuthorizeSecurityGroupEgress.java       |    518 +-
 .../AuthorizeSecurityGroupEgressResponse.java   |    518 +-
 ...uthorizeSecurityGroupEgressResponseType.java |    875 +-
 .../ec2/AuthorizeSecurityGroupEgressType.java   |    829 +-
 .../ec2/AuthorizeSecurityGroupIngress.java      |    518 +-
 .../AuthorizeSecurityGroupIngressResponse.java  |    518 +-
 ...thorizeSecurityGroupIngressResponseType.java |    875 +-
 .../ec2/AuthorizeSecurityGroupIngressType.java  |    944 +-
 ...izeSecurityGroupIngressTypeChoice_type0.java |    846 +-
 .../amazon/ec2/AvailabilityZoneItemType.java    |   1173 +-
 .../ec2/AvailabilityZoneMessageSetType.java     |    845 +-
 .../amazon/ec2/AvailabilityZoneMessageType.java |    712 +-
 .../com/amazon/ec2/AvailabilityZoneSetType.java |    845 +-
 .../amazon/ec2/BlockDeviceMappingItemType.java  |    814 +-
 .../BlockDeviceMappingItemTypeChoice_type0.java |    928 +-
 .../com/amazon/ec2/BlockDeviceMappingType.java  |    845 +-
 awsapi/src/com/amazon/ec2/BundleInstance.java   |    517 +-
 .../com/amazon/ec2/BundleInstanceResponse.java  |    517 +-
 .../amazon/ec2/BundleInstanceResponseType.java  |    829 +-
 .../amazon/ec2/BundleInstanceS3StorageType.java |   1478 +-
 .../amazon/ec2/BundleInstanceTaskErrorType.java |    890 +-
 .../ec2/BundleInstanceTaskStorageType.java      |    651 +-
 .../com/amazon/ec2/BundleInstanceTaskType.java  |   1857 +-
 .../amazon/ec2/BundleInstanceTasksSetType.java  |    845 +-
 .../src/com/amazon/ec2/BundleInstanceType.java  |    829 +-
 awsapi/src/com/amazon/ec2/CancelBundleTask.java |    517 +-
 .../amazon/ec2/CancelBundleTaskResponse.java    |    517 +-
 .../ec2/CancelBundleTaskResponseType.java       |    829 +-
 .../com/amazon/ec2/CancelBundleTaskType.java    |    712 +-
 .../com/amazon/ec2/CancelConversionTask.java    |    517 +-
 .../ec2/CancelConversionTaskResponse.java       |    518 +-
 .../ec2/CancelConversionTaskResponseType.java   |    875 +-
 .../amazon/ec2/CancelConversionTaskType.java    |    712 +-
 awsapi/src/com/amazon/ec2/CancelExportTask.java |    517 +-
 .../amazon/ec2/CancelExportTaskResponse.java    |    517 +-
 .../ec2/CancelExportTaskResponseType.java       |    875 +-
 .../com/amazon/ec2/CancelExportTaskType.java    |    712 +-
 .../ec2/CancelReservedInstancesListing.java     |    518 +-
 .../CancelReservedInstancesListingResponse.java |    518 +-
 ...celReservedInstancesListingResponseType.java |    831 +-
 .../ec2/CancelReservedInstancesListingType.java |    713 +-
 .../amazon/ec2/CancelSpotInstanceRequests.java  |    518 +-
 .../ec2/CancelSpotInstanceRequestsResponse.java |    518 +-
 ...SpotInstanceRequestsResponseSetItemType.java |    891 +-
 ...ncelSpotInstanceRequestsResponseSetType.java |    811 +-
 .../CancelSpotInstanceRequestsResponseType.java |    830 +-
 .../ec2/CancelSpotInstanceRequestsType.java     |    652 +-
 .../com/amazon/ec2/ConfirmProductInstance.java  |    517 +-
 .../ec2/ConfirmProductInstanceResponse.java     |    518 +-
 .../ec2/ConfirmProductInstanceResponseType.java |   1068 +-
 .../amazon/ec2/ConfirmProductInstanceType.java  |    890 +-
 .../amazon/ec2/ConversionTaskIdItemType.java    |    712 +-
 .../com/amazon/ec2/ConversionTaskIdSetType.java |    845 +-
 .../com/amazon/ec2/ConversionTaskSetType.java   |    845 +-
 .../src/com/amazon/ec2/ConversionTaskType.java  |   1514 +-
 .../ec2/ConversionTaskTypeChoice_type0.java     |    734 +-
 .../com/amazon/ec2/CreateCustomerGateway.java   |    517 +-
 .../ec2/CreateCustomerGatewayResponse.java      |    518 +-
 .../ec2/CreateCustomerGatewayResponseType.java  |    829 +-
 .../amazon/ec2/CreateCustomerGatewayType.java   |   1074 +-
 .../src/com/amazon/ec2/CreateDhcpOptions.java   |    517 +-
 .../amazon/ec2/CreateDhcpOptionsResponse.java   |    518 +-
 .../ec2/CreateDhcpOptionsResponseType.java      |    829 +-
 .../com/amazon/ec2/CreateDhcpOptionsType.java   |    651 +-
 awsapi/src/com/amazon/ec2/CreateImage.java      |    516 +-
 .../src/com/amazon/ec2/CreateImageResponse.java |    517 +-
 .../com/amazon/ec2/CreateImageResponseType.java |    890 +-
 awsapi/src/com/amazon/ec2/CreateImageType.java  |   1407 +-
 .../amazon/ec2/CreateInstanceExportTask.java    |    517 +-
 .../ec2/CreateInstanceExportTaskResponse.java   |    518 +-
 .../CreateInstanceExportTaskResponseType.java   |    829 +-
 .../ec2/CreateInstanceExportTaskType.java       |   1179 +-
 ...reateInstanceExportTaskTypeChoice_type0.java |    589 +-
 .../com/amazon/ec2/CreateInternetGateway.java   |    517 +-
 .../ec2/CreateInternetGatewayResponse.java      |    518 +-
 .../ec2/CreateInternetGatewayResponseType.java  |    829 +-
 .../amazon/ec2/CreateInternetGatewayType.java   |    536 +-
 awsapi/src/com/amazon/ec2/CreateKeyPair.java    |    517 +-
 .../com/amazon/ec2/CreateKeyPairResponse.java   |    517 +-
 .../amazon/ec2/CreateKeyPairResponseType.java   |   1234 +-
 .../src/com/amazon/ec2/CreateKeyPairType.java   |    712 +-
 awsapi/src/com/amazon/ec2/CreateNetworkAcl.java |    517 +-
 .../com/amazon/ec2/CreateNetworkAclEntry.java   |    517 +-
 .../ec2/CreateNetworkAclEntryResponse.java      |    518 +-
 .../ec2/CreateNetworkAclEntryResponseType.java  |    875 +-
 .../amazon/ec2/CreateNetworkAclEntryType.java   |   1833 +-
 .../amazon/ec2/CreateNetworkAclResponse.java    |    517 +-
 .../ec2/CreateNetworkAclResponseType.java       |    829 +-
 .../com/amazon/ec2/CreateNetworkAclType.java    |    712 +-
 .../com/amazon/ec2/CreateNetworkInterface.java  |    517 +-
 .../ec2/CreateNetworkInterfaceResponse.java     |    518 +-
 .../ec2/CreateNetworkInterfaceResponseType.java |    829 +-
 .../amazon/ec2/CreateNetworkInterfaceType.java  |   1576 +-
 .../com/amazon/ec2/CreatePlacementGroup.java    |    517 +-
 .../ec2/CreatePlacementGroupResponse.java       |    518 +-
 .../ec2/CreatePlacementGroupResponseType.java   |    875 +-
 .../amazon/ec2/CreatePlacementGroupType.java    |    890 +-
 .../ec2/CreateReservedInstancesListing.java     |    518 +-
 .../CreateReservedInstancesListingResponse.java |    518 +-
 ...ateReservedInstancesListingResponseType.java |    831 +-
 .../ec2/CreateReservedInstancesListingType.java |   1184 +-
 awsapi/src/com/amazon/ec2/CreateRoute.java      |    516 +-
 .../src/com/amazon/ec2/CreateRouteResponse.java |    517 +-
 .../com/amazon/ec2/CreateRouteResponseType.java |    875 +-
 awsapi/src/com/amazon/ec2/CreateRouteTable.java |    517 +-
 .../amazon/ec2/CreateRouteTableResponse.java    |    517 +-
 .../ec2/CreateRouteTableResponseType.java       |    829 +-
 .../com/amazon/ec2/CreateRouteTableType.java    |    712 +-
 awsapi/src/com/amazon/ec2/CreateRouteType.java  |    986 +-
 .../amazon/ec2/CreateRouteTypeChoice_type0.java |   1042 +-
 .../src/com/amazon/ec2/CreateSecurityGroup.java |    517 +-
 .../amazon/ec2/CreateSecurityGroupResponse.java |    518 +-
 .../ec2/CreateSecurityGroupResponseType.java    |   1047 +-
 .../com/amazon/ec2/CreateSecurityGroupType.java |   1083 +-
 awsapi/src/com/amazon/ec2/CreateSnapshot.java   |    517 +-
 .../com/amazon/ec2/CreateSnapshotResponse.java  |    517 +-
 .../amazon/ec2/CreateSnapshotResponseType.java  |   2125 +-
 .../src/com/amazon/ec2/CreateSnapshotType.java  |    909 +-
 .../ec2/CreateSpotDatafeedSubscription.java     |    518 +-
 .../CreateSpotDatafeedSubscriptionResponse.java |    518 +-
 ...ateSpotDatafeedSubscriptionResponseType.java |    830 +-
 .../ec2/CreateSpotDatafeedSubscriptionType.java |    890 +-
 awsapi/src/com/amazon/ec2/CreateSubnet.java     |    516 +-
 .../com/amazon/ec2/CreateSubnetResponse.java    |    517 +-
 .../amazon/ec2/CreateSubnetResponseType.java    |    829 +-
 awsapi/src/com/amazon/ec2/CreateSubnetType.java |   1083 +-
 awsapi/src/com/amazon/ec2/CreateTags.java       |    516 +-
 .../src/com/amazon/ec2/CreateTagsResponse.java  |    517 +-
 .../com/amazon/ec2/CreateTagsResponseType.java  |    875 +-
 awsapi/src/com/amazon/ec2/CreateTagsType.java   |    768 +-
 awsapi/src/com/amazon/ec2/CreateVolume.java     |    516 +-
 .../ec2/CreateVolumePermissionItemType.java     |    942 +-
 .../ec2/CreateVolumePermissionListType.java     |    845 +-
 .../CreateVolumePermissionOperationType.java    |    830 +-
 .../com/amazon/ec2/CreateVolumeResponse.java    |    517 +-
 .../amazon/ec2/CreateVolumeResponseType.java    |   2116 +-
 awsapi/src/com/amazon/ec2/CreateVolumeType.java |   1491 +-
 awsapi/src/com/amazon/ec2/CreateVpc.java        |    516 +-
 .../src/com/amazon/ec2/CreateVpcResponse.java   |    517 +-
 .../com/amazon/ec2/CreateVpcResponseType.java   |    829 +-
 awsapi/src/com/amazon/ec2/CreateVpcType.java    |    909 +-
 .../src/com/amazon/ec2/CreateVpnConnection.java |    517 +-
 .../amazon/ec2/CreateVpnConnectionResponse.java |    518 +-
 .../ec2/CreateVpnConnectionResponseType.java    |    829 +-
 .../amazon/ec2/CreateVpnConnectionRoute.java    |    517 +-
 .../ec2/CreateVpnConnectionRouteResponse.java   |    518 +-
 .../CreateVpnConnectionRouteResponseType.java   |    875 +-
 .../ec2/CreateVpnConnectionRouteType.java       |    890 +-
 .../com/amazon/ec2/CreateVpnConnectionType.java |   1200 +-
 awsapi/src/com/amazon/ec2/CreateVpnGateway.java |    517 +-
 .../amazon/ec2/CreateVpnGatewayResponse.java    |    517 +-
 .../ec2/CreateVpnGatewayResponseType.java       |    829 +-
 .../com/amazon/ec2/CreateVpnGatewayType.java    |    909 +-
 .../ec2/CustomerGatewayIdSetItemType.java       |    712 +-
 .../amazon/ec2/CustomerGatewayIdSetType.java    |    845 +-
 .../com/amazon/ec2/CustomerGatewaySetType.java  |    845 +-
 .../src/com/amazon/ec2/CustomerGatewayType.java |   1561 +-
 .../src/com/amazon/ec2/DeactivateLicense.java   |    517 +-
 .../amazon/ec2/DeactivateLicenseResponse.java   |    518 +-
 .../ec2/DeactivateLicenseResponseType.java      |    875 +-
 .../com/amazon/ec2/DeactivateLicenseType.java   |    875 +-
 .../com/amazon/ec2/DeleteCustomerGateway.java   |    517 +-
 .../ec2/DeleteCustomerGatewayResponse.java      |    518 +-
 .../ec2/DeleteCustomerGatewayResponseType.java  |    875 +-
 .../amazon/ec2/DeleteCustomerGatewayType.java   |    712 +-
 .../src/com/amazon/ec2/DeleteDhcpOptions.java   |    517 +-
 .../amazon/ec2/DeleteDhcpOptionsResponse.java   |    518 +-
 .../ec2/DeleteDhcpOptionsResponseType.java      |    875 +-
 .../com/amazon/ec2/DeleteDhcpOptionsType.java   |    712 +-
 .../com/amazon/ec2/DeleteInternetGateway.java   |    517 +-
 .../ec2/DeleteInternetGatewayResponse.java      |    518 +-
 .../ec2/DeleteInternetGatewayResponseType.java  |    875 +-
 .../amazon/ec2/DeleteInternetGatewayType.java   |    712 +-
 awsapi/src/com/amazon/ec2/DeleteKeyPair.java    |    517 +-
 .../com/amazon/ec2/DeleteKeyPairResponse.java   |    517 +-
 .../amazon/ec2/DeleteKeyPairResponseType.java   |    875 +-
 .../src/com/amazon/ec2/DeleteKeyPairType.java   |    712 +-
 awsapi/src/com/amazon/ec2/DeleteNetworkAcl.java |    517 +-
 .../com/amazon/ec2/DeleteNetworkAclEntry.java   |    517 +-
 .../ec2/DeleteNetworkAclEntryResponse.java      |    518 +-
 .../ec2/DeleteNetworkAclEntryResponseType.java  |    875 +-
 .../amazon/ec2/DeleteNetworkAclEntryType.java   |   1034 +-
 .../amazon/ec2/DeleteNetworkAclResponse.java    |    517 +-
 .../ec2/DeleteNetworkAclResponseType.java       |    875 +-
 .../com/amazon/ec2/DeleteNetworkAclType.java    |    712 +-
 .../com/amazon/ec2/DeleteNetworkInterface.java  |    517 +-
 .../ec2/DeleteNetworkInterfaceResponse.java     |    518 +-
 .../ec2/DeleteNetworkInterfaceResponseType.java |    875 +-
 .../amazon/ec2/DeleteNetworkInterfaceType.java  |    712 +-
 .../com/amazon/ec2/DeletePlacementGroup.java    |    517 +-
 .../ec2/DeletePlacementGroupResponse.java       |    518 +-
 .../ec2/DeletePlacementGroupResponseType.java   |    875 +-
 .../amazon/ec2/DeletePlacementGroupType.java    |    712 +-
 awsapi/src/com/amazon/ec2/DeleteRoute.java      |    516 +-
 .../src/com/amazon/ec2/DeleteRouteResponse.java |    517 +-
 .../com/amazon/ec2/DeleteRouteResponseType.java |    875 +-
 awsapi/src/com/amazon/ec2/DeleteRouteTable.java |    517 +-
 .../amazon/ec2/DeleteRouteTableResponse.java    |    517 +-
 .../ec2/DeleteRouteTableResponseType.java       |    875 +-
 .../com/amazon/ec2/DeleteRouteTableType.java    |    712 +-
 awsapi/src/com/amazon/ec2/DeleteRouteType.java  |    890 +-
 .../src/com/amazon/ec2/DeleteSecurityGroup.java |    517 +-
 .../amazon/ec2/DeleteSecurityGroupResponse.java |    518 +-
 .../ec2/DeleteSecurityGroupResponseType.java    |    875 +-
 .../com/amazon/ec2/DeleteSecurityGroupType.java |    942 +-
 awsapi/src/com/amazon/ec2/DeleteSnapshot.java   |    517 +-
 .../com/amazon/ec2/DeleteSnapshotResponse.java  |    517 +-
 .../amazon/ec2/DeleteSnapshotResponseType.java  |    875 +-
 .../src/com/amazon/ec2/DeleteSnapshotType.java  |    712 +-
 .../ec2/DeleteSpotDatafeedSubscription.java     |    518 +-
 .../DeleteSpotDatafeedSubscriptionResponse.java |    518 +-
 ...eteSpotDatafeedSubscriptionResponseType.java |    875 +-
 .../ec2/DeleteSpotDatafeedSubscriptionType.java |    536 +-
 awsapi/src/com/amazon/ec2/DeleteSubnet.java     |    516 +-
 .../com/amazon/ec2/DeleteSubnetResponse.java    |    517 +-
 .../amazon/ec2/DeleteSubnetResponseType.java    |    875 +-
 awsapi/src/com/amazon/ec2/DeleteSubnetType.java |    712 +-
 awsapi/src/com/amazon/ec2/DeleteTags.java       |    516 +-
 .../src/com/amazon/ec2/DeleteTagsResponse.java  |    517 +-
 .../com/amazon/ec2/DeleteTagsResponseType.java  |    875 +-
 .../com/amazon/ec2/DeleteTagsSetItemType.java   |    934 +-
 .../src/com/amazon/ec2/DeleteTagsSetType.java   |    845 +-
 awsapi/src/com/amazon/ec2/DeleteTagsType.java   |    768 +-
 awsapi/src/com/amazon/ec2/DeleteVolume.java     |    516 +-
 .../com/amazon/ec2/DeleteVolumeResponse.java    |    517 +-
 .../amazon/ec2/DeleteVolumeResponseType.java    |    875 +-
 awsapi/src/com/amazon/ec2/DeleteVolumeType.java |    712 +-
 awsapi/src/com/amazon/ec2/DeleteVpc.java        |    516 +-
 .../src/com/amazon/ec2/DeleteVpcResponse.java   |    517 +-
 .../com/amazon/ec2/DeleteVpcResponseType.java   |    875 +-
 awsapi/src/com/amazon/ec2/DeleteVpcType.java    |    712 +-
 .../src/com/amazon/ec2/DeleteVpnConnection.java |    517 +-
 .../amazon/ec2/DeleteVpnConnectionResponse.java |    518 +-
 .../ec2/DeleteVpnConnectionResponseType.java    |    875 +-
 .../amazon/ec2/DeleteVpnConnectionRoute.java    |    517 +-
 .../ec2/DeleteVpnConnectionRouteResponse.java   |    518 +-
 .../DeleteVpnConnectionRouteResponseType.java   |    875 +-
 .../ec2/DeleteVpnConnectionRouteType.java       |    890 +-
 .../com/amazon/ec2/DeleteVpnConnectionType.java |    712 +-
 awsapi/src/com/amazon/ec2/DeleteVpnGateway.java |    517 +-
 .../amazon/ec2/DeleteVpnGatewayResponse.java    |    517 +-
 .../ec2/DeleteVpnGatewayResponseType.java       |    875 +-
 .../com/amazon/ec2/DeleteVpnGatewayType.java    |    712 +-
 awsapi/src/com/amazon/ec2/DeregisterImage.java  |    517 +-
 .../com/amazon/ec2/DeregisterImageResponse.java |    517 +-
 .../amazon/ec2/DeregisterImageResponseType.java |    875 +-
 .../src/com/amazon/ec2/DeregisterImageType.java |    712 +-
 .../src/com/amazon/ec2/DescribeAddresses.java   |    517 +-
 .../amazon/ec2/DescribeAddressesInfoType.java   |    845 +-
 .../amazon/ec2/DescribeAddressesItemType.java   |    712 +-
 .../amazon/ec2/DescribeAddressesResponse.java   |    518 +-
 .../ec2/DescribeAddressesResponseInfoType.java  |    845 +-
 .../ec2/DescribeAddressesResponseItemType.java  |   2076 +-
 .../ec2/DescribeAddressesResponseType.java      |    829 +-
 .../com/amazon/ec2/DescribeAddressesType.java   |    906 +-
 .../amazon/ec2/DescribeAvailabilityZones.java   |    518 +-
 .../ec2/DescribeAvailabilityZonesResponse.java  |    518 +-
 .../DescribeAvailabilityZonesResponseType.java  |    829 +-
 .../DescribeAvailabilityZonesSetItemType.java   |    712 +-
 .../ec2/DescribeAvailabilityZonesSetType.java   |    845 +-
 .../ec2/DescribeAvailabilityZonesType.java      |    793 +-
 .../src/com/amazon/ec2/DescribeBundleTasks.java |    517 +-
 .../amazon/ec2/DescribeBundleTasksInfoType.java |    845 +-
 .../amazon/ec2/DescribeBundleTasksItemType.java |    712 +-
 .../amazon/ec2/DescribeBundleTasksResponse.java |    518 +-
 .../ec2/DescribeBundleTasksResponseType.java    |    830 +-
 .../com/amazon/ec2/DescribeBundleTasksType.java |    793 +-
 .../com/amazon/ec2/DescribeConversionTasks.java |    517 +-
 .../ec2/DescribeConversionTasksResponse.java    |    518 +-
 .../DescribeConversionTasksResponseType.java    |    829 +-
 .../amazon/ec2/DescribeConversionTasksType.java |    651 +-
 .../amazon/ec2/DescribeCustomerGateways.java    |    517 +-
 .../ec2/DescribeCustomerGatewaysResponse.java   |    518 +-
 .../DescribeCustomerGatewaysResponseType.java   |    829 +-
 .../ec2/DescribeCustomerGatewaysType.java       |    822 +-
 .../src/com/amazon/ec2/DescribeDhcpOptions.java |    517 +-
 .../amazon/ec2/DescribeDhcpOptionsResponse.java |    518 +-
 .../ec2/DescribeDhcpOptionsResponseType.java    |    829 +-
 .../com/amazon/ec2/DescribeDhcpOptionsType.java |    822 +-
 .../src/com/amazon/ec2/DescribeExportTasks.java |    517 +-
 .../amazon/ec2/DescribeExportTasksResponse.java |    518 +-
 .../ec2/DescribeExportTasksResponseType.java    |    829 +-
 .../com/amazon/ec2/DescribeExportTasksType.java |    651 +-
 .../com/amazon/ec2/DescribeImageAttribute.java  |    517 +-
 .../ec2/DescribeImageAttributeResponse.java     |    518 +-
 .../ec2/DescribeImageAttributeResponseType.java |    986 +-
 ...eImageAttributeResponseTypeChoice_type0.java |   1286 +-
 .../amazon/ec2/DescribeImageAttributeType.java  |    814 +-
 .../ec2/DescribeImageAttributesGroup.java       |   1447 +-
 awsapi/src/com/amazon/ec2/DescribeImages.java   |    517 +-
 .../ec2/DescribeImagesExecutableBySetType.java  |    845 +-
 .../ec2/DescribeImagesExecutableByType.java     |    712 +-
 .../com/amazon/ec2/DescribeImagesInfoType.java  |    845 +-
 .../com/amazon/ec2/DescribeImagesItemType.java  |    712 +-
 .../com/amazon/ec2/DescribeImagesOwnerType.java |    712 +-
 .../amazon/ec2/DescribeImagesOwnersType.java    |    845 +-
 .../com/amazon/ec2/DescribeImagesResponse.java  |    517 +-
 .../ec2/DescribeImagesResponseInfoType.java     |    845 +-
 .../ec2/DescribeImagesResponseItemType.java     |   4456 +-
 .../amazon/ec2/DescribeImagesResponseType.java  |    829 +-
 .../src/com/amazon/ec2/DescribeImagesType.java  |   1072 +-
 .../amazon/ec2/DescribeInstanceAttribute.java   |    518 +-
 .../ec2/DescribeInstanceAttributeResponse.java  |    518 +-
 .../DescribeInstanceAttributeResponseType.java  |    986 +-
 ...stanceAttributeResponseTypeChoice_type0.java |   2124 +-
 .../ec2/DescribeInstanceAttributeType.java      |    814 +-
 .../ec2/DescribeInstanceAttributesGroup.java    |   2123 +-
 .../com/amazon/ec2/DescribeInstanceStatus.java  |    517 +-
 .../ec2/DescribeInstanceStatusResponse.java     |    518 +-
 .../ec2/DescribeInstanceStatusResponseType.java |   1022 +-
 .../amazon/ec2/DescribeInstanceStatusType.java  |   1359 +-
 .../src/com/amazon/ec2/DescribeInstances.java   |    517 +-
 .../amazon/ec2/DescribeInstancesInfoType.java   |    845 +-
 .../amazon/ec2/DescribeInstancesItemType.java   |    712 +-
 .../amazon/ec2/DescribeInstancesResponse.java   |    518 +-
 .../ec2/DescribeInstancesResponseType.java      |    829 +-
 .../com/amazon/ec2/DescribeInstancesType.java   |    793 +-
 .../amazon/ec2/DescribeInternetGateways.java    |    517 +-
 .../ec2/DescribeInternetGatewaysResponse.java   |    518 +-
 .../DescribeInternetGatewaysResponseType.java   |    829 +-
 .../ec2/DescribeInternetGatewaysType.java       |    793 +-
 awsapi/src/com/amazon/ec2/DescribeKeyPairs.java |    517 +-
 .../amazon/ec2/DescribeKeyPairsInfoType.java    |    845 +-
 .../amazon/ec2/DescribeKeyPairsItemType.java    |    712 +-
 .../amazon/ec2/DescribeKeyPairsResponse.java    |    517 +-
 .../ec2/DescribeKeyPairsResponseInfoType.java   |    845 +-
 .../ec2/DescribeKeyPairsResponseItemType.java   |    890 +-
 .../ec2/DescribeKeyPairsResponseType.java       |    829 +-
 .../com/amazon/ec2/DescribeKeyPairsType.java    |    793 +-
 awsapi/src/com/amazon/ec2/DescribeLicenses.java |    517 +-
 .../amazon/ec2/DescribeLicensesResponse.java    |    517 +-
 .../ec2/DescribeLicensesResponseType.java       |    829 +-
 .../com/amazon/ec2/DescribeLicensesType.java    |    822 +-
 .../src/com/amazon/ec2/DescribeNetworkAcls.java |    517 +-
 .../amazon/ec2/DescribeNetworkAclsResponse.java |    518 +-
 .../ec2/DescribeNetworkAclsResponseType.java    |    829 +-
 .../com/amazon/ec2/DescribeNetworkAclsType.java |    793 +-
 .../ec2/DescribeNetworkInterfaceAttribute.java  |    518 +-
 ...scribeNetworkInterfaceAttributeResponse.java |    518 +-
 ...beNetworkInterfaceAttributeResponseType.java |    986 +-
 ...erfaceAttributeResponseTypeChoice_type0.java |   1011 +-
 .../DescribeNetworkInterfaceAttributeType.java  |    814 +-
 ...DescribeNetworkInterfaceAttributesGroup.java |   1010 +-
 .../amazon/ec2/DescribeNetworkInterfaces.java   |    518 +-
 .../ec2/DescribeNetworkInterfacesResponse.java  |    518 +-
 .../DescribeNetworkInterfacesResponseType.java  |    829 +-
 .../ec2/DescribeNetworkInterfacesType.java      |    823 +-
 .../ec2/DescribePlacementGroupItemType.java     |    712 +-
 .../com/amazon/ec2/DescribePlacementGroups.java |    517 +-
 .../ec2/DescribePlacementGroupsInfoType.java    |    845 +-
 .../ec2/DescribePlacementGroupsResponse.java    |    518 +-
 .../DescribePlacementGroupsResponseType.java    |    829 +-
 .../amazon/ec2/DescribePlacementGroupsType.java |    793 +-
 awsapi/src/com/amazon/ec2/DescribeRegions.java  |    517 +-
 .../com/amazon/ec2/DescribeRegionsResponse.java |    517 +-
 .../amazon/ec2/DescribeRegionsResponseType.java |    829 +-
 .../amazon/ec2/DescribeRegionsSetItemType.java  |    712 +-
 .../com/amazon/ec2/DescribeRegionsSetType.java  |    845 +-
 .../src/com/amazon/ec2/DescribeRegionsType.java |    793 +-
 .../amazon/ec2/DescribeReservedInstances.java   |    518 +-
 ...ribeReservedInstancesListingSetItemType.java |    713 +-
 ...DescribeReservedInstancesListingSetType.java |    811 +-
 .../ec2/DescribeReservedInstancesListings.java  |    518 +-
 ...scribeReservedInstancesListingsResponse.java |    518 +-
 ...vedInstancesListingsResponseSetItemType.java |   2146 +-
 ...eservedInstancesListingsResponseSetType.java |    847 +-
 ...beReservedInstancesListingsResponseType.java |    831 +-
 .../DescribeReservedInstancesListingsType.java  |    965 +-
 .../ec2/DescribeReservedInstancesOfferings.java |    518 +-
 ...cribeReservedInstancesOfferingsResponse.java |    518 +-
 ...edInstancesOfferingsResponseSetItemType.java |   2671 +-
 ...servedInstancesOfferingsResponseSetType.java |    847 +-
 ...eReservedInstancesOfferingsResponseType.java |   1024 +-
 ...beReservedInstancesOfferingsSetItemType.java |    713 +-
 ...scribeReservedInstancesOfferingsSetType.java |    846 +-
 .../DescribeReservedInstancesOfferingsType.java |   2997 +-
 .../ec2/DescribeReservedInstancesResponse.java  |    518 +-
 ...ibeReservedInstancesResponseSetItemType.java |   3036 +-
 ...escribeReservedInstancesResponseSetType.java |    846 +-
 .../DescribeReservedInstancesResponseType.java  |    829 +-
 .../DescribeReservedInstancesSetItemType.java   |    712 +-
 .../ec2/DescribeReservedInstancesSetType.java   |    845 +-
 .../ec2/DescribeReservedInstancesType.java      |   1018 +-
 .../src/com/amazon/ec2/DescribeRouteTables.java |    517 +-
 .../amazon/ec2/DescribeRouteTablesResponse.java |    518 +-
 .../ec2/DescribeRouteTablesResponseType.java    |    829 +-
 .../com/amazon/ec2/DescribeRouteTablesType.java |    793 +-
 .../com/amazon/ec2/DescribeSecurityGroups.java  |    517 +-
 .../DescribeSecurityGroupsIdSetItemType.java    |    712 +-
 .../ec2/DescribeSecurityGroupsIdSetType.java    |    845 +-
 .../ec2/DescribeSecurityGroupsResponse.java     |    518 +-
 .../ec2/DescribeSecurityGroupsResponseType.java |    829 +-
 .../ec2/DescribeSecurityGroupsSetItemType.java  |    712 +-
 .../ec2/DescribeSecurityGroupsSetType.java      |    845 +-
 .../amazon/ec2/DescribeSecurityGroupsType.java  |    934 +-
 .../amazon/ec2/DescribeSnapshotAttribute.java   |    518 +-
 .../ec2/DescribeSnapshotAttributeResponse.java  |    518 +-
 .../DescribeSnapshotAttributeResponseType.java  |    986 +-
 ...apshotAttributeResponseTypeChoice_type0.java |    736 +-
 .../ec2/DescribeSnapshotAttributeType.java      |    814 +-
 .../ec2/DescribeSnapshotAttributesGroup.java    |    735 +-
 .../src/com/amazon/ec2/DescribeSnapshots.java   |    517 +-
 .../amazon/ec2/DescribeSnapshotsOwnerType.java  |    712 +-
 .../amazon/ec2/DescribeSnapshotsOwnersType.java |    845 +-
 .../amazon/ec2/DescribeSnapshotsResponse.java   |    518 +-
 .../ec2/DescribeSnapshotsResponseType.java      |    829 +-
 .../DescribeSnapshotsRestorableBySetType.java   |    845 +-
 .../ec2/DescribeSnapshotsRestorableByType.java  |    712 +-
 .../DescribeSnapshotsSetItemResponseType.java   |   2290 +-
 .../ec2/DescribeSnapshotsSetItemType.java       |    712 +-
 .../ec2/DescribeSnapshotsSetResponseType.java   |    845 +-
 .../amazon/ec2/DescribeSnapshotsSetType.java    |    845 +-
 .../com/amazon/ec2/DescribeSnapshotsType.java   |   1073 +-
 .../ec2/DescribeSpotDatafeedSubscription.java   |    518 +-
 ...escribeSpotDatafeedSubscriptionResponse.java |    518 +-
 ...ibeSpotDatafeedSubscriptionResponseType.java |    830 +-
 .../DescribeSpotDatafeedSubscriptionType.java   |    536 +-
 .../ec2/DescribeSpotInstanceRequests.java       |    518 +-
 .../DescribeSpotInstanceRequestsResponse.java   |    518 +-
 ...escribeSpotInstanceRequestsResponseType.java |    830 +-
 .../ec2/DescribeSpotInstanceRequestsType.java   |    794 +-
 .../amazon/ec2/DescribeSpotPriceHistory.java    |    517 +-
 .../ec2/DescribeSpotPriceHistoryResponse.java   |    518 +-
 .../DescribeSpotPriceHistoryResponseType.java   |   1022 +-
 .../ec2/DescribeSpotPriceHistoryType.java       |   1952 +-
 awsapi/src/com/amazon/ec2/DescribeSubnets.java  |    517 +-
 .../com/amazon/ec2/DescribeSubnetsResponse.java |    517 +-
 .../amazon/ec2/DescribeSubnetsResponseType.java |    829 +-
 .../src/com/amazon/ec2/DescribeSubnetsType.java |    822 +-
 awsapi/src/com/amazon/ec2/DescribeTags.java     |    516 +-
 .../com/amazon/ec2/DescribeTagsResponse.java    |    517 +-
 .../amazon/ec2/DescribeTagsResponseType.java    |    829 +-
 awsapi/src/com/amazon/ec2/DescribeTagsType.java |    677 +-
 .../com/amazon/ec2/DescribeVolumeAttribute.java |    517 +-
 .../ec2/DescribeVolumeAttributeResponse.java    |    518 +-
 .../DescribeVolumeAttributeResponseType.java    |    986 +-
 ...VolumeAttributeResponseTypeChoice_type0.java |    735 +-
 .../amazon/ec2/DescribeVolumeAttributeType.java |    814 +-
 .../ec2/DescribeVolumeAttributesGroup.java      |    734 +-
 .../com/amazon/ec2/DescribeVolumeStatus.java    |    517 +-
 .../ec2/DescribeVolumeStatusResponse.java       |    518 +-
 .../ec2/DescribeVolumeStatusResponseType.java   |   1022 +-
 .../amazon/ec2/DescribeVolumeStatusType.java    |   1185 +-
 awsapi/src/com/amazon/ec2/DescribeVolumes.java  |    517 +-
 .../com/amazon/ec2/DescribeVolumesResponse.java |    517 +-
 .../amazon/ec2/DescribeVolumesResponseType.java |    829 +-
 .../ec2/DescribeVolumesSetItemResponseType.java |   2194 +-
 .../amazon/ec2/DescribeVolumesSetItemType.java  |    712 +-
 .../ec2/DescribeVolumesSetResponseType.java     |    845 +-
 .../com/amazon/ec2/DescribeVolumesSetType.java  |    845 +-
 .../src/com/amazon/ec2/DescribeVolumesType.java |    793 +-
 awsapi/src/com/amazon/ec2/DescribeVpcs.java     |    516 +-
 .../com/amazon/ec2/DescribeVpcsResponse.java    |    517 +-
 .../amazon/ec2/DescribeVpcsResponseType.java    |    829 +-
 awsapi/src/com/amazon/ec2/DescribeVpcsType.java |    822 +-
 .../com/amazon/ec2/DescribeVpnConnections.java  |    517 +-
 .../ec2/DescribeVpnConnectionsResponse.java     |    518 +-
 .../ec2/DescribeVpnConnectionsResponseType.java |    829 +-
 .../amazon/ec2/DescribeVpnConnectionsType.java  |    822 +-
 .../src/com/amazon/ec2/DescribeVpnGateways.java |    517 +-
 .../amazon/ec2/DescribeVpnGatewaysResponse.java |    518 +-
 .../ec2/DescribeVpnGatewaysResponseType.java    |    829 +-
 .../com/amazon/ec2/DescribeVpnGatewaysType.java |    822 +-
 .../com/amazon/ec2/DetachInternetGateway.java   |    517 +-
 .../ec2/DetachInternetGatewayResponse.java      |    518 +-
 .../ec2/DetachInternetGatewayResponseType.java  |    875 +-
 .../amazon/ec2/DetachInternetGatewayType.java   |    890 +-
 .../com/amazon/ec2/DetachNetworkInterface.java  |    517 +-
 .../ec2/DetachNetworkInterfaceResponse.java     |    518 +-
 .../ec2/DetachNetworkInterfaceResponseType.java |    875 +-
 .../amazon/ec2/DetachNetworkInterfaceType.java  |    896 +-
 awsapi/src/com/amazon/ec2/DetachVolume.java     |    516 +-
 .../com/amazon/ec2/DetachVolumeResponse.java    |    517 +-
 .../amazon/ec2/DetachVolumeResponseType.java    |   1582 +-
 awsapi/src/com/amazon/ec2/DetachVolumeType.java |   1290 +-
 awsapi/src/com/amazon/ec2/DetachVpnGateway.java |    517 +-
 .../amazon/ec2/DetachVpnGatewayResponse.java    |    517 +-
 .../ec2/DetachVpnGatewayResponseType.java       |    875 +-
 .../com/amazon/ec2/DetachVpnGatewayType.java    |    890 +-
 .../ec2/DhcpConfigurationItemSetType.java       |    845 +-
 .../amazon/ec2/DhcpConfigurationItemType.java   |    829 +-
 .../amazon/ec2/DhcpOptionsIdSetItemType.java    |    712 +-
 .../com/amazon/ec2/DhcpOptionsIdSetType.java    |    845 +-
 .../src/com/amazon/ec2/DhcpOptionsSetType.java  |    845 +-
 awsapi/src/com/amazon/ec2/DhcpOptionsType.java  |    967 +-
 awsapi/src/com/amazon/ec2/DhcpValueSetType.java |    845 +-
 awsapi/src/com/amazon/ec2/DhcpValueType.java    |    712 +-
 .../amazon/ec2/DisableVgwRoutePropagation.java  |    518 +-
 .../DisableVgwRoutePropagationRequestType.java  |    890 +-
 .../ec2/DisableVgwRoutePropagationResponse.java |    518 +-
 .../DisableVgwRoutePropagationResponseType.java |    875 +-
 .../src/com/amazon/ec2/DisassociateAddress.java |    517 +-
 .../amazon/ec2/DisassociateAddressResponse.java |    518 +-
 .../ec2/DisassociateAddressResponseType.java    |    875 +-
 .../com/amazon/ec2/DisassociateAddressType.java |    943 +-
 .../com/amazon/ec2/DisassociateRouteTable.java  |    517 +-
 .../ec2/DisassociateRouteTableResponse.java     |    518 +-
 .../ec2/DisassociateRouteTableResponseType.java |    875 +-
 .../amazon/ec2/DisassociateRouteTableType.java  |    712 +-
 .../amazon/ec2/DiskImageDescriptionType.java    |   1240 +-
 .../src/com/amazon/ec2/DiskImageDetailType.java |   1047 +-
 awsapi/src/com/amazon/ec2/DiskImageSetType.java |    845 +-
 awsapi/src/com/amazon/ec2/DiskImageType.java    |    960 +-
 .../ec2/DiskImageVolumeDescriptionType.java     |    890 +-
 .../src/com/amazon/ec2/DiskImageVolumeType.java |    712 +-
 .../src/com/amazon/ec2/EbsBlockDeviceType.java  |   1499 +-
 ...sInstanceBlockDeviceMappingResponseType.java |   1242 +-
 awsapi/src/com/amazon/ec2/EmptyElementType.java |    536 +-
 .../amazon/ec2/EnableVgwRoutePropagation.java   |    518 +-
 .../EnableVgwRoutePropagationRequestType.java   |    890 +-
 .../ec2/EnableVgwRoutePropagationResponse.java  |    518 +-
 .../EnableVgwRoutePropagationResponseType.java  |    875 +-
 awsapi/src/com/amazon/ec2/EnableVolumeIO.java   |    517 +-
 .../com/amazon/ec2/EnableVolumeIOResponse.java  |    517 +-
 .../amazon/ec2/EnableVolumeIOResponseType.java  |    875 +-
 .../src/com/amazon/ec2/EnableVolumeIOType.java  |    712 +-
 .../src/com/amazon/ec2/ExportTaskIdSetType.java |    845 +-
 awsapi/src/com/amazon/ec2/ExportTaskIdType.java |    712 +-
 .../com/amazon/ec2/ExportTaskResponseType.java  |   1470 +-
 .../ec2/ExportTaskResponseTypeChoice_type0.java |    589 +-
 .../ec2/ExportTaskResponseTypeChoice_type1.java |    589 +-
 .../amazon/ec2/ExportTaskSetResponseType.java   |    845 +-
 .../amazon/ec2/ExportToS3TaskResponseType.java  |   1252 +-
 .../src/com/amazon/ec2/ExportToS3TaskType.java  |   1277 +-
 awsapi/src/com/amazon/ec2/ExtensionMapper.java  |   9474 +-
 awsapi/src/com/amazon/ec2/FilterSetType.java    |    844 +-
 awsapi/src/com/amazon/ec2/FilterType.java       |    829 +-
 awsapi/src/com/amazon/ec2/GetConsoleOutput.java |    517 +-
 .../amazon/ec2/GetConsoleOutputResponse.java    |    517 +-
 .../ec2/GetConsoleOutputResponseType.java       |   1234 +-
 .../com/amazon/ec2/GetConsoleOutputType.java    |    712 +-
 awsapi/src/com/amazon/ec2/GetPasswordData.java  |    517 +-
 .../com/amazon/ec2/GetPasswordDataResponse.java |    517 +-
 .../amazon/ec2/GetPasswordDataResponseType.java |   1234 +-
 .../src/com/amazon/ec2/GetPasswordDataType.java |    712 +-
 awsapi/src/com/amazon/ec2/GroupItemType.java    |    934 +-
 awsapi/src/com/amazon/ec2/GroupSetType.java     |    845 +-
 .../ec2/IamInstanceProfileRequestType.java      |    934 +-
 .../ec2/IamInstanceProfileResponseType.java     |    890 +-
 awsapi/src/com/amazon/ec2/IcmpTypeCodeType.java |    862 +-
 awsapi/src/com/amazon/ec2/ImportInstance.java   |    517 +-
 .../amazon/ec2/ImportInstanceGroupItemType.java |    934 +-
 .../amazon/ec2/ImportInstanceGroupSetType.java  |    845 +-
 .../ImportInstanceLaunchSpecificationType.java  |   2038 +-
 .../com/amazon/ec2/ImportInstanceResponse.java  |    517 +-
 .../amazon/ec2/ImportInstanceResponseType.java  |    829 +-
 .../ec2/ImportInstanceTaskDetailsType.java      |   1242 +-
 .../src/com/amazon/ec2/ImportInstanceType.java  |   1316 +-
 .../ec2/ImportInstanceVolumeDetailItemType.java |   1660 +-
 .../ec2/ImportInstanceVolumeDetailSetType.java  |    845 +-
 awsapi/src/com/amazon/ec2/ImportKeyPair.java    |    517 +-
 .../com/amazon/ec2/ImportKeyPairResponse.java   |    517 +-
 .../amazon/ec2/ImportKeyPairResponseType.java   |   1062 +-
 .../src/com/amazon/ec2/ImportKeyPairType.java   |    890 +-
 awsapi/src/com/amazon/ec2/ImportVolume.java     |    516 +-
 .../com/amazon/ec2/ImportVolumeResponse.java    |    517 +-
 .../amazon/ec2/ImportVolumeResponseType.java    |    829 +-
 .../amazon/ec2/ImportVolumeTaskDetailsType.java |   1289 +-
 awsapi/src/com/amazon/ec2/ImportVolumeType.java |   1132 +-
 .../ec2/InstanceBlockDeviceMappingItemType.java |    814 +-
 ...eBlockDeviceMappingItemTypeChoice_type0.java |    928 +-
 ...tanceBlockDeviceMappingResponseItemType.java |    814 +-
 ...viceMappingResponseItemTypeChoice_type0.java |    590 +-
 .../InstanceBlockDeviceMappingResponseType.java |    846 +-
 .../ec2/InstanceBlockDeviceMappingType.java     |    845 +-
 .../amazon/ec2/InstanceCountsSetItemType.java   |    875 +-
 .../com/amazon/ec2/InstanceCountsSetType.java   |    810 +-
 .../amazon/ec2/InstanceEbsBlockDeviceType.java  |    896 +-
 .../ec2/InstanceExportTaskResponseType.java     |    909 +-
 .../src/com/amazon/ec2/InstanceIdSetType.java   |    845 +-
 awsapi/src/com/amazon/ec2/InstanceIdType.java   |    712 +-
 .../amazon/ec2/InstanceLicenseRequestType.java  |    712 +-
 .../amazon/ec2/InstanceLicenseResponseType.java |    712 +-
 .../amazon/ec2/InstanceMonitoringStateType.java |    712 +-
 ...InstanceNetworkInterfaceAssociationType.java |    909 +-
 .../InstanceNetworkInterfaceAttachmentType.java |   1378 +-
 ...tanceNetworkInterfaceSetItemRequestType.java |   2149 +-
 .../InstanceNetworkInterfaceSetItemType.java    |   2793 +-
 .../InstanceNetworkInterfaceSetRequestType.java |    846 +-
 .../ec2/InstanceNetworkInterfaceSetType.java    |    845 +-
 .../com/amazon/ec2/InstancePlacementType.java   |    934 +-
 .../InstancePrivateIpAddressesSetItemType.java  |   1062 +-
 .../ec2/InstancePrivateIpAddressesSetType.java  |    845 +-
 .../amazon/ec2/InstanceStateChangeSetType.java  |    845 +-
 .../com/amazon/ec2/InstanceStateChangeType.java |    940 +-
 .../src/com/amazon/ec2/InstanceStateType.java   |    875 +-
 .../ec2/InstanceStatusDetailsSetItemType.java   |   1083 +-
 .../ec2/InstanceStatusDetailsSetType.java       |    845 +-
 .../com/amazon/ec2/InstanceStatusEventType.java |   1255 +-
 .../amazon/ec2/InstanceStatusEventsSetType.java |    845 +-
 .../com/amazon/ec2/InstanceStatusItemType.java  |   1362 +-
 .../com/amazon/ec2/InstanceStatusSetType.java   |    845 +-
 .../src/com/amazon/ec2/InstanceStatusType.java  |    854 +-
 .../com/amazon/ec2/InstanceTypeSetItemType.java |    712 +-
 .../src/com/amazon/ec2/InstanceTypeSetType.java |    810 +-
 .../ec2/InternetGatewayAttachmentSetType.java   |    845 +-
 .../ec2/InternetGatewayAttachmentType.java      |    890 +-
 .../ec2/InternetGatewayIdSetItemType.java       |    712 +-
 .../amazon/ec2/InternetGatewayIdSetType.java    |    845 +-
 .../com/amazon/ec2/InternetGatewaySetType.java  |    845 +-
 .../src/com/amazon/ec2/InternetGatewayType.java |    967 +-
 .../src/com/amazon/ec2/IpPermissionSetType.java |    845 +-
 awsapi/src/com/amazon/ec2/IpPermissionType.java |   1312 +-
 awsapi/src/com/amazon/ec2/IpRangeItemType.java  |    712 +-
 awsapi/src/com/amazon/ec2/IpRangeSetType.java   |    845 +-
 .../amazon/ec2/LaunchPermissionItemType.java    |    942 +-
 .../amazon/ec2/LaunchPermissionListType.java    |    845 +-
 .../ec2/LaunchPermissionOperationType.java      |    830 +-
 .../ec2/LaunchSpecificationRequestType.java     |   3045 +-
 .../ec2/LaunchSpecificationResponseType.java    |   2900 +-
 .../amazon/ec2/LicenseCapacitySetItemType.java  |   1226 +-
 .../com/amazon/ec2/LicenseCapacitySetType.java  |    845 +-
 .../com/amazon/ec2/LicenseIdSetItemType.java    |    712 +-
 awsapi/src/com/amazon/ec2/LicenseIdSetType.java |    845 +-
 .../src/com/amazon/ec2/LicenseSetItemType.java  |   1313 +-
 awsapi/src/com/amazon/ec2/LicenseSetType.java   |    845 +-
 .../com/amazon/ec2/ModifyImageAttribute.java    |    517 +-
 .../ec2/ModifyImageAttributeResponse.java       |    518 +-
 .../ec2/ModifyImageAttributeResponseType.java   |    875 +-
 .../amazon/ec2/ModifyImageAttributeType.java    |    814 +-
 .../ModifyImageAttributeTypeChoice_type0.java   |    873 +-
 .../com/amazon/ec2/ModifyInstanceAttribute.java |    517 +-
 .../ec2/ModifyInstanceAttributeResponse.java    |    518 +-
 .../ModifyInstanceAttributeResponseType.java    |    875 +-
 .../amazon/ec2/ModifyInstanceAttributeType.java |    814 +-
 ...ModifyInstanceAttributeTypeChoice_type0.java |   1845 +-
 .../ModifyNetworkInterfaceAttachmentType.java   |    875 +-
 .../ec2/ModifyNetworkInterfaceAttribute.java    |    518 +-
 ...ModifyNetworkInterfaceAttributeResponse.java |    518 +-
 ...fyNetworkInterfaceAttributeResponseType.java |    875 +-
 .../ModifyNetworkInterfaceAttributeType.java    |    814 +-
 ...tworkInterfaceAttributeTypeChoice_type0.java |   1011 +-
 .../com/amazon/ec2/ModifySnapshotAttribute.java |    517 +-
 .../ec2/ModifySnapshotAttributeResponse.java    |    518 +-
 .../ModifySnapshotAttributeResponseType.java    |    875 +-
 .../amazon/ec2/ModifySnapshotAttributeType.java |    830 +-
 .../com/amazon/ec2/ModifyVolumeAttribute.java   |    517 +-
 .../ec2/ModifyVolumeAttributeResponse.java      |    518 +-
 .../ec2/ModifyVolumeAttributeResponseType.java  |    875 +-
 .../amazon/ec2/ModifyVolumeAttributeType.java   |    814 +-
 .../ModifyVolumeAttributeTypeChoice_type0.java  |    589 +-
 awsapi/src/com/amazon/ec2/MonitorInstances.java |    517 +-
 .../amazon/ec2/MonitorInstancesResponse.java    |    517 +-
 .../MonitorInstancesResponseSetItemType.java    |    829 +-
 .../ec2/MonitorInstancesResponseSetType.java    |    810 +-
 .../ec2/MonitorInstancesResponseType.java       |    829 +-
 .../amazon/ec2/MonitorInstancesSetItemType.java |    712 +-
 .../com/amazon/ec2/MonitorInstancesSetType.java |    810 +-
 .../com/amazon/ec2/MonitorInstancesType.java    |    651 +-
 .../com/amazon/ec2/MonitoringInstanceType.java  |    719 +-
 .../ec2/NetworkAclAssociationSetType.java       |    845 +-
 .../amazon/ec2/NetworkAclAssociationType.java   |   1063 +-
 .../com/amazon/ec2/NetworkAclEntrySetType.java  |    845 +-
 .../src/com/amazon/ec2/NetworkAclEntryType.java |   1677 +-
 .../com/amazon/ec2/NetworkAclIdSetItemType.java |    712 +-
 .../src/com/amazon/ec2/NetworkAclIdSetType.java |    845 +-
 .../src/com/amazon/ec2/NetworkAclSetType.java   |    845 +-
 awsapi/src/com/amazon/ec2/NetworkAclType.java   |   1411 +-
 .../ec2/NetworkInterfaceAssociationType.java    |   1303 +-
 .../ec2/NetworkInterfaceAttachmentType.java     |   1768 +-
 .../ec2/NetworkInterfaceIdSetItemType.java      |    712 +-
 .../amazon/ec2/NetworkInterfaceIdSetType.java   |    845 +-
 ...kInterfacePrivateIpAddressesSetItemType.java |   1013 +-
 ...tworkInterfacePrivateIpAddressesSetType.java |    846 +-
 .../com/amazon/ec2/NetworkInterfaceSetType.java |    845 +-
 .../com/amazon/ec2/NetworkInterfaceType.java    |   3661 +-
 .../ec2/NullableAttributeBooleanValueType.java  |    719 +-
 .../amazon/ec2/NullableAttributeValueType.java  |    732 +-
 .../com/amazon/ec2/PlacementGroupInfoType.java  |   1062 +-
 .../com/amazon/ec2/PlacementGroupSetType.java   |    845 +-
 .../com/amazon/ec2/PlacementRequestType.java    |   1132 +-
 .../com/amazon/ec2/PlacementResponseType.java   |   1107 +-
 awsapi/src/com/amazon/ec2/PortRangeType.java    |    862 +-
 .../ec2/PriceScheduleRequestSetItemType.java    |   1053 +-
 .../amazon/ec2/PriceScheduleRequestSetType.java |    810 +-
 .../amazon/ec2/PriceScheduleSetItemType.java    |   1211 +-
 .../com/amazon/ec2/PriceScheduleSetType.java    |    845 +-
 .../amazon/ec2/PricingDetailsSetItemType.java   |    862 +-
 .../com/amazon/ec2/PricingDetailsSetType.java   |    845 +-
 .../PrivateIpAddressesSetItemRequestType.java   |    896 +-
 .../ec2/PrivateIpAddressesSetRequestType.java   |    845 +-
 .../src/com/amazon/ec2/ProductCodeItemType.java |    712 +-
 .../src/com/amazon/ec2/ProductCodeListType.java |    845 +-
 .../com/amazon/ec2/ProductCodesSetItemType.java |    890 +-
 .../src/com/amazon/ec2/ProductCodesSetType.java |    845 +-
 .../ec2/ProductDescriptionSetItemType.java      |    712 +-
 .../amazon/ec2/ProductDescriptionSetType.java   |    810 +-
 .../com/amazon/ec2/PropagatingVgwSetType.java   |    845 +-
 .../src/com/amazon/ec2/PropagatingVgwType.java  |    712 +-
 .../ec2/PurchaseReservedInstancesOffering.java  |    518 +-
 ...rchaseReservedInstancesOfferingResponse.java |    518 +-
 ...seReservedInstancesOfferingResponseType.java |    890 +-
 .../PurchaseReservedInstancesOfferingType.java  |   1014 +-
 awsapi/src/com/amazon/ec2/RebootInstances.java  |    517 +-
 .../com/amazon/ec2/RebootInstancesInfoType.java |    810 +-
 .../com/amazon/ec2/RebootInstancesItemType.java |    712 +-
 .../com/amazon/ec2/RebootInstancesResponse.java |    517 +-
 .../amazon/ec2/RebootInstancesResponseType.java |    875 +-
 .../src/com/amazon/ec2/RebootInstancesType.java |    651 +-
 .../amazon/ec2/RecurringChargesSetItemType.java |    875 +-
 .../com/amazon/ec2/RecurringChargesSetType.java |    845 +-
 awsapi/src/com/amazon/ec2/RegionItemType.java   |    890 +-
 awsapi/src/com/amazon/ec2/RegionSetType.java    |    845 +-
 awsapi/src/com/amazon/ec2/RegisterImage.java    |    517 +-
 .../com/amazon/ec2/RegisterImageResponse.java   |    517 +-
 .../amazon/ec2/RegisterImageResponseType.java   |    890 +-
 .../src/com/amazon/ec2/RegisterImageType.java   |   2043 +-
 awsapi/src/com/amazon/ec2/ReleaseAddress.java   |    517 +-
 .../com/amazon/ec2/ReleaseAddressResponse.java  |    517 +-
 .../amazon/ec2/ReleaseAddressResponseType.java  |    875 +-
 .../src/com/amazon/ec2/ReleaseAddressType.java  |    636 +-
 .../ec2/ReleaseAddressTypeChoice_type0.java     |    846 +-
 .../ec2/ReplaceNetworkAclAssociation.java       |    518 +-
 .../ReplaceNetworkAclAssociationResponse.java   |    518 +-
 ...eplaceNetworkAclAssociationResponseType.java |    890 +-
 .../ec2/ReplaceNetworkAclAssociationType.java   |    890 +-
 .../com/amazon/ec2/ReplaceNetworkAclEntry.java  |    517 +-
 .../ec2/ReplaceNetworkAclEntryResponse.java     |    518 +-
 .../ec2/ReplaceNetworkAclEntryResponseType.java |    875 +-
 .../amazon/ec2/ReplaceNetworkAclEntryType.java  |   1833 +-
 awsapi/src/com/amazon/ec2/ReplaceRoute.java     |    516 +-
 .../com/amazon/ec2/ReplaceRouteResponse.java    |    517 +-
 .../amazon/ec2/ReplaceRouteResponseType.java    |    875 +-
 .../ec2/ReplaceRouteTableAssociation.java       |    518 +-
 .../ReplaceRouteTableAssociationResponse.java   |    518 +-
 ...eplaceRouteTableAssociationResponseType.java |    890 +-
 .../ec2/ReplaceRouteTableAssociationType.java   |    890 +-
 awsapi/src/com/amazon/ec2/ReplaceRouteType.java |    986 +-
 .../ec2/ReplaceRouteTypeChoice_type0.java       |   1042 +-
 .../com/amazon/ec2/ReportInstanceStatus.java    |    517 +-
 ...portInstanceStatusReasonCodeSetItemType.java |    712 +-
 .../ReportInstanceStatusReasonCodesSetType.java |    811 +-
 .../ec2/ReportInstanceStatusResponse.java       |    518 +-
 .../ec2/ReportInstanceStatusResponseType.java   |    875 +-
 .../amazon/ec2/ReportInstanceStatusType.java    |   1525 +-
 .../com/amazon/ec2/RequestSpotInstances.java    |    517 +-
 .../ec2/RequestSpotInstancesResponse.java       |    518 +-
 .../ec2/RequestSpotInstancesResponseType.java   |    830 +-
 .../amazon/ec2/RequestSpotInstancesType.java    |   2016 +-
 .../src/com/amazon/ec2/ReservationInfoType.java |   1307 +-
 .../src/com/amazon/ec2/ReservationSetType.java  |    845 +-
 .../ec2/ReservedInstanceLimitPriceType.java     |    894 +-
 .../src/com/amazon/ec2/ResetImageAttribute.java |    517 +-
 .../amazon/ec2/ResetImageAttributeResponse.java |    518 +-
 .../ec2/ResetImageAttributeResponseType.java    |    875 +-
 .../com/amazon/ec2/ResetImageAttributeType.java |    814 +-
 .../amazon/ec2/ResetImageAttributesGroup.java   |    589 +-
 .../com/amazon/ec2/ResetInstanceAttribute.java  |    517 +-
 .../ec2/ResetInstanceAttributeResponse.java     |    518 +-
 .../ec2/ResetInstanceAttributeResponseType.java |    875 +-
 .../amazon/ec2/ResetInstanceAttributeType.java  |    814 +-
 .../ec2/ResetInstanceAttributesGroup.java       |    873 +-
 .../ec2/ResetNetworkInterfaceAttribute.java     |    518 +-
 .../ResetNetworkInterfaceAttributeResponse.java |    518 +-
 ...etNetworkInterfaceAttributeResponseType.java |    875 +-
 .../ec2/ResetNetworkInterfaceAttributeType.java |    814 +-
 .../ResetNetworkInterfaceAttributesGroup.java   |    589 +-
 .../com/amazon/ec2/ResetSnapshotAttribute.java  |    517 +-
 .../ec2/ResetSnapshotAttributeResponse.java     |    518 +-
 .../ec2/ResetSnapshotAttributeResponseType.java |    875 +-
 .../amazon/ec2/ResetSnapshotAttributeType.java  |    814 +-
 .../ec2/ResetSnapshotAttributesGroup.java       |    590 +-
 .../com/amazon/ec2/ResourceIdSetItemType.java   |    712 +-
 .../src/com/amazon/ec2/ResourceIdSetType.java   |    845 +-
 .../com/amazon/ec2/ResourceTagSetItemType.java  |    890 +-
 .../src/com/amazon/ec2/ResourceTagSetType.java  |    845 +-
 .../amazon/ec2/RevokeSecurityGroupEgress.java   |    518 +-
 .../ec2/RevokeSecurityGroupEgressResponse.java  |    518 +-
 .../RevokeSecurityGroupEgressResponseType.java  |    875 +-
 .../ec2/RevokeSecurityGroupEgressType.java      |    829 +-
 .../amazon/ec2/RevokeSecurityGroupIngress.java  |    518 +-
 .../ec2/RevokeSecurityGroupIngressResponse.java |    518 +-
 .../RevokeSecurityGroupIngressResponseType.java |    875 +-
 .../ec2/RevokeSecurityGroupIngressType.java     |    944 +-
 ...okeSecurityGroupIngressTypeChoice_type0.java |    846 +-
 awsapi/src/com/amazon/ec2/RouteSetType.java     |    844 +-
 .../ec2/RouteTableAssociationSetType.java       |    845 +-
 .../amazon/ec2/RouteTableAssociationType.java   |    987 +-
 .../RouteTableAssociationTypeChoice_type0.java  |    833 +-
 .../com/amazon/ec2/RouteTableIdSetItemType.java |    712 +-
 .../src/com/amazon/ec2/RouteTableIdSetType.java |    845 +-
 .../src/com/amazon/ec2/RouteTableSetType.java   |    845 +-
 awsapi/src/com/amazon/ec2/RouteTableType.java   |   1365 +-
 awsapi/src/com/amazon/ec2/RouteType.java        |   1848 +-
 awsapi/src/com/amazon/ec2/RunInstances.java     |    516 +-
 .../com/amazon/ec2/RunInstancesResponse.java    |    517 +-
 .../amazon/ec2/RunInstancesResponseType.java    |   1481 +-
 awsapi/src/com/amazon/ec2/RunInstancesType.java |   4143 +-
 .../amazon/ec2/RunningInstancesItemType.java    |   7197 +-
 .../com/amazon/ec2/RunningInstancesSetType.java |    810 +-
 .../amazon/ec2/SecurityGroupIdSetItemType.java  |    712 +-
 .../com/amazon/ec2/SecurityGroupIdSetType.java  |    845 +-
 .../com/amazon/ec2/SecurityGroupItemType.java   |   1820 +-
 .../com/amazon/ec2/SecurityGroupSetType.java    |    845 +-
 .../ec2/SpotDatafeedSubscriptionType.java       |   1374 +-
 .../ec2/SpotInstanceRequestIdSetItemType.java   |    713 +-
 .../ec2/SpotInstanceRequestIdSetType.java       |    845 +-
 .../ec2/SpotInstanceRequestSetItemType.java     |   3281 +-
 .../amazon/ec2/SpotInstanceRequestSetType.java  |    845 +-
 .../amazon/ec2/SpotInstanceStateFaultType.java  |    890 +-
 .../amazon/ec2/SpotPlacementRequestType.java    |    934 +-
 .../amazon/ec2/SpotPriceHistorySetItemType.java |   1429 +-
 .../com/amazon/ec2/SpotPriceHistorySetType.java |    845 +-
 awsapi/src/com/amazon/ec2/StartInstances.java   |    517 +-
 .../com/amazon/ec2/StartInstancesResponse.java  |    517 +-
 .../amazon/ec2/StartInstancesResponseType.java  |    829 +-
 .../src/com/amazon/ec2/StartInstancesType.java  |    651 +-
 awsapi/src/com/amazon/ec2/StateReasonType.java  |    890 +-
 awsapi/src/com/amazon/ec2/StopInstances.java    |    517 +-
 .../com/amazon/ec2/StopInstancesResponse.java   |    517 +-
 .../amazon/ec2/StopInstancesResponseType.java   |    829 +-
 .../src/com/amazon/ec2/StopInstancesType.java   |    835 +-
 .../src/com/amazon/ec2/SubnetIdSetItemType.java |    712 +-
 awsapi/src/com/amazon/ec2/SubnetIdSetType.java  |    845 +-
 awsapi/src/com/amazon/ec2/SubnetSetType.java    |    844 +-
 awsapi/src/com/amazon/ec2/SubnetType.java       |   1834 +-
 awsapi/src/com/amazon/ec2/TagSetItemType.java   |   1330 +-
 awsapi/src/com/amazon/ec2/TagSetType.java       |    845 +-
 .../src/com/amazon/ec2/TerminateInstances.java  |    517 +-
 .../amazon/ec2/TerminateInstancesResponse.java  |    518 +-
 .../ec2/TerminateInstancesResponseType.java     |    829 +-
 .../com/amazon/ec2/TerminateInstancesType.java  |    651 +-
 .../amazon/ec2/UnassignPrivateIpAddresses.java  |    518 +-
 .../ec2/UnassignPrivateIpAddressesResponse.java |    518 +-
 .../UnassignPrivateIpAddressesResponseType.java |    875 +-
 .../ec2/UnassignPrivateIpAddressesType.java     |    830 +-
 .../src/com/amazon/ec2/UnmonitorInstances.java  |    517 +-
 .../amazon/ec2/UnmonitorInstancesResponse.java  |    518 +-
 awsapi/src/com/amazon/ec2/UserDataType.java     |    983 +-
 .../com/amazon/ec2/UserIdGroupPairSetType.java  |    845 +-
 .../src/com/amazon/ec2/UserIdGroupPairType.java |   1132 +-
 awsapi/src/com/amazon/ec2/ValueSetType.java     |    844 +-
 awsapi/src/com/amazon/ec2/ValueType.java        |    712 +-
 awsapi/src/com/amazon/ec2/VgwTelemetryType.java |    845 +-
 .../amazon/ec2/VolumeStatusActionItemType.java  |   1234 +-
 .../amazon/ec2/VolumeStatusActionsSetType.java  |    845 +-
 .../amazon/ec2/VolumeStatusDetailsItemType.java |    890 +-
 .../amazon/ec2/VolumeStatusDetailsSetType.java  |    845 +-
 .../amazon/ec2/VolumeStatusEventItemType.java   |   1408 +-
 .../amazon/ec2/VolumeStatusEventsSetType.java   |    845 +-
 .../com/amazon/ec2/VolumeStatusInfoType.java    |    829 +-
 .../com/amazon/ec2/VolumeStatusItemType.java    |   1225 +-
 .../src/com/amazon/ec2/VolumeStatusSetType.java |    845 +-
 awsapi/src/com/amazon/ec2/VpcIdSetItemType.java |    712 +-
 awsapi/src/com/amazon/ec2/VpcIdSetType.java     |    845 +-
 awsapi/src/com/amazon/ec2/VpcSetType.java       |    844 +-
 awsapi/src/com/amazon/ec2/VpcType.java          |   1642 +-
 .../amazon/ec2/VpnConnectionIdSetItemType.java  |    712 +-
 .../com/amazon/ec2/VpnConnectionIdSetType.java  |    845 +-
 .../ec2/VpnConnectionOptionsRequestType.java    |    719 +-
 .../ec2/VpnConnectionOptionsResponseType.java   |    719 +-
 .../com/amazon/ec2/VpnConnectionSetType.java    |    845 +-
 .../src/com/amazon/ec2/VpnConnectionType.java   |   2188 +-
 .../com/amazon/ec2/VpnGatewayIdSetItemType.java |    712 +-
 .../src/com/amazon/ec2/VpnGatewayIdSetType.java |    845 +-
 .../src/com/amazon/ec2/VpnGatewaySetType.java   |    845 +-
 awsapi/src/com/amazon/ec2/VpnGatewayType.java   |   1507 +-
 .../src/com/amazon/ec2/VpnStaticRouteType.java  |   1062 +-
 .../com/amazon/ec2/VpnStaticRoutesSetType.java  |    845 +-
 .../com/amazon/ec2/VpnTunnelTelemetryType.java  |   1413 +-
 .../ec2/client/AmazonEC2CallbackHandler.java    |   4350 +-
 .../com/amazon/ec2/client/AmazonEC2Stub.java    | 775307 +++++++---------
 awsapi/src/com/amazon/s3/AccessControlList.java |    852 +-
 .../src/com/amazon/s3/AccessControlPolicy.java  |    768 +-
 .../com/amazon/s3/AmazonCustomerByEmail.java    |    714 +-
 .../amazon/s3/AmazonS3MessageReceiverInOut.java |   2225 +-
 awsapi/src/com/amazon/s3/AmazonS3Skeleton.java  |    442 +-
 .../amazon/s3/AmazonS3SkeletonInterface.java    |    366 +-
 .../src/com/amazon/s3/BucketLoggingStatus.java  |    677 +-
 awsapi/src/com/amazon/s3/CanonicalUser.java     |    907 +-
 awsapi/src/com/amazon/s3/CopyObject.java        |   3981 +-
 .../src/com/amazon/s3/CopyObjectResponse.java   |    653 +-
 awsapi/src/com/amazon/s3/CopyObjectResult.java  |    890 +-
 awsapi/src/com/amazon/s3/CreateBucket.java      |   1444 +-
 .../amazon/s3/CreateBucketConfiguration.java    |    651 +-
 .../src/com/amazon/s3/CreateBucketResponse.java |    653 +-
 .../src/com/amazon/s3/CreateBucketResult.java   |    712 +-
 awsapi/src/com/amazon/s3/DeleteBucket.java      |   1503 +-
 .../src/com/amazon/s3/DeleteBucketResponse.java |    653 +-
 awsapi/src/com/amazon/s3/DeleteMarkerEntry.java |   1359 +-
 awsapi/src/com/amazon/s3/DeleteObject.java      |   1677 +-
 .../src/com/amazon/s3/DeleteObjectResponse.java |    653 +-
 awsapi/src/com/amazon/s3/ExtensionMapper.java   |    640 +-
 .../amazon/s3/GetBucketAccessControlPolicy.java |   1504 +-
 .../GetBucketAccessControlPolicyResponse.java   |    656 +-
 .../com/amazon/s3/GetBucketLoggingStatus.java   |   1503 +-
 .../s3/GetBucketLoggingStatusResponse.java      |    656 +-
 awsapi/src/com/amazon/s3/GetObject.java         |   2154 +-
 .../amazon/s3/GetObjectAccessControlPolicy.java |   1678 +-
 .../GetObjectAccessControlPolicyResponse.java   |    656 +-
 awsapi/src/com/amazon/s3/GetObjectExtended.java |   3922 +-
 .../amazon/s3/GetObjectExtendedResponse.java    |    653 +-
 awsapi/src/com/amazon/s3/GetObjectResponse.java |    653 +-
 awsapi/src/com/amazon/s3/GetObjectResult.java   |   1437 +-
 awsapi/src/com/amazon/s3/Grant.java             |    768 +-
 awsapi/src/com/amazon/s3/Grantee.java           |    540 +-
 awsapi/src/com/amazon/s3/Group.java             |    714 +-
 awsapi/src/com/amazon/s3/ListAllMyBuckets.java  |   1134 +-
 .../com/amazon/s3/ListAllMyBucketsEntry.java    |    890 +-
 .../src/com/amazon/s3/ListAllMyBucketsList.java |    845 +-
 .../com/amazon/s3/ListAllMyBucketsResponse.java |    654 +-
 .../com/amazon/s3/ListAllMyBucketsResult.java   |    768 +-
 awsapi/src/com/amazon/s3/ListBucket.java        |   2300 +-
 .../src/com/amazon/s3/ListBucketResponse.java   |    653 +-
 awsapi/src/com/amazon/s3/ListBucketResult.java  |   2694 +-
 awsapi/src/com/amazon/s3/ListEntry.java         |   1471 +-
 .../src/com/amazon/s3/ListVersionsResponse.java |    653 +-
 .../src/com/amazon/s3/ListVersionsResult.java   |   3077 +-
 .../s3/ListVersionsResultChoice_type0.java      |    734 +-
 .../src/com/amazon/s3/LocationConstraint.java   |    709 +-
 awsapi/src/com/amazon/s3/LoggingSettings.java   |   1028 +-
 awsapi/src/com/amazon/s3/MetadataDirective.java |    705 +-
 awsapi/src/com/amazon/s3/MetadataEntry.java     |    890 +-
 awsapi/src/com/amazon/s3/MfaDeleteStatus.java   |    705 +-
 .../amazon/s3/NotificationConfiguration.java    |    846 +-
 awsapi/src/com/amazon/s3/Payer.java             |    705 +-
 awsapi/src/com/amazon/s3/Permission.java        |    735 +-
 awsapi/src/com/amazon/s3/PostResponse.java      |   1236 +-
 awsapi/src/com/amazon/s3/PrefixEntry.java       |    712 +-
 awsapi/src/com/amazon/s3/PutObject.java         |   2427 +-
 awsapi/src/com/amazon/s3/PutObjectInline.java   |   2622 +-
 .../com/amazon/s3/PutObjectInlineResponse.java  |    654 +-
 awsapi/src/com/amazon/s3/PutObjectResponse.java |    653 +-
 awsapi/src/com/amazon/s3/PutObjectResult.java   |    890 +-
 .../amazon/s3/RequestPaymentConfiguration.java  |    651 +-
 awsapi/src/com/amazon/s3/Result.java            |    651 +-
 .../amazon/s3/SetBucketAccessControlPolicy.java |   1645 +-
 .../SetBucketAccessControlPolicyResponse.java   |    547 +-
 .../com/amazon/s3/SetBucketLoggingStatus.java   |   1615 +-
 .../s3/SetBucketLoggingStatusResponse.java      |    547 +-
 .../amazon/s3/SetObjectAccessControlPolicy.java |   1791 +-
 .../SetObjectAccessControlPolicyResponse.java   |    547 +-
 awsapi/src/com/amazon/s3/Status.java            |    875 +-
 awsapi/src/com/amazon/s3/StorageClass.java      |    705 +-
 .../src/com/amazon/s3/TopicConfiguration.java   |   1038 +-
 awsapi/src/com/amazon/s3/User.java              |    536 +-
 awsapi/src/com/amazon/s3/VersionEntry.java      |   1804 +-
 .../com/amazon/s3/VersioningConfiguration.java  |    822 +-
 awsapi/src/com/amazon/s3/VersioningStatus.java  |    705 +-
 .../s3/client/AmazonS3CallbackHandler.java      |    510 +-
 .../src/com/amazon/s3/client/AmazonS3Stub.java  |  72559 +-
 .../bridge/auth/ec2/AuthenticationHandler.java  |    117 +-
 .../bridge/auth/ec2/AuthenticationModule.java   |     55 +-
 .../bridge/auth/s3/AuthenticationHandler.java   |    206 +-
 .../bridge/auth/s3/AuthenticationModule.java    |     59 +-
 .../bridge/io/DimeDelimitedInputStream.java     |    539 +-
 .../cloud/bridge/io/FileRangeDataSource.java    |     58 +-
 .../cloud/bridge/io/FileRangeInputStream.java   |    134 +-
 .../bridge/io/MTOMAwareResultStreamWriter.java  |    116 +-
 .../bridge/io/MultiPartDimeInputStream.java     |    182 +-
 .../cloud/bridge/io/S3CAStorBucketAdapter.java  |    117 +-
 .../bridge/io/S3FileSystemBucketAdapter.java    |    403 +-
 .../lifecycle/ServiceEngineLifecycle.java       |     42 +-
 .../com/cloud/bridge/model/BucketPolicyVO.java  |     39 +-
 .../cloud/bridge/model/CloudStackAccountVO.java |      9 +-
 .../bridge/model/CloudStackConfigurationVO.java |     25 +-
 .../model/CloudStackServiceOfferingVO.java      |     21 +-
 .../cloud/bridge/model/CloudStackUserVO.java    |      8 +-
 .../com/cloud/bridge/model/MHostMountVO.java    |    203 +-
 awsapi/src/com/cloud/bridge/model/MHostVO.java  |    202 +-
 .../cloud/bridge/model/MultiPartPartsVO.java    |     42 +-
 .../cloud/bridge/model/MultiPartUploadsVO.java  |     36 +-
 .../com/cloud/bridge/model/MultipartMetaVO.java |     25 +-
 .../cloud/bridge/model/OfferingBundleVO.java    |     18 +-
 awsapi/src/com/cloud/bridge/model/SAcl.java     |    211 +-
 awsapi/src/com/cloud/bridge/model/SAclVO.java   |    391 +-
 awsapi/src/com/cloud/bridge/model/SBucket.java  |    193 +-
 .../src/com/cloud/bridge/model/SBucketVO.java   |    247 +-
 awsapi/src/com/cloud/bridge/model/SHost.java    |    191 +-
 awsapi/src/com/cloud/bridge/model/SHostVO.java  |    242 +-
 awsapi/src/com/cloud/bridge/model/SMetaVO.java  |    164 +-
 .../com/cloud/bridge/model/SObjectItemVO.java   |    316 +-
 .../src/com/cloud/bridge/model/SObjectVO.java   |    402 +-
 .../cloud/bridge/model/UserCredentialsVO.java   |    182 +-
 .../com/cloud/bridge/persist/dao/BaseDao.java   |     42 +-
 .../bridge/persist/dao/BucketPolicyDaoImpl.java |     21 +-
 .../persist/dao/CloudStackAccountDao.java       |      4 +-
 .../persist/dao/CloudStackAccountDaoImpl.java   |     15 +-
 .../dao/CloudStackConfigurationDaoImpl.java     |     11 +-
 .../persist/dao/CloudStackSvcOfferingDao.java   |      3 +-
 .../dao/CloudStackSvcOfferingDaoImpl.java       |     36 +-
 .../persist/dao/CloudStackUserDaoImpl.java      |     16 +-
 .../cloud/bridge/persist/dao/MHostDaoImpl.java  |     38 +-
 .../cloud/bridge/persist/dao/MHostMountDao.java |      1 -
 .../bridge/persist/dao/MHostMountDaoImpl.java   |     42 +-
 .../persist/dao/MultiPartPartsDaoImpl.java      |     37 +-
 .../bridge/persist/dao/MultiPartUploadsDao.java |      6 +-
 .../persist/dao/MultiPartUploadsDaoImpl.java    |     80 +-
 .../bridge/persist/dao/MultipartLoadDao.java    |    148 +-
 .../persist/dao/MultipartMetaDaoImpl.java       |     18 +-
 .../bridge/persist/dao/OfferingDaoImpl.java     |    133 +-
 .../cloud/bridge/persist/dao/SAclDaoImpl.java   |    179 +-
 .../bridge/persist/dao/SBucketDaoImpl.java      |     67 +-
 .../cloud/bridge/persist/dao/SHostDaoImpl.java  |     60 +-
 .../cloud/bridge/persist/dao/SMetaDaoImpl.java  |     98 +-
 .../cloud/bridge/persist/dao/SObjectDao.java    |      6 +-
 .../bridge/persist/dao/SObjectDaoImpl.java      |     26 +-
 .../bridge/persist/dao/SObjectItemDaoImpl.java  |     50 +-
 .../persist/dao/UserCredentialsDaoImpl.java     |     57 +-
 .../cloud/bridge/service/EC2MainServlet.java    |     47 +-
 .../cloud/bridge/service/EC2RestServlet.java    |   1700 +-
 .../cloud/bridge/service/EC2SoapService.java    |   1954 +-
 .../bridge/service/EC2SoapServiceImpl.java      |   4794 +-
 .../com/cloud/bridge/service/S3Constants.java   |      8 +-
 .../com/cloud/bridge/service/S3RestServlet.java |    637 +-
 .../com/cloud/bridge/service/UserContext.java   |    162 +-
 .../src/com/cloud/bridge/service/UserInfo.java  |     78 +-
 .../service/controller/s3/S3BucketAction.java   |    655 +-
 .../service/controller/s3/S3ObjectAction.java   |   1077 +-
 .../s3/S3SerializableServiceImplementation.java |   1143 +-
 .../service/controller/s3/ServiceProvider.java  |    135 +-
 .../service/controller/s3/ServletAction.java    |      2 +-
 .../cloud/bridge/service/core/ec2/Account.java  |     72 +-
 .../bridge/service/core/ec2/DiskOffer.java      |    109 +-
 .../bridge/service/core/ec2/DiskOfferings.java  |     22 +-
 .../bridge/service/core/ec2/EC2Address.java     |      7 +-
 .../service/core/ec2/EC2AddressFilterSet.java   |    123 +-
 .../service/core/ec2/EC2AssociateAddress.java   |     48 +-
 .../ec2/EC2AuthorizeRevokeSecurityGroup.java    |     44 +-
 .../service/core/ec2/EC2AvailabilityZone.java   |     18 +-
 .../core/ec2/EC2AvailabilityZonesFilterSet.java |     42 +-
 .../bridge/service/core/ec2/EC2CreateImage.java |     66 +-
 .../core/ec2/EC2CreateImageResponse.java        |     24 +-
 .../service/core/ec2/EC2CreateKeyPair.java      |     39 +-
 .../service/core/ec2/EC2CreateVolume.java       |     94 +-
 .../service/core/ec2/EC2DeleteKeyPair.java      |     40 +-
 .../service/core/ec2/EC2DescribeAddresses.java  |     74 +-
 .../core/ec2/EC2DescribeAddressesResponse.java  |     22 +-
 .../core/ec2/EC2DescribeAvailabilityZones.java  |     26 +-
 .../EC2DescribeAvailabilityZonesResponse.java   |      4 +-
 .../core/ec2/EC2DescribeImageAttribute.java     |     14 +-
 .../service/core/ec2/EC2DescribeImages.java     |     64 +-
 .../core/ec2/EC2DescribeImagesResponse.java     |     22 +-
 .../service/core/ec2/EC2DescribeInstances.java  |     46 +-
 .../core/ec2/EC2DescribeInstancesResponse.java  |     22 +-
 .../service/core/ec2/EC2DescribeKeyPairs.java   |     68 +-
 .../core/ec2/EC2DescribeKeyPairsResponse.java   |     40 +-
 .../core/ec2/EC2DescribeSecurityGroups.java     |     44 +-
 .../ec2/EC2DescribeSecurityGroupsResponse.java  |     22 +-
 .../service/core/ec2/EC2DescribeSnapshots.java  |     46 +-
 .../core/ec2/EC2DescribeSnapshotsResponse.java  |     22 +-
 .../service/core/ec2/EC2DescribeTags.java       |      2 +-
 .../core/ec2/EC2DescribeTagsResponse.java       |      4 +-
 .../service/core/ec2/EC2DescribeVolumes.java    |     46 +-
 .../core/ec2/EC2DescribeVolumesResponse.java    |     30 +-
 .../core/ec2/EC2DisassociateAddress.java        |     40 +-
 .../bridge/service/core/ec2/EC2Engine.java      |   1567 +-
 .../bridge/service/core/ec2/EC2Filter.java      |     60 +-
 .../service/core/ec2/EC2GroupFilterSet.java     |    225 +-
 .../cloud/bridge/service/core/ec2/EC2Image.java |    148 +-
 .../service/core/ec2/EC2ImageAttributes.java    |     48 +-
 .../service/core/ec2/EC2ImageFilterSet.java     |    136 +-
 .../core/ec2/EC2ImageLaunchPermission.java      |     11 +-
 .../service/core/ec2/EC2ImportKeyPair.java      |     83 +-
 .../bridge/service/core/ec2/EC2Instance.java    |    364 +-
 .../service/core/ec2/EC2InstanceFilterSet.java  |    414 +-
 .../service/core/ec2/EC2IpPermission.java       |    196 +-
 .../service/core/ec2/EC2KeyPairFilterSet.java   |    132 +-
 .../core/ec2/EC2ModifyImageAttribute.java       |     28 +-
 .../core/ec2/EC2ModifyInstanceAttribute.java    |    127 +-
 .../service/core/ec2/EC2PasswordData.java       |     38 +-
 .../service/core/ec2/EC2RebootInstances.java    |     20 +-
 .../service/core/ec2/EC2RegisterImage.java      |    124 +-
 .../service/core/ec2/EC2ReleaseAddress.java     |     36 +-
 .../bridge/service/core/ec2/EC2ResourceTag.java |     16 +-
 .../service/core/ec2/EC2RunInstances.java       |    208 +-
 .../core/ec2/EC2RunInstancesResponse.java       |     24 +-
 .../bridge/service/core/ec2/EC2SSHKeyPair.java  |     76 +-
 .../service/core/ec2/EC2SecurityGroup.java      |    144 +-
 .../bridge/service/core/ec2/EC2Snapshot.java    |    195 +-
 .../service/core/ec2/EC2SnapshotFilterSet.java  |    276 +-
 .../service/core/ec2/EC2StartInstances.java     |     20 +-
 .../core/ec2/EC2StartInstancesResponse.java     |     22 +-
 .../service/core/ec2/EC2StopInstances.java      |     48 +-
 .../core/ec2/EC2StopInstancesResponse.java      |     22 +-
 .../bridge/service/core/ec2/EC2TagKeyValue.java |      8 +-
 .../bridge/service/core/ec2/EC2TagTypeId.java   |      6 +-
 .../cloud/bridge/service/core/ec2/EC2Tags.java  |      9 +-
 .../service/core/ec2/EC2TagsFilterSet.java      |     41 +-
 .../bridge/service/core/ec2/EC2Volume.java      |    428 +-
 .../service/core/ec2/EC2VolumeFilterSet.java    |    369 +-
 .../core/ec2/IpForwardingRuleResponse.java      |      2 +-
 .../bridge/service/core/ec2/OfferingBundle.java |     27 +-
 .../bridge/service/core/ec2/ServiceOffer.java   |    126 +-
 .../service/core/ec2/ServiceOfferings.java      |     24 +-
 .../service/core/s3/S3AccessControlList.java    |     32 +-
 .../service/core/s3/S3AccessControlPolicy.java  |     38 +-
 .../bridge/service/core/s3/S3AuthParams.java    |     50 +-
 .../bridge/service/core/s3/S3BucketAdapter.java |     23 +-
 .../bridge/service/core/s3/S3BucketPolicy.java  |    270 +-
 .../bridge/service/core/s3/S3CanonicalUser.java |     50 +-
 .../service/core/s3/S3ConditionFactory.java     |    284 +-
 .../service/core/s3/S3ConditionalHeaders.java   |    314 +-
 .../service/core/s3/S3CopyObjectRequest.java    |    210 +-
 .../service/core/s3/S3CopyObjectResponse.java   |     82 +-
 .../core/s3/S3CreateBucketConfiguration.java    |     30 +-
 .../service/core/s3/S3CreateBucketRequest.java  |     80 +-
 .../service/core/s3/S3CreateBucketResponse.java |     22 +-
 .../service/core/s3/S3DeleteBucketRequest.java  |     22 +-
 .../service/core/s3/S3DeleteObjectRequest.java  |     64 +-
 .../cloud/bridge/service/core/s3/S3Engine.java  |   1262 +-
 .../S3GetBucketAccessControlPolicyRequest.java  |     22 +-
 .../S3GetObjectAccessControlPolicyRequest.java  |     62 +-
 .../service/core/s3/S3GetObjectRequest.java     |    192 +-
 .../service/core/s3/S3GetObjectResponse.java    |    137 +-
 .../cloud/bridge/service/core/s3/S3Grant.java   |     94 +-
 .../service/core/s3/S3HostCallingFormat.java    |    208 +-
 .../core/s3/S3ListAllMyBucketsEntry.java        |     63 +-
 .../core/s3/S3ListAllMyBucketsRequest.java      |      6 +-
 .../core/s3/S3ListAllMyBucketsResponse.java     |     37 +-
 .../core/s3/S3ListBucketObjectEntry.java        |    228 +-
 .../core/s3/S3ListBucketPrefixEntry.java        |     25 +-
 .../service/core/s3/S3ListBucketRequest.java    |    110 +-
 .../service/core/s3/S3ListBucketResponse.java   |    200 +-
 .../bridge/service/core/s3/S3MetaDataEntry.java |     34 +-
 .../bridge/service/core/s3/S3MultipartPart.java |     90 +-
 .../service/core/s3/S3MultipartUpload.java      |     94 +-
 .../bridge/service/core/s3/S3PolicyAction.java  |    193 +-
 .../service/core/s3/S3PolicyArnCondition.java   |    227 +-
 .../service/core/s3/S3PolicyBoolCondition.java  |    180 +-
 .../service/core/s3/S3PolicyCondition.java      |    156 +-
 .../service/core/s3/S3PolicyConditionBlock.java |    102 +-
 .../bridge/service/core/s3/S3PolicyContext.java |    148 +-
 .../service/core/s3/S3PolicyDateCondition.java  |    271 +-
 .../core/s3/S3PolicyIPAddressCondition.java     |    218 +-
 .../core/s3/S3PolicyNumericCondition.java       |    258 +-
 .../service/core/s3/S3PolicyPrincipal.java      |     75 +-
 .../service/core/s3/S3PolicyStatement.java      |    246 +-
 .../core/s3/S3PolicyStringCondition.java        |    246 +-
 .../core/s3/S3PutObjectInlineRequest.java       |    164 +-
 .../core/s3/S3PutObjectInlineResponse.java      |     74 +-
 .../service/core/s3/S3PutObjectRequest.java     |    170 +-
 .../service/core/s3/S3PutObjectResponse.java    |     36 +-
 .../cloud/bridge/service/core/s3/S3Request.java |     60 +-
 .../bridge/service/core/s3/S3Response.java      |     70 +-
 .../S3SetBucketAccessControlPolicyRequest.java  |     36 +-
 .../S3SetObjectAccessControlPolicyRequest.java  |     80 +-
 .../exception/ConfigurationException.java       |     30 +-
 .../service/exception/EC2ServiceException.java  |    154 +-
 .../exception/FileNotExistException.java        |     30 +-
 .../exception/HostNotMountedException.java      |     28 +-
 .../exception/InternalErrorException.java       |     28 +-
 .../service/exception/InvalidBucketName.java    |     30 +-
 .../InvalidRequestContentException.java         |     28 +-
 .../service/exception/NetworkIOException.java   |     30 +-
 .../exception/NoSuchObjectException.java        |     30 +-
 .../exception/ObjectAlreadyExistsException.java |     30 +-
 .../exception/OutOfServiceException.java        |     30 +-
 .../exception/OutOfStorageException.java        |     30 +-
 .../exception/PermissionDeniedException.java    |     28 +-
 .../service/exception/UnsupportedException.java |     30 +-
 .../com/cloud/bridge/tool/CloudS3CmdTool.java   |    537 +-
 .../cloud/bridge/util/AuthenticationUtils.java  |     34 +-
 .../cloud/bridge/util/CalendarDateParam.java    |     19 +-
 .../cloud/bridge/util/ConfigurationHelper.java  |    101 +-
 awsapi/src/com/cloud/bridge/util/Converter.java |     90 +-
 .../bridge/util/DatabindingConverterUtil.java   |     43 +-
 .../src/com/cloud/bridge/util/DateHelper.java   |    120 +-
 .../src/com/cloud/bridge/util/EC2RestAuth.java  |    448 +-
 .../src/com/cloud/bridge/util/EntityParam.java  |     18 +-
 .../src/com/cloud/bridge/util/HeaderParam.java  |     56 +-
 .../util/ISO8601SimpleDateTimeFormat.java       |    573 +-
 .../com/cloud/bridge/util/IpAddressRange.java   |    214 +-
 .../com/cloud/bridge/util/IteratorHelper.java   |     56 +-
 .../src/com/cloud/bridge/util/JsonAccessor.java |    429 +-
 awsapi/src/com/cloud/bridge/util/NetHelper.java |    104 +-
 .../src/com/cloud/bridge/util/OrderedPair.java  |     52 +-
 .../src/com/cloud/bridge/util/PolicyParser.java |    630 +-
 awsapi/src/com/cloud/bridge/util/RestAuth.java  |    697 +-
 .../src/com/cloud/bridge/util/S3SoapAuth.java   |     56 +-
 .../bridge/util/ServletRequestDataSource.java   |     50 +-
 .../src/com/cloud/bridge/util/StringHelper.java |    178 +-
 awsapi/src/com/cloud/bridge/util/TextParam.java |     18 +-
 awsapi/src/com/cloud/bridge/util/TimeParam.java |     18 +-
 .../com/cloud/bridge/util/TimestampParam.java   |     18 +-
 awsapi/src/com/cloud/bridge/util/Triple.java    |     74 +-
 awsapi/src/com/cloud/bridge/util/XElement.java  |     11 +-
 awsapi/src/com/cloud/bridge/util/XFlatten.java  |      2 +-
 awsapi/src/com/cloud/bridge/util/XOmitNull.java |      2 +-
 .../com/cloud/bridge/util/XSerializable.java    |      5 +-
 .../src/com/cloud/bridge/util/XSerializer.java  |    825 +-
 .../cloud/bridge/util/XSerializerAdapter.java   |     16 +-
 .../bridge/util/XSerializerJsonAdapter.java     |    271 +-
 .../bridge/util/XSerializerXmlAdapter.java      |    283 +-
 awsapi/src/com/cloud/bridge/util/XmlHelper.java |    211 +-
 awsapi/src/com/cloud/stack/CloudStackApi.java   |   4718 +-
 .../src/com/cloud/stack/CloudStackClient.java   |    295 +-
 .../src/com/cloud/stack/CloudStackCommand.java  |    218 +-
 .../com/cloud/stack/models/ApiConstants.java    |    386 +-
 .../cloud/stack/models/CloudStackAccount.java   |    488 +-
 .../stack/models/CloudStackCapabilities.java    |     65 +-
 .../stack/models/CloudStackConfiguration.java   |      3 +-
 .../stack/models/CloudStackDiskOffering.java    |    106 +-
 .../com/cloud/stack/models/CloudStackEvent.java |    212 +-
 .../cloud/stack/models/CloudStackEventType.java |     26 +-
 .../stack/models/CloudStackExtractTemplate.java |    248 +-
 .../stack/models/CloudStackIdentifier.java      |     54 +-
 .../stack/models/CloudStackInfoResponse.java    |     46 +-
 .../stack/models/CloudStackIngressRule.java     |     58 +-
 .../stack/models/CloudStackInstanceGroup.java   |    110 +-
 .../cloud/stack/models/CloudStackIpAddress.java |    128 +-
 .../cloud/stack/models/CloudStackKeyPair.java   |     69 +-
 .../cloud/stack/models/CloudStackKeyValue.java  |     69 +-
 .../models/CloudStackLoadBalancerRule.java      |    248 +-
 .../cloud/stack/models/CloudStackNetwork.java   |    552 +-
 .../stack/models/CloudStackNetworkOffering.java |    230 +-
 .../stack/models/CloudStackNetworkService.java  |     64 +-
 .../CloudStackNetworkServiceCapability.java     |     44 +-
 .../com/cloud/stack/models/CloudStackNic.java   |     88 +-
 .../stack/models/CloudStackOsCategory.java      |     45 +-
 .../cloud/stack/models/CloudStackOsType.java    |     58 +-
 .../stack/models/CloudStackPasswordData.java    |     30 +-
 .../models/CloudStackPortForwardingRule.java    |    250 +-
 .../stack/models/CloudStackResourceLimit.java   |     25 +-
 .../stack/models/CloudStackSecurityGroup.java   |     57 +-
 .../models/CloudStackSecurityGroupIngress.java  |    186 +-
 .../stack/models/CloudStackServiceOffering.java |    308 +-
 .../cloud/stack/models/CloudStackSnapshot.java  |     84 +-
 .../stack/models/CloudStackSnapshotPolicy.java  |    108 +-
 .../cloud/stack/models/CloudStackTemplate.java  |    568 +-
 .../models/CloudStackTemplatePermission.java    |     79 +-
 .../com/cloud/stack/models/CloudStackUser.java  |    265 +-
 .../cloud/stack/models/CloudStackUserVm.java    |    587 +-
 .../cloud/stack/models/CloudStackVolume.java    |    404 +-
 .../com/cloud/stack/models/CloudStackZone.java  |    240 +-
 .../com/cloud/gate/service/ServiceTestCase.java |     77 +-
 .../com/cloud/gate/testcase/BaseTestCase.java   |     57 +-
 .../gate/util/CloudStackClientTestCase.java     |     54 +-
 .../cloud/gate/util/JsonAccessorTestCase.java   |     70 +-
 .../test/com/cloud/gate/util/UtilTestCase.java  |    282 +-
 .../classes/resources/messages.properties       |     32 +-
 .../classes/resources/messages_ja.properties    |     66 +-
 .../classes/resources/messages_zh_CN.properties |     46 +-
 client/pom.xml                                  |     52 +-
 .../tomcatconf/cloudmanagementserver.keystore   |    Bin 1316 -> 0 bytes
 .../cloudmanagementserver.keystore.in           |    Bin 0 -> 1316 bytes
 client/tomcatconf/commands.properties.in        |     56 +-
 client/tomcatconf/db.properties.in              |     25 +-
 core/pom.xml                                    |      7 +-
 .../core/spring-core-registry-core-context.xml  |     15 +
 ...re-lifecycle-network-context-inheritable.xml |      6 +
 ...re-lifecycle-planner-context-inheritable.xml |      5 +
 core/src/com/cloud/agent/IAgentControl.java     |     13 +-
 .../com/cloud/agent/IAgentControlListener.java  |      5 +-
 .../cloud/agent/StartupCommandProcessor.java    |      5 +-
 .../com/cloud/agent/api/AgentControlAnswer.java |      6 +-
 .../cloud/agent/api/AgentControlCommand.java    |      7 +-
 .../com/cloud/agent/api/AttachIsoCommand.java   |     54 +-
 .../com/cloud/agent/api/AttachVolumeAnswer.java |      9 +-
 .../cloud/agent/api/AttachVolumeCommand.java    |     16 +-
 .../cloud/agent/api/BackupSnapshotAnswer.java   |      1 -
 .../cloud/agent/api/BackupSnapshotCommand.java  |     18 +-
 core/src/com/cloud/agent/api/CancelCommand.java |      2 -
 .../com/cloud/agent/api/ChangeAgentAnswer.java  |     10 +-
 .../com/cloud/agent/api/ChangeAgentCommand.java |     36 +-
 .../com/cloud/agent/api/CheckHealthAnswer.java  |      5 +-
 .../com/cloud/agent/api/CheckHealthCommand.java |      1 -
 .../com/cloud/agent/api/CheckNetworkAnswer.java |      3 +-
 .../com/cloud/agent/api/CheckOnHostCommand.java |      1 -
 .../com/cloud/agent/api/CheckRouterAnswer.java  |      6 +-
 .../com/cloud/agent/api/CheckStateAnswer.java   |      3 +-
 .../com/cloud/agent/api/CheckStateCommand.java  |      3 +-
 .../agent/api/CheckVirtualMachineAnswer.java    |      2 -
 .../cloud/agent/api/CleanupNetworkRulesCmd.java |      7 +-
 .../com/cloud/agent/api/ClusterSyncAnswer.java  |      9 +-
 .../com/cloud/agent/api/ClusterSyncCommand.java |      3 +-
 .../cloud/agent/api/ComputeChecksumCommand.java |     21 +-
 .../api/ConsoleAccessAuthenticationAnswer.java  |    102 +-
 .../api/ConsoleAccessAuthenticationCommand.java |     74 +-
 .../api/ConsoleProxyLoadReportCommand.java      |     28 +-
 ...reatePrivateTemplateFromSnapshotCommand.java |     16 +-
 .../CreatePrivateTemplateFromVolumeCommand.java |     12 +-
 .../agent/api/CreateStoragePoolCommand.java     |      7 +-
 .../cloud/agent/api/CreateVMSnapshotAnswer.java |     15 +-
 .../agent/api/CreateVMSnapshotCommand.java      |     10 +-
 .../api/CreateVolumeFromSnapshotAnswer.java     |      1 -
 .../api/CreateVolumeFromSnapshotCommand.java    |     12 +-
 .../api/CreateVolumeFromVMSnapshotAnswer.java   |      9 +-
 .../api/CreateVolumeFromVMSnapshotCommand.java  |      8 +-
 .../agent/api/DeleteSnapshotsDirCommand.java    |      1 -
 .../agent/api/DeleteStoragePoolCommand.java     |     26 +-
 .../cloud/agent/api/DeleteVMSnapshotAnswer.java |     11 +-
 .../agent/api/DeleteVMSnapshotCommand.java      |      4 +-
 .../agent/api/DirectNetworkUsageAnswer.java     |     62 +-
 .../agent/api/DirectNetworkUsageCommand.java    |     44 +-
 .../api/ExternalNetworkResourceUsageAnswer.java |     34 +-
 .../ExternalNetworkResourceUsageCommand.java    |      6 +-
 core/src/com/cloud/agent/api/FenceCommand.java  |      2 +-
 .../com/cloud/agent/api/GetFileStatsAnswer.java |      1 +
 .../com/cloud/agent/api/GetHostStatsAnswer.java |      4 +-
 .../cloud/agent/api/GetHostStatsCommand.java    |      9 +-
 .../cloud/agent/api/GetStorageStatsAnswer.java  |      1 -
 .../cloud/agent/api/GetStorageStatsCommand.java |     13 +-
 .../cloud/agent/api/GetVmDiskStatsAnswer.java   |      4 +-
 .../cloud/agent/api/GetVmDiskStatsCommand.java  |      4 +-
 .../com/cloud/agent/api/GetVmStatsCommand.java  |      4 +-
 .../com/cloud/agent/api/GetVncPortAnswer.java   |      4 +-
 .../src/com/cloud/agent/api/HostStatsEntry.java |     93 +-
 .../src/com/cloud/agent/api/MaintainAnswer.java |      4 +-
 .../cloud/agent/api/ManageSnapshotAnswer.java   |     10 +-
 .../cloud/agent/api/ManageSnapshotCommand.java  |     17 +-
 .../src/com/cloud/agent/api/MigrateCommand.java |      6 +-
 .../agent/api/MigrateWithStorageCommand.java    |      3 +-
 .../api/MigrateWithStorageReceiveAnswer.java    |      7 +-
 .../api/MigrateWithStorageReceiveCommand.java   |      3 +-
 .../agent/api/MigrateWithStorageSendAnswer.java |      1 +
 .../api/MigrateWithStorageSendCommand.java      |      6 +-
 .../cloud/agent/api/ModifySshKeysCommand.java   |      4 +
 .../agent/api/ModifyStoragePoolAnswer.java      |      8 +-
 .../agent/api/ModifyStoragePoolCommand.java     |     40 +-
 .../agent/api/NetworkRulesSystemVmCommand.java  |     50 +-
 .../api/NetworkRulesVmSecondaryIpCommand.java   |      4 +-
 .../com/cloud/agent/api/NetworkUsageAnswer.java |     11 +-
 .../cloud/agent/api/NetworkUsageCommand.java    |     24 +-
 .../agent/api/PerformanceMonitorAnswer.java     |     27 +
 .../agent/api/PerformanceMonitorCommand.java    |     46 +
 core/src/com/cloud/agent/api/PingCommand.java   |      2 +-
 .../com/cloud/agent/api/PingRoutingCommand.java |     15 +-
 .../api/PingRoutingWithNwGroupsCommand.java     |     30 +-
 .../agent/api/PingRoutingWithOvsCommand.java    |     25 +-
 .../com/cloud/agent/api/PingTestCommand.java    |      3 +-
 core/src/com/cloud/agent/api/PlugNicAnswer.java |      5 +-
 .../com/cloud/agent/api/PoolEjectCommand.java   |     16 +-
 .../agent/api/PrepareForMigrationCommand.java   |      4 +-
 core/src/com/cloud/agent/api/ReadyAnswer.java   |     16 +-
 core/src/com/cloud/agent/api/ReadyCommand.java  |     69 +-
 core/src/com/cloud/agent/api/RebootAnswer.java  |      2 +-
 .../cloud/agent/api/RebootRouterCommand.java    |     23 +-
 .../agent/api/RecurringNetworkUsageAnswer.java  |     22 +-
 .../agent/api/RecurringNetworkUsageCommand.java |     16 +-
 .../agent/api/RevertToVMSnapshotAnswer.java     |     12 +-
 .../agent/api/RevertToVMSnapshotCommand.java    |     15 +-
 core/src/com/cloud/agent/api/ScaleVmAnswer.java |      2 +-
 .../src/com/cloud/agent/api/ScaleVmCommand.java |    125 +-
 .../agent/api/SecStorageFirewallCfgCommand.java |    101 +-
 .../cloud/agent/api/SecStorageSetupAnswer.java  |     13 +-
 .../cloud/agent/api/SecStorageSetupCommand.java |     68 +-
 .../agent/api/SecStorageVMSetupCommand.java     |     72 +-
 .../agent/api/SecurityGroupRuleAnswer.java      |      9 +-
 .../cloud/agent/api/SecurityGroupRulesCmd.java  |     62 +-
 core/src/com/cloud/agent/api/SetupAnswer.java   |      5 +-
 core/src/com/cloud/agent/api/SetupCommand.java  |     20 -
 .../agent/api/SetupGuestNetworkAnswer.java      |      5 +-
 .../agent/api/SetupGuestNetworkCommand.java     |      9 +-
 .../com/cloud/agent/api/SnapshotCommand.java    |      6 +-
 core/src/com/cloud/agent/api/StartAnswer.java   |     16 +-
 core/src/com/cloud/agent/api/StartCommand.java  |     10 +
 core/src/com/cloud/agent/api/StartupAnswer.java |      1 -
 .../src/com/cloud/agent/api/StartupCommand.java |     79 +-
 .../agent/api/StartupExternalDhcpCommand.java   |      6 +-
 .../cloud/agent/api/StartupProxyCommand.java    |     15 +-
 .../agent/api/StartupPxeServerCommand.java      |      6 +-
 .../cloud/agent/api/StartupRoutingCommand.java  |     99 +-
 .../api/StartupSecondaryStorageCommand.java     |      2 +-
 .../cloud/agent/api/StartupStorageCommand.java  |     78 +-
 .../cloud/agent/api/StartupVMMAgentCommand.java |     25 +-
 core/src/com/cloud/agent/api/StopAnswer.java    |     26 +-
 core/src/com/cloud/agent/api/StopCommand.java   |     36 +-
 .../com/cloud/agent/api/UnPlugNicAnswer.java    |      5 +-
 .../com/cloud/agent/api/UnPlugNicCommand.java   |      2 +-
 .../cloud/agent/api/UnregisterVMCommand.java    |     68 +-
 .../agent/api/UpdateHostPasswordCommand.java    |     15 +-
 .../cloud/agent/api/UpgradeSnapshotCommand.java |     15 +-
 .../cloud/agent/api/VMSnapshotBaseCommand.java  |     11 +-
 core/src/com/cloud/agent/api/VMSnapshotTO.java  |     83 +-
 .../cloud/agent/api/ValidateSnapshotAnswer.java |      4 +-
 .../agent/api/ValidateSnapshotCommand.java      |     15 +-
 .../com/cloud/agent/api/VmDiskStatsEntry.java   |     44 +-
 core/src/com/cloud/agent/api/VmStatsEntry.java  |     53 +-
 .../api/baremetal/IpmISetBootDevCommand.java    |     30 +-
 .../baremetal/PrepareCreateTemplateCommand.java |     66 +
 .../api/baremetal/PreparePxeServerAnswer.java   |     12 +-
 .../api/baremetal/PreparePxeServerCommand.java  |     92 +-
 .../baremetal/prepareCreateTemplateCommand.java |     66 -
 .../api/proxy/CheckConsoleProxyLoadCommand.java |     49 +-
 .../agent/api/proxy/ConsoleProxyLoadAnswer.java |     30 +-
 ...tartConsoleProxyAgentHttpHandlerCommand.java |     64 +-
 .../api/proxy/WatchConsoleProxyLoadCommand.java |     62 +-
 .../agent/api/routing/CreateIpAliasCommand.java |     15 +-
 .../agent/api/routing/DeleteIpAliasCommand.java |     11 +-
 .../agent/api/routing/DhcpEntryCommand.java     |     61 +-
 .../agent/api/routing/DnsMasqConfigCommand.java |      4 +-
 .../routing/GlobalLoadBalancerConfigAnswer.java |      2 +-
 .../GlobalLoadBalancerConfigCommand.java        |     11 +-
 .../com/cloud/agent/api/routing/IpAliasTO.java  |     11 +-
 .../cloud/agent/api/routing/IpAssocAnswer.java  |      4 +-
 .../cloud/agent/api/routing/IpAssocCommand.java |     13 +-
 .../agent/api/routing/IpAssocVpcCommand.java    |      2 +-
 .../api/routing/LoadBalancerConfigCommand.java  |     28 +-
 .../api/routing/NetworkElementCommand.java      |      1 -
 .../api/routing/RemoteAccessVpnCfgCommand.java  |    142 +-
 .../agent/api/routing/SavePasswordCommand.java  |     15 +-
 .../api/routing/SetFirewallRulesCommand.java    |     91 +-
 .../api/routing/SetMonitorServiceCommand.java   |     55 +
 .../agent/api/routing/SetNetworkACLCommand.java |     33 +-
 .../routing/SetPortForwardingRulesAnswer.java   |      3 +-
 .../SetPortForwardingRulesVpcCommand.java       |      2 +-
 .../agent/api/routing/SetSourceNatAnswer.java   |      5 +-
 .../agent/api/routing/SetSourceNatCommand.java  |      2 +-
 .../api/routing/SetStaticNatRulesAnswer.java    |      3 +-
 .../api/routing/SetStaticNatRulesCommand.java   |      2 +-
 .../agent/api/routing/SetStaticRouteAnswer.java |      2 +-
 .../api/routing/SetStaticRouteCommand.java      |      6 +-
 .../api/routing/Site2SiteVpnCfgCommand.java     |     20 +-
 .../api/routing/SiteLoadBalancerConfig.java     |     14 +-
 .../agent/api/routing/UserDataCommand.java      |     31 +-
 .../cloud/agent/api/routing/VmDataCommand.java  |     31 +-
 .../agent/api/routing/VpnUsersCfgCommand.java   |    128 +-
 .../api/storage/AbstractDownloadCommand.java    |     18 +-
 .../api/storage/AbstractUploadCommand.java      |      9 +-
 .../agent/api/storage/CopyVolumeAnswer.java     |     30 +-
 .../agent/api/storage/CopyVolumeCommand.java    |     73 +-
 .../cloud/agent/api/storage/CreateAnswer.java   |      3 +-
 .../cloud/agent/api/storage/CreateCommand.java  |      2 +-
 .../storage/CreateEntityDownloadURLAnswer.java  |      4 +-
 .../storage/CreateEntityDownloadURLCommand.java |     13 +-
 .../storage/CreatePrivateTemplateAnswer.java    |     16 +-
 .../storage/CreatePrivateTemplateCommand.java   |     24 +-
 .../storage/DeleteEntityDownloadURLAnswer.java  |      4 +-
 .../storage/DeleteEntityDownloadURLCommand.java |     24 +-
 .../cloud/agent/api/storage/DestroyCommand.java |     18 +-
 .../cloud/agent/api/storage/DownloadAnswer.java |    183 +-
 .../agent/api/storage/ListTemplateAnswer.java   |     30 +-
 .../agent/api/storage/ListTemplateCommand.java  |     12 +-
 .../agent/api/storage/ListVolumeAnswer.java     |     30 +-
 .../agent/api/storage/ListVolumeCommand.java    |      9 +-
 .../storage/ManageVolumeAvailabilityAnswer.java |     10 +-
 .../ManageVolumeAvailabilityCommand.java        |     37 +-
 .../agent/api/storage/MigrateVolumeCommand.java |     12 +
 .../storage/PrimaryStorageDownloadAnswer.java   |     28 +-
 .../storage/PrimaryStorageDownloadCommand.java  |     30 +-
 .../agent/api/storage/ResizeVolumeCommand.java  |     18 +-
 .../com/cloud/agent/api/storage/SsCommand.java  |     48 +
 .../agent/api/storage/UpgradeDiskCommand.java   |      6 +-
 .../cloud/agent/api/storage/UploadAnswer.java   |    166 +-
 .../cloud/agent/api/storage/UploadCommand.java  |    200 +-
 .../api/storage/UploadProgressCommand.java      |     43 +-
 .../com/cloud/agent/api/storage/ssCommand.java  |     48 -
 .../virtualnetwork/VirtualRoutingResource.java  |    147 +-
 .../cloud/agent/transport/ArrayTypeAdaptor.java |      8 +-
 .../agent/transport/InterfaceTypeAdaptor.java   |     15 +-
 .../transport/LoggingExclusionStrategy.java     |      5 +-
 core/src/com/cloud/agent/transport/Request.java |     53 +-
 .../src/com/cloud/agent/transport/Response.java |      5 +-
 .../exception/UnsupportedVersionException.java  |      8 +-
 .../cloud/exception/UsageServerException.java   |      5 +-
 core/src/com/cloud/host/HostInfo.java           |     11 +-
 .../resource/HypervDummyResourceBase.java       |    123 +-
 .../cloud/info/ConsoleProxyConnectionInfo.java  |     18 +-
 core/src/com/cloud/info/ConsoleProxyInfo.java   |    148 +-
 core/src/com/cloud/info/ConsoleProxyStatus.java |     16 +-
 .../cloud/info/RunningHostInfoAgregator.java    |    120 +-
 .../com/cloud/info/SecStorageVmLoadInfo.java    |     56 +-
 .../com/cloud/network/HAProxyConfigurator.java  |    646 +-
 .../cloud/network/LoadBalancerConfigurator.java |     18 +-
 .../cloud/network/LoadBalancerValidator.java    |      2 -
 .../CreateLoadBalancerApplianceAnswer.java      |     12 +-
 .../resource/TrafficSentinelResource.java       |    412 +-
 .../com/cloud/resource/ResourceListener.java    |      4 +-
 core/src/com/cloud/resource/ServerResource.java |     10 +-
 .../com/cloud/resource/ServerResourceBase.java  |    123 +-
 .../resource/hypervisor/HypervisorResource.java |      6 +-
 core/src/com/cloud/serializer/GsonHelper.java   |      9 +-
 .../com/cloud/serializer/SerializerHelper.java  |     38 +-
 .../src/com/cloud/storage/JavaStorageLayer.java |    172 +-
 core/src/com/cloud/storage/StorageLayer.java    |     31 +-
 .../storage/resource/StoragePoolResource.java   |      6 +-
 .../storage/resource/StorageProcessor.java      |     19 +-
 .../StorageSubsystemCommandHandlerBase.java     |     19 +-
 .../storage/template/FtpTemplateUploader.java   |    114 +-
 .../template/HttpTemplateDownloader.java        |    125 +-
 .../cloud/storage/template/IsoProcessor.java    |     14 +-
 .../template/LocalTemplateDownloader.java       |     12 +-
 .../cloud/storage/template/OVAProcessor.java    |    158 +
 .../com/cloud/storage/template/Processor.java   |     10 +-
 .../cloud/storage/template/QCOW2Processor.java  |     91 +-
 .../storage/template/RawImageProcessor.java     |     34 +-
 .../storage/template/S3TemplateDownloader.java  |     88 +-
 .../storage/template/ScpTemplateDownloader.java |     50 +-
 .../storage/template/TemplateConstants.java     |     20 +-
 .../storage/template/TemplateDownloader.java    |    146 +-
 .../template/TemplateDownloaderBase.java        |     76 +-
 .../storage/template/TemplateLocation.java      |     26 +-
 .../storage/template/TemplateUploader.java      |    132 +-
 .../cloud/storage/template/VhdProcessor.java    |     74 +-
 .../cloud/storage/template/VmdkProcessor.java   |    104 +-
 .../cloudstack/storage/command/CopyCommand.java |     13 +-
 .../storage/command/DownloadCommand.java        |    182 +-
 .../command/DownloadProgressCommand.java        |     46 +-
 .../storage/command/ForgetObjectCmd.java        |      4 +-
 .../storage/command/IntroduceObjectAnswer.java  |      1 +
 .../storage/command/IntroduceObjectCmd.java     |      1 +
 .../cloudstack/storage/to/ImageStoreTO.java     |     11 +-
 .../storage/to/PrimaryDataStoreTO.java          |     12 +-
 .../cloudstack/storage/to/SnapshotObjectTO.java |     41 +-
 .../cloudstack/storage/to/TemplateObjectTO.java |     10 +-
 .../cloudstack/storage/to/VolumeObjectTO.java   |     69 +-
 .../com/cloud/agent/transport/RequestTest.java  |     13 +-
 .../cloud/network/HAProxyConfiguratorTest.java  |      9 +-
 .../cloudstack/api/agent/test/AnswerTest.java   |      3 +-
 .../api/agent/test/AttachVolumeAnswerTest.java  |      4 +-
 .../api/agent/test/AttachVolumeCommandTest.java |      4 +-
 .../agent/test/BackupSnapshotAnswerTest.java    |      7 +-
 .../agent/test/BackupSnapshotCommandTest.java   |     24 +-
 .../agent/test/BumpUpPriorityCommandTest.java   |     18 +-
 .../api/agent/test/ChangeAgentAnswerTest.java   |      3 +-
 .../api/agent/test/ChangeAgentCommandTest.java  |      3 +-
 .../api/agent/test/CheckNetworkAnswerTest.java  |     28 +-
 .../api/agent/test/CheckNetworkCommandTest.java |      3 +-
 .../api/agent/test/CheckOnHostCommandTest.java  |     71 +-
 .../api/agent/test/SnapshotCommandTest.java     |     42 +-
 debian/changelog                                |      6 +
 debian/cloudstack-management.install            |      1 -
 debian/cloudstack-management.postinst           |      5 +-
 deps/XenServerJava/pom.xml                      |     24 +-
 .../src/com/xensource/xenapi/APIVersion.java    |     44 +-
 .../src/com/xensource/xenapi/Auth.java          |     26 +-
 .../src/com/xensource/xenapi/Blob.java          |    139 +-
 .../src/com/xensource/xenapi/Bond.java          |    181 +-
 .../src/com/xensource/xenapi/Connection.java    |     66 +-
 .../src/com/xensource/xenapi/Console.java       |    127 +-
 .../src/com/xensource/xenapi/Crashdump.java     |    105 +-
 .../src/com/xensource/xenapi/DRTask.java        |     85 +-
 .../src/com/xensource/xenapi/DataSource.java    |     11 +-
 .../src/com/xensource/xenapi/Event.java         |     90 +-
 .../src/com/xensource/xenapi/GPUGroup.java      |    137 +-
 .../src/com/xensource/xenapi/Host.java          |   1083 +-
 .../src/com/xensource/xenapi/HostCpu.java       |    174 +-
 .../src/com/xensource/xenapi/HostCrashdump.java |    125 +-
 .../src/com/xensource/xenapi/HostMetrics.java   |    112 +-
 .../src/com/xensource/xenapi/HostPatch.java     |    187 +-
 .../src/com/xensource/xenapi/Marshalling.java   |     20 +-
 .../src/com/xensource/xenapi/Message.java       |     84 +-
 .../src/com/xensource/xenapi/Network.java       |    267 +-
 .../src/com/xensource/xenapi/PBD.java           |    175 +-
 .../src/com/xensource/xenapi/PCI.java           |    125 +-
 .../src/com/xensource/xenapi/PGPU.java          |    101 +-
 .../src/com/xensource/xenapi/PIF.java           |    509 +-
 .../src/com/xensource/xenapi/PIFMetrics.java    |    165 +-
 .../src/com/xensource/xenapi/Pool.java          |    854 +-
 .../src/com/xensource/xenapi/PoolPatch.java     |    229 +-
 .../src/com/xensource/xenapi/Role.java          |    115 +-
 .../src/com/xensource/xenapi/SM.java            |    165 +-
 .../src/com/xensource/xenapi/SR.java            |    739 +-
 .../src/com/xensource/xenapi/Secret.java        |    117 +-
 .../src/com/xensource/xenapi/Session.java       |    219 +-
 .../src/com/xensource/xenapi/Subject.java       |    121 +-
 .../src/com/xensource/xenapi/Task.java          |    227 +-
 .../src/com/xensource/xenapi/Tunnel.java        |    157 +-
 .../src/com/xensource/xenapi/Types.java         |   3213 +-
 .../src/com/xensource/xenapi/User.java          |    127 +-
 .../src/com/xensource/xenapi/VBD.java           |    413 +-
 .../src/com/xensource/xenapi/VBDMetrics.java    |    101 +-
 .../src/com/xensource/xenapi/VDI.java           |    824 +-
 .../src/com/xensource/xenapi/VGPU.java          |    141 +-
 .../src/com/xensource/xenapi/VIF.java           |    399 +-
 .../src/com/xensource/xenapi/VIFMetrics.java    |    101 +-
 .../src/com/xensource/xenapi/VLAN.java          |    127 +-
 .../src/com/xensource/xenapi/VM.java            |   2103 +-
 .../src/com/xensource/xenapi/VMAppliance.java   |    233 +-
 .../com/xensource/xenapi/VMGuestMetrics.java    |    149 +-
 .../src/com/xensource/xenapi/VMMetrics.java     |    157 +-
 .../src/com/xensource/xenapi/VMPP.java          |    399 +-
 .../src/com/xensource/xenapi/VTPM.java          |     77 +-
 .../src/com/xensource/xenapi/XenAPIObject.java  |      4 +-
 developer/pom.xml                               |      3 +-
 engine/api/pom.xml                              |      2 +-
 .../src/com/cloud/vm/VirtualMachineGuru.java    |     14 +-
 .../src/com/cloud/vm/VirtualMachineManager.java |     58 +-
 .../src/org/apache/cloudstack/engine/Rules.java |     85 -
 .../engine/cloud/entity/api/TemplateEntity.java |      5 +-
 .../cloud/entity/api/VirtualMachineEntity.java  |     19 +-
 .../engine/cloud/entity/api/VolumeEntity.java   |     15 +-
 .../datacenter/entity/api/ClusterEntity.java    |      2 +-
 .../entity/api/DataCenterResourceEntity.java    |     24 +-
 .../engine/datacenter/entity/api/PodEntity.java |      3 +-
 .../datacenter/entity/api/StorageEntity.java    |      2 +-
 .../datacenter/entity/api/ZoneEntity.java       |      7 +-
 .../engine/entity/api/CloudStackEntity.java     |      9 +-
 .../InsufficientCapacityException.java          |      1 -
 .../service/NetworkOrchestrationService.java    |     28 +-
 .../service/VolumeOrchestrationService.java     |     27 +-
 .../rest/service/api/ClusterRestService.java    |     32 +-
 .../rest/service/api/NetworkRestService.java    |     17 +-
 .../engine/rest/service/api/PodRestService.java |     29 +-
 .../service/api/VirtualMachineRestService.java  |     14 +-
 .../rest/service/api/VolumeRestService.java     |     27 +-
 .../rest/service/api/ZoneRestService.java       |     28 +-
 .../engine/service/api/DirectoryService.java    |      3 +
 .../engine/service/api/EntityService.java       |      9 +
 .../service/api/OrchestrationService.java       |     51 +-
 .../engine/service/api/ProvisioningService.java |      5 +-
 .../api/hypervisor/ComputeSubsystem.java        |      1 -
 .../engine/subsystem/api/storage/ChapInfo.java  |      3 +
 .../api/storage/DataMotionService.java          |      3 +-
 .../api/storage/DataMotionStrategy.java         |      3 +-
 .../api/storage/DataStoreCapabilities.java      |     23 +
 .../subsystem/api/storage/DataStoreDriver.java  |     15 +-
 .../subsystem/api/storage/DataStoreManager.java |      4 +
 .../api/storage/DataStoreProvider.java          |      2 +-
 .../api/storage/DataStoreProviderManager.java   |      2 -
 .../subsystem/api/storage/EndPointSelector.java |      6 +
 .../subsystem/api/storage/PrimaryDataStore.java |      6 -
 .../api/storage/PrimaryDataStoreDriver.java     |     12 +
 .../api/storage/PrimaryDataStoreInfo.java       |      2 +
 .../api/storage/PrimaryDataStoreParameters.java |     24 +-
 .../api/storage/SnapshotDataFactory.java        |      2 +
 .../subsystem/api/storage/SnapshotInfo.java     |      2 +
 .../subsystem/api/storage/SnapshotResult.java   |      2 +-
 .../subsystem/api/storage/SnapshotService.java  |      2 +
 .../subsystem/api/storage/SnapshotStrategy.java |      5 +-
 .../subsystem/api/storage/StorageAction.java    |     25 +
 .../api/storage/StorageCacheManager.java        |      2 +-
 .../api/storage/StoragePoolAllocator.java       |     10 +-
 .../subsystem/api/storage/StrategyPriority.java |      6 +-
 .../subsystem/api/storage/TemplateInfo.java     |      1 +
 .../subsystem/api/storage/TemplateService.java  |      8 +-
 .../api/storage/VMSnapshotOptions.java          |      1 +
 .../api/storage/VMSnapshotStrategy.java         |      3 +
 .../subsystem/api/storage/VolumeInfo.java       |      8 +
 .../subsystem/api/storage/VolumeService.java    |     16 +-
 .../subsystem/api/storage/type/DataDisk.java    |      1 -
 .../engine/subsystem/api/storage/type/Iso.java  |      1 -
 .../subsystem/api/storage/type/RootDisk.java    |      1 -
 .../api/storage/type/VolumeTypeBase.java        |      4 +-
 .../engine/subsystem/api/storage/ScopeTest.java |      1 -
 engine/components-api/pom.xml                   |      2 +-
 .../src/com/cloud/agent/AgentManager.java       |      3 +-
 .../src/com/cloud/alert/AlertManager.java       |     53 +-
 .../src/com/cloud/capacity/CapacityManager.java |     47 +-
 .../configuration/ConfigurationManager.java     |     46 +-
 .../cloud/deploy/DeploymentPlanningManager.java |    100 +-
 .../src/com/cloud/event/UsageEventUtils.java    |    114 +-
 .../com/cloud/ha/HighAvailabilityManager.java   |     30 +-
 .../cloud/hypervisor/HypervisorGuruManager.java |      4 +-
 .../src/com/cloud/network/IpAddressManager.java |     64 +-
 .../com/cloud/network/NetworkStateListener.java |     24 +-
 .../src/com/cloud/network/addr/PublicIp.java    |     29 +-
 .../network/lb/LoadBalancingRulesManager.java   |     17 +-
 .../cloud/network/rules/FirewallManager.java    |     15 +-
 .../com/cloud/network/rules/RulesManager.java   |      3 +-
 .../cloud/network/rules/StaticNatRuleImpl.java  |     33 +-
 .../cloud/network/vpc/NetworkACLManager.java    |     18 +-
 .../src/com/cloud/network/vpc/VpcManager.java   |     41 +-
 .../src/com/cloud/resource/Discoverer.java      |     25 +-
 .../src/com/cloud/resource/ResourceManager.java |     10 +-
 .../cloud/resource/ResourceStateAdapter.java    |     25 +-
 .../src/com/cloud/template/TemplateManager.java |      7 +-
 .../com/cloud/vm/ReservationContextImpl.java    |     14 +-
 .../com/cloud/vm/VirtualMachineProfileImpl.java |     30 +-
 .../components-api/src/com/cloud/vm/VmWork.java |     52 +
 .../src/com/cloud/vm/VmWorkConstants.java       |     23 +
 .../src/com/cloud/vm/VmWorkJobHandler.java      |     25 +
 .../src/com/cloud/vm/VmWorkJobHandlerProxy.java |    133 +
 .../src/com/cloud/vm/VmWorkSerializer.java      |     74 +
 .../cloud/vm/snapshot/VMSnapshotManager.java    |      6 +-
 .../apache/cloudstack/compute/ComputeGuru.java  |      4 +-
 engine/network/pom.xml                          |      2 +-
 .../cloudstack/network/NetworkOrchestrator.java |      2 +-
 engine/orchestration/pom.xml                    |      2 +-
 ...spring-engine-orchestration-core-context.xml |     29 +-
 .../com/cloud/agent/manager/AgentAttache.java   |     41 +-
 .../cloud/agent/manager/AgentManagerImpl.java   |    167 +-
 .../agent/manager/ClusteredAgentAttache.java    |     46 +-
 .../manager/ClusteredAgentManagerImpl.java      |    293 +-
 .../manager/ClusteredDirectAgentAttache.java    |      8 +-
 .../agent/manager/ConnectedAgentAttache.java    |      4 +-
 .../cloud/agent/manager/DirectAgentAttache.java |     20 +-
 .../com/cloud/agent/manager/DummyAttache.java   |     30 +-
 .../src/com/cloud/agent/manager/Routable.java   |      2 +-
 .../agent/manager/SynchronousListener.java      |     50 +-
 .../agentlb/AgentLoadBalancerPlanner.java       |      3 +-
 .../ClusterBasedAgentLoadBalancerPlanner.java   |     46 +-
 .../vm/ClusteredVirtualMachineManagerImpl.java  |     18 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java |   1931 +-
 .../cloud/vm/VirtualMachinePowerStateSync.java  |     33 +
 .../vm/VirtualMachinePowerStateSyncImpl.java    |    107 +
 .../src/com/cloud/vm/VmWorkAddVmToNetwork.java  |     40 +
 .../src/com/cloud/vm/VmWorkJobDispatcher.java   |    113 +
 .../com/cloud/vm/VmWorkJobWakeupDispatcher.java |    147 +
 .../src/com/cloud/vm/VmWorkMigrate.java         |     87 +
 .../src/com/cloud/vm/VmWorkMigrateForScale.java |     48 +
 .../com/cloud/vm/VmWorkMigrateWithStorage.java  |     52 +
 .../src/com/cloud/vm/VmWorkReboot.java          |     60 +
 .../src/com/cloud/vm/VmWorkReconfigure.java     |     42 +
 .../src/com/cloud/vm/VmWorkRemoveNicFromVm.java |     33 +
 .../com/cloud/vm/VmWorkRemoveVmFromNetwork.java |     43 +
 .../src/com/cloud/vm/VmWorkStart.java           |    125 +
 .../src/com/cloud/vm/VmWorkStop.java            |     32 +
 .../com/cloud/vm/VmWorkStorageMigration.java    |     35 +
 .../cloud/entity/api/VMEntityManager.java       |     14 +-
 .../cloud/entity/api/VMEntityManagerImpl.java   |     65 +-
 .../entity/api/VirtualMachineEntityImpl.java    |    419 +-
 .../entity/api/ClusterEntityImpl.java           |    340 +-
 .../entity/api/DataCenterResourceManager.java   |     21 +-
 .../api/DataCenterResourceManagerImpl.java      |    163 +-
 .../datacenter/entity/api/HostEntityImpl.java   |    352 +-
 .../datacenter/entity/api/PodEntityImpl.java    |    108 +-
 .../datacenter/entity/api/ZoneEntityImpl.java   |    107 +-
 .../entity/api/db/ClusterDetailsVO.java         |     12 +-
 .../datacenter/entity/api/db/DcDetailVO.java    |     12 +-
 .../entity/api/db/EngineClusterVO.java          |     45 +-
 .../entity/api/db/EngineDataCenterVO.java       |    122 +-
 .../entity/api/db/EngineHostPodVO.java          |     22 +-
 .../datacenter/entity/api/db/EngineHostVO.java  |    225 +-
 .../entity/api/db/dao/DcDetailsDao.java         |      2 +-
 .../entity/api/db/dao/DcDetailsDaoImpl.java     |      8 +-
 .../entity/api/db/dao/EngineClusterDao.java     |     11 +-
 .../entity/api/db/dao/EngineClusterDaoImpl.java |     63 +-
 .../entity/api/db/dao/EngineDataCenterDao.java  |     23 +-
 .../api/db/dao/EngineDataCenterDaoImpl.java     |     65 +-
 .../entity/api/db/dao/EngineHostDao.java        |     20 +-
 .../entity/api/db/dao/EngineHostDaoImpl.java    |    201 +-
 .../entity/api/db/dao/EngineHostPodDao.java     |     10 +-
 .../entity/api/db/dao/EngineHostPodDaoImpl.java |    151 +-
 .../entity/api/db/dao/HostDetailsDao.java       |      6 +-
 .../entity/api/db/dao/HostDetailsDaoImpl.java   |     23 +-
 .../entity/api/db/dao/HostTagsDao.java          |      8 +-
 .../entity/api/db/dao/HostTagsDaoImpl.java      |     18 +-
 .../engine/orchestration/CloudOrchestrator.java |    192 +-
 .../orchestration/NetworkOrchestrator.java      |    532 +-
 .../orchestration/VolumeOrchestrator.java       |    348 +-
 .../service/api/ProvisioningServiceImpl.java    |      6 +-
 .../cloud/vm/VirtualMachineManagerImplTest.java |     44 +-
 .../test/ChildTestConfiguration.java            |     41 +-
 .../provisioning/test/ProvisioningTest.java     |    158 +-
 engine/pom.xml                                  |      2 +-
 engine/schema/pom.xml                           |      2 +-
 .../spring-engine-schema-core-daos-context.xml  |     23 +-
 engine/schema/src/com/cloud/alert/AlertVO.java  |     53 +-
 .../src/com/cloud/alert/dao/AlertDao.java       |      7 +-
 .../src/com/cloud/alert/dao/AlertDaoImpl.java   |     28 +-
 .../src/com/cloud/capacity/CapacityVO.java      |     99 +-
 .../src/com/cloud/capacity/dao/CapacityDao.java |     40 +-
 .../com/cloud/capacity/dao/CapacityDaoImpl.java |    569 +-
 .../com/cloud/certificate/CertificateVO.java    |     33 +-
 .../cloud/certificate/dao/CertificateDao.java   |      2 +-
 .../certificate/dao/CertificateDaoImpl.java     |     53 +-
 .../cluster/agentlb/HostTransferMapVO.java      |     10 +-
 .../cluster/agentlb/dao/HostTransferMapDao.java |     10 +-
 .../agentlb/dao/HostTransferMapDaoImpl.java     |     72 +-
 .../cloud/configuration/ResourceCountVO.java    |    188 +-
 .../cloud/configuration/ResourceLimitVO.java    |      2 -
 .../configuration/dao/ResourceCountDao.java     |     20 +-
 .../configuration/dao/ResourceCountDaoImpl.java |     31 +-
 .../configuration/dao/ResourceLimitDaoImpl.java |      2 +-
 .../src/com/cloud/dc/AccountVlanMapVO.java      |     70 +-
 .../src/com/cloud/dc/ClusterDetailsDao.java     |      7 +-
 .../src/com/cloud/dc/ClusterDetailsDaoImpl.java |     12 +-
 .../src/com/cloud/dc/ClusterDetailsVO.java      |     27 +-
 engine/schema/src/com/cloud/dc/ClusterVO.java   |     74 +-
 .../src/com/cloud/dc/ClusterVSMMapVO.java       |     19 +-
 .../src/com/cloud/dc/DataCenterDetailVO.java    |     29 +-
 .../src/com/cloud/dc/DataCenterIpAddressVO.java |     61 +-
 .../dc/DataCenterLinkLocalIpAddressVO.java      |     57 +-
 .../schema/src/com/cloud/dc/DataCenterVO.java   |    209 +-
 .../src/com/cloud/dc/DataCenterVnetVO.java      |     55 +-
 engine/schema/src/com/cloud/dc/HostPodVO.java   |    217 +-
 engine/schema/src/com/cloud/dc/PodCluster.java  |     21 +-
 .../schema/src/com/cloud/dc/PodVlanMapVO.java   |     69 +-
 engine/schema/src/com/cloud/dc/PodVlanVO.java   |     45 +-
 .../com/cloud/dc/StorageNetworkIpAddressVO.java |    171 +-
 .../com/cloud/dc/StorageNetworkIpRangeVO.java   |    305 +-
 engine/schema/src/com/cloud/dc/VlanVO.java      |    209 +-
 .../src/com/cloud/dc/dao/AccountVlanMapDao.java |     12 +-
 .../com/cloud/dc/dao/AccountVlanMapDaoImpl.java |     68 +-
 .../schema/src/com/cloud/dc/dao/ClusterDao.java |      9 +
 .../src/com/cloud/dc/dao/ClusterDaoImpl.java    |     12 +-
 .../src/com/cloud/dc/dao/ClusterVSMMapDao.java  |      3 +
 .../com/cloud/dc/dao/ClusterVSMMapDaoImpl.java  |     42 +-
 .../src/com/cloud/dc/dao/DataCenterDao.java     |     49 +-
 .../src/com/cloud/dc/dao/DataCenterDaoImpl.java |     90 +-
 .../cloud/dc/dao/DataCenterDetailsDaoImpl.java  |      5 +-
 .../cloud/dc/dao/DataCenterIpAddressDao.java    |     10 +-
 .../dc/dao/DataCenterIpAddressDaoImpl.java      |     90 +-
 .../dc/dao/DataCenterLinkLocalIpAddressDao.java |      8 +-
 .../DataCenterLinkLocalIpAddressDaoImpl.java    |     82 +-
 .../src/com/cloud/dc/dao/DataCenterVnetDao.java |     15 +-
 .../com/cloud/dc/dao/DataCenterVnetDaoImpl.java |     95 +-
 .../schema/src/com/cloud/dc/dao/HostPodDao.java |      1 -
 .../src/com/cloud/dc/dao/HostPodDaoImpl.java    |      4 +-
 .../schema/src/com/cloud/dc/dao/PodVlanDao.java |      8 +-
 .../src/com/cloud/dc/dao/PodVlanDaoImpl.java    |     38 +-
 .../src/com/cloud/dc/dao/PodVlanMapDao.java     |     12 +-
 .../src/com/cloud/dc/dao/PodVlanMapDaoImpl.java |     70 +-
 .../dc/dao/StorageNetworkIpAddressDao.java      |     12 +-
 .../dc/dao/StorageNetworkIpAddressDaoImpl.java  |    111 +-
 .../cloud/dc/dao/StorageNetworkIpRangeDao.java  |     10 +-
 .../dc/dao/StorageNetworkIpRangeDaoImpl.java    |     48 +-
 engine/schema/src/com/cloud/dc/dao/VlanDao.java |     60 +-
 .../src/com/cloud/dc/dao/VlanDaoImpl.java       |     95 +-
 .../schema/src/com/cloud/domain/DomainVO.java   |     86 +-
 .../src/com/cloud/domain/dao/DomainDao.java     |      8 +
 .../src/com/cloud/domain/dao/DomainDaoImpl.java |    219 +-
 engine/schema/src/com/cloud/event/EventVO.java  |     85 +-
 .../com/cloud/event/UsageEventDetailsVO.java    |     70 +
 .../src/com/cloud/event/UsageEventVO.java       |    183 +-
 .../src/com/cloud/event/dao/EventDaoImpl.java   |     11 +-
 .../src/com/cloud/event/dao/UsageEventDao.java  |      3 +
 .../com/cloud/event/dao/UsageEventDaoImpl.java  |     62 +-
 .../cloud/event/dao/UsageEventDetailsDao.java   |     32 +
 .../event/dao/UsageEventDetailsDaoImpl.java     |     89 +
 engine/schema/src/com/cloud/host/DetailVO.java  |     27 +-
 engine/schema/src/com/cloud/host/HostTagVO.java |     25 +-
 engine/schema/src/com/cloud/host/HostVO.java    |    247 +-
 .../schema/src/com/cloud/host/dao/HostDao.java  |      5 +-
 .../src/com/cloud/host/dao/HostDaoImpl.java     |     24 +-
 .../src/com/cloud/host/dao/HostDetailsDao.java  |      6 +-
 .../com/cloud/host/dao/HostDetailsDaoImpl.java  |     21 +-
 .../src/com/cloud/host/dao/HostTagsDao.java     |      8 +-
 .../src/com/cloud/host/dao/HostTagsDaoImpl.java |     16 +-
 .../hypervisor/HypervisorCapabilitiesVO.java    |     61 +-
 .../dao/HypervisorCapabilitiesDao.java          |      8 +-
 .../dao/HypervisorCapabilitiesDaoImpl.java      |     41 +-
 .../src/com/cloud/keystore/KeystoreDao.java     |     29 -
 .../src/com/cloud/keystore/KeystoreDaoImpl.java |    118 -
 .../src/com/cloud/keystore/KeystoreVO.java      |    101 -
 .../cloud/network/LBHealthCheckPolicyVO.java    |     19 +-
 .../com/cloud/network/UserIpv6AddressVO.java    |    265 +-
 .../schema/src/com/cloud/network/VpnUserVO.java |     34 +-
 .../as/AutoScalePolicyConditionMapVO.java       |     18 +-
 .../com/cloud/network/as/AutoScalePolicyVO.java |     27 +-
 .../network/as/AutoScaleVmGroupPolicyMapVO.java |     18 +-
 .../cloud/network/as/AutoScaleVmGroupVO.java    |     29 +-
 .../network/as/AutoScaleVmGroupVmMapVO.java     |     62 +
 .../cloud/network/as/AutoScaleVmProfileVO.java  |      7 +-
 .../src/com/cloud/network/as/ConditionVO.java   |      3 +-
 .../src/com/cloud/network/as/CounterVO.java     |      3 +-
 .../as/dao/AutoScalePolicyConditionMapDao.java  |      6 +-
 .../dao/AutoScalePolicyConditionMapDaoImpl.java |     32 +-
 .../network/as/dao/AutoScalePolicyDaoImpl.java  |      5 +-
 .../network/as/dao/AutoScaleVmGroupDao.java     |      2 +
 .../network/as/dao/AutoScaleVmGroupDaoImpl.java |      8 +-
 .../as/dao/AutoScaleVmGroupPolicyMapDao.java    |      4 +
 .../dao/AutoScaleVmGroupPolicyMapDaoImpl.java   |      2 +-
 .../as/dao/AutoScaleVmGroupVmMapDao.java        |     31 +
 .../as/dao/AutoScaleVmGroupVmMapDaoImpl.java    |     56 +
 .../as/dao/AutoScaleVmProfileDaoImpl.java       |      4 +-
 .../cloud/network/as/dao/ConditionDaoImpl.java  |      1 +
 .../network/dao/AccountGuestVlanMapDao.java     |      5 +-
 .../network/dao/AccountGuestVlanMapDaoImpl.java |      7 +-
 .../network/dao/AccountGuestVlanMapVO.java      |     29 +-
 .../network/dao/ExternalFirewallDeviceDao.java  |     12 +-
 .../dao/ExternalFirewallDeviceDaoImpl.java      |     19 +-
 .../network/dao/ExternalFirewallDeviceVO.java   |     32 +-
 .../dao/ExternalLoadBalancerDeviceDao.java      |     20 +-
 .../dao/ExternalLoadBalancerDeviceDaoImpl.java  |     24 +-
 .../dao/ExternalLoadBalancerDeviceVO.java       |     72 +-
 .../network/dao/FirewallRulesCidrsDao.java      |      9 +-
 .../network/dao/FirewallRulesCidrsDaoImpl.java  |     25 +-
 .../cloud/network/dao/FirewallRulesCidrsVO.java |     24 +-
 .../com/cloud/network/dao/FirewallRulesDao.java |      7 +-
 .../cloud/network/dao/FirewallRulesDaoImpl.java |     15 +-
 .../src/com/cloud/network/dao/IPAddressDao.java |     77 +-
 .../com/cloud/network/dao/IPAddressDaoImpl.java |     78 +-
 .../src/com/cloud/network/dao/IPAddressVO.java  |    245 +-
 .../dao/InlineLoadBalancerNicMapDao.java        |      5 +-
 .../dao/InlineLoadBalancerNicMapDaoImpl.java    |     14 +-
 .../network/dao/InlineLoadBalancerNicMapVO.java |     22 +-
 .../network/dao/LBHealthCheckPolicyDao.java     |      7 +-
 .../network/dao/LBHealthCheckPolicyDaoImpl.java |     10 +-
 .../network/dao/LBStickinessPolicyDao.java      |      7 +-
 .../network/dao/LBStickinessPolicyDaoImpl.java  |      9 +-
 .../cloud/network/dao/LBStickinessPolicyVO.java |     48 +-
 .../network/dao/LoadBalancerCertMapDao.java     |     29 +
 .../network/dao/LoadBalancerCertMapDaoImpl.java |     81 +
 .../network/dao/LoadBalancerCertMapVO.java      |     94 +
 .../cloud/network/dao/LoadBalancerDaoImpl.java  |      7 +-
 .../cloud/network/dao/LoadBalancerVMMapDao.java |      6 +
 .../network/dao/LoadBalancerVMMapDaoImpl.java   |      4 +-
 .../cloud/network/dao/LoadBalancerVMMapVO.java  |     15 +-
 .../com/cloud/network/dao/LoadBalancerVO.java   |     54 +-
 .../cloud/network/dao/MonitoringServiceDao.java |     32 +
 .../network/dao/MonitoringServiceDaoImpl.java   |     66 +
 .../cloud/network/dao/MonitoringServiceVO.java  |    129 +
 .../com/cloud/network/dao/NetworkAccountVO.java |     25 +-
 .../src/com/cloud/network/dao/NetworkDao.java   |     22 +-
 .../com/cloud/network/dao/NetworkDaoImpl.java   |    108 +-
 .../com/cloud/network/dao/NetworkDetailVO.java  |     21 +-
 .../network/dao/NetworkDetailsDaoImpl.java      |      4 +-
 .../com/cloud/network/dao/NetworkDomainDao.java |      4 +-
 .../cloud/network/dao/NetworkDomainDaoImpl.java |     21 +-
 .../com/cloud/network/dao/NetworkDomainVO.java  |     32 +-
 .../network/dao/NetworkExternalFirewallDao.java |      8 +-
 .../dao/NetworkExternalFirewallDaoImpl.java     |      7 +-
 .../network/dao/NetworkExternalFirewallVO.java  |     12 +-
 .../dao/NetworkExternalLoadBalancerDao.java     |      4 +-
 .../dao/NetworkExternalLoadBalancerDaoImpl.java |      5 +-
 .../dao/NetworkExternalLoadBalancerVO.java      |     14 +-
 .../src/com/cloud/network/dao/NetworkOpDao.java |      3 +
 .../com/cloud/network/dao/NetworkOpDaoImpl.java |     25 +-
 .../src/com/cloud/network/dao/NetworkOpVO.java  |     37 +-
 .../cloud/network/dao/NetworkRuleConfigDao.java |      1 +
 .../network/dao/NetworkRuleConfigDaoImpl.java   |      6 +-
 .../cloud/network/dao/NetworkRuleConfigVO.java  |     19 +-
 .../cloud/network/dao/NetworkServiceMapDao.java |     17 +-
 .../network/dao/NetworkServiceMapDaoImpl.java   |     49 +-
 .../cloud/network/dao/NetworkServiceMapVO.java  |     39 +-
 .../src/com/cloud/network/dao/NetworkVO.java    |    225 +-
 .../com/cloud/network/dao/OvsProviderDao.java   |     30 +
 .../cloud/network/dao/OvsProviderDaoImpl.java   |     73 +
 .../cloud/network/dao/PhysicalNetworkDao.java   |      2 +
 .../network/dao/PhysicalNetworkDaoImpl.java     |      8 +-
 .../PhysicalNetworkIsolationMethodDaoImpl.java  |      5 +-
 .../dao/PhysicalNetworkIsolationMethodVO.java   |      7 +-
 .../dao/PhysicalNetworkServiceProviderDao.java  |      3 +
 .../PhysicalNetworkServiceProviderDaoImpl.java  |     81 +-
 .../dao/PhysicalNetworkServiceProviderVO.java   |     92 +-
 .../cloud/network/dao/PhysicalNetworkTagVO.java |      7 +-
 .../dao/PhysicalNetworkTrafficTypeDao.java      |      7 +-
 .../dao/PhysicalNetworkTrafficTypeDaoImpl.java  |     30 +-
 .../dao/PhysicalNetworkTrafficTypeVO.java       |     62 +-
 .../cloud/network/dao/PhysicalNetworkVO.java    |     97 +-
 .../com/cloud/network/dao/PortProfileDao.java   |     15 +-
 .../cloud/network/dao/PortProfileDaoImpl.java   |     54 +-
 .../com/cloud/network/dao/PortProfileVO.java    |    139 +-
 .../cloud/network/dao/RemoteAccessVpnDao.java   |      5 +
 .../network/dao/RemoteAccessVpnDaoImpl.java     |     33 +-
 .../cloud/network/dao/RemoteAccessVpnVO.java    |     80 +-
 .../com/cloud/network/dao/RouterNetworkDao.java |      5 +-
 .../cloud/network/dao/RouterNetworkDaoImpl.java |     13 +-
 .../com/cloud/network/dao/RouterNetworkVO.java  |     30 +-
 .../dao/Site2SiteCustomerGatewayDao.java        |      4 +-
 .../dao/Site2SiteCustomerGatewayDaoImpl.java    |      8 +-
 .../network/dao/Site2SiteCustomerGatewayVO.java |     46 +-
 .../network/dao/Site2SiteVpnConnectionDao.java  |      6 +-
 .../dao/Site2SiteVpnConnectionDaoImpl.java      |     10 +-
 .../network/dao/Site2SiteVpnConnectionVO.java   |     59 +-
 .../network/dao/Site2SiteVpnGatewayDao.java     |      2 +-
 .../network/dao/Site2SiteVpnGatewayDaoImpl.java |      7 +-
 .../network/dao/Site2SiteVpnGatewayVO.java      |     34 +-
 .../src/com/cloud/network/dao/SslCertDao.java   |     25 +
 .../com/cloud/network/dao/SslCertDaoImpl.java   |     45 +
 .../src/com/cloud/network/dao/SslCertVO.java    |    131 +
 .../cloud/network/dao/UserIpv6AddressDao.java   |     25 +-
 .../network/dao/UserIpv6AddressDaoImpl.java     |     64 +-
 .../network/dao/VirtualRouterProviderDao.java   |      6 +-
 .../dao/VirtualRouterProviderDaoImpl.java       |     11 +-
 .../src/com/cloud/network/dao/VpnUserDao.java   |      2 +
 .../com/cloud/network/dao/VpnUserDaoImpl.java   |     33 +-
 .../cloud/network/element/OvsProviderVO.java    |     99 +
 .../element/VirtualRouterProviderVO.java        |     32 +-
 .../com/cloud/network/rules/FirewallRuleVO.java |     74 +-
 .../network/rules/PortForwardingRuleVO.java     |     43 +-
 .../rules/dao/PortForwardingRulesDao.java       |     15 +-
 .../rules/dao/PortForwardingRulesDaoImpl.java   |     52 +-
 .../network/security/SecurityGroupRuleVO.java   |     26 +-
 .../network/security/SecurityGroupRulesVO.java  |      7 +-
 .../network/security/SecurityGroupVMMapVO.java  |     10 +-
 .../cloud/network/security/SecurityGroupVO.java |     10 +-
 .../network/security/SecurityGroupWork.java     |     17 +-
 .../network/security/SecurityGroupWorkVO.java   |    117 +-
 .../cloud/network/security/VmRulesetLogVO.java  |     78 +-
 .../network/security/dao/SecurityGroupDao.java  |      6 +-
 .../security/dao/SecurityGroupDaoImpl.java      |     68 +-
 .../security/dao/SecurityGroupRuleDao.java      |     11 +-
 .../security/dao/SecurityGroupRuleDaoImpl.java  |     47 +-
 .../security/dao/SecurityGroupRulesDao.java     |     22 +-
 .../security/dao/SecurityGroupRulesDaoImpl.java |      9 +-
 .../security/dao/SecurityGroupVMMapDao.java     |     17 +-
 .../security/dao/SecurityGroupVMMapDaoImpl.java |     65 +-
 .../security/dao/SecurityGroupWorkDao.java      |     27 +-
 .../security/dao/SecurityGroupWorkDaoImpl.java  |    109 +-
 .../network/security/dao/VmRulesetLogDao.java   |      2 +-
 .../security/dao/VmRulesetLogDaoImpl.java       |     69 +-
 .../cloud/network/vpc/NetworkACLItemDao.java    |      6 +-
 .../com/cloud/network/vpc/NetworkACLItemVO.java |     77 +-
 .../src/com/cloud/network/vpc/NetworkACLVO.java |     28 +-
 .../src/com/cloud/network/vpc/PrivateIpVO.java  |     47 +-
 .../com/cloud/network/vpc/StaticRouteVO.java    |     34 +-
 .../src/com/cloud/network/vpc/VpcGatewayVO.java |     41 +-
 .../network/vpc/VpcOfferingServiceMapVO.java    |     34 +-
 .../com/cloud/network/vpc/VpcOfferingVO.java    |     31 +-
 .../com/cloud/network/vpc/VpcServiceMapVO.java  |     20 +-
 .../schema/src/com/cloud/network/vpc/VpcVO.java |     33 +-
 .../cloud/network/vpc/dao/NetworkACLDao.java    |      2 +-
 .../network/vpc/dao/NetworkACLDaoImpl.java      |      9 +-
 .../network/vpc/dao/NetworkACLItemDaoImpl.java  |     19 +-
 .../com/cloud/network/vpc/dao/PrivateIpDao.java |      6 +-
 .../cloud/network/vpc/dao/PrivateIpDaoImpl.java |     27 +-
 .../cloud/network/vpc/dao/StaticRouteDao.java   |      8 +-
 .../network/vpc/dao/StaticRouteDaoImpl.java     |     17 +-
 .../src/com/cloud/network/vpc/dao/VpcDao.java   |     14 +-
 .../com/cloud/network/vpc/dao/VpcDaoImpl.java   |     35 +-
 .../cloud/network/vpc/dao/VpcGatewayDao.java    |      3 +-
 .../network/vpc/dao/VpcGatewayDaoImpl.java      |     12 +-
 .../cloud/network/vpc/dao/VpcOfferingDao.java   |      5 +-
 .../network/vpc/dao/VpcOfferingDaoImpl.java     |      7 +-
 .../vpc/dao/VpcOfferingServiceMapDao.java       |      7 +-
 .../vpc/dao/VpcOfferingServiceMapDaoImpl.java   |     31 +-
 .../cloud/network/vpc/dao/VpcServiceMapDao.java |      8 +-
 .../network/vpc/dao/VpcServiceMapDaoImpl.java   |     11 +-
 .../offerings/NetworkOfferingDetailsVO.java     |     28 +-
 .../offerings/NetworkOfferingServiceMapVO.java  |     40 +-
 .../com/cloud/offerings/NetworkOfferingVO.java  |     61 +-
 .../cloud/offerings/dao/NetworkOfferingDao.java |      6 +-
 .../offerings/dao/NetworkOfferingDaoImpl.java   |     11 +-
 .../dao/NetworkOfferingDetailsDao.java          |      6 +-
 .../dao/NetworkOfferingDetailsDaoImpl.java      |     15 +-
 .../dao/NetworkOfferingServiceMapDao.java       |     25 +-
 .../dao/NetworkOfferingServiceMapDaoImpl.java   |     67 +-
 .../com/cloud/projects/ProjectAccountVO.java    |     45 +-
 .../com/cloud/projects/ProjectInvitationVO.java |     11 +-
 .../src/com/cloud/projects/ProjectVO.java       |     69 +-
 .../cloud/projects/dao/ProjectAccountDao.java   |      2 +-
 .../projects/dao/ProjectAccountDaoImpl.java     |      4 +-
 .../src/com/cloud/projects/dao/ProjectDao.java  |      2 +-
 .../com/cloud/projects/dao/ProjectDaoImpl.java  |     13 +-
 .../projects/dao/ProjectInvitationDaoImpl.java  |      8 +-
 .../com/cloud/secstorage/CommandExecLogDao.java |      2 +-
 .../cloud/secstorage/CommandExecLogDaoImpl.java |     29 +-
 .../com/cloud/secstorage/CommandExecLogVO.java  |    100 +-
 .../cloud/service/ServiceOfferingDetailsVO.java |     18 +-
 .../com/cloud/service/ServiceOfferingVO.java    |    303 +-
 .../cloud/service/dao/ServiceOfferingDao.java   |     22 +-
 .../service/dao/ServiceOfferingDaoImpl.java     |    134 +-
 .../dao/ServiceOfferingDetailsDaoImpl.java      |     10 +-
 .../src/com/cloud/storage/DiskOfferingVO.java   |     89 +-
 .../com/cloud/storage/GuestOSHypervisorVO.java  |     24 +-
 .../schema/src/com/cloud/storage/GuestOSVO.java |      1 +
 .../com/cloud/storage/LaunchPermissionVO.java   |      5 +-
 .../src/com/cloud/storage/SnapshotPolicyVO.java |     14 +-
 .../com/cloud/storage/SnapshotScheduleVO.java   |     10 +
 .../src/com/cloud/storage/SnapshotVO.java       |     36 +-
 .../com/cloud/storage/StoragePoolHostAssoc.java |      4 +-
 .../com/cloud/storage/StoragePoolHostVO.java    |      2 +-
 .../com/cloud/storage/StoragePoolWorkVO.java    |      9 +-
 .../schema/src/com/cloud/storage/UploadVO.java  |     11 +-
 .../com/cloud/storage/VMTemplateDetailVO.java   |      6 +-
 .../src/com/cloud/storage/VMTemplateHostVO.java |     11 +-
 .../cloud/storage/VMTemplateStoragePoolVO.java  |     12 +-
 .../src/com/cloud/storage/VMTemplateVO.java     |    127 +-
 .../src/com/cloud/storage/VMTemplateZoneVO.java |      4 +-
 .../src/com/cloud/storage/VolumeDetailVO.java   |     21 +-
 .../src/com/cloud/storage/VolumeHostVO.java     |     18 +-
 .../schema/src/com/cloud/storage/VolumeVO.java  |    155 +-
 .../cloud/storage/dao/DiskOfferingDaoImpl.java  |     11 +-
 .../storage/dao/GuestOSCategoryDaoImpl.java     |      2 +-
 .../com/cloud/storage/dao/GuestOSDaoImpl.java   |      2 +-
 .../cloud/storage/dao/GuestOSHypervisorDao.java |      2 +-
 .../storage/dao/GuestOSHypervisorDaoImpl.java   |      2 +-
 .../cloud/storage/dao/LaunchPermissionDao.java  |     10 +-
 .../storage/dao/LaunchPermissionDaoImpl.java    |     24 +-
 .../src/com/cloud/storage/dao/SnapshotDao.java  |     13 +-
 .../com/cloud/storage/dao/SnapshotDaoImpl.java  |     46 +-
 .../cloud/storage/dao/SnapshotDetailsDao.java   |     26 +
 .../storage/dao/SnapshotDetailsDaoImpl.java     |     28 +
 .../cloud/storage/dao/SnapshotDetailsVO.java    |     81 +
 .../storage/dao/SnapshotPolicyDaoImpl.java      |      2 +-
 .../storage/dao/SnapshotScheduleDaoImpl.java    |     17 +-
 .../storage/dao/StoragePoolDetailsDaoImpl.java  |      1 -
 .../storage/dao/StoragePoolHostDaoImpl.java     |     17 +-
 .../storage/dao/StoragePoolWorkDaoImpl.java     |     32 +-
 .../src/com/cloud/storage/dao/UploadDao.java    |      4 +-
 .../com/cloud/storage/dao/UploadDaoImpl.java    |     23 +-
 .../com/cloud/storage/dao/VMTemplateDao.java    |      4 -
 .../cloud/storage/dao/VMTemplateDaoImpl.java    |     59 +-
 .../cloud/storage/dao/VMTemplateDetailsDao.java |      2 +-
 .../storage/dao/VMTemplateDetailsDaoImpl.java   |      3 +-
 .../cloud/storage/dao/VMTemplateHostDao.java    |      6 +-
 .../storage/dao/VMTemplateHostDaoImpl.java      |    125 +-
 .../cloud/storage/dao/VMTemplatePoolDao.java    |     12 +-
 .../storage/dao/VMTemplatePoolDaoImpl.java      |     85 +-
 .../storage/dao/VMTemplateZoneDaoImpl.java      |      2 +-
 .../src/com/cloud/storage/dao/VolumeDao.java    |      8 +-
 .../com/cloud/storage/dao/VolumeDaoImpl.java    |     87 +-
 .../cloud/storage/dao/VolumeDetailsDaoImpl.java |      7 +-
 .../cloud/storage/dao/VolumeHostDaoImpl.java    |     51 +-
 .../src/com/cloud/tags/ResourceTagVO.java       |     54 +-
 .../src/com/cloud/tags/dao/ResourceTagDao.java  |      4 +-
 .../com/cloud/tags/dao/ResourceTagsDaoImpl.java |      8 +-
 .../src/com/cloud/upgrade/DatabaseCreator.java  |     93 +-
 .../cloud/upgrade/DatabaseIntegrityChecker.java |    353 +-
 .../cloud/upgrade/DatabaseUpgradeChecker.java   |    178 +-
 .../upgrade/PremiumDatabaseUpgradeChecker.java  |    177 +-
 .../src/com/cloud/upgrade/dao/DbUpgrade.java    |     12 +-
 .../com/cloud/upgrade/dao/DbUpgradeUtils.java   |      8 +-
 .../com/cloud/upgrade/dao/Upgrade217to218.java  |     14 +-
 .../com/cloud/upgrade/dao/Upgrade218to22.java   |    363 +-
 .../upgrade/dao/Upgrade218to224DomainVlans.java |      2 +-
 .../upgrade/dao/Upgrade218to22Premium.java      |     35 +-
 .../cloud/upgrade/dao/Upgrade2210to2211.java    |      8 +-
 .../cloud/upgrade/dao/Upgrade2211to2212.java    |     30 +-
 .../upgrade/dao/Upgrade2211to2212Premium.java   |     16 +-
 .../cloud/upgrade/dao/Upgrade2212to2213.java    |     15 +-
 .../cloud/upgrade/dao/Upgrade2213to2214.java    |    385 +-
 .../com/cloud/upgrade/dao/Upgrade2214to30.java  |    537 +-
 .../com/cloud/upgrade/dao/Upgrade221to222.java  |     12 +-
 .../upgrade/dao/Upgrade221to222Premium.java     |     19 +-
 .../com/cloud/upgrade/dao/Upgrade222to224.java  |     56 +-
 .../upgrade/dao/Upgrade222to224Premium.java     |     33 +-
 .../com/cloud/upgrade/dao/Upgrade224to225.java  |     20 +-
 .../com/cloud/upgrade/dao/Upgrade225to226.java  |      4 +-
 .../com/cloud/upgrade/dao/Upgrade227to228.java  |     41 +-
 .../upgrade/dao/Upgrade227to228Premium.java     |     87 +-
 .../com/cloud/upgrade/dao/Upgrade228to229.java  |     27 +-
 .../com/cloud/upgrade/dao/Upgrade229to2210.java |     53 +-
 .../com/cloud/upgrade/dao/Upgrade301to302.java  |     69 +-
 .../com/cloud/upgrade/dao/Upgrade302to303.java  |     92 +-
 .../com/cloud/upgrade/dao/Upgrade302to40.java   |    479 +-
 .../com/cloud/upgrade/dao/Upgrade303to304.java  |    248 +-
 .../com/cloud/upgrade/dao/Upgrade304to305.java  |    178 +-
 .../com/cloud/upgrade/dao/Upgrade305to306.java  |    104 +-
 .../com/cloud/upgrade/dao/Upgrade306to307.java  |     12 +-
 .../com/cloud/upgrade/dao/Upgrade307to410.java  |     13 +-
 .../com/cloud/upgrade/dao/Upgrade30to301.java   |     22 +-
 .../com/cloud/upgrade/dao/Upgrade30xBase.java   |     88 +-
 .../com/cloud/upgrade/dao/Upgrade40to41.java    |     54 +-
 .../com/cloud/upgrade/dao/Upgrade410to420.java  |    648 +-
 .../com/cloud/upgrade/dao/Upgrade420to421.java  |    119 +-
 .../com/cloud/upgrade/dao/Upgrade421to430.java  |    164 +-
 .../com/cloud/upgrade/dao/Upgrade430to440.java  |    118 +
 .../upgrade/dao/UpgradeSnapshot217to224.java    |     10 +-
 .../upgrade/dao/UpgradeSnapshot223to224.java    |     10 +-
 .../src/com/cloud/upgrade/dao/VersionDao.java   |      1 +
 .../com/cloud/upgrade/dao/VersionDaoImpl.java   |      4 +-
 .../src/com/cloud/upgrade/dao/VersionVO.java    |     50 +-
 .../usage/ExternalPublicIpStatisticsVO.java     |    116 +-
 .../src/com/cloud/usage/UsageIPAddressVO.java   |    160 +-
 .../schema/src/com/cloud/usage/UsageJobVO.java  |     36 +-
 .../cloud/usage/UsageLoadBalancerPolicyVO.java  |    116 +-
 .../com/cloud/usage/UsageNetworkOfferingVO.java |    118 +-
 .../src/com/cloud/usage/UsageNetworkVO.java     |    170 +-
 .../cloud/usage/UsagePortForwardingRuleVO.java  |    116 +-
 .../com/cloud/usage/UsageSecurityGroupVO.java   |    105 +-
 .../src/com/cloud/usage/UsageStorageVO.java     |    160 +-
 .../src/com/cloud/usage/UsageVMInstanceVO.java  |    139 +-
 .../src/com/cloud/usage/UsageVMSnapshotVO.java  |     49 +-
 engine/schema/src/com/cloud/usage/UsageVO.java  |    311 +-
 .../src/com/cloud/usage/UsageVPNUserVO.java     |    137 +-
 .../src/com/cloud/usage/UsageVmDiskVO.java      |    220 +-
 .../src/com/cloud/usage/UsageVolumeVO.java      |    144 +-
 .../dao/ExternalPublicIpStatisticsDao.java      |     13 +-
 .../dao/ExternalPublicIpStatisticsDaoImpl.java  |     65 +-
 .../src/com/cloud/usage/dao/UsageDao.java       |     11 +
 .../src/com/cloud/usage/dao/UsageDaoImpl.java   |    169 +-
 .../com/cloud/usage/dao/UsageIPAddressDao.java  |      5 +-
 .../cloud/usage/dao/UsageIPAddressDaoImpl.java  |     84 +-
 .../src/com/cloud/usage/dao/UsageJobDao.java    |      6 +
 .../com/cloud/usage/dao/UsageJobDaoImpl.java    |      5 +-
 .../usage/dao/UsageLoadBalancerPolicyDao.java   |      8 +-
 .../dao/UsageLoadBalancerPolicyDaoImpl.java     |    130 +-
 .../com/cloud/usage/dao/UsageNetworkDao.java    |      2 +
 .../cloud/usage/dao/UsageNetworkDaoImpl.java    |     43 +-
 .../usage/dao/UsageNetworkOfferingDao.java      |      5 +-
 .../usage/dao/UsageNetworkOfferingDaoImpl.java  |     93 +-
 .../usage/dao/UsagePortForwardingRuleDao.java   |      8 +-
 .../dao/UsagePortForwardingRuleDaoImpl.java     |    130 +-
 .../cloud/usage/dao/UsageSecurityGroupDao.java  |      5 +-
 .../usage/dao/UsageSecurityGroupDaoImpl.java    |     93 +-
 .../com/cloud/usage/dao/UsageStorageDao.java    |     10 +-
 .../cloud/usage/dao/UsageStorageDaoImpl.java    |    163 +-
 .../com/cloud/usage/dao/UsageVMInstanceDao.java |      2 +
 .../cloud/usage/dao/UsageVMInstanceDaoImpl.java |     33 +-
 .../com/cloud/usage/dao/UsageVMSnapshotDao.java |      2 +
 .../cloud/usage/dao/UsageVMSnapshotDaoImpl.java |     67 +-
 .../com/cloud/usage/dao/UsageVPNUserDao.java    |      5 +-
 .../cloud/usage/dao/UsageVPNUserDaoImpl.java    |     87 +-
 .../src/com/cloud/usage/dao/UsageVmDiskDao.java |      2 +
 .../com/cloud/usage/dao/UsageVmDiskDaoImpl.java |     47 +-
 .../src/com/cloud/usage/dao/UsageVolumeDao.java |      8 +-
 .../com/cloud/usage/dao/UsageVolumeDaoImpl.java |    136 +-
 .../src/com/cloud/user/AccountDetailVO.java     |     16 +-
 .../src/com/cloud/user/AccountDetailsDao.java   |     19 +-
 engine/schema/src/com/cloud/user/AccountVO.java |     50 +-
 .../schema/src/com/cloud/user/SSHKeyPairVO.java |    151 +-
 .../src/com/cloud/user/UserAccountVO.java       |     70 +-
 .../src/com/cloud/user/UserStatisticsVO.java    |    190 +-
 .../src/com/cloud/user/UserStatsLogVO.java      |    146 +-
 engine/schema/src/com/cloud/user/UserVO.java    |     31 +-
 .../src/com/cloud/user/VmDiskStatisticsVO.java  |    256 +-
 .../src/com/cloud/user/dao/AccountDao.java      |     21 +-
 .../src/com/cloud/user/dao/AccountDaoImpl.java  |     93 +-
 .../src/com/cloud/user/dao/SSHKeyPairDao.java   |     16 +-
 .../com/cloud/user/dao/SSHKeyPairDaoImpl.java   |     70 +-
 .../src/com/cloud/user/dao/UserAccountDao.java  |      2 +
 .../com/cloud/user/dao/UserAccountDaoImpl.java  |     28 +-
 .../schema/src/com/cloud/user/dao/UserDao.java  |     52 +-
 .../src/com/cloud/user/dao/UserDaoImpl.java     |     84 +-
 .../com/cloud/user/dao/UserStatisticsDao.java   |      2 +-
 .../cloud/user/dao/UserStatisticsDaoImpl.java   |     24 +-
 .../com/cloud/user/dao/UserStatsLogDaoImpl.java |      6 +-
 .../com/cloud/user/dao/VmDiskStatisticsDao.java |      2 +-
 .../cloud/user/dao/VmDiskStatisticsDaoImpl.java |     42 +-
 .../schema/src/com/cloud/vm/ConsoleProxyVO.java |    217 +-
 .../schema/src/com/cloud/vm/DomainRouterVO.java |     70 +-
 .../src/com/cloud/vm/InstanceGroupVMMapVO.java  |     27 +-
 .../src/com/cloud/vm/InstanceGroupVO.java       |     54 +-
 engine/schema/src/com/cloud/vm/ItWorkDao.java   |      8 +-
 .../schema/src/com/cloud/vm/ItWorkDaoImpl.java  |     32 +-
 engine/schema/src/com/cloud/vm/ItWorkVO.java    |    104 +-
 engine/schema/src/com/cloud/vm/NicDetailVO.java |     19 +-
 engine/schema/src/com/cloud/vm/NicVO.java       |     45 +-
 .../src/com/cloud/vm/SecondaryStorageVmVO.java  |      4 +-
 .../src/com/cloud/vm/UserVmCloneSettingVO.java  |      9 +-
 .../schema/src/com/cloud/vm/UserVmDetailVO.java |     61 +-
 engine/schema/src/com/cloud/vm/UserVmVO.java    |     95 +-
 .../schema/src/com/cloud/vm/VMInstanceVO.java   |    202 +-
 .../src/com/cloud/vm/dao/ConsoleProxyDao.java   |     16 +-
 .../com/cloud/vm/dao/ConsoleProxyDaoImpl.java   |    229 +-
 .../src/com/cloud/vm/dao/DomainRouterDao.java   |     54 +-
 .../com/cloud/vm/dao/DomainRouterDaoImpl.java   |    122 +-
 .../src/com/cloud/vm/dao/InstanceGroupDao.java  |     10 +-
 .../com/cloud/vm/dao/InstanceGroupDaoImpl.java  |     40 +-
 .../com/cloud/vm/dao/InstanceGroupVMMapDao.java |     10 +-
 .../cloud/vm/dao/InstanceGroupVMMapDaoImpl.java |     48 +-
 engine/schema/src/com/cloud/vm/dao/NicDao.java  |     41 +-
 .../schema/src/com/cloud/vm/dao/NicDaoImpl.java |     59 +-
 .../src/com/cloud/vm/dao/NicDetailsDaoImpl.java |      5 +-
 .../src/com/cloud/vm/dao/NicIpAliasDao.java     |      7 +-
 .../src/com/cloud/vm/dao/NicIpAliasDaoImpl.java |     22 +-
 .../src/com/cloud/vm/dao/NicIpAliasVO.java      |     48 +-
 .../src/com/cloud/vm/dao/NicSecondaryIpDao.java |      5 +-
 .../com/cloud/vm/dao/NicSecondaryIpDaoImpl.java |      6 +-
 .../src/com/cloud/vm/dao/NicSecondaryIpVO.java  |     57 +-
 .../com/cloud/vm/dao/SecondaryStorageVmDao.java |     15 +-
 .../cloud/vm/dao/SecondaryStorageVmDaoImpl.java |    160 +-
 .../cloud/vm/dao/UserVmCloneSettingDaoImpl.java |      6 +-
 .../schema/src/com/cloud/vm/dao/UserVmDao.java  |     59 +-
 .../src/com/cloud/vm/dao/UserVmDaoImpl.java     |    246 +-
 .../schema/src/com/cloud/vm/dao/UserVmData.java |     76 +-
 .../com/cloud/vm/dao/UserVmDetailsDaoImpl.java  |      7 +-
 .../src/com/cloud/vm/dao/VMInstanceDao.java     |     45 +-
 .../src/com/cloud/vm/dao/VMInstanceDaoImpl.java |    285 +-
 .../cloud/vm/snapshot/VMSnapshotDetailsVO.java  |     44 +-
 .../src/com/cloud/vm/snapshot/VMSnapshotVO.java |     50 +-
 .../cloud/vm/snapshot/dao/VMSnapshotDao.java    |     10 +-
 .../vm/snapshot/dao/VMSnapshotDaoImpl.java      |     82 +-
 .../vm/snapshot/dao/VMSnapshotDetailsDao.java   |      7 +-
 .../snapshot/dao/VMSnapshotDetailsDaoImpl.java  |     31 +-
 .../affinity/AffinityGroupDomainMapVO.java      |      3 +-
 .../affinity/AffinityGroupVMMapVO.java          |      5 +-
 .../cloudstack/affinity/AffinityGroupVO.java    |     10 +-
 .../affinity/dao/AffinityGroupDao.java          |      4 +
 .../affinity/dao/AffinityGroupDaoImpl.java      |     54 +-
 .../dao/AffinityGroupDomainMapDaoImpl.java      |     10 +-
 .../affinity/dao/AffinityGroupVMMapDaoImpl.java |     33 +-
 .../cloud/entity/api/db/VMComputeTagVO.java     |      3 +-
 .../engine/cloud/entity/api/db/VMEntityVO.java  |    169 +-
 .../cloud/entity/api/db/VMNetworkMapVO.java     |     11 +-
 .../cloud/entity/api/db/VMReservationVO.java    |     24 +-
 .../cloud/entity/api/db/VMRootDiskTagVO.java    |      1 +
 .../entity/api/db/VolumeReservationVO.java      |     10 +-
 .../entity/api/db/dao/VMComputeTagDao.java      |      2 +-
 .../entity/api/db/dao/VMComputeTagDaoImpl.java  |     10 +-
 .../cloud/entity/api/db/dao/VMEntityDao.java    |     15 +-
 .../entity/api/db/dao/VMEntityDaoImpl.java      |     68 +-
 .../entity/api/db/dao/VMNetworkMapDao.java      |      2 +-
 .../entity/api/db/dao/VMNetworkMapDaoImpl.java  |      9 +-
 .../entity/api/db/dao/VMReservationDao.java     |      5 +-
 .../entity/api/db/dao/VMReservationDaoImpl.java |     27 +-
 .../entity/api/db/dao/VMRootDiskTagDao.java     |      2 +-
 .../entity/api/db/dao/VMRootDiskTagDaoImpl.java |     11 +-
 .../entity/api/db/dao/VolumeReservationDao.java |      6 +-
 .../api/db/dao/VolumeReservationDaoImpl.java    |      9 +-
 .../lb/ApplicationLoadBalancerRuleVO.java       |     63 +-
 .../lb/dao/ApplicationLoadBalancerRuleDao.java  |     10 +-
 .../dao/ApplicationLoadBalancerRuleDaoImpl.java |     22 +-
 .../apache/cloudstack/region/PortableIpDao.java |      5 +-
 .../cloudstack/region/PortableIpDaoImpl.java    |     20 +-
 .../cloudstack/region/PortableIpRangeDao.java   |      3 -
 .../region/PortableIpRangeDaoImpl.java          |     20 +-
 .../cloudstack/region/PortableIpRangeVO.java    |     31 +-
 .../apache/cloudstack/region/PortableIpVO.java  |     57 +-
 .../apache/cloudstack/region/RegionSyncVO.java  |     97 +-
 .../org/apache/cloudstack/region/RegionVO.java  |     63 +-
 .../apache/cloudstack/region/dao/RegionDao.java |      3 +-
 .../cloudstack/region/dao/RegionDaoImpl.java    |     25 +-
 .../region/gslb/GlobalLoadBalancerDaoImpl.java  |     12 +-
 .../gslb/GlobalLoadBalancerLbRuleMapDao.java    |      4 +-
 .../GlobalLoadBalancerLbRuleMapDaoImpl.java     |     12 +-
 .../gslb/GlobalLoadBalancerLbRuleMapVO.java     |     19 +-
 .../region/gslb/GlobalLoadBalancerRuleDao.java  |      4 +-
 .../region/gslb/GlobalLoadBalancerRuleVO.java   |     60 +-
 .../resourcedetail/DiskOfferingDetailVO.java    |     81 +
 .../resourcedetail/FirewallRuleDetailVO.java    |     83 +-
 .../resourcedetail/NetworkACLItemDetailVO.java  |     81 +
 .../resourcedetail/NetworkACLListDetailVO.java  |     81 +
 .../resourcedetail/RemoteAccessVpnDetailVO.java |     81 +
 .../resourcedetail/ResourceDetailsDao.java      |     12 +-
 .../resourcedetail/ResourceDetailsDaoBase.java  |     26 +-
 .../Site2SiteCustomerGatewayDetailVO.java       |     81 +
 .../Site2SiteVpnConnectionDetailVO.java         |     81 +
 .../Site2SiteVpnGatewayDetailVO.java            |     84 +
 .../cloudstack/resourcedetail/UserDetailVO.java |     81 +
 .../resourcedetail/UserIpAddressDetailVO.java   |     81 +
 .../cloudstack/resourcedetail/VpcDetailVO.java  |     81 +
 .../resourcedetail/VpcGatewayDetailVO.java      |     81 +
 .../dao/DiskOfferingDetailsDao.java             |     26 +
 .../dao/DiskOfferingDetailsDaoImpl.java         |     33 +
 .../dao/FirewallRuleDetailsDao.java             |      2 +-
 .../dao/FirewallRuleDetailsDaoImpl.java         |      8 +-
 .../dao/NetworkACLItemDetailsDao.java           |     26 +
 .../dao/NetworkACLItemDetailsDaoImpl.java       |     34 +
 .../dao/NetworkACLListDetailsDao.java           |     26 +
 .../dao/NetworkACLListDetailsDaoImpl.java       |     34 +
 .../dao/RemoteAccessVpnDetailsDao.java          |     26 +
 .../dao/RemoteAccessVpnDetailsDaoImpl.java      |     34 +
 .../dao/Site2SiteCustomerGatewayDetailsDao.java |     26 +
 .../Site2SiteCustomerGatewayDetailsDaoImpl.java |     34 +
 .../dao/Site2SiteVpnConnectionDetailsDao.java   |     26 +
 .../Site2SiteVpnConnectionDetailsDaoImpl.java   |     32 +
 .../dao/Site2SiteVpnGatewayDetailsDao.java      |     27 +
 .../dao/Site2SiteVpnGatewayDetailsDaoImpl.java  |     34 +
 .../resourcedetail/dao/UserDetailsDao.java      |     26 +
 .../resourcedetail/dao/UserDetailsDaoImpl.java  |     33 +
 .../dao/UserIpAddressDetailsDao.java            |     26 +
 .../dao/UserIpAddressDetailsDaoImpl.java        |     34 +
 .../resourcedetail/dao/VpcDetailsDao.java       |     26 +
 .../resourcedetail/dao/VpcDetailsDaoImpl.java   |     34 +
 .../dao/VpcGatewayDetailsDao.java               |     26 +
 .../dao/VpcGatewayDetailsDaoImpl.java           |     34 +
 .../datastore/db/ImageStoreDetailVO.java        |      5 +-
 .../storage/datastore/db/ImageStoreVO.java      |      9 +-
 .../datastore/db/PrimaryDataStoreDao.java       |      3 +-
 .../datastore/db/PrimaryDataStoreDaoImpl.java   |     50 +-
 .../datastore/db/PrimaryDataStoreDetailVO.java  |     10 +-
 .../datastore/db/SnapshotDataStoreDao.java      |      8 +-
 .../datastore/db/SnapshotDataStoreVO.java       |     14 +-
 .../datastore/db/StoragePoolDetailVO.java       |     10 +-
 .../storage/datastore/db/StoragePoolVO.java     |     46 +-
 .../datastore/db/TemplateDataStoreDao.java      |     16 +-
 .../datastore/db/TemplateDataStoreVO.java       |     48 +-
 .../datastore/db/VolumeDataStoreDao.java        |      2 +-
 .../storage/datastore/db/VolumeDataStoreVO.java |     12 +-
 engine/service/pom.xml                          |      2 +-
 .../service/src/main/webapp/WEB-INF/beans.xml   |      6 +-
 engine/storage/cache/pom.xml                    |      2 +-
 .../allocator/StorageCacheRandomAllocator.java  |      5 +-
 .../cache/manager/StorageCacheManagerImpl.java  |      7 +-
 .../StorageCacheReplacementAlgorithmLRU.java    |     27 +-
 engine/storage/datamotion/pom.xml               |      2 +-
 .../motion/AncientDataMotionStrategy.java       |     98 +-
 .../storage/motion/DataMotionServiceImpl.java   |     18 +-
 engine/storage/image/pom.xml                    |      2 +-
 .../storage/image/TemplateDataFactoryImpl.java  |      4 +-
 .../storage/image/TemplateServiceImpl.java      |    175 +-
 .../manager/ImageStoreProviderManagerImpl.java  |      5 +-
 .../storage/image/store/ImageStoreImpl.java     |     10 +-
 .../storage/image/store/TemplateObject.java     |     26 +-
 engine/storage/integration-test/pom.xml         |     37 +-
 .../vm/snapshot/dao/VmSnapshotDaoTest.java      |     14 +-
 .../MockLocalNfsSecondaryStorageResource.java   |     26 +-
 .../storage/allocator/StorageAllocatorTest.java |     49 +-
 .../StorageAllocatorTestConfiguration.java      |     12 +-
 ...StorageCacheReplacementAlgorithmLRUTest.java |     41 +-
 .../cloudstack/storage/test/AllTests.java       |      2 +-
 .../apache/cloudstack/storage/test/AopTest.java |      2 +-
 .../cloudstack/storage/test/AopTestAdvice.java  |      1 -
 .../storage/test/ChildTestConfiguration.java    |     68 +-
 .../storage/test/CloudStackTestNGBase.java      |     25 +-
 .../test/DirectAgentManagerSimpleImpl.java      |     14 +-
 .../storage/test/DirectAgentTest.java           |      8 +-
 .../storage/test/EndpointSelectorTest.java      |     29 +-
 .../test/FakeDriverTestConfiguration.java       |     19 +-
 .../test/FakePrimaryDataStoreDriver.java        |     24 +-
 .../storage/test/MockLocalHostEndPoint.java     |      3 +-
 .../storage/test/MockRpcCallBack.java           |      3 +-
 .../storage/test/MockStorageMotionStrategy.java |      4 +-
 .../cloudstack/storage/test/S3TemplateTest.java |     28 +-
 .../cloudstack/storage/test/SnapshotTest.java   |    139 +-
 .../storage/test/SnapshotTestWithFakeData.java  |     62 +-
 .../storage/test/StorageFactoryBean.java        |      6 +-
 .../cloudstack/storage/test/StorageTest.java    |      2 +-
 .../cloudstack/storage/test/TemplateTest.java   |     22 +-
 .../cloudstack/storage/test/TestHttp.java       |      1 +
 .../storage/test/VolumeServiceTest.java         |    470 +
 .../cloudstack/storage/test/VolumeTest.java     |     43 +-
 .../storage/test/VolumeTestVmware.java          |     38 +-
 .../storage/test/volumeServiceTest.java         |    473 -
 .../resources/StorageAllocatorTestContext.xml   |     36 +-
 engine/storage/pom.xml                          |      4 +-
 engine/storage/snapshot/pom.xml                 |      2 +-
 .../snapshot/SnapshotDataFactoryImpl.java       |     12 +
 .../storage/snapshot/SnapshotObject.java        |     54 +-
 .../storage/snapshot/SnapshotServiceImpl.java   |    192 +-
 .../SnapshotStateMachineManagerImpl.java        |      2 +-
 .../snapshot/XenserverSnapshotStrategy.java     |     63 +-
 .../vmsnapshot/DefaultVMSnapshotStrategy.java   |     87 +-
 .../test/src/SnapshotDataFactoryTest.java       |      3 +-
 .../test/src/VMSnapshotStrategyTest.java        |     74 +-
 .../org/apache/cloudstack/storage/BaseType.java |      4 +-
 .../cloudstack/storage/LocalHostEndpoint.java   |      2 +-
 .../cloudstack/storage/RemoteHostEndPoint.java  |     25 +-
 .../allocator/AbstractStoragePoolAllocator.java |     30 +-
 .../ClusterScopeStoragePoolAllocator.java       |     16 +-
 .../GarbageCollectingStoragePoolAllocator.java  |     15 +-
 .../allocator/LocalStoragePoolAllocator.java    |     23 +-
 .../allocator/UseLocalForRootAllocator.java     |      5 +-
 .../allocator/ZoneWideStoragePoolAllocator.java |     33 +-
 .../storage/datastore/DataObjectManager.java    |      3 +-
 .../datastore/DataObjectManagerImpl.java        |     17 +-
 .../storage/datastore/DataStoreManagerImpl.java |     14 +
 .../datastore/ObjectInDataStoreManagerImpl.java |    264 +-
 .../provider/DataStoreProviderManagerImpl.java  |     58 +-
 .../storage/db/ObjectInDataStoreDaoImpl.java    |     47 +-
 .../endpoint/DefaultEndPointSelector.java       |    115 +-
 .../storage/helper/HypervisorHelper.java        |      3 +
 .../storage/helper/HypervisorHelperImpl.java    |     10 +-
 .../helper/StorageStrategyFactoryImpl.java      |     12 +-
 .../storage/helper/VMSnapshotHelperImpl.java    |     22 +-
 .../storage/image/BaseImageStoreDriverImpl.java |     28 +-
 .../storage/image/TemplateEntityImpl.java       |      2 +-
 .../image/datastore/ImageStoreHelper.java       |     36 +-
 .../image/db/ImageStoreDetailsDaoImpl.java      |      3 +-
 .../image/db/SnapshotDataStoreDaoImpl.java      |     95 +-
 .../image/db/TemplateDataStoreDaoImpl.java      |     99 +-
 .../image/db/VolumeDataStoreDaoImpl.java        |     44 +-
 .../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 +-
 .../image/motion/ImageMotionService.java        |      3 +-
 .../storage/vmsnapshot/VMSnapshotHelper.java    |      2 +-
 .../volume/TemplateOnPrimaryDataStoreInfo.java  |      2 +-
 .../cloudstack/storage/volume/VolumeEvent.java  |     13 +-
 .../datastore/PrimaryDataStoreHelper.java       |     10 +-
 .../db/PrimaryDataStoreDetailsDaoImpl.java      |      9 +-
 .../db/TemplatePrimaryDataStoreDaoImpl.java     |     46 +-
 .../volume/db/TemplatePrimaryDataStoreVO.java   |     21 +-
 .../api/storage/StrategyPriorityTest.java       |     14 +-
 engine/storage/volume/pom.xml                   |      2 +-
 .../storage/datastore/PrimaryDataStoreImpl.java |     54 +-
 .../PrimaryDataStoreProviderManagerImpl.java    |      8 +-
 .../datastore/provider/DefaultHostListener.java |     20 +-
 .../storage/datastore/type/ISCSI.java           |      3 +-
 .../datastore/type/NetworkFileSystem.java       |      3 +-
 .../storage/volume/VolumeDataFactoryImpl.java   |      2 +-
 .../cloudstack/storage/volume/VolumeObject.java |    225 +-
 .../storage/volume/VolumeServiceImpl.java       |    248 +-
 .../storage/volume/test/ConfiguratorTest.java   |      5 +-
 .../storage/volume/test/TestConfiguration.java  |      4 +-
 framework/cluster/pom.xml                       |      2 +-
 .../cloud/cluster/ActiveFencingException.java   |      1 -
 .../com/cloud/cluster/ClusterFenceManager.java  |      2 +-
 .../cloud/cluster/ClusterFenceManagerImpl.java  |     40 +-
 .../cluster/ClusterInvalidSessionException.java |      4 +-
 .../src/com/cloud/cluster/ClusterManager.java   |      6 +-
 .../com/cloud/cluster/ClusterManagerImpl.java   |    713 +-
 .../cloud/cluster/ClusterManagerListener.java   |      3 +-
 .../com/cloud/cluster/ClusterManagerMBean.java  |     17 +-
 .../cloud/cluster/ClusterManagerMessage.java    |     46 +-
 .../cloud/cluster/ClusterNodeJoinEventArgs.java |     38 +-
 .../cloud/cluster/ClusterNodeLeftEventArgs.java |     39 +-
 .../src/com/cloud/cluster/ClusterService.java   |      1 +
 .../cloud/cluster/ClusterServiceAdapter.java    |      8 +-
 .../com/cloud/cluster/ClusterServicePdu.java    |     28 +-
 .../cloud/cluster/ClusterServiceRequestPdu.java |      2 +-
 .../cluster/ClusterServiceServletAdapter.java   |      5 +-
 .../cluster/ClusterServiceServletContainer.java |    125 +-
 .../ClusterServiceServletHttpHandler.java       |     75 +-
 .../cluster/ClusterServiceServletImpl.java      |      5 +-
 .../com/cloud/cluster/ManagementServerHost.java |      1 -
 .../cluster/ManagementServerHostPeerVO.java     |     32 +-
 .../cloud/cluster/ManagementServerHostVO.java   |    269 +-
 .../cluster/dao/ManagementServerHostDao.java    |     37 +-
 .../dao/ManagementServerHostDaoImpl.java        |    243 +-
 .../dao/ManagementServerHostPeerDao.java        |      2 +
 .../dao/ManagementServerHostPeerDaoImpl.java    |     26 +-
 framework/config/pom.xml                        |      2 +-
 .../framework/config/ConfigDepot.java           |     58 +-
 .../framework/config/ConfigDepotAdmin.java      |      2 +-
 .../cloudstack/framework/config/ConfigKey.java  |    375 +-
 .../framework/config/Configurable.java          |      2 +-
 .../framework/config/ScopedConfigStorage.java   |      2 +-
 .../framework/config/dao/ConfigurationDao.java  |     42 +-
 .../config/dao/ConfigurationDaoImpl.java        |     26 +-
 .../framework/config/impl/ConfigDepotImpl.java  |     55 +-
 .../config/impl/ConfigDepotAdminTest.java       |      8 +-
 framework/db/pom.xml                            |     11 +-
 .../db/src/com/cloud/dao/EntityManagerImpl.java |      9 +-
 .../utils/crypt/EncryptionSecretKeyChanger.java |    747 +-
 .../db/src/com/cloud/utils/db/Attribute.java    |      1 +
 .../com/cloud/utils/db/ConnectionConcierge.java |     13 +-
 .../utils/db/ConnectionConciergeMBean.java      |      8 +-
 framework/db/src/com/cloud/utils/db/DB.java     |      4 +-
 framework/db/src/com/cloud/utils/db/DbUtil.java |    213 +-
 framework/db/src/com/cloud/utils/db/EcInfo.java |      3 +-
 .../db/src/com/cloud/utils/db/Encrypt.java      |      2 +-
 framework/db/src/com/cloud/utils/db/Filter.java |     32 +-
 .../db/src/com/cloud/utils/db/GenericDao.java   |     84 +-
 .../src/com/cloud/utils/db/GenericDaoBase.java  |    194 +-
 .../com/cloud/utils/db/GenericQueryBuilder.java |     16 +-
 .../cloud/utils/db/GenericSearchBuilder.java    |     44 +-
 .../db/src/com/cloud/utils/db/GlobalLock.java   |    350 +-
 .../db/src/com/cloud/utils/db/GroupBy.java      |     26 +-
 .../db/src/com/cloud/utils/db/JoinBuilder.java  |      9 +-
 .../db/src/com/cloud/utils/db/JoinType.java     |      2 +-
 .../db/src/com/cloud/utils/db/Merovingian2.java |     37 +-
 .../com/cloud/utils/db/MerovingianMBean.java    |      9 +-
 .../db/src/com/cloud/utils/db/ScriptRunner.java |     12 +-
 .../db/src/com/cloud/utils/db/SearchBase.java   |     28 +-
 .../src/com/cloud/utils/db/SearchBuilder.java   |     13 +-
 .../src/com/cloud/utils/db/SearchCriteria.java  |     43 +-
 .../src/com/cloud/utils/db/SequenceFetcher.java |     46 +-
 .../db/src/com/cloud/utils/db/SqlGenerator.java |     16 +-
 .../db/src/com/cloud/utils/db/StateMachine.java |      1 +
 .../src/com/cloud/utils/db/StaticStrategy.java  |    131 +
 .../db/src/com/cloud/utils/db/Transaction.java  |      4 +-
 .../cloud/utils/db/TransactionAttachment.java   |      2 +-
 .../com/cloud/utils/db/TransactionCallback.java |      2 +-
 .../utils/db/TransactionCallbackNoReturn.java   |     12 +-
 .../db/TransactionCallbackWithException.java    |      6 +-
 ...ransactionCallbackWithExceptionNoReturn.java |      1 -
 .../utils/db/TransactionContextBuilder.java     |     40 +-
 .../utils/db/TransactionContextInterceptor.java |      3 +-
 .../utils/db/TransactionContextListener.java    |      6 +-
 .../com/cloud/utils/db/TransactionLegacy.java   |    271 +-
 .../com/cloud/utils/db/TransactionMBean.java    |     10 +-
 .../cloud/utils/db/TransactionMBeanImpl.java    |     20 +-
 .../src/com/cloud/utils/db/UpdateBuilder.java   |     88 +-
 .../db/test/com/cloud/utils/DbUtilTest.java     |    253 +
 .../com/cloud/utils/db/DbAnnotatedBase.java     |     14 +-
 .../cloud/utils/db/DbAnnotatedBaseDerived.java  |      6 +-
 .../db/test/com/cloud/utils/db/DbTestDao.java   |      6 +-
 .../db/test/com/cloud/utils/db/DbTestUtils.java |     18 +-
 .../test/com/cloud/utils/db/DummyComponent.java |      6 +-
 .../cloud/utils/db/ElementCollectionTest.java   |      4 +-
 .../test/com/cloud/utils/db/GlobalLockTest.java |     22 +-
 .../com/cloud/utils/db/Merovingian2Test.java    |     48 +-
 .../com/cloud/utils/db/TestTransaction.java     |     26 +-
 .../utils/db/TransactionContextBuilderTest.java |     59 +-
 .../com/cloud/utils/db/TransactionTest.java     |      7 +-
 framework/events/pom.xml                        |      2 +-
 .../cloudstack/framework/events/Event.java      |      7 +-
 .../cloudstack/framework/events/EventBus.java   |      2 +-
 .../framework/events/EventBusException.java     |      6 +-
 framework/ipc/pom.xml                           |      2 +-
 .../src/com/cloud/agent/manager/Commands.java   |     42 +-
 .../framework/async/AsyncCallFuture.java        |    100 +-
 .../async/AsyncCallbackDispatcher.java          |    212 +-
 .../framework/async/AsyncCallbackDriver.java    |      3 +-
 .../async/AsyncCompletionCallback.java          |      4 +-
 .../framework/async/AsyncRpcContext.java        |      1 +
 .../async/InplaceAsyncCallbackDriver.java       |      9 +-
 .../framework/client/ClientMessageBus.java      |      9 +-
 .../client/ClientTransportConnection.java       |     97 +-
 .../client/ClientTransportEndpoint.java         |     27 +-
 .../client/ClientTransportEndpointSite.java     |     42 +-
 .../client/ClientTransportProvider.java         |    207 +-
 .../framework/messagebus/MessageBus.java        |     22 +-
 .../framework/messagebus/MessageBusBase.java    |    734 +-
 .../messagebus/MessageBusEndpoint.java          |     75 +-
 .../framework/messagebus/MessageDispatcher.java |    197 +-
 .../framework/messagebus/MessageHandler.java    |      2 +-
 .../framework/messagebus/MessageSubscriber.java |      2 +-
 .../framework/messagebus/PublishScope.java      |      2 +-
 .../framework/rpc/RpcCallRequestPdu.java        |     86 +-
 .../framework/rpc/RpcCallResponsePdu.java       |    110 +-
 .../framework/rpc/RpcCallbackDispatcher.java    |     87 +-
 .../framework/rpc/RpcCallbackListener.java      |      6 +-
 .../cloudstack/framework/rpc/RpcClientCall.java |     55 +-
 .../framework/rpc/RpcClientCallImpl.java        |    415 +-
 .../cloudstack/framework/rpc/RpcException.java  |     24 +-
 .../framework/rpc/RpcIOException.java           |     27 +-
 .../cloudstack/framework/rpc/RpcProvider.java   |     46 +-
 .../framework/rpc/RpcProviderImpl.java          |    430 +-
 .../cloudstack/framework/rpc/RpcServerCall.java |      9 +-
 .../framework/rpc/RpcServerCallImpl.java        |     89 +-
 .../framework/rpc/RpcServiceDispatcher.java     |    179 +-
 .../framework/rpc/RpcServiceEndpoint.java       |     17 +-
 .../framework/rpc/RpcTimeoutException.java      |     17 +-
 .../serializer/JsonMessageSerializer.java       |    115 +-
 .../framework/serializer/MessageSerializer.java |      5 +-
 .../serializer/OnwireClassRegistry.java         |    282 +-
 .../framework/serializer/OnwireName.java        |      2 +-
 .../framework/server/ServerMessageBus.java      |      9 +-
 .../server/ServerTransportProvider.java         |    296 +-
 .../framework/transport/TransportAddress.java   |    226 +-
 .../transport/TransportAddressMapper.java       |      2 +-
 .../transport/TransportAttachRequestPdu.java    |     24 +-
 .../transport/TransportAttachResponsePdu.java   |     42 +-
 .../transport/TransportConnectRequestPdu.java   |     44 +-
 .../transport/TransportConnectResponsePdu.java  |     24 +-
 .../framework/transport/TransportDataPdu.java   |     44 +-
 .../framework/transport/TransportEndpoint.java  |      5 +-
 .../transport/TransportEndpointSite.java        |    233 +-
 .../transport/TransportMultiplexier.java        |      3 +-
 .../framework/transport/TransportPdu.java       |     39 +-
 .../framework/transport/TransportProvider.java  |     19 +-
 .../framework/codestyle/AsyncSampleCallee.java  |     27 +-
 .../AsyncSampleEventDrivenStyleCaller.java      |     32 +-
 .../AsyncSampleListenerStyleCaller.java         |     30 +-
 .../codestyle/ClientOnlyEventDrivenStyle.java   |     54 +-
 .../codestyle/ClientOnlyListenerStyle.java      |     59 +-
 .../sampleserver/SampleManagementServer.java    |     16 +-
 .../sampleserver/SampleManagementServerApp.java |     50 +-
 .../sampleserver/SampleManagerComponent.java    |    119 +-
 .../sampleserver/SampleManagerComponent2.java   |     77 +-
 .../SampleStoragePrepareAnswer.java             |     22 +-
 .../SampleStoragePrepareCommand.java            |     44 +-
 .../cloudstack/messagebus/TestMessageBus.java   |    244 +-
 framework/jobs/pom.xml                          |      2 +-
 .../core/spring-framework-jobs-core-context.xml |      4 +-
 .../cloudstack/framework/jobs/AsyncJob.java     |     16 +-
 .../framework/jobs/AsyncJobDispatcher.java      |      6 +-
 .../jobs/AsyncJobExecutionContext.java          |    192 +-
 .../framework/jobs/AsyncJobMBean.java           |     50 +-
 .../framework/jobs/AsyncJobManager.java         |     86 +-
 .../jobs/JobCancellationException.java          |      7 +-
 .../cloudstack/framework/jobs/Outcome.java      |      6 +-
 .../framework/jobs/dao/AsyncJobDao.java         |     25 +-
 .../framework/jobs/dao/AsyncJobDaoImpl.java     |    211 +-
 .../framework/jobs/dao/AsyncJobJoinMapDao.java  |     27 +-
 .../jobs/dao/AsyncJobJoinMapDaoImpl.java        |    267 +-
 .../framework/jobs/dao/AsyncJobJournalDao.java  |      2 +-
 .../jobs/dao/AsyncJobJournalDaoImpl.java        |     30 +-
 .../framework/jobs/dao/SyncQueueDao.java        |      7 +-
 .../framework/jobs/dao/SyncQueueDaoImpl.java    |     41 +-
 .../framework/jobs/dao/SyncQueueItemDao.java    |     14 +-
 .../jobs/dao/SyncQueueItemDaoImpl.java          |    114 +-
 .../framework/jobs/dao/VmWorkJobDao.java        |     38 +
 .../framework/jobs/dao/VmWorkJobDaoImpl.java    |    125 +
 .../framework/jobs/impl/AsyncJobJoinMapVO.java  |    238 +-
 .../framework/jobs/impl/AsyncJobJournalVO.java  |    127 +-
 .../framework/jobs/impl/AsyncJobMBeanImpl.java  |    234 +-
 .../jobs/impl/AsyncJobManagerImpl.java          |     80 +-
 .../framework/jobs/impl/AsyncJobMonitor.java    |    268 +-
 .../framework/jobs/impl/AsyncJobVO.java         |    472 +-
 .../jobs/impl/JobSerializerHelper.java          |     62 +-
 .../framework/jobs/impl/OutcomeImpl.java        |      7 +-
 .../framework/jobs/impl/SyncQueueItem.java      |      2 +-
 .../framework/jobs/impl/SyncQueueItemVO.java    |     55 +-
 .../framework/jobs/impl/SyncQueueManager.java   |     17 +-
 .../jobs/impl/SyncQueueManagerImpl.java         |     75 +-
 .../framework/jobs/impl/SyncQueueVO.java        |     32 +-
 .../framework/jobs/impl/VmWorkJobVO.java        |     92 +
 framework/managed-context/pom.xml               |      2 +-
 .../managed/context/ManagedContext.java         |      8 +-
 .../managed/context/ManagedContextListener.java |      3 +-
 .../managed/context/ManagedContextRunnable.java |     26 +-
 .../context/ManagedContextTimerTask.java        |      4 +-
 .../managed/context/ManagedContextUtils.java    |     22 +-
 .../context/impl/DefaultManagedContext.java     |     49 +-
 .../managed/threadlocal/ManagedThreadLocal.java |     32 +-
 .../context/impl/DefaultManagedContextTest.java |     58 +-
 framework/pom.xml                               |      3 +-
 framework/rest/.gitignore                       |      1 +
 framework/rest/pom.xml                          |      2 +-
 .../CSJacksonAnnotationIntrospector.java        |      3 +-
 .../ws/jackson/CSJacksonAnnotationModule.java   |      2 -
 .../framework/ws/jackson/UrisSerializer.java    |      1 -
 .../ws/jackson/CSJacksonAnnotationTest.java     |     17 +-
 framework/security/pom.xml                      |     60 +
 .../spring-framework-security-core-context.xml  |     32 +
 .../framework/security/keys/KeysManager.java    |     38 +
 .../security/keys/KeysManagerImpl.java          |    127 +
 .../security/keystore/KeystoreDao.java          |     31 +
 .../security/keystore/KeystoreDaoImpl.java      |    121 +
 .../security/keystore/KeystoreManager.java      |     64 +
 .../security/keystore/KeystoreManagerImpl.java  |    154 +
 .../framework/security/keystore/KeystoreVO.java |    102 +
 framework/spring/lifecycle/pom.xml              |      2 +-
 .../spring/lifecycle/AbstractBeanCollector.java |     42 +-
 .../lifecycle/AbstractSmartLifeCycle.java       |      2 +-
 .../lifecycle/CloudStackExtendedLifeCycle.java  |     47 +-
 .../CloudStackExtendedLifeCycleStart.java       |      2 +-
 .../spring/lifecycle/ConfigDepotLifeCycle.java  |     11 +-
 .../spring/lifecycle/registry/DumpRegistry.java |     30 +-
 .../lifecycle/registry/ExtensionRegistry.java   |    115 +-
 .../registry/PluggableServiceLifecycle.java     |      5 +-
 .../lifecycle/registry/RegistryLifecycle.java   |     66 +-
 .../lifecycle/registry/RegistryUtils.java       |     35 +
 framework/spring/module/pom.xml                 |      2 +-
 .../context/ResourceApplicationContext.java     |      7 +
 .../module/factory/CloudStackSpringContext.java |     78 +-
 .../factory/ModuleBasedContextFactory.java      |     49 +-
 .../module/factory/QuietLoaderFactory.java      |     62 +
 .../module/locator/ModuleDefinitionLocator.java |      2 +-
 .../impl/ClasspathModuleDefinitionLocator.java  |     30 +-
 .../spring/module/model/ModuleDefinition.java   |     22 +-
 .../module/model/ModuleDefinitionSet.java       |      6 +-
 .../model/impl/DefaultModuleDefinition.java     |     73 +-
 .../model/impl/DefaultModuleDefinitionSet.java  |    176 +-
 .../cloudstack/spring/module/util/Main.java     |     17 +-
 .../spring/module/util/ModuleLocationUtils.java |     10 +-
 .../web/CloudStackContextLoaderListener.java    |     25 +-
 .../spring/module/web/ModuleBasedFilter.java    |     61 +
 .../module/model/impl/defaults-context.xml      |      9 +
 .../spring/module/factory/InitTest.java         |      2 +-
 .../factory/ModuleBasedContextFactoryTest.java  |     81 +-
 ...ClasspathModuleDefinitionSetLocatorTest.java |     13 +-
 .../model/impl/DefaultModuleDefinitionTest.java |     64 +-
 .../testhierarchy/excluded/module.properties    |     19 +
 .../testhierarchy/excluded/test-context.xml     |     33 +
 .../testhierarchy/excluded2/module.properties   |     19 +
 .../testhierarchy/excluded2/test-context.xml    |     33 +
 .../orphan-of-excluded/defaults.properties      |     20 +
 .../orphan-of-excluded/module.properties        |     19 +
 .../orphan-of-excluded/test-context.xml         |     33 +
 maven-standard/pom.xml                          |      2 +-
 packaging/centos63/cloud.spec                   |      8 +
 parents/checkstyle/pom.xml                      |     21 -
 .../src/main/resources/tooling/checkstyle.xml   |     39 -
 plugins/acl/static-role-based/pom.xml           |      2 +-
 .../acl/StaticRoleBasedAPIAccessChecker.java    |     46 +-
 .../explicit-dedication/pom.xml                 |      2 +-
 .../affinity/ExplicitDedicationProcessor.java   |     52 +-
 .../host-anti-affinity/pom.xml                  |      2 +-
 .../affinity/HostAntiAffinityProcessor.java     |    302 +-
 plugins/alert-handlers/snmp-alerts/pom.xml      |      2 +-
 .../alert/snmp/SnmpEnhancedPatternLayout.java   |     15 +-
 .../cloudstack/alert/snmp/SnmpHelper.java       |     20 +-
 .../cloudstack/alert/snmp/SnmpTrapAppender.java |     28 +-
 .../cloudstack/alert/snmp/SnmpTrapInfo.java     |      3 +-
 .../snmp/SnmpEnhancedPatternLayoutTest.java     |     33 +-
 .../alert/snmp/SnmpTrapAppenderTest.java        |     12 +-
 plugins/alert-handlers/syslog-alerts/pom.xml    |      4 +-
 .../cloudstack/syslog/AlertsSyslogAppender.java |     91 +-
 .../syslog/AlertsSyslogAppenderTest.java        |     19 +-
 plugins/api/discovery/pom.xml                   |      2 +-
 .../api/command/user/discovery/ListApisCmd.java |     13 +-
 .../api/response/ApiDiscoveryResponse.java      |     37 +-
 .../api/response/ApiParameterResponse.java      |     31 +-
 .../api/response/ApiResponseResponse.java       |     22 +-
 .../discovery/ApiDiscoveryService.java          |      5 +-
 .../discovery/ApiDiscoveryServiceImpl.java      |     44 +-
 .../cloudstack/discovery/ApiDiscoveryTest.java  |     56 +-
 plugins/api/rate-limit/pom.xml                  |      2 +-
 .../admin/ratelimit/ResetApiLimitCmd.java       |     21 +-
 .../command/user/ratelimit/GetApiLimitCmd.java  |     35 +-
 .../api/response/ApiLimitResponse.java          |     21 +-
 .../ratelimit/ApiRateLimitService.java          |      3 +-
 .../ratelimit/ApiRateLimitServiceImpl.java      |     64 +-
 .../cloudstack/ratelimit/EhcacheLimitStore.java |     11 +-
 .../apache/cloudstack/ratelimit/LimitStore.java |      2 -
 .../apache/cloudstack/ratelimit/StoreEntry.java |      2 +-
 .../cloudstack/ratelimit/StoreEntryImpl.java    |      8 +-
 .../cloudstack/ratelimit/ApiRateLimitTest.java  |    148 +-
 .../ratelimit/integration/APITest.java          |     27 +-
 .../ratelimit/integration/LoginResponse.java    |      5 +-
 .../integration/RateLimitIntegrationTest.java   |     35 +-
 plugins/dedicated-resources/pom.xml             |      2 +-
 .../api/commands/DedicateClusterCmd.java        |     21 +-
 .../api/commands/DedicateHostCmd.java           |     19 +-
 .../cloudstack/api/commands/DedicatePodCmd.java |     22 +-
 .../api/commands/DedicateZoneCmd.java           |     22 +-
 .../api/commands/ListDedicatedClustersCmd.java  |     34 +-
 .../api/commands/ListDedicatedHostsCmd.java     |     29 +-
 .../api/commands/ListDedicatedPodsCmd.java      |     29 +-
 .../api/commands/ListDedicatedZonesCmd.java     |     29 +-
 .../commands/ReleaseDedicatedClusterCmd.java    |     12 +-
 .../api/commands/ReleaseDedicatedHostCmd.java   |     12 +-
 .../api/commands/ReleaseDedicatedPodCmd.java    |     12 +-
 .../api/commands/ReleaseDedicatedZoneCmd.java   |     12 +-
 .../api/response/DedicateClusterResponse.java   |     18 +-
 .../api/response/DedicateHostResponse.java      |     18 +-
 .../api/response/DedicatePodResponse.java       |     18 +-
 .../api/response/DedicateZoneResponse.java      |     18 +-
 .../dedicated/DedicatedResourceManagerImpl.java |    179 +-
 .../cloudstack/dedicated/DedicatedService.java  |     14 +-
 .../dedicated/manager/DedicatedApiUnitTest.java |    119 +-
 .../implicit-dedication/pom.xml                 |      2 +-
 .../cloud/deploy/ImplicitDedicationPlanner.java |     39 +-
 .../implicitplanner/ImplicitPlannerTest.java    |     34 +-
 .../user-concentrated-pod/pom.xml               |      2 +-
 .../deploy/UserConcentratedPodPlanner.java      |     40 +-
 .../deployment-planners/user-dispersing/pom.xml |      2 +-
 .../com/cloud/deploy/UserDispersingPlanner.java |    128 +-
 plugins/event-bus/inmemory/pom.xml              |     40 +
 .../mom/inmemory/InMemoryEventBus.java          |    163 +
 plugins/event-bus/rabbitmq/pom.xml              |      2 +-
 .../mom/rabbitmq/RabbitMQEventBus.java          |    244 +-
 plugins/file-systems/netapp/pom.xml             |      2 +-
 .../api/commands/netapp/AssociateLunCmd.java    |    108 +-
 .../cloud/api/commands/netapp/CreateLunCmd.java |    104 +-
 .../commands/netapp/CreateVolumeOnFilerCmd.java |    176 +-
 .../commands/netapp/CreateVolumePoolCmd.java    |     80 +-
 .../commands/netapp/DeleteVolumePoolCmd.java    |     71 +-
 .../api/commands/netapp/DestroyLunCmd.java      |     64 +-
 .../netapp/DestroyVolumeOnFilerCmd.java         |     95 +-
 .../api/commands/netapp/DissociateLunCmd.java   |     78 +-
 .../cloud/api/commands/netapp/ListLunsCmd.java  |     87 +-
 .../api/commands/netapp/ListVolumePoolsCmd.java |     79 +-
 .../commands/netapp/ListVolumesOnFilerCmd.java  |    101 +-
 .../commands/netapp/ModifyVolumePoolCmd.java    |     53 +-
 .../netapp/src/com/cloud/netapp/LunVO.java      |    173 +-
 .../src/com/cloud/netapp/NetappAllocator.java   |      7 +-
 .../netapp/NetappDefaultAllocatorImpl.java      |    212 +-
 .../src/com/cloud/netapp/NetappManager.java     |     42 +-
 .../src/com/cloud/netapp/NetappManagerImpl.java |   1749 +-
 .../src/com/cloud/netapp/NetappVolumeVO.java    |    227 +-
 .../netapp/src/com/cloud/netapp/PoolVO.java     |     89 +-
 .../netapp/src/com/cloud/netapp/dao/LunDao.java |      6 +-
 .../src/com/cloud/netapp/dao/LunDaoImpl.java    |     33 +-
 .../src/com/cloud/netapp/dao/PoolDao.java       |      5 +-
 .../src/com/cloud/netapp/dao/PoolDaoImpl.java   |     33 +-
 .../src/com/cloud/netapp/dao/VolumeDao.java     |     11 +-
 .../src/com/cloud/netapp/dao/VolumeDaoImpl.java |     45 +-
 plugins/ha-planners/skip-heurestics/pom.xml     |     29 +
 .../skip-heurestics/module.properties           |     18 +
 .../spring-skip-heurestics-context.xml          |     26 +
 .../com/cloud/deploy/SkipHeuresticsPlanner.java |     61 +
 plugins/host-allocators/random/pom.xml          |      2 +-
 .../manager/allocator/impl/RandomAllocator.java |     53 +-
 plugins/hypervisors/baremetal/pom.xml           |      2 +-
 .../baremetal/database/BaremetalDhcpDao.java    |      6 +-
 .../database/BaremetalDhcpDaoImpl.java          |     14 +-
 .../baremetal/database/BaremetalDhcpVO.java     |     26 +-
 .../baremetal/database/BaremetalPxeDao.java     |      7 +-
 .../baremetal/database/BaremetalPxeDaoImpl.java |     10 +-
 .../baremetal/database/BaremetalPxeVO.java      |     26 +-
 .../baremetal/manager/BareMetalDiscoverer.java  |    399 +-
 .../cloud/baremetal/manager/BareMetalGuru.java  |     59 +-
 .../baremetal/manager/BareMetalPlanner.java     |    211 +-
 .../manager/BareMetalTemplateAdapter.java       |    271 +-
 .../baremetal/manager/BaremetalManager.java     |      7 +-
 .../baremetal/manager/BaremetalManagerImpl.java |    135 +-
 .../BareMetalPingServiceImpl.java               |    145 +-
 .../networkservice/BareMetalPxeServiceBase.java |     34 +-
 .../networkservice/BareMetalResourceBase.java   |   1016 +-
 .../networkservice/BaremetaNetworkGuru.java     |      7 +-
 .../networkservice/BaremetalDhcpElement.java    |     51 +-
 .../networkservice/BaremetalDhcpManager.java    |     39 +-
 .../BaremetalDhcpManagerImpl.java               |     50 +-
 .../BaremetalDhcpResourceBase.java              |    233 +-
 .../networkservice/BaremetalDhcpResponse.java   |     69 +-
 .../networkservice/BaremetalDhcpdResource.java  |    205 +-
 .../BaremetalDnsmasqResource.java               |    183 +-
 .../BaremetalKickStartPxeResource.java          |     33 +-
 .../BaremetalKickStartServiceImpl.java          |     22 +-
 .../BaremetalPingPxeResource.java               |    330 +-
 .../networkservice/BaremetalPxeElement.java     |     49 +-
 .../BaremetalPxeKickStartResponse.java          |     12 +-
 .../networkservice/BaremetalPxeManager.java     |     39 +-
 .../networkservice/BaremetalPxeManagerImpl.java |    176 +-
 .../BaremetalPxePingResponse.java               |     25 +-
 .../BaremetalPxeResourceBase.java               |    234 +-
 .../networkservice/BaremetalPxeResponse.java    |     61 +-
 .../networkservice/BaremetalPxeService.java     |     40 +-
 .../BaremetalUserdataElement.java               |     39 +-
 .../PrepareKickstartPxeServerCommand.java       |      6 +-
 .../networkservice/SecurityGroupHttpClient.java |     16 +-
 .../cloudstack/api/AddBaremetalDhcpCmd.java     |     53 +-
 .../cloudstack/api/AddBaremetalHostCmd.java     |     14 +-
 .../api/AddBaremetalKickStartPxeCmd.java        |     14 +-
 .../cloudstack/api/AddBaremetalPxeCmd.java      |     56 +-
 .../api/AddBaremetalPxePingServerCmd.java       |     30 +-
 .../cloudstack/api/ListBaremetalDhcpCmd.java    |     39 +-
 .../api/ListBaremetalPxeServersCmd.java         |     18 +-
 .../hyperv/DotNet/ServerResource/.gitignore     |     17 +
 .../DotNet/ServerResource/.nuget/NuGet.targets  |     48 +-
 .../ServerResource/AgentShell/AgentService.cs   |      2 +-
 .../ServerResource/AgentShell/AgentShell.csproj |      9 +-
 .../DotNet/ServerResource/AgentShell/Program.cs |    247 +-
 .../AgentShell/ProjectInstaller.Designer.cs     |     89 +
 .../AgentShell/ProjectInstaller.cs              |     35 +
 .../ServerResource/HypervResource/App.config    |      6 +-
 .../HypervResource/CloudStackTypes.cs           |    338 +-
 .../HypervResource/HypervResource.csproj        |      1 +
 .../HypervResource/HypervResourceController.cs  |    790 +-
 .../HypervResource/IWmiCallsV2.cs               |      7 +-
 .../ServerResource/HypervResource/Utils.cs      |    231 +-
 .../ServerResource/HypervResource/WmiCallsV2.cs |    424 +-
 .../ROOT.virtualization.v2.Msvm_MigrationJob.cs |   1867 +
 .../ROOT.virtualization.v2.Msvm_StorageJob.cs   |   1863 +
 ...ion.v2.Msvm_VirtualSystemMigrationService.cs |   1581 +
 ...v2.Msvm_VirtualSystemMigrationSettingData.cs |    915 +
 .../WmiWrappers/WmiWrappers.csproj              |     14 +-
 plugins/hypervisors/hyperv/pom.xml              |      3 +-
 .../core/spring-hyperv-core-context.xml         |     32 +
 .../spring-hyperv-compute-context.xml           |      4 +-
 .../src/com/cloud/ha/HypervInvestigator.java    |     77 +
 .../discoverer/HypervServerDiscoverer.java      |    350 +-
 .../hypervisor/hyperv/guru/HypervGuru.java      |     10 +-
 .../hyperv/manager/HypervManager.java           |     24 +
 .../hyperv/manager/HypervManagerImpl.java       |    376 +
 .../resource/HypervDirectConnectResource.java   |    624 +-
 .../test/HypervDirectConnectResourceTest.java   |    555 +-
 plugins/hypervisors/kvm/pom.xml                 |      9 +-
 .../kvm/src/com/cloud/ha/KVMInvestigator.java   |     15 +-
 .../kvm/resource/BridgeVifDriver.java           |     78 +-
 .../kvm/resource/DirectVifDriver.java           |     21 +-
 .../kvm/resource/KVMGuestOsMapper.java          |     87 +-
 .../hypervisor/kvm/resource/KVMHABase.java      |     22 +-
 .../hypervisor/kvm/resource/KVMHAChecker.java   |      6 +-
 .../hypervisor/kvm/resource/KVMHAMonitor.java   |     35 +-
 .../kvm/resource/LibvirtCapXMLParser.java       |     29 +-
 .../kvm/resource/LibvirtComputingResource.java  |   1910 +-
 .../kvm/resource/LibvirtConnection.java         |     18 +-
 .../kvm/resource/LibvirtDomainXMLParser.java    |     47 +-
 .../kvm/resource/LibvirtNetworkDef.java         |     28 +-
 .../kvm/resource/LibvirtSecretDef.java          |    170 +-
 .../kvm/resource/LibvirtStoragePoolDef.java     |     11 +-
 .../resource/LibvirtStoragePoolXMLParser.java   |     35 +-
 .../kvm/resource/LibvirtStorageVolumeDef.java   |      9 +-
 .../resource/LibvirtStorageVolumeXMLParser.java |     20 +-
 .../hypervisor/kvm/resource/LibvirtVMDef.java   |    188 +-
 .../kvm/resource/LibvirtXMLParser.java          |      6 +-
 .../hypervisor/kvm/resource/OvsVifDriver.java   |     30 +-
 .../hypervisor/kvm/resource/VifDriver.java      |     16 +-
 .../hypervisor/kvm/resource/VifDriverBase.java  |     24 +-
 .../kvm/storage/IscsiAdmStorageAdaptor.java     |    367 +
 .../kvm/storage/IscsiAdmStoragePool.java        |    167 +
 .../hypervisor/kvm/storage/KVMPhysicalDisk.java |      4 +-
 .../hypervisor/kvm/storage/KVMStoragePool.java  |      1 +
 .../kvm/storage/KVMStoragePoolManager.java      |    112 +-
 .../kvm/storage/KVMStorageProcessor.java        |    346 +-
 .../kvm/storage/KVMStorageResource.java         |     37 +-
 .../kvm/storage/LibvirtStorageAdaptor.java      |    252 +-
 .../kvm/storage/LibvirtStoragePool.java         |     25 +-
 .../hypervisor/kvm/storage/StorageAdaptor.java  |     27 +-
 .../kvm/storage/iScsiAdmStorageAdaptor.java     |    373 -
 .../kvm/storage/iScsiAdmStoragePool.java        |    167 -
 .../apache/cloudstack/utils/qemu/QemuImg.java   |     25 +-
 .../resource/LibvirtComputingResourceTest.java  |    263 +-
 .../kvm/resource/LibvirtVMDefTest.java          |     18 +-
 .../kvm/resource/LibvirtVifDriverTest.java      |    109 +-
 .../kvm/storage/KVMStorageProcessorTest.java    |      8 +-
 .../cloudstack/utils/qemu/QemuImgFileTest.java  |      5 +-
 .../cloudstack/utils/qemu/QemuImgTest.java      |     16 +-
 plugins/hypervisors/ovm/pom.xml                 |      2 +-
 .../com/cloud/ovm/hypervisor/OvmDiscoverer.java |      7 +-
 .../src/com/cloud/ovm/hypervisor/OvmFencer.java |    150 +-
 .../src/com/cloud/ovm/hypervisor/OvmGuru.java   |     40 +-
 .../src/com/cloud/ovm/hypervisor/OvmHelper.java |     86 +-
 .../cloud/ovm/hypervisor/OvmResourceBase.java   |   1034 +-
 .../ovm/src/com/cloud/ovm/object/Coder.java     |     99 +-
 .../src/com/cloud/ovm/object/Connection.java    |    214 +-
 .../ovm/src/com/cloud/ovm/object/OvmBridge.java |     92 +-
 .../ovm/src/com/cloud/ovm/object/OvmDisk.java   |     21 +-
 .../ovm/src/com/cloud/ovm/object/OvmHost.java   |    137 +-
 .../com/cloud/ovm/object/OvmSecurityGroup.java  |     66 +-
 .../com/cloud/ovm/object/OvmStoragePool.java    |    158 +-
 .../ovm/src/com/cloud/ovm/object/OvmVif.java    |     20 +-
 .../ovm/src/com/cloud/ovm/object/OvmVlan.java   |     42 +-
 .../ovm/src/com/cloud/ovm/object/OvmVm.java     |    170 +-
 .../ovm/src/com/cloud/ovm/object/OvmVolume.java |     62 +-
 .../ovm/src/com/cloud/ovm/object/Test.java      |    314 +-
 plugins/hypervisors/simulator/pom.xml           |      2 +-
 .../cloud/agent/manager/MockAgentManager.java   |     34 +-
 .../agent/manager/MockAgentManagerImpl.java     |     55 +-
 .../agent/manager/MockNetworkManagerImpl.java   |     16 +-
 .../cloud/agent/manager/MockStorageManager.java |     61 +-
 .../agent/manager/MockStorageManagerImpl.java   |    144 +-
 .../com/cloud/agent/manager/MockVmManager.java  |      8 +-
 .../cloud/agent/manager/MockVmManagerImpl.java  |    114 +-
 .../com/cloud/agent/manager/SimulatorInfo.java  |     78 +-
 .../cloud/agent/manager/SimulatorManager.java   |     30 +-
 .../agent/manager/SimulatorManagerImpl.java     |    122 +-
 .../api/commands/ConfigureSimulatorCmd.java     |     40 +-
 .../com/cloud/resource/AgentResourceBase.java   |     99 +-
 .../cloud/resource/AgentRoutingResource.java    |    174 +-
 .../cloud/resource/AgentStorageResource.java    |     18 +-
 .../com/cloud/resource/SimulatorDiscoverer.java |     90 +-
 .../resource/SimulatorSecondaryDiscoverer.java  |     42 +-
 .../resource/SimulatorStorageProcessor.java     |     15 +-
 .../cloud/simulator/MockConfigurationVO.java    |     19 +-
 .../src/com/cloud/simulator/MockHost.java       |      4 +-
 .../src/com/cloud/simulator/MockHostVO.java     |     72 +-
 .../com/cloud/simulator/MockSecStorageVO.java   |     14 +-
 .../cloud/simulator/MockSecurityRulesVO.java    |     20 +-
 .../com/cloud/simulator/MockStoragePoolVO.java  |     19 +-
 .../src/com/cloud/simulator/MockVMVO.java       |     43 +-
 .../src/com/cloud/simulator/MockVm.java         |     36 +-
 .../src/com/cloud/simulator/MockVolumeVO.java   |     31 +-
 .../src/com/cloud/simulator/SimulatorGuru.java  |      6 +-
 .../simulator/dao/MockConfigurationDao.java     |      3 +-
 .../simulator/dao/MockConfigurationDaoImpl.java |     55 +-
 .../com/cloud/simulator/dao/MockHostDao.java    |      2 +
 .../cloud/simulator/dao/MockHostDaoImpl.java    |     23 +-
 .../simulator/dao/MockSecStorageDaoImpl.java    |     10 +-
 .../simulator/dao/MockSecurityRulesDao.java     |      1 +
 .../simulator/dao/MockSecurityRulesDaoImpl.java |     21 +-
 .../cloud/simulator/dao/MockStoragePoolDao.java |      2 +
 .../simulator/dao/MockStoragePoolDaoImpl.java   |     10 +-
 .../src/com/cloud/simulator/dao/MockVMDao.java  |      3 +
 .../com/cloud/simulator/dao/MockVMDaoImpl.java  |     24 +-
 .../com/cloud/simulator/dao/MockVolumeDao.java  |      4 +
 .../cloud/simulator/dao/MockVolumeDaoImpl.java  |     19 +-
 .../driver/SimulatorImageStoreDriverImpl.java   |     22 +-
 .../SimulatorImageStoreLifeCycleImpl.java       |     23 +-
 .../SimulatorImageStoreProviderImpl.java        |     17 +-
 plugins/hypervisors/ucs/pom.xml                 |      2 +-
 .../src/com/cloud/ucs/database/UcsBladeDao.java |      4 +-
 .../com/cloud/ucs/database/UcsBladeDaoImpl.java |      7 +-
 .../src/com/cloud/ucs/database/UcsBladeVO.java  |     24 +-
 .../com/cloud/ucs/database/UcsManagerDao.java   |     14 +-
 .../cloud/ucs/database/UcsManagerDaoImpl.java   |      8 +-
 .../com/cloud/ucs/database/UcsManagerVO.java    |    105 +-
 .../com/cloud/ucs/manager/StringTemplate.java   |      4 +-
 .../src/com/cloud/ucs/manager/UcsCommands.java  |     25 +-
 .../com/cloud/ucs/manager/UcsHttpClient.java    |      5 +-
 .../src/com/cloud/ucs/manager/UcsManager.java   |      6 +-
 .../com/cloud/ucs/manager/UcsManagerImpl.java   |    183 +-
 .../com/cloud/ucs/structure/ComputeBlade.java   |     42 +-
 .../src/com/cloud/ucs/structure/UcsProfile.java |      4 +-
 .../apache/cloudstack/api/AddUcsManagerCmd.java |     29 +-
 .../api/AssociateUcsProfileToBladeCmd.java      |     24 +-
 .../cloudstack/api/DeleteUcsManagerCmd.java     |     71 +-
 .../apache/cloudstack/api/ListUcsBladeCmd.java  |     16 +-
 .../cloudstack/api/ListUcsManagerCmd.java       |     45 +-
 .../cloudstack/api/ListUcsProfileCmd.java       |     30 +-
 .../api/response/UcsBladeResponse.java          |      6 +-
 .../api/response/UcsManagerResponse.java        |     25 +-
 .../api/response/UcsProfileResponse.java        |     10 +-
 plugins/hypervisors/vmware/pom.xml              |      2 +-
 .../api/commands/DeleteCiscoNexusVSMCmd.java    |     34 +-
 .../api/commands/DisableCiscoNexusVSMCmd.java   |     40 +-
 .../api/commands/EnableCiscoNexusVSMCmd.java    |     40 +-
 .../api/commands/ListCiscoNexusVSMsCmd.java     |    102 +-
 .../api/response/CiscoNexusVSMResponse.java     |     61 +-
 .../vmware/src/com/cloud/ha/VmwareFencer.java   |      6 +-
 .../src/com/cloud/ha/VmwareInvestigator.java    |     23 +-
 .../com/cloud/hypervisor/guru/VMwareGuru.java   |    176 +-
 .../com/cloud/hypervisor/vmware/LegacyZone.java |      1 +
 .../cloud/hypervisor/vmware/LegacyZoneVO.java   |      2 +-
 .../hypervisor/vmware/VmwareCleanupMaid.java    |    160 +-
 .../hypervisor/vmware/VmwareDatacenter.java     |      1 +
 .../hypervisor/vmware/VmwareDatacenterVO.java   |      5 +-
 .../vmware/VmwareDatacenterZoneMap.java         |      1 +
 .../vmware/VmwareDatacenterZoneMapVO.java       |     11 +-
 .../vmware/VmwareServerDiscoverer.java          |    710 +-
 .../vmware/dao/LegacyZoneDaoImpl.java           |     97 +-
 .../vmware/dao/VmwareDatacenterDaoImpl.java     |      3 +-
 .../dao/VmwareDatacenterZoneMapDaoImpl.java     |     31 +-
 .../vmware/manager/VmwareHostService.java       |     14 +-
 .../vmware/manager/VmwareManager.java           |     23 +-
 .../vmware/manager/VmwareManagerImpl.java       |    322 +-
 .../vmware/manager/VmwareStorageManager.java    |     20 +-
 .../manager/VmwareStorageManagerImpl.java       |    605 +-
 .../vmware/manager/VmwareStorageMount.java      |      2 +-
 .../vmware/resource/VmwareContextFactory.java   |    139 +-
 .../vmware/resource/VmwareResource.java         |   2306 +-
 .../com/cloud/network/CiscoNexusVSMDevice.java  |     10 +-
 .../network/CiscoNexusVSMDeviceManagerImpl.java |    254 +-
 .../cloud/network/CiscoNexusVSMDeviceVO.java    |      7 +-
 .../com/cloud/network/VmwareTrafficLabel.java   |     19 +-
 .../network/dao/CiscoNexusVSMDeviceDao.java     |     76 +-
 .../network/dao/CiscoNexusVSMDeviceDaoImpl.java |     66 +-
 .../network/element/CiscoNexusVSMElement.java   |    243 +-
 .../element/CiscoNexusVSMElementService.java    |     15 +-
 .../PremiumSecondaryStorageResource.java        |    111 +-
 .../VmwareSecondaryStorageContextFactory.java   |    109 +-
 .../VmwareSecondaryStorageResourceHandler.java  |    176 +-
 .../resource/VmwareStorageLayoutHelper.java     |    450 +-
 .../resource/VmwareStorageLayoutType.java       |      5 +-
 .../resource/VmwareStorageProcessor.java        |    464 +-
 .../VmwareStorageSubsystemCommandHandler.java   |     32 +-
 .../api/command/admin/zone/AddVmwareDcCmd.java  |     23 +-
 .../command/admin/zone/ListVmwareDcsCmd.java    |      9 +-
 .../command/admin/zone/RemoveVmwareDcCmd.java   |     15 +-
 .../api/response/VmwareDatacenterResponse.java  |      6 +-
 .../motion/VmwareStorageMotionStrategy.java     |     53 +-
 .../vmware/VmwareDatacenterApiUnitTest.java     |     25 +-
 .../vmware/resource/VmwareResourceTest.java     |     44 +-
 .../motion/VmwareStorageMotionStrategyTest.java |     71 +-
 plugins/hypervisors/xen/pom.xml                 |      4 +-
 .../xen/src/com/cloud/ha/XenServerFencer.java   |     25 +-
 .../src/com/cloud/hypervisor/XenServerGuru.java |    111 +-
 .../xen/discoverer/XcpServerDiscoverer.java     |    344 +-
 .../hypervisor/xen/resource/CitrixHelper.java   |   3312 +-
 .../xen/resource/CitrixResourceBase.java        |   2455 +-
 .../hypervisor/xen/resource/XcpOssResource.java |    115 +-
 .../xen/resource/XcpServerResource.java         |     38 +-
 .../xen/resource/XenServer56FP1Resource.java    |     53 +-
 .../xen/resource/XenServer56Resource.java       |     51 +-
 .../xen/resource/XenServer56SP2Resource.java    |     42 +-
 .../xen/resource/XenServer600Resource.java      |     35 +-
 .../xen/resource/XenServer602Resource.java      |     35 +-
 .../xen/resource/XenServer610Resource.java      |    109 +-
 .../xen/resource/XenServer620Resource.java      |     20 +-
 .../xen/resource/XenServerConnectionPool.java   |    456 +-
 .../xen/resource/XenServerPoolVms.java          |     84 +-
 .../xen/resource/XenServerStorageProcessor.java |    476 +-
 .../xen/resource/Xenserver625Resource.java      |    112 +
 .../resource/Xenserver625StorageProcessor.java  |    822 +
 .../xenserver/XenServerResourceNewBase.java     |    320 +
 .../motion/XenServerStorageMotionStrategy.java  |     76 +-
 .../xen/resource/CitrixResourceBaseTest.java    |     77 +-
 plugins/network-elements/bigswitch-vns/pom.xml  |      2 +-
 .../agent/api/CreateVnsNetworkCommand.java      |      4 +-
 .../cloud/agent/api/CreateVnsPortAnswer.java    |      3 +-
 .../cloud/agent/api/CreateVnsPortCommand.java   |      8 +-
 .../cloud/agent/api/DeleteVnsNetworkAnswer.java |      3 +-
 .../cloud/agent/api/DeleteVnsPortAnswer.java    |      3 +-
 .../cloud/agent/api/UpdateVnsPortAnswer.java    |      3 +-
 .../cloud/agent/api/UpdateVnsPortCommand.java   |      5 -
 .../api/commands/AddBigSwitchVnsDeviceCmd.java  |     20 +-
 .../commands/DeleteBigSwitchVnsDeviceCmd.java   |     18 +-
 .../commands/ListBigSwitchVnsDevicesCmd.java    |     32 +-
 .../com/cloud/api/commands/VnsConstants.java    |      1 -
 .../response/BigSwitchVnsDeviceResponse.java    |     21 +-
 .../com/cloud/network/BigSwitchVnsDeviceVO.java |     18 +-
 .../cloud/network/bigswitch/AttachmentData.java |     46 +-
 .../network/bigswitch/BigSwitchVnsApi.java      |    104 +-
 .../bigswitch/BigSwitchVnsApiException.java     |      1 -
 .../network/bigswitch/ControlClusterStatus.java |      2 +-
 .../cloud/network/bigswitch/NetworkData.java    |    132 +-
 .../com/cloud/network/bigswitch/PortData.java   |     74 +-
 .../com/cloud/network/dao/BigSwitchVnsDao.java  |      2 +-
 .../cloud/network/dao/BigSwitchVnsDaoImpl.java  |      5 +-
 .../network/element/BigSwitchVnsElement.java    |    202 +-
 .../element/BigSwitchVnsElementService.java     |      3 +-
 .../guru/BigSwitchVnsGuestNetworkGuru.java      |     74 +-
 .../network/resource/BigSwitchVnsResource.java  |    134 +-
 .../network/bigswitch/BigSwitchApiTest.java     |     34 +-
 .../resource/BigSwitchVnsResourceTest.java      |     57 +-
 plugins/network-elements/cisco-vnmc/pom.xml     |      2 +-
 .../cloudstack/cisco-vnmc/module.properties     |     18 +
 .../cisco-vnmc/spring-cisco-vnmc-context.xml    |     40 +
 ...ociateAsaWithLogicalEdgeFirewallCommand.java |      2 +-
 .../api/CleanupLogicalEdgeFirewallCommand.java  |      2 +-
 .../api/ConfigureNexusVsmForAsaCommand.java     |     29 +-
 .../api/CreateLogicalEdgeFirewallCommand.java   |     14 +-
 .../commands/AddCiscoAsa1000vResourceCmd.java   |     29 +-
 .../api/commands/AddCiscoVnmcResourceCmd.java   |     26 +-
 .../DeleteCiscoAsa1000vResourceCmd.java         |     20 +-
 .../commands/DeleteCiscoVnmcResourceCmd.java    |     20 +-
 .../commands/ListCiscoAsa1000vResourcesCmd.java |     21 +-
 .../api/commands/ListCiscoVnmcResourcesCmd.java |     19 +-
 .../response/CiscoAsa1000vResourceResponse.java |     16 +-
 .../api/response/CiscoVnmcResourceResponse.java |     10 +-
 .../network/cisco/CiscoAsa1000vDevice.java      |      2 +
 .../network/cisco/CiscoAsa1000vDeviceVO.java    |     29 +-
 .../network/cisco/CiscoVnmcConnection.java      |    169 +-
 .../network/cisco/CiscoVnmcConnectionImpl.java  |    323 +-
 .../network/cisco/CiscoVnmcController.java      |      2 +
 .../network/cisco/CiscoVnmcControllerVO.java    |     18 +-
 .../cloud/network/cisco/NetworkAsa1000vMap.java |      1 +
 .../network/cisco/NetworkAsa1000vMapVO.java     |     46 +-
 .../com/cloud/network/dao/CiscoAsa1000vDao.java |      2 +-
 .../cloud/network/dao/CiscoAsa1000vDaoImpl.java |      5 +-
 .../src/com/cloud/network/dao/CiscoVnmcDao.java |      2 +-
 .../com/cloud/network/dao/CiscoVnmcDaoImpl.java |      7 +-
 .../network/dao/NetworkAsa1000vMapDao.java      |      2 +-
 .../network/dao/NetworkAsa1000vMapDaoImpl.java  |      5 +-
 .../network/element/CiscoAsa1000vService.java   |      3 +-
 .../cloud/network/element/CiscoVnmcElement.java |    193 +-
 .../element/CiscoVnmcElementService.java        |      3 +-
 .../network/resource/CiscoVnmcResource.java     |     90 +-
 .../network/cisco/CiscoVnmcConnectionTest.java  |     17 +-
 .../network/element/CiscoVnmcElementTest.java   |     14 +-
 .../network/resource/CiscoVnmcResourceTest.java |     71 +-
 plugins/network-elements/dns-notifier/pom.xml   |      2 +-
 .../resources/components-example.xml            |      1 -
 .../cloudstack/network/element/DnsNotifier.java |     16 +-
 .../elastic-loadbalancer/pom.xml                |      2 +-
 .../src/com/cloud/network/ElasticLbVmMapVO.java |     22 +-
 .../element/ElasticLoadBalancerElement.java     |     72 +-
 .../network/lb/ElasticLoadBalancerManager.java  |      9 +-
 .../lb/ElasticLoadBalancerManagerImpl.java      |    252 +-
 .../cloud/network/lb/dao/ElasticLbVmMapDao.java |      8 +-
 .../network/lb/dao/ElasticLbVmMapDaoImpl.java   |     40 +-
 plugins/network-elements/f5/pom.xml             |      7 +-
 .../META-INF/cloudstack/f5/module.properties    |     18 +
 .../cloudstack/f5/spring-f5-context.xml         |     34 +
 .../commands/AddExternalLoadBalancerCmd.java    |     41 +-
 .../api/commands/AddF5LoadBalancerCmd.java      |     36 +-
 .../commands/ConfigureF5LoadBalancerCmd.java    |     29 +-
 .../commands/DeleteExternalLoadBalancerCmd.java |     35 +-
 .../api/commands/DeleteF5LoadBalancerCmd.java   |     22 +-
 .../commands/ListExternalLoadBalancersCmd.java  |     29 +-
 .../commands/ListF5LoadBalancerNetworksCmd.java |     15 +-
 .../api/commands/ListF5LoadBalancersCmd.java    |     30 +-
 .../api/response/F5LoadBalancerResponse.java    |     39 +-
 .../element/F5ExternalLoadBalancerElement.java  |     58 +-
 .../F5ExternalLoadBalancerElementService.java   |     34 +-
 .../cloud/network/resource/F5BigIpResource.java |   1861 +-
 .../internal-loadbalancer/pom.xml               |      2 +-
 .../element/InternalLoadBalancerElement.java    |    160 +-
 .../lb/InternalLoadBalancerVMManager.java       |     19 +-
 .../lb/InternalLoadBalancerVMManagerImpl.java   |    321 +-
 .../ElementChildTestConfiguration.java          |     39 +-
 .../InternalLbElementServiceTest.java           |    131 +-
 .../InternalLbElementTest.java                  |    153 +-
 .../InternalLBVMManagerTest.java                |    189 +-
 .../InternalLBVMServiceTest.java                |     89 +-
 .../LbChildTestConfiguration.java               |    237 +-
 .../network-elements/juniper-contrail/pom.xml   |      4 +-
 .../api/command/CreateServiceInstanceCmd.java   |     93 +-
 .../api/response/ServiceInstanceResponse.java   |     32 +-
 .../management/ContrailElementImpl.java         |    505 +-
 .../contrail/management/ContrailGuru.java       |    151 +-
 .../contrail/management/ContrailManager.java    |     81 +-
 .../management/ContrailManagerImpl.java         |    451 +-
 .../contrail/management/DBSyncGeneric.java      |     86 +-
 .../network/contrail/management/EventUtils.java |     46 +-
 .../management/ManagementNetworkGuru.java       |     64 +-
 .../contrail/management/ModelDatabase.java      |     43 +-
 .../contrail/management/ServerDBSync.java       |      7 +-
 .../contrail/management/ServerDBSyncImpl.java   |    574 +-
 .../management/ServerEventHandlerImpl.java      |    129 +-
 .../contrail/management/ServiceManager.java     |      5 +-
 .../contrail/management/ServiceManagerImpl.java |    129 +-
 .../management/ServiceVirtualMachine.java       |      8 +-
 .../network/contrail/model/FloatingIpModel.java |     24 +-
 .../contrail/model/FloatingIpPoolModel.java     |     21 +-
 .../network/contrail/model/InstanceIpModel.java |     48 +-
 .../network/contrail/model/ModelController.java |     25 +-
 .../network/contrail/model/ModelObject.java     |     55 +-
 .../network/contrail/model/ModelObjectBase.java |     39 +-
 .../contrail/model/NetworkPolicyModel.java      |    305 +
 .../contrail/model/ServiceInstanceModel.java    |    200 +-
 .../contrail/model/VMInterfaceModel.java        |     99 +-
 .../contrail/model/VirtualMachineModel.java     |    197 +-
 .../contrail/model/VirtualNetworkModel.java     |    236 +-
 .../management/ApiConnectorMockito.java         |     37 +-
 .../IntegrationTestConfiguration.java           |    476 +-
 .../management/ManagementServerMock.java        |    223 +-
 .../contrail/management/MockAccountManager.java |    199 +-
 .../management/NetworkProviderTest.java         |    165 +-
 .../contrail/management/PublicNetworkTest.java  |     65 +-
 .../contrail/management/TestDbSetup.java        |     91 +-
 .../management/VirtualNetworkModelTest.java     |     62 -
 .../contrail/model/VirtualMachineModelTest.java |    124 +
 .../contrail/model/VirtualNetworkModelTest.java |    102 +
 .../test/resources/commonContext.xml            |    146 +-
 plugins/network-elements/juniper-srx/pom.xml    |      2 +-
 .../META-INF/cloudstack/srx/module.properties   |     18 +
 .../cloudstack/srx/spring-srx-context.xml       |     35 +
 .../api/commands/AddExternalFirewallCmd.java    |     59 +-
 .../cloud/api/commands/AddSrxFirewallCmd.java   |     35 +-
 .../api/commands/ConfigureSrxFirewallCmd.java   |     27 +-
 .../api/commands/DeleteExternalFirewallCmd.java |     37 +-
 .../api/commands/DeleteSrxFirewallCmd.java      |     22 +-
 .../api/commands/ListExternalFirewallsCmd.java  |     33 +-
 .../commands/ListSrxFirewallNetworksCmd.java    |     15 +-
 .../cloud/api/commands/ListSrxFirewallsCmd.java |     27 +-
 .../cloud/api/response/SrxFirewallResponse.java |     57 +-
 .../JuniperSRXExternalFirewallElement.java      |     51 +-
 .../JuniperSRXFirewallElementService.java       |     39 +-
 .../network/resource/JuniperSrxResource.java    |   3313 +-
 plugins/network-elements/midonet/pom.xml        |      2 +-
 .../cloud/network/element/MidoNetElement.java   |    741 +-
 .../network/element/SimpleFirewallRule.java     |     59 +-
 .../network/guru/MidoNetGuestNetworkGuru.java   |     66 +-
 .../network/guru/MidoNetPublicNetworkGuru.java  |     37 +-
 .../network/resource/MidoNetVifDriver.java      |     52 +-
 .../network/element/MidoNetElementTest.java     |     51 +-
 plugins/network-elements/netscaler/pom.xml      |      2 +-
 .../cloudstack/netscaler/module.properties      |     18 +
 .../netscaler/spring-netscaler-context.xml      |     35 +
 .../commands/AddNetscalerLoadBalancerCmd.java   |     93 +-
 .../ConfigureNetscalerLoadBalancerCmd.java      |     53 +-
 .../DeleteNetscalerLoadBalancerCmd.java         |     20 +-
 .../ListNetscalerLoadBalancerNetworksCmd.java   |     17 +-
 .../commands/ListNetscalerLoadBalancersCmd.java |     25 +-
 .../response/NetscalerLoadBalancerResponse.java |     63 +-
 .../src/com/cloud/network/NetScalerPodVO.java   |     31 +-
 .../com/cloud/network/dao/NetScalerPodDao.java  |      2 +-
 .../cloud/network/dao/NetScalerPodDaoImpl.java  |      5 +-
 .../cloud/network/element/NetscalerElement.java |    172 +-
 .../NetscalerLoadBalancerElementService.java    |      7 +-
 .../network/resource/NetscalerResource.java     |   1126 +-
 plugins/network-elements/nicira-nvp/pom.xml     |     61 +-
 ...ortForwardingRulesOnLogicalRouterAnswer.java |      4 +-
 ...rtForwardingRulesOnLogicalRouterCommand.java |      9 +-
 ...ConfigurePublicIpsOnLogicalRouterAnswer.java |      4 +-
 ...onfigurePublicIpsOnLogicalRouterCommand.java |      8 +-
 ...gureStaticNatRulesOnLogicalRouterAnswer.java |      4 +-
 ...ureStaticNatRulesOnLogicalRouterCommand.java |      9 +-
 .../agent/api/CreateLogicalRouterAnswer.java    |     11 +-
 .../agent/api/CreateLogicalRouterCommand.java   |     88 +-
 .../agent/api/CreateLogicalSwitchAnswer.java    |     11 +-
 .../agent/api/CreateLogicalSwitchCommand.java   |     28 +-
 .../api/CreateLogicalSwitchPortAnswer.java      |     11 +-
 .../api/CreateLogicalSwitchPortCommand.java     |     33 +-
 .../agent/api/DeleteLogicalRouterAnswer.java    |      5 +-
 .../agent/api/DeleteLogicalRouterCommand.java   |      9 +-
 .../agent/api/DeleteLogicalSwitchAnswer.java    |      5 +-
 .../agent/api/DeleteLogicalSwitchCommand.java   |      8 +-
 .../api/DeleteLogicalSwitchPortAnswer.java      |      5 +-
 .../api/DeleteLogicalSwitchPortCommand.java     |     14 +-
 .../agent/api/FindLogicalSwitchPortAnswer.java  |     11 +-
 .../agent/api/FindLogicalSwitchPortCommand.java |     15 +-
 .../api/UpdateLogicalSwitchPortAnswer.java      |      9 +-
 .../api/UpdateLogicalSwitchPortCommand.java     |     41 +-
 .../api/commands/AddNiciraNvpDeviceCmd.java     |     40 +-
 .../api/commands/DeleteNiciraNvpDeviceCmd.java  |     22 +-
 .../ListNiciraNvpDeviceNetworksCmd.java         |     17 +-
 .../api/commands/ListNiciraNvpDevicesCmd.java   |     24 +-
 .../api/response/NiciraNvpDeviceResponse.java   |     37 +-
 .../com/cloud/network/NiciraNvpDeviceVO.java    |     18 +-
 .../cloud/network/NiciraNvpNicMappingVO.java    |     18 +-
 .../cloud/network/NiciraNvpRouterMappingVO.java |     19 +-
 .../src/com/cloud/network/dao/NiciraNvpDao.java |      2 +-
 .../com/cloud/network/dao/NiciraNvpDaoImpl.java |      7 +-
 .../network/dao/NiciraNvpNicMappingDao.java     |      9 +-
 .../network/dao/NiciraNvpNicMappingDaoImpl.java |      7 +-
 .../dao/NiciraNvpRouterMappingDaoImpl.java      |      4 +-
 .../cloud/network/element/NiciraNvpElement.java |    516 +-
 .../element/NiciraNvpElementService.java        |      6 +-
 .../network/guru/NiciraNvpGuestNetworkGuru.java |     92 +-
 .../network/nicira/AccessConfiguration.java     |    129 +
 .../com/cloud/network/nicira/AccessRule.java    |     55 +
 .../src/com/cloud/network/nicira/Acl.java       |     21 +
 .../src/com/cloud/network/nicira/AclRule.java   |    206 +
 .../network/nicira/ControlClusterStatus.java    |     48 +-
 .../network/nicira/DestinationNatRule.java      |     60 +-
 .../network/nicira/L3GatewayAttachment.java     |     28 +-
 .../network/nicira/LogicalRouterConfig.java     |     19 +-
 .../cloud/network/nicira/LogicalRouterPort.java |     34 +-
 .../com/cloud/network/nicira/LogicalSwitch.java |     53 +-
 .../cloud/network/nicira/LogicalSwitchPort.java |     58 +-
 .../src/com/cloud/network/nicira/Match.java     |     92 +-
 .../src/com/cloud/network/nicira/NatRule.java   |     18 +-
 .../com/cloud/network/nicira/NiciraNvpApi.java  |    640 +-
 .../network/nicira/NiciraNvpApiException.java   |      6 +-
 .../com/cloud/network/nicira/NiciraNvpList.java |     12 +-
 .../com/cloud/network/nicira/NiciraNvpTag.java  |      6 +-
 .../cloud/network/nicira/PatchAttachment.java   |      8 +-
 .../com/cloud/network/nicira/RouterNextHop.java |     13 +-
 .../cloud/network/nicira/SecurityProfile.java   |     21 +
 .../com/cloud/network/nicira/SecurityRule.java  |    135 +
 .../SingleDefaultRouteImplictRoutingConfig.java |     13 +-
 .../com/cloud/network/nicira/SourceNatRule.java |     27 +-
 .../network/nicira/TransportZoneBinding.java    |     29 +-
 .../com/cloud/network/nicira/VifAttachment.java |     14 +-
 .../network/resource/NiciraNvpResource.java     |    348 +-
 .../network/element/NiciraNvpElementTest.java   |    108 +-
 .../guru/NiciraNvpGuestNetworkGuruTest.java     |    174 +-
 .../com/cloud/network/nicira/NatRuleTest.java   |      8 +-
 .../cloud/network/nicira/NiciraNvpApiIT.java    |    163 +
 .../cloud/network/nicira/NiciraNvpApiTest.java  |    436 +-
 .../com/cloud/network/nicira/NiciraTagTest.java |      7 +-
 .../network/resource/NiciraNvpResourceTest.java |    412 +-
 .../nicira-nvp/test/resources/config.properties |     21 +
 plugins/network-elements/opendaylight/pom.xml   |    104 +
 .../opendaylight/OpendaylightElement.java       |    174 +
 .../OpendaylightGuestNetworkGuru.java           |    276 +
 .../agent/OpenDaylightControllerResource.java   |    344 +
 .../OpenDaylightControllerResourceManager.java  |     42 +
 ...enDaylightControllerResourceManagerImpl.java |    219 +
 .../agent/commands/AddHypervisorCommand.java    |     58 +
 .../agent/commands/ConfigureNetworkCommand.java |     54 +
 .../agent/commands/ConfigurePortCommand.java    |     80 +
 .../agent/commands/DestroyNetworkCommand.java   |     45 +
 .../agent/commands/DestroyPortCommand.java      |     50 +
 .../StartupOpenDaylightControllerCommand.java   |     29 +
 .../agent/responses/AddHypervisorAnswer.java    |     35 +
 .../agent/responses/ConfigureNetworkAnswer.java |     43 +
 .../agent/responses/ConfigurePortAnswer.java    |     35 +
 .../agent/responses/DestroyNetworkAnswer.java   |     35 +
 .../agent/responses/DestroyPortAnswer.java      |     35 +
 .../api/NeutronInvalidCredentialsException.java |     38 +
 .../opendaylight/api/NeutronRestApi.java        |    217 +
 .../api/NeutronRestApiException.java            |     38 +
 .../opendaylight/api/NeutronRestFactory.java    |     55 +
 .../commands/AddOpenDaylightControllerCmd.java  |    114 +
 .../DeleteOpenDaylightControllerCmd.java        |     99 +
 .../ListOpenDaylightControllersCmd.java         |    104 +
 .../api/enums/NeutronNorthboundEnum.java        |     44 +
 .../opendaylight/api/model/NeutronNetwork.java  |    213 +
 .../api/model/NeutronNetworkWrapper.java        |     70 +
 .../api/model/NeutronNetworksList.java          |     42 +
 .../opendaylight/api/model/NeutronNode.java     |     98 +
 .../api/model/NeutronNodeWrapper.java           |     65 +
 .../api/model/NeutronNodesList.java             |     42 +
 .../opendaylight/api/model/NeutronPort.java     |    265 +
 .../api/model/NeutronPortWrapper.java           |     70 +
 .../api/model/NeutronPortsList.java             |     42 +
 .../opendaylight/api/resources/Action.java      |    287 +
 .../NeutronNetworksNorthboundAction.java        |    113 +
 .../resources/NeutronNodesNorthboundAction.java |     89 +
 .../resources/NeutronPortsNorthboundAction.java |    111 +
 .../OpenDaylightControllerResponse.java         |     73 +
 .../dao/OpenDaylightControllerMappingDao.java   |     28 +
 .../OpenDaylightControllerMappingDaoImpl.java   |     45 +
 .../dao/OpenDaylightControllerVO.java           |    100 +
 .../cloudstack/opendaylight/module.properties   |     21 +
 .../spring-opendaylight-context.xml             |     42 +
 .../opendaylight/api/test/NeutronEnumsTest.java |     85 +
 .../api/test/NeutronNetworkAdapterTest.java     |     88 +
 .../api/test/NeutronNodeAdapterTest.java        |     74 +
 .../api/test/NeutronPortAdapterTest.java        |     95 +
 .../opendaylight/api/test/NeutronRestApiIT.java |     95 +
 .../api/test/NeutronRestApiTest.java            |    254 +
 plugins/network-elements/ovs/pom.xml            |      2 +-
 .../cloudstack/ovs/spring-ovs-context.xml       |      2 +
 .../agent/api/OvsCreateGreTunnelAnswer.java     |     79 +
 .../agent/api/OvsCreateGreTunnelCommand.java    |     54 +
 .../cloud/agent/api/OvsCreateTunnelAnswer.java  |     83 +
 .../cloud/agent/api/OvsCreateTunnelCommand.java |     69 +
 .../cloud/agent/api/OvsDeleteFlowCommand.java   |     35 +
 .../agent/api/OvsDestroyBridgeCommand.java      |     43 +
 .../agent/api/OvsDestroyTunnelCommand.java      |     49 +
 .../agent/api/OvsFetchInterfaceAnswer.java      |     56 +
 .../agent/api/OvsFetchInterfaceCommand.java     |     37 +
 .../cloud/agent/api/OvsSetTagAndFlowAnswer.java |     38 +
 .../agent/api/OvsSetTagAndFlowCommand.java      |     60 +
 .../cloud/agent/api/OvsSetupBridgeCommand.java  |     48 +
 .../com/cloud/agent/api/StartupOvsCommand.java  |     26 +
 .../com/cloud/network/element/OvsElement.java   |    582 +-
 .../network/element/OvsElementService.java      |     23 +
 .../cloud/network/guru/OvsGuestNetworkGuru.java |    169 +-
 .../cloud/network/ovs/GreTunnelException.java   |      6 +-
 .../network/ovs/OvsCreateGreTunnelAnswer.java   |     81 -
 .../network/ovs/OvsCreateGreTunnelCommand.java  |     54 -
 .../network/ovs/OvsCreateTunnelAnswer.java      |     86 -
 .../network/ovs/OvsCreateTunnelCommand.java     |     69 -
 .../cloud/network/ovs/OvsDeleteFlowCommand.java |     36 -
 .../network/ovs/OvsDestroyBridgeCommand.java    |     45 -
 .../network/ovs/OvsDestroyTunnelCommand.java    |     50 -
 .../network/ovs/OvsFetchInterfaceAnswer.java    |     59 -
 .../network/ovs/OvsFetchInterfaceCommand.java   |     38 -
 .../network/ovs/OvsSetTagAndFlowAnswer.java     |     40 -
 .../network/ovs/OvsSetTagAndFlowCommand.java    |     60 -
 .../network/ovs/OvsSetupBridgeCommand.java      |     50 -
 .../com/cloud/network/ovs/OvsTunnelManager.java |      9 +-
 .../cloud/network/ovs/OvsTunnelManagerImpl.java |    339 +-
 .../network/ovs/dao/OvsTunnelInterfaceDao.java  |      9 +-
 .../ovs/dao/OvsTunnelInterfaceDaoImpl.java      |     46 +-
 .../network/ovs/dao/OvsTunnelInterfaceVO.java   |    153 +-
 .../network/ovs/dao/OvsTunnelNetworkDao.java    |     14 +-
 .../ovs/dao/OvsTunnelNetworkDaoImpl.java        |     60 +-
 .../network/ovs/dao/OvsTunnelNetworkVO.java     |    155 +-
 plugins/network-elements/palo-alto/pom.xml      |     29 +
 .../cloudstack/paloalto/module.properties       |     18 +
 .../paloalto/spring-paloalto-context.xml        |     33 +
 .../api/commands/AddPaloAltoFirewallCmd.java    |    140 +
 .../commands/ConfigurePaloAltoFirewallCmd.java  |    122 +
 .../api/commands/DeletePaloAltoFirewallCmd.java |    110 +
 .../ListPaloAltoFirewallNetworksCmd.java        |    106 +
 .../api/commands/ListPaloAltoFirewallsCmd.java  |    108 +
 .../api/response/PaloAltoFirewallResponse.java  |    159 +
 .../PaloAltoExternalFirewallElement.java        |    459 +
 .../element/PaloAltoFirewallElementService.java |     69 +
 .../network/resource/PaloAltoResource.java      |   2156 +
 .../cloud/network/utils/HttpClientWrapper.java  |     89 +
 .../resource/MockablePaloAltoResource.java      |    499 +
 .../network/resource/PaloAltoResourceTest.java  |    444 +
 .../network-elements/stratosphere-ssp/pom.xml   |      2 +-
 .../cloudstack/ssp/spring-ssp-context.xml       |      1 -
 .../cloudstack/api/commands/AddSspCmd.java      |     28 +-
 .../cloudstack/api/commands/DeleteSspCmd.java   |     18 +-
 .../cloudstack/api/response/SspResponse.java    |     14 +-
 .../cloudstack/network/dao/SspCredentialVO.java |     13 +-
 .../network/dao/SspTenantDaoImpl.java           |      7 +-
 .../cloudstack/network/dao/SspTenantVO.java     |      8 +-
 .../cloudstack/network/dao/SspUuidDao.java      |      4 +
 .../cloudstack/network/dao/SspUuidDaoImpl.java  |     12 +-
 .../cloudstack/network/dao/SspUuidVO.java       |     19 +-
 .../cloudstack/network/element/SspClient.java   |     66 +-
 .../cloudstack/network/element/SspElement.java  |    252 +-
 .../cloudstack/network/element/SspManager.java  |      3 +-
 .../network/guru/SspGuestNetworkGuru.java       |     66 +-
 .../network/element/SspClientTest.java          |     18 +-
 .../network/element/SspElementTest.java         |     30 +-
 plugins/network-elements/vxlan/pom.xml          |      2 +-
 .../network/guru/VxlanGuestNetworkGuru.java     |     91 +-
 .../network/guru/VxlanGuestNetworkGuruTest.java |    162 +-
 plugins/pom.xml                                 |      7 +-
 plugins/storage-allocators/random/pom.xml       |      2 +-
 .../allocator/RandomStoragePoolAllocator.java   |     15 +-
 plugins/storage/image/default/pom.xml           |      2 +-
 .../driver/CloudStackImageStoreDriverImpl.java  |     16 +-
 .../CloudStackImageStoreLifeCycleImpl.java      |     35 +-
 .../CloudStackImageStoreProviderImpl.java       |      4 +-
 plugins/storage/image/s3/pom.xml                |      2 +-
 .../driver/S3ImageStoreDriverImpl.java          |     36 +-
 .../lifecycle/S3ImageStoreLifeCycleImpl.java    |     18 +-
 .../provider/S3ImageStoreProviderImpl.java      |      4 +-
 plugins/storage/image/sample/pom.xml            |      2 +-
 .../driver/SampleImageStoreDriverImpl.java      |      2 +-
 plugins/storage/image/swift/pom.xml             |      2 +-
 .../driver/SwiftImageStoreDriverImpl.java       |      8 +-
 .../lifecycle/SwiftImageStoreLifeCycleImpl.java |     15 +-
 .../provider/SwiftImageStoreProviderImpl.java   |      4 +-
 plugins/storage/volume/default/pom.xml          |      2 +-
 .../CloudStackPrimaryDataStoreDriverImpl.java   |     72 +-
 ...CloudStackPrimaryDataStoreLifeCycleImpl.java |     67 +-
 plugins/storage/volume/nexenta/pom.xml          |     47 +
 .../module.properties                           |     18 +
 .../spring-storage-volume-nexenta-context.xml   |     32 +
 .../driver/NexentaPrimaryDataStoreDriver.java   |    194 +
 .../NexentaPrimaryDataStoreLifeCycle.java       |    159 +
 .../datastore/provider/NexentaHostListener.java |     17 +
 .../NexentaPrimaryDataStoreProvider.java        |     81 +
 .../datastore/util/NexentaNmsClient.java        |    212 +
 .../storage/datastore/util/NexentaNmsUrl.java   |     85 +
 .../datastore/util/NexentaStorAppliance.java    |    401 +
 .../storage/datastore/util/NexentaUtil.java     |    242 +
 .../util/NexentaStorApplianceTest.java          |    319 +
 .../storage/datastore/util/NexentaUtilTest.java |    117 +
 plugins/storage/volume/sample/pom.xml           |      2 +-
 .../SamplePrimaryDataStoreDriverImpl.java       |     44 +-
 plugins/storage/volume/solidfire/pom.xml        |      2 +-
 .../driver/SolidfirePrimaryDataStoreDriver.java |    435 +-
 .../SolidFirePrimaryDataStoreLifeCycle.java     |    320 +-
 .../provider/SolidFireHostListener.java         |     24 +-
 .../SolidfirePrimaryDataStoreProvider.java      |      7 +-
 .../storage/datastore/util/SolidFireUtil.java   |    732 +-
 .../storage/test/ChildTestConfiguration.java    |      5 +-
 .../storage/test/TestConfiguration.java         |      5 +-
 .../cloudstack/storage/test/VolumeTest.java     |     13 +-
 plugins/user-authenticators/ldap/pom.xml        |     37 +-
 .../cloudstack/api/command/LDAPConfigCmd.java   |    277 +
 .../cloudstack/api/command/LDAPRemoveCmd.java   |     77 +
 .../api/command/LdapAddConfigurationCmd.java    |    121 +-
 .../api/command/LdapCreateAccountCmd.java       |    232 +-
 .../api/command/LdapDeleteConfigurationCmd.java |     70 +-
 .../api/command/LdapImportUsersCmd.java         |    224 +-
 .../api/command/LdapListConfigurationCmd.java   |    142 +-
 .../api/command/LdapListUsersCmd.java           |    161 +-
 .../api/command/LdapUserSearchCmd.java          |    118 +-
 .../api/response/LDAPConfigResponse.java        |    115 +
 .../api/response/LDAPRemoveResponse.java        |     30 +
 .../api/response/LdapConfigurationResponse.java |     77 +-
 .../api/response/LdapUserResponse.java          |     44 +-
 .../cloudstack/ldap/LdapAuthenticator.java      |     63 +-
 .../cloudstack/ldap/LdapConfiguration.java      |    234 +-
 .../cloudstack/ldap/LdapConfigurationVO.java    |     54 +-
 .../cloudstack/ldap/LdapContextFactory.java     |    197 +-
 .../org/apache/cloudstack/ldap/LdapManager.java |     25 +-
 .../apache/cloudstack/ldap/LdapManagerImpl.java |    387 +-
 .../org/apache/cloudstack/ldap/LdapUser.java    |     94 +-
 .../apache/cloudstack/ldap/LdapUserManager.java |    214 +-
 .../org/apache/cloudstack/ldap/LdapUtils.java   |     71 +-
 .../ldap/NoLdapUserMatchingQueryException.java  |     18 +-
 .../ldap/NoSuchLdapUserException.java           |     18 +-
 .../ldap/dao/LdapConfigurationDao.java          |      8 +-
 .../ldap/dao/LdapConfigurationDaoImpl.java      |     66 +-
 .../ldap/LdapImportUsersCmdSpec.groovy          |    289 +-
 plugins/user-authenticators/md5/pom.xml         |      2 +-
 .../cloud/server/auth/MD5UserAuthenticator.java |     64 +-
 plugins/user-authenticators/plain-text/pom.xml  |      2 +-
 .../server/auth/PlainTextUserAuthenticator.java |     36 +-
 .../user-authenticators/sha256salted/pom.xml    |      2 +-
 .../auth/SHA256SaltedUserAuthenticator.java     |      5 +-
 .../server/auth/test/AuthenticatorTest.java     |     24 +-
 pom.xml                                         |     94 +-
 quickcloud/pom.xml                              |      2 +-
 .../storage/secondary/cloud-install-sys-tmplt   |      8 +-
 scripts/storage/secondary/createtmplt.sh        |      4 +-
 scripts/storage/secondary/createvolume.sh       |     23 +-
 scripts/vm/hypervisor/xenserver/cloudlog        |     37 +
 .../xenserver/copy_vhd_from_secondarystorage.sh |      2 +-
 .../xenserver/copy_vhd_to_secondarystorage.sh   |      5 +-
 .../create_privatetemplate_from_snapshot.sh     |      2 +-
 scripts/vm/hypervisor/xenserver/hostvmstats.py  |     19 +-
 scripts/vm/hypervisor/xenserver/launch_hb.sh    |      4 +-
 scripts/vm/hypervisor/xenserver/ovs-pvlan       |     16 +-
 scripts/vm/hypervisor/xenserver/ovstunnel       |     65 +-
 scripts/vm/hypervisor/xenserver/perfmon.py      |    261 +
 scripts/vm/hypervisor/xenserver/s3xen           |      6 +-
 .../xenserver/setup_heartbeat_file.sh           |      2 +-
 .../vm/hypervisor/xenserver/setupxenserver.sh   |      2 +-
 scripts/vm/hypervisor/xenserver/storagePlugin   |     10 +-
 scripts/vm/hypervisor/xenserver/swiftxen        |     14 +-
 .../vm/hypervisor/xenserver/upgrade_snapshot.sh |      2 +-
 scripts/vm/hypervisor/xenserver/vmops           |    304 +-
 scripts/vm/hypervisor/xenserver/vmopsSnapshot   |    135 +-
 scripts/vm/hypervisor/xenserver/vmopspremium    |     40 +-
 .../xcposs/copy_vhd_from_secondarystorage.sh    |    188 -
 .../xcposs/copy_vhd_to_secondarystorage.sh      |    130 -
 .../create_privatetemplate_from_snapshot.sh     |    138 -
 scripts/vm/hypervisor/xenserver/xcposs/patch    |     73 +-
 scripts/vm/hypervisor/xenserver/xcposs/vmops    |   1493 -
 .../hypervisor/xenserver/xcposs/vmopsSnapshot   |    601 -
 .../vm/hypervisor/xenserver/xcposs/vmopspremium |    146 -
 scripts/vm/hypervisor/xenserver/xcpserver/patch |     63 +-
 scripts/vm/hypervisor/xenserver/xenheartbeat.sh |      2 +-
 .../vm/hypervisor/xenserver/xenserver56/patch   |     63 +-
 .../hypervisor/xenserver/xenserver56fp1/patch   |     63 +-
 .../vm/hypervisor/xenserver/xenserver60/patch   |     69 +-
 .../xenserver/xenserver62/cloud-plugin-storage  |    301 +
 .../vm/hypervisor/xenserver/xenserver62/patch   |     74 +
 scripts/vm/network/vnet/cloudstack_pluginlib.py |    219 +
 scripts/vm/network/vnet/ovstunnel.py            |    229 +
 server/pom.xml                                  |     53 +-
 .../spring-server-core-managers-context.xml     |     25 +-
 .../src/com/cloud/account/SecurityManager.java  |      1 -
 .../cloud/acl/AffinityGroupAccessChecker.java   |     21 +-
 server/src/com/cloud/acl/DomainChecker.java     |    198 +-
 .../allocator/impl/FirstFitAllocator.java       |     28 +-
 .../impl/FirstFitRoutingAllocator.java          |      8 +-
 .../allocator/impl/RecreateHostAllocator.java   |     94 +-
 .../allocator/impl/TestingAllocator.java        |     17 +-
 .../impl/UserConcentratedAllocator.java         |     41 +-
 .../manager/authn/AgentAuthnException.java      |      2 +-
 .../agent/manager/authn/AgentAuthorizer.java    |      3 +-
 .../authn/impl/BasicAgentAuthManager.java       |     21 +-
 .../src/com/cloud/alert/AlertManagerImpl.java   |    470 +-
 .../com/cloud/alert/ClusterAlertAdapter.java    |     25 +-
 .../cloud/alert/ConsoleProxyAlertAdapter.java   |    219 +-
 .../alert/SecondaryStorageVmAlertAdapter.java   |    285 +-
 .../com/cloud/api/ApiAsyncJobDispatcher.java    |     25 +-
 server/src/com/cloud/api/ApiDBUtils.java        |   1345 +-
 server/src/com/cloud/api/ApiDispatcher.java     |    310 +-
 server/src/com/cloud/api/ApiGsonHelper.java     |      5 +-
 .../com/cloud/api/ApiResponseGsonHelper.java    |      1 +
 server/src/com/cloud/api/ApiResponseHelper.java |    352 +-
 .../src/com/cloud/api/ApiSerializerHelper.java  |      4 +-
 server/src/com/cloud/api/ApiServer.java         |    204 +-
 server/src/com/cloud/api/ApiServerService.java  |      8 +-
 server/src/com/cloud/api/ApiServlet.java        |     95 +-
 .../com/cloud/api/EncodedStringTypeAdapter.java |      7 +-
 .../cloud/api/ResponseObjectTypeAdapter.java    |     17 +-
 .../src/com/cloud/api/SerializationContext.java |     20 +-
 .../src/com/cloud/api/StringMapTypeAdapter.java |     10 +-
 server/src/com/cloud/api/doc/Alert.java         |      4 +-
 .../src/com/cloud/api/doc/ApiXmlDocReader.java  |      7 +-
 .../src/com/cloud/api/doc/ApiXmlDocWriter.java  |    221 +-
 server/src/com/cloud/api/doc/Argument.java      |    117 +-
 server/src/com/cloud/api/doc/Command.java       |    153 +-
 .../com/cloud/api/query/QueryManagerImpl.java   |    311 +-
 .../com/cloud/api/query/ViewResponseHelper.java |     77 +-
 .../cloud/api/query/dao/AccountJoinDaoImpl.java |     13 +-
 .../api/query/dao/AffinityGroupJoinDao.java     |      3 +-
 .../api/query/dao/AffinityGroupJoinDaoImpl.java |     10 +-
 .../api/query/dao/AsyncJobJoinDaoImpl.java      |     17 +-
 .../api/query/dao/DataCenterJoinDaoImpl.java    |     13 +-
 .../api/query/dao/DiskOfferingJoinDao.java      |      1 +
 .../api/query/dao/DiskOfferingJoinDaoImpl.java  |      9 +-
 .../api/query/dao/DomainRouterJoinDaoImpl.java  |     35 +-
 .../com/cloud/api/query/dao/HostJoinDao.java    |      3 +-
 .../cloud/api/query/dao/HostJoinDaoImpl.java    |     53 +-
 .../cloud/api/query/dao/ImageStoreJoinDao.java  |      1 +
 .../api/query/dao/ImageStoreJoinDaoImpl.java    |     37 +-
 .../api/query/dao/InstanceGroupJoinDao.java     |      1 -
 .../api/query/dao/InstanceGroupJoinDaoImpl.java |     18 +-
 .../api/query/dao/ProjectAccountJoinDao.java    |      1 -
 .../query/dao/ProjectAccountJoinDaoImpl.java    |     12 +-
 .../query/dao/ProjectInvitationJoinDaoImpl.java |     10 +-
 .../cloud/api/query/dao/ProjectJoinDaoImpl.java |     24 +-
 .../cloud/api/query/dao/ResourceTagJoinDao.java |      4 +-
 .../api/query/dao/ResourceTagJoinDaoImpl.java   |     25 +-
 .../api/query/dao/SecurityGroupJoinDao.java     |      1 -
 .../api/query/dao/SecurityGroupJoinDaoImpl.java |     22 +-
 .../query/dao/ServiceOfferingJoinDaoImpl.java   |     16 +-
 .../cloud/api/query/dao/StoragePoolJoinDao.java |     10 +-
 .../api/query/dao/StoragePoolJoinDaoImpl.java   |     11 +-
 .../cloud/api/query/dao/TemplateJoinDao.java    |      7 +-
 .../api/query/dao/TemplateJoinDaoImpl.java      |     83 +-
 .../api/query/dao/UserAccountJoinDaoImpl.java   |     24 +-
 .../cloud/api/query/dao/UserVmJoinDaoImpl.java  |     59 +-
 .../cloud/api/query/dao/VolumeJoinDaoImpl.java  |     48 +-
 .../com/cloud/api/query/vo/AccountJoinVO.java   |     98 +-
 .../cloud/api/query/vo/AffinityGroupJoinVO.java |     21 +-
 .../com/cloud/api/query/vo/AsyncJobJoinVO.java  |     47 +-
 .../src/com/cloud/api/query/vo/BaseViewVO.java  |      4 +-
 .../api/query/vo/ControlledViewEntity.java      |      1 -
 .../cloud/api/query/vo/DataCenterJoinVO.java    |     50 +-
 .../cloud/api/query/vo/DiskOfferingJoinVO.java  |     71 +-
 .../cloud/api/query/vo/DomainRouterJoinVO.java  |    115 +-
 .../src/com/cloud/api/query/vo/EventJoinVO.java |     52 +-
 .../src/com/cloud/api/query/vo/HostJoinVO.java  |     99 +-
 .../cloud/api/query/vo/ImageStoreJoinVO.java    |     24 +-
 .../cloud/api/query/vo/InstanceGroupJoinVO.java |     34 +-
 .../api/query/vo/ProjectAccountJoinVO.java      |     30 +-
 .../api/query/vo/ProjectInvitationJoinVO.java   |     29 +-
 .../com/cloud/api/query/vo/ProjectJoinVO.java   |     54 +-
 .../cloud/api/query/vo/ResourceTagJoinVO.java   |     42 +-
 .../cloud/api/query/vo/SecurityGroupJoinVO.java |     58 +-
 .../api/query/vo/ServiceOfferingJoinVO.java     |     89 +-
 .../cloud/api/query/vo/StoragePoolJoinVO.java   |     62 +-
 .../com/cloud/api/query/vo/TemplateJoinVO.java  |    151 +-
 .../cloud/api/query/vo/UserAccountJoinVO.java   |     56 +-
 .../com/cloud/api/query/vo/UserVmJoinVO.java    |    219 +-
 .../com/cloud/api/query/vo/VolumeJoinVO.java    |    269 +-
 .../api/response/ApiResponseSerializer.java     |     81 +-
 .../response/EmptyFieldExclusionStrategy.java   |      5 +-
 .../api/response/SecurityGroupResultObject.java |     13 +-
 .../response/SecurityGroupRuleResultObject.java |     29 +-
 server/src/com/cloud/async/AsyncJobResult.java  |    156 +-
 .../com/cloud/capacity/CapacityManagerImpl.java |    523 +-
 .../cloud/capacity/ComputeCapacityListener.java |     32 +-
 .../cloud/capacity/StorageCapacityListener.java |     36 +-
 server/src/com/cloud/configuration/Config.java  |   2208 +-
 .../configuration/ConfigurationManagerImpl.java |   1046 +-
 .../src/com/cloud/configuration/ZoneConfig.java |     45 +-
 .../AgentBasedConsoleProxyManager.java          |     38 +-
 ...AgentBasedStandaloneConsoleProxyManager.java |    111 +-
 .../src/com/cloud/consoleproxy/AgentHook.java   |      4 +-
 .../com/cloud/consoleproxy/AgentHookBase.java   |    116 +-
 .../ConsoleProxyAlertEventArgs.java             |     87 +-
 .../ConsoleProxyBalanceAllocator.java           |      2 +-
 .../consoleproxy/ConsoleProxyListener.java      |     14 +-
 .../ConsoleProxyManagementState.java            |      6 +-
 .../cloud/consoleproxy/ConsoleProxyManager.java |     43 +-
 .../consoleproxy/ConsoleProxyManagerImpl.java   |    213 +-
 .../consoleproxy/StaticConsoleProxyManager.java |     22 +-
 .../src/com/cloud/dc/DedicatedResourceVO.java   |     32 +-
 .../com/cloud/dc/dao/DedicatedResourceDao.java  |      1 -
 .../cloud/dc/dao/DedicatedResourceDaoImpl.java  |     41 +-
 .../deploy/DeploymentPlanningManagerImpl.java   |    429 +-
 .../src/com/cloud/deploy/FirstFitPlanner.java   |    247 +-
 .../cloud/deploy/PlannerHostReservationVO.java  |     20 +-
 .../deploy/dao/PlannerHostReservationDao.java   |     60 +-
 .../dao/PlannerHostReservationDaoImpl.java      |    123 +-
 .../com/cloud/event/ActionEventInterceptor.java |    152 +-
 .../src/com/cloud/event/ActionEventUtils.java   |    132 +-
 server/src/com/cloud/event/AlertGenerator.java  |     65 +-
 .../com/cloud/event/dao/EventJoinDaoImpl.java   |     22 +-
 .../com/cloud/ha/AbstractInvestigatorImpl.java  |     27 +-
 .../com/cloud/ha/CheckOnAgentInvestigator.java  |     56 +-
 server/src/com/cloud/ha/HaWorkVO.java           |    125 +-
 .../ha/HighAvailabilityManagerExtImpl.java      |     52 +-
 .../cloud/ha/HighAvailabilityManagerImpl.java   |    180 +-
 server/src/com/cloud/ha/KVMFencer.java          |    129 +-
 .../ha/ManagementIPSystemVMInvestigator.java    |     14 +-
 server/src/com/cloud/ha/RecreatableFencer.java  |     12 +-
 .../com/cloud/ha/UserVmDomRInvestigator.java    |     32 +-
 .../src/com/cloud/ha/XenServerInvestigator.java |     19 +-
 .../com/cloud/ha/dao/HighAvailabilityDao.java   |     20 +-
 .../cloud/ha/dao/HighAvailabilityDaoImpl.java   |      4 +-
 .../hypervisor/CloudZonesStartupProcessor.java  |    414 +-
 .../cloud/hypervisor/HypervisorGuruBase.java    |     43 +-
 .../hypervisor/HypervisorGuruManagerImpl.java   |     22 +-
 server/src/com/cloud/hypervisor/KVMGuru.java    |     45 +-
 server/src/com/cloud/hypervisor/LXCGuru.java    |      5 +-
 .../kvm/discoverer/KvmDummyResourceBase.java    |    168 +-
 .../kvm/discoverer/KvmServerDiscoverer.java     |     11 +-
 .../kvm/discoverer/LibvirtServerDiscoverer.java |     27 +-
 .../kvm/discoverer/LxcServerDiscoverer.java     |     10 +-
 .../src/com/cloud/keystore/KeystoreManager.java |     29 -
 .../com/cloud/keystore/KeystoreManagerImpl.java |    164 -
 .../metadata/ResourceMetaDataManagerImpl.java   |    119 +-
 .../network/ExternalDeviceUsageManager.java     |      3 +-
 .../network/ExternalDeviceUsageManagerImpl.java |     53 +-
 .../network/ExternalFirewallDeviceManager.java  |     10 +-
 .../ExternalFirewallDeviceManagerImpl.java      |    161 +-
 .../network/ExternalIpAddressAllocator.java     |     14 +-
 .../ExternalLoadBalancerDeviceManager.java      |     24 +-
 .../ExternalLoadBalancerDeviceManagerImpl.java  |    193 +-
 .../ExternalNetworkDeviceManagerImpl.java       |     94 +-
 .../src/com/cloud/network/IpAddrAllocator.java  |     77 +-
 .../com/cloud/network/IpAddressManagerImpl.java |    225 +-
 .../com/cloud/network/Ipv6AddressManager.java   |      2 +-
 .../cloud/network/Ipv6AddressManagerImpl.java   |    172 +-
 .../src/com/cloud/network/NetworkModelImpl.java |    960 +-
 .../com/cloud/network/NetworkServiceImpl.java   |    898 +-
 .../com/cloud/network/NetworkUsageManager.java  |      3 +-
 .../cloud/network/NetworkUsageManagerImpl.java  |    181 +-
 .../cloud/network/PortProfileManagerImpl.java   |    116 +-
 .../com/cloud/network/SshKeysDistriMonitor.java |    153 +-
 .../cloud/network/StorageNetworkManager.java    |     16 +-
 .../network/StorageNetworkManagerImpl.java      |     20 +-
 .../com/cloud/network/as/AutoScaleManager.java  |      4 +
 .../cloud/network/as/AutoScaleManagerImpl.java  |    385 +-
 .../element/CloudZonesNetworkElement.java       |     47 +-
 .../network/element/SecurityGroupElement.java   |     31 +-
 .../network/element/VirtualRouterElement.java   |    529 +-
 .../element/VpcVirtualRouterElement.java        |    163 +-
 .../network/firewall/FirewallManagerImpl.java   |    190 +-
 .../cloud/network/guru/ControlNetworkGuru.java  |     44 +-
 .../cloud/network/guru/DirectNetworkGuru.java   |     77 +-
 .../network/guru/DirectPodBasedNetworkGuru.java |     24 +-
 .../network/guru/ExternalGuestNetworkGuru.java  |     90 +-
 .../cloud/network/guru/GuestNetworkGuru.java    |     90 +-
 .../cloud/network/guru/PodBasedNetworkGuru.java |     86 +-
 .../cloud/network/guru/PrivateNetworkGuru.java  |     47 +-
 .../cloud/network/guru/PublicNetworkGuru.java   |     31 +-
 .../cloud/network/guru/StorageNetworkGuru.java  |    268 +-
 .../cloud/network/lb/LBHealthCheckManager.java  |      1 -
 .../network/lb/LBHealthCheckManagerImpl.java    |      1 +
 .../lb/LoadBalancingRulesManagerImpl.java       |    589 +-
 .../router/VirtualNetworkApplianceManager.java  |     82 +-
 .../VirtualNetworkApplianceManagerImpl.java     |   1695 +-
 .../VpcVirtualNetworkApplianceManager.java      |     44 +-
 .../VpcVirtualNetworkApplianceManagerImpl.java  |    609 +-
 .../cloud/network/rules/RulesManagerImpl.java   |    195 +-
 .../com/cloud/network/rules/StaticNatImpl.java  |      6 +-
 .../security/LocalSecurityGroupWorkQueue.java   |     53 +-
 .../cloud/network/security/RuleUpdateLog.java   |      5 +-
 .../network/security/SecurityGroupListener.java |     53 +-
 .../network/security/SecurityGroupManager.java  |     41 +-
 .../security/SecurityGroupManagerImpl.java      |    193 +-
 .../security/SecurityGroupManagerImpl2.java     |     90 +-
 .../security/SecurityGroupManagerMBean.java     |     22 +-
 .../security/SecurityGroupWorkQueue.java        |     15 +-
 .../security/SecurityGroupWorkTracker.java      |     48 +-
 .../security/SecurityManagerMBeanImpl.java      |     47 +-
 .../network/vpc/NetworkACLManagerImpl.java      |    126 +-
 .../network/vpc/NetworkACLServiceImpl.java      |    301 +-
 .../network/vpc/PrivateGatewayProfile.java      |      3 +-
 .../com/cloud/network/vpc/PrivateIpAddress.java |      8 +-
 .../com/cloud/network/vpc/VpcManagerImpl.java   |    542 +-
 .../network/vpn/RemoteAccessVpnManagerImpl.java |    203 +-
 .../cloud/network/vpn/Site2SiteVpnManager.java  |      7 +-
 .../network/vpn/Site2SiteVpnManagerImpl.java    |     96 +-
 .../com/cloud/projects/ProjectManagerImpl.java  |    157 +-
 .../src/com/cloud/resource/DiscovererBase.java  |     28 +-
 .../com/cloud/resource/DummyHostDiscoverer.java |     44 +-
 .../cloud/resource/DummyHostServerResource.java |    235 +-
 .../com/cloud/resource/ResourceManagerImpl.java |    162 +-
 .../resourcelimit/ResourceLimitManagerImpl.java |    163 +-
 .../PremiumSecondaryStorageManagerImpl.java     |    200 +-
 .../com/cloud/server/ConfigurationServer.java   |      4 +-
 .../cloud/server/ConfigurationServerImpl.java   |    398 +-
 server/src/com/cloud/server/Criteria.java       |    186 +-
 .../com/cloud/server/LockMasterListener.java    |      2 +-
 .../src/com/cloud/server/ManagementServer.java  |     27 +-
 .../com/cloud/server/ManagementServerImpl.java  |    455 +-
 server/src/com/cloud/server/StatsCollector.java |    905 +-
 .../api/response/BaremetalTemplateResponse.java |      7 +-
 .../api/response/NwDeviceDhcpResponse.java      |     84 +-
 .../api/response/NwDevicePxeServerResponse.java |     76 +-
 .../server/api/response/PxePingResponse.java    |     62 +-
 .../netapp/AssociateLunCmdResponse.java         |     46 +-
 .../response/netapp/CreateLunCmdResponse.java   |     76 +-
 .../netapp/CreateVolumeOnFilerCmdResponse.java  |      2 +-
 .../netapp/CreateVolumePoolCmdResponse.java     |      2 +-
 .../response/netapp/DeleteLUNCmdResponse.java   |      2 +-
 .../netapp/DeleteVolumePoolCmdResponse.java     |      2 +-
 .../netapp/DissociateLunCmdResponse.java        |      2 +-
 .../response/netapp/ListLunsCmdResponse.java    |     85 +-
 .../netapp/ListVolumePoolsCmdResponse.java      |     65 +-
 .../netapp/ListVolumesOnFilerCmdResponse.java   |    171 +-
 .../server/auth/DefaultUserAuthenticator.java   |      4 +-
 .../cloud/server/auth/UserAuthenticator.java    |     32 +-
 .../com/cloud/servlet/CloudStartupServlet.java  |     43 +-
 .../cloud/servlet/ConsoleProxyClientParam.java  |    178 +-
 .../ConsoleProxyPasswordBasedEncryptor.java     |    305 +-
 .../com/cloud/servlet/ConsoleProxyServlet.java  |    186 +-
 .../cloud/servlet/RegisterCompleteServlet.java  |     41 +-
 .../cloud/storage/CreateSnapshotPayload.java    |     29 +-
 .../cloud/storage/LocalStoragePoolListener.java |     27 +-
 server/src/com/cloud/storage/OCFS2Manager.java  |      3 +-
 .../src/com/cloud/storage/OCFS2ManagerImpl.java |     32 +-
 .../cloud/storage/RegisterVolumePayload.java    |      8 +-
 .../com/cloud/storage/ResizeVolumePayload.java  |     21 +-
 .../src/com/cloud/storage/StorageManager.java   |     66 +-
 .../com/cloud/storage/StorageManagerImpl.java   |    329 +-
 .../cloud/storage/StoragePoolAutomation.java    |      1 +
 .../storage/StoragePoolAutomationImpl.java      |    103 +-
 .../src/com/cloud/storage/TemplateProfile.java  |    461 +-
 .../com/cloud/storage/VmWorkAttachVolume.java   |     40 +
 .../com/cloud/storage/VmWorkDetachVolume.java   |     34 +
 .../com/cloud/storage/VmWorkMigrateVolume.java  |     46 +
 .../com/cloud/storage/VmWorkResizeVolume.java   |     61 +
 .../cloud/storage/VmWorkTakeVolumeSnapshot.java |     54 +
 .../com/cloud/storage/VolumeApiServiceImpl.java |    835 +-
 .../download/DownloadAbandonedState.java        |     41 +-
 .../storage/download/DownloadActiveState.java   |    156 +-
 .../storage/download/DownloadCompleteState.java |     18 +-
 .../storage/download/DownloadErrorState.java    |    115 +-
 .../download/DownloadInProgressState.java       |     33 +-
 .../storage/download/DownloadInactiveState.java |     60 +-
 .../storage/download/DownloadListener.java      |    529 +-
 .../cloud/storage/download/DownloadMonitor.java |      5 +-
 .../storage/download/DownloadMonitorImpl.java   |     28 +-
 .../cloud/storage/download/DownloadState.java   |    112 +-
 .../storage/download/NotDownloadedState.java    |     35 +-
 .../storage/listener/SnapshotStateListener.java |     37 +-
 .../storage/listener/StoragePoolMonitor.java    |     14 +-
 .../storage/listener/StorageSyncListener.java   |     24 +-
 .../storage/listener/VolumeStateListener.java   |     39 +-
 .../storage/monitor/StorageHostMonitor.java     |      2 +-
 .../resource/DummySecondaryStorageResource.java |     97 +-
 .../secondary/SecStorageVmAlertEventArgs.java   |     90 +-
 .../secondary/SecondaryStorageListener.java     |     39 +-
 .../secondary/SecondaryStorageManagerImpl.java  |    248 +-
 .../secondary/SecondaryStorageVmAllocator.java  |      2 +-
 .../SecondaryStorageVmDefaultAllocator.java     |     13 +-
 .../secondary/SecondaryStorageVmManager.java    |     43 +-
 .../cloud/storage/snapshot/SnapshotManager.java |     20 +-
 .../storage/snapshot/SnapshotManagerImpl.java   |    319 +-
 .../storage/snapshot/SnapshotScheduler.java     |     14 +-
 .../storage/snapshot/SnapshotSchedulerImpl.java |    212 +-
 .../cloud/storage/upload/NotUploadedState.java  |     28 +-
 .../storage/upload/UploadAbandonedState.java    |     34 +-
 .../cloud/storage/upload/UploadActiveState.java |    158 +-
 .../storage/upload/UploadCompleteState.java     |     35 +-
 .../cloud/storage/upload/UploadErrorState.java  |    108 +-
 .../storage/upload/UploadInProgressState.java   |     26 +-
 .../storage/upload/UploadInactiveState.java     |     47 +-
 .../cloud/storage/upload/UploadListener.java    |     30 +-
 .../com/cloud/storage/upload/UploadMonitor.java |     23 +-
 .../cloud/storage/upload/UploadMonitorImpl.java |    321 +-
 .../com/cloud/storage/upload/UploadState.java   |    113 +-
 .../cloud/tags/TaggedResourceManagerImpl.java   |    311 +-
 .../template/HypervisorTemplateAdapter.java     |    181 +-
 .../src/com/cloud/template/TemplateAdapter.java |     56 +-
 .../com/cloud/template/TemplateAdapterBase.java |    132 +-
 .../com/cloud/template/TemplateManagerImpl.java |    233 +-
 server/src/com/cloud/test/DatabaseConfig.java   |    141 +-
 server/src/com/cloud/test/IPRangeConfig.java    |     79 +-
 server/src/com/cloud/test/PodZoneConfig.java    |    203 +-
 .../src/com/cloud/usage/UsageServiceImpl.java   |     75 +-
 server/src/com/cloud/user/AccountManager.java   |     65 +-
 .../src/com/cloud/user/AccountManagerImpl.java  |    166 +-
 server/src/com/cloud/user/DomainManager.java    |      8 +-
 .../src/com/cloud/user/DomainManagerImpl.java   |     52 +-
 .../cloud/uuididentity/IdentityServiceImpl.java |     46 -
 .../src/com/cloud/uuididentity/UUIDManager.java |     37 +
 .../com/cloud/uuididentity/UUIDManagerImpl.java |    100 +
 .../com/cloud/uuididentity/dao/IdentityDao.java |     35 -
 .../cloud/uuididentity/dao/IdentityDaoImpl.java |    247 -
 .../com/cloud/uuididentity/dao/IdentityVO.java  |     25 -
 .../com/cloud/vm/SystemVmLoadScanHandler.java   |     30 +-
 .../src/com/cloud/vm/SystemVmLoadScanner.java   |     39 +-
 server/src/com/cloud/vm/UserVmManager.java      |     41 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java  |   2045 +-
 .../src/com/cloud/vm/UserVmStateListener.java   |    101 +-
 .../vm/snapshot/VMSnapshotManagerImpl.java      |    637 +-
 .../vm/snapshot/VmWorkCreateVMSnapshot.java     |     41 +
 .../vm/snapshot/VmWorkDeleteAllVMSnapshots.java |     35 +
 .../vm/snapshot/VmWorkDeleteVMSnapshot.java     |     35 +
 .../vm/snapshot/VmWorkRevertToVMSnapshot.java   |     35 +
 .../affinity/AffinityGroupServiceImpl.java      |    117 +-
 .../lb/ApplicationLoadBalancerManagerImpl.java  |    171 +-
 .../cloudstack/network/lb/CertServiceImpl.java  |    502 +
 .../apache/cloudstack/region/RegionAccount.java |    408 +-
 .../apache/cloudstack/region/RegionDomain.java  |     50 +-
 .../apache/cloudstack/region/RegionManager.java |      9 +-
 .../cloudstack/region/RegionManagerImpl.java    |    107 +-
 .../cloudstack/region/RegionServiceImpl.java    |     55 +-
 .../apache/cloudstack/region/RegionUser.java    |     68 +-
 .../cloudstack/region/RegionsApiUtil.java       |     38 +-
 .../GlobalLoadBalancingRulesServiceImpl.java    |    176 +-
 .../region/gslb/GslbServiceProvider.java        |      6 +-
 server/test/async-job-component.xml             |    371 +-
 .../com/cloud/alert/AlertControlsUnitTest.java  |     14 +-
 .../com/cloud/alert/MockAlertManagerImpl.java   |     10 +-
 server/test/com/cloud/api/APITest.java          |     27 +-
 .../test/com/cloud/api/ApiDispatcherTest.java   |     26 +-
 server/test/com/cloud/api/ListPerfTest.java     |     30 +-
 server/test/com/cloud/api/LoginResponse.java    |      5 +-
 .../com/cloud/capacity/CapacityManagerTest.java |     67 +-
 .../configuration/ConfigurationManagerTest.java |     92 +-
 .../configuration/ValidateIpRangeTest.java      |     35 +-
 .../com/cloud/event/EventControlsUnitTest.java  |     19 +-
 server/test/com/cloud/ha/KVMFencerTest.java     |     51 +-
 .../test/com/cloud/keystore/KeystoreTest.java   |    236 +-
 .../metadata/ResourceMetaDataManagerTest.java   |     24 +-
 .../cloud/network/CreatePrivateNetworkTest.java |     92 +-
 .../network/DedicateGuestVlanRangesTest.java    |     59 +-
 .../cloud/network/MockFirewallManagerImpl.java  |    260 +-
 .../com/cloud/network/MockNetworkModelImpl.java |     82 +-
 .../NetworkManagerTestComponentLibrary.java     |      5 -
 .../com/cloud/network/NetworkModelTest.java     |     17 +-
 .../network/UpdatePhysicalNetworkTest.java      |     44 +-
 .../com/cloud/network/dao/NetworkDaoTest.java   |     13 +-
 .../network/firewall/FirewallManagerTest.java   |     37 +-
 .../security/SecurityGroupManagerImpl2Test.java |      5 +-
 .../security/SecurityGroupManagerImplTest.java  |     21 +-
 .../SecurityGroupManagerTestConfiguration.java  |     57 +-
 .../security/SecurityGroupQueueTest.java        |    130 +-
 .../vpn/MockRemoteAccessVPNServiceProvider.java |     73 +-
 .../cloud/network/vpn/RemoteAccessVpnTest.java  |     83 +-
 .../cloud/projects/MockProjectManagerImpl.java  |     40 +-
 .../cloud/resource/MockResourceManagerImpl.java |     42 +-
 .../ResourceLimitManagerImplTest.java           |     25 +-
 .../server/ConfigurationServerImplTest.java     |      6 +-
 .../com/cloud/snapshot/SnapshotDaoTest.java     |     13 +-
 .../snapshot/SnapshotDaoTestConfiguration.java  |     23 +-
 .../cloud/storage/dao/StoragePoolDaoTest.java   |      8 +-
 .../dao/StoragePoolDaoTestConfiguration.java    |     14 +-
 .../com/cloud/user/MockAccountManagerImpl.java  |     21 +-
 .../com/cloud/user/MockDomainManagerImpl.java   |     25 +-
 .../vm/DeploymentPlanningManagerImplTest.java   |    751 +-
 server/test/com/cloud/vm/UserVmManagerTest.java |    159 +-
 .../vm/dao/UserVmCloneSettingDaoImplTest.java   |      7 +-
 .../UserVmCloneSettingDaoTestConfiguration.java |     11 +-
 .../com/cloud/vm/dao/UserVmDaoImplTest.java     |     13 +-
 .../vm/dao/UserVmDaoTestConfiguration.java      |     11 +-
 .../vm/snapshot/VMSnapshotManagerTest.java      |    132 +-
 .../cloud/vpc/MockConfigurationManagerImpl.java |     59 +-
 .../com/cloud/vpc/MockNetworkManagerImpl.java   |    460 +-
 .../com/cloud/vpc/MockNetworkModelImpl.java     |     80 +-
 .../cloud/vpc/MockResourceLimitManagerImpl.java |     23 +-
 .../cloud/vpc/MockSite2SiteVpnManagerImpl.java  |      6 +-
 .../MockVpcVirtualNetworkApplianceManager.java  |    157 +-
 .../com/cloud/vpc/NetworkACLManagerTest.java    |    126 +-
 .../com/cloud/vpc/NetworkACLServiceTest.java    |     76 +-
 server/test/com/cloud/vpc/Site2SiteVpnTest.java |      8 +-
 server/test/com/cloud/vpc/VpcApiUnitTest.java   |     26 +-
 .../com/cloud/vpc/VpcTestConfiguration.java     |     88 +-
 .../cloud/vpc/dao/MockConfigurationDaoImpl.java |      8 +-
 .../com/cloud/vpc/dao/MockNetworkDaoImpl.java   |     24 +-
 .../vpc/dao/MockNetworkOfferingDaoImpl.java     |     49 +-
 .../MockNetworkOfferingServiceMapDaoImpl.java   |      6 +-
 .../vpc/dao/MockNetworkServiceMapDaoImpl.java   |      4 +-
 .../test/com/cloud/vpc/dao/MockVpcDaoImpl.java  |     25 +-
 .../cloud/vpc/dao/MockVpcOfferingDaoImpl.java   |      4 +-
 .../dao/MockVpcOfferingServiceMapDaoImpl.java   |      6 +-
 .../vpc/dao/MockVpcVirtualRouterElement.java    |      4 +-
 .../affinity/AffinityApiUnitTest.java           |    549 +-
 .../lb/ApplicationLoadBalancerTest.java         |    380 -
 .../network/lb/ApplicationLoadBalancerTest.java |    385 +
 .../cloudstack/network/lb/CertServiceTest.java  |    759 +
 .../networkoffering/ChildTestConfiguration.java |     89 +-
 .../CreateNetworkOfferingTest.java              |    134 +-
 .../privategw/AclOnPrivateGwTest.java           |    158 +-
 .../cloudstack/region/RegionManagerTest.java    |     25 +-
 ...GlobalLoadBalancingRulesServiceImplTest.java |    107 +-
 .../service/ServiceOfferingVOTest.java          |     49 +
 .../SecurityGroupManagerTestContext.xml         |     20 +-
 .../test/resources/SnapshotDaoTestContext.xml   |     20 +-
 .../resources/StoragePoolDaoTestContext.xml     |     20 +-
 server/test/resources/certs/bad_format_cert.crt |      1 +
 server/test/resources/certs/dsa_self_signed.crt |     26 +
 server/test/resources/certs/dsa_self_signed.key |     20 +
 server/test/resources/certs/expired_cert.crt    |     20 +
 server/test/resources/certs/non_x509_pem.crt    |     17 +
 server/test/resources/certs/root_chain.crt      |     22 +
 server/test/resources/certs/rsa_ca_signed.crt   |     23 +
 server/test/resources/certs/rsa_ca_signed.key   |     30 +
 server/test/resources/certs/rsa_ca_signed2.crt  |     23 +
 server/test/resources/certs/rsa_ca_signed2.key  |     30 +
 server/test/resources/certs/rsa_random_pkey.key |     28 +
 server/test/resources/certs/rsa_self_signed.crt |     19 +
 server/test/resources/certs/rsa_self_signed.key |     27 +
 .../certs/rsa_self_signed_with_pwd.crt          |     19 +
 .../certs/rsa_self_signed_with_pwd.key          |     30 +
 server/test/resources/createNetworkOffering.xml |      4 +-
 server/test/resources/network-mgr-component.xml |      1 -
 .../console-proxy-rdp/rdpconsole/README.txt     |     60 +
 services/console-proxy-rdp/rdpconsole/pom.xml   |     77 +
 .../console-proxy-rdp/rdpconsole/rdp-config.bat |     42 +
 .../src/main/java/common/AwtKeyEventSource.java |     53 +
 .../main/java/common/AwtMouseEventSource.java   |     71 +
 .../src/main/java/common/BitmapOrder.java       |     47 +
 .../src/main/java/common/BitmapRectangle.java   |     74 +
 .../main/java/common/BufferedImageCanvas.java   |     79 +
 .../common/BufferedImageCopyRectAdapter.java    |    124 +
 .../java/common/BufferedImagePixelsAdapter.java |    148 +
 .../rdpconsole/src/main/java/common/Client.java |    375 +
 .../src/main/java/common/CopyRectOrder.java     |     38 +
 .../src/main/java/common/KeyOrder.java          |     44 +
 .../src/main/java/common/MouseOrder.java        |     42 +
 .../src/main/java/common/OrderType.java         |     22 +
 .../src/main/java/common/ScreenDescription.java |    168 +
 .../main/java/common/SizeChangeListener.java    |     22 +
 .../java/common/adapter/AwtBellAdapter.java     |     77 +
 .../java/common/adapter/AwtCanvasAdapter.java   |    171 +
 .../common/adapter/AwtClipboardAdapter.java     |     57 +
 .../src/main/java/common/asn1/Any.java          |     78 +
 .../main/java/common/asn1/Asn1Constants.java    |     83 +
 .../src/main/java/common/asn1/Asn1Integer.java  |    116 +
 .../src/main/java/common/asn1/BerType.java      |     40 +
 .../src/main/java/common/asn1/BitString.java    |     67 +
 .../src/main/java/common/asn1/ObjectID.java     |     67 +
 .../src/main/java/common/asn1/OctetString.java  |     80 +
 .../src/main/java/common/asn1/Sequence.java     |    143 +
 .../src/main/java/common/asn1/SequenceOf.java   |     82 +
 .../src/main/java/common/asn1/Tag.java          |    462 +
 .../main/java/common/opt/IncrementalOption.java |     28 +
 .../src/main/java/common/opt/IntOption.java     |     41 +
 .../opt/NoArgumentForOptionException.java       |     26 +
 .../src/main/java/common/opt/Option.java        |    102 +
 .../src/main/java/common/opt/OptionParser.java  |    147 +
 .../common/opt/OptionRequiredException.java     |     26 +
 .../main/java/common/opt/StringArrayOption.java |     38 +
 .../common/opt/StringEnumerationOption.java     |     72 +
 .../src/main/java/common/opt/StringOption.java  |     41 +
 .../java/common/opt/UnknownOptionException.java |     27 +
 .../src/main/java/rdpclient/RdpClient.java      |    393 +
 .../adapter/AwtRdpKeyboardAdapter.java          |    350 +
 .../rdpclient/adapter/AwtRdpMouseAdapter.java   |    179 +
 .../rdpclient/clip/ClipboardDataFormat.java     |    143 +
 .../java/rdpclient/clip/ClipboardState.java     |     70 +
 .../clip/ServerClipRdrChannelRouter.java        |    193 +
 .../clip/ServerClipboardCapabilitiesPDU.java    |    180 +
 .../clip/ServerFormatDataResponsePDU.java       |     97 +
 .../rdpclient/clip/ServerFormatListPDU.java     |    237 +
 .../rdpclient/clip/ServerMonitorReadyPDU.java   |     85 +
 .../rdpclient/debug/ClientPacketSniffer.java    |     51 +
 .../java/rdpclient/debug/PacketSniffer.java     |     75 +
 .../rdpclient/debug/ServerPacketSniffer.java    |     49 +
 .../hyperv/ClientPreConnectionBlob.java         |    121 +
 .../ntlmssp/ClientNtlmsspNegotiate.java         |    177 +
 .../ntlmssp/ClientNtlmsspPubKeyAuth.java        |    680 +
 .../ntlmssp/ClientNtlmsspUserCredentials.java   |    128 +
 .../java/rdpclient/ntlmssp/CryptoAlgos.java     |    361 +
 .../main/java/rdpclient/ntlmssp/NegoFlags.java  |    492 +
 .../java/rdpclient/ntlmssp/NtlmCompute.java     |     24 +
 .../java/rdpclient/ntlmssp/NtlmConstants.java   |    157 +
 .../main/java/rdpclient/ntlmssp/NtlmState.java  |    887 +
 .../main/java/rdpclient/ntlmssp/SecBuffer.java  |     21 +
 .../ntlmssp/ServerNtlmsspChallenge.java         |    293 +
 .../ntlmssp/ServerNtlmsspPubKeyPlus1.java       |    125 +
 .../ntlmssp/asn1/AlgorithmIdentifier.java       |     40 +
 .../java/rdpclient/ntlmssp/asn1/NegoData.java   |     64 +
 .../java/rdpclient/ntlmssp/asn1/NegoItem.java   |     73 +
 .../ntlmssp/asn1/SubjectPublicKeyInfo.java      |     35 +
 .../rdpclient/ntlmssp/asn1/TSCredentials.java   |     62 +
 .../rdpclient/ntlmssp/asn1/TSCspDataDetail.java |     98 +
 .../rdpclient/ntlmssp/asn1/TSPasswordCreds.java |     76 +
 .../java/rdpclient/ntlmssp/asn1/TSRequest.java  |    201 +
 .../ntlmssp/asn1/TSSmartCardCreds.java          |     90 +
 .../java/rdpclient/ntlmssp/package-info.java    |     71 +
 .../rdpclient/rdp/ClientConfirmActivePDU.java   |   1131 +
 .../java/rdpclient/rdp/ClientFastPathPDU.java   |     55 +
 .../main/java/rdpclient/rdp/ClientInfoPDU.java  |    456 +
 .../rdp/ClientMCSAttachUserRequest.java         |    103 +
 ...lJoinRequestServerMCSChannelConfirmPDUs.java |    223 +
 .../rdpclient/rdp/ClientMCSConnectInitial.java  |    696 +
 .../rdp/ClientMCSErectDomainRequest.java        |    189 +
 .../rdpclient/rdp/ClientSynchronizePDU.java     |    248 +
 .../src/main/java/rdpclient/rdp/ClientTpkt.java |     54 +
 .../rdp/ClientX224ConnectionRequestPDU.java     |    162 +
 .../java/rdpclient/rdp/ClientX224DataPDU.java   |     52 +
 .../rdpclient/rdp/RLEBitmapDecompression.java   |   1014 +
 .../main/java/rdpclient/rdp/RdpConstants.java   |     91 +
 .../src/main/java/rdpclient/rdp/RdpState.java   |     33 +
 .../java/rdpclient/rdp/ServerBitmapUpdate.java  |    199 +
 .../rdp/ServerControlPDUCooperate.java          |    117 +
 .../rdp/ServerControlPDUGrantedControl.java     |    114 +
 .../rdpclient/rdp/ServerDemandActivePDU.java    |    660 +
 .../main/java/rdpclient/rdp/ServerFastPath.java |    315 +
 .../rdpclient/rdp/ServerIOChannelRouter.java    |    534 +
 .../rdp/ServerLicenseErrorPDUValidClient.java   |    121 +
 .../rdp/ServerMCSAttachUserConfirmPDU.java      |    116 +
 .../rdp/ServerMCSChannelJoinConfirmPDU.java     |     89 +
 .../rdpclient/rdp/ServerMCSConnectResponse.java |    283 +
 .../main/java/rdpclient/rdp/ServerMCSPDU.java   |    149 +
 .../java/rdpclient/rdp/ServerPaletteUpdate.java |     77 +
 .../rdpclient/rdp/ServerSynchronizePDU.java     |    115 +
 .../src/main/java/rdpclient/rdp/ServerTpkt.java |     70 +
 .../rdp/ServerX224ConnectionConfirmPDU.java     |    234 +
 .../java/rdpclient/rdp/ServerX224DataPdu.java   |     64 +
 .../src/main/java/streamer/BaseElement.java     |    421 +
 .../src/main/java/streamer/BufferPool.java      |     36 +
 .../src/main/java/streamer/ByteBuffer.java      |   1123 +
 .../src/main/java/streamer/DataSink.java        |     24 +
 .../src/main/java/streamer/DataSource.java      |     60 +
 .../src/main/java/streamer/Direction.java       |     21 +
 .../src/main/java/streamer/Element.java         |    120 +
 .../src/main/java/streamer/Event.java           |     33 +
 .../main/java/streamer/InputStreamSource.java   |    196 +
 .../rdpconsole/src/main/java/streamer/Link.java |     66 +
 .../src/main/java/streamer/OneTimeSwitch.java   |    136 +
 .../src/main/java/streamer/Order.java           |     23 +
 .../main/java/streamer/OutputStreamSink.java    |    155 +
 .../src/main/java/streamer/Pipeline.java        |     93 +
 .../src/main/java/streamer/PipelineImpl.java    |    340 +
 .../src/main/java/streamer/Queue.java           |    138 +
 .../src/main/java/streamer/SocketWrapper.java   |     35 +
 .../main/java/streamer/SocketWrapperImpl.java   |    249 +
 .../src/main/java/streamer/SyncLink.java        |    416 +
 .../main/java/streamer/apr/AprSocketSink.java   |    129 +
 .../main/java/streamer/apr/AprSocketSource.java |    171 +
 .../java/streamer/apr/AprSocketWrapperImpl.java |    281 +
 .../java/streamer/bco/BcoSocketWrapperImpl.java |    119 +
 .../streamer/debug/AssertingByteBuffer.java     |    109 +
 .../src/main/java/streamer/debug/Dumper.java    |     28 +
 .../src/main/java/streamer/debug/FakeSink.java  |     77 +
 .../main/java/streamer/debug/FakeSource.java    |    138 +
 .../main/java/streamer/debug/MockServer.java    |    203 +
 .../src/main/java/streamer/debug/MockSink.java  |    154 +
 .../main/java/streamer/debug/MockSource.java    |     95 +
 .../src/main/java/streamer/ssl/SSLState.java    |     26 +
 .../streamer/ssl/TrustAllX509TrustManager.java  |     52 +
 .../java/streamer/ssl/UpgradeSocketToSSL.java   |     44 +
 .../src/main/java/vncclient/VncClient.java      |    116 +
 .../adapter/AwtVncKeyboardAdapter.java          |    369 +
 .../vncclient/adapter/AwtVncMouseAdapter.java   |     71 +
 .../java/vncclient/vnc/EncodingsMessage.java    |     63 +
 .../vncclient/vnc/FrameBufferUpdateRequest.java |    126 +
 .../vnc/RGB888LE32PixelFormatRequest.java       |     89 +
 .../main/java/vncclient/vnc/RfbConstants.java   |     85 +
 .../java/vncclient/vnc/Vnc33Authentication.java |    292 +
 .../src/main/java/vncclient/vnc/Vnc33Hello.java |    116 +
 .../main/java/vncclient/vnc/VncInitializer.java |    245 +
 .../java/vncclient/vnc/VncMessageHandler.java   |    420 +
 .../src/main/resources/jaas_ntlm_config.txt     |     21 +
 .../rdpconsole/src/test/doc/README.txt          |     34 +
 .../rdpconsole/src/test/doc/dev-rdp-config.bat  |    139 +
 .../src/test/doc/freerdp-debug-log.txt          |    772 +
 .../rdpconsole/src/test/doc/rdp-key.pem         |     23 +
 .../rdpconsole/src/test/doc/rdp.pfx             |    Bin 0 -> 2572 bytes
 .../src/test/java/rdpclient/MockServerTest.java |    190 +
 services/console-proxy/plugin/pom.xml           |      2 +-
 services/console-proxy/pom.xml                  |      2 +-
 services/console-proxy/server/pom.xml           |      2 +-
 .../cloud/consoleproxy/AjaxFIFOImageCache.java  |     24 +-
 .../consoleproxy/AuthenticationException.java   |     10 +-
 .../com/cloud/consoleproxy/ConsoleProxy.java    |    271 +-
 .../consoleproxy/ConsoleProxyAjaxHandler.java   |    295 +-
 .../ConsoleProxyAjaxImageHandler.java           |     71 +-
 .../ConsoleProxyAuthenticationResult.java       |      2 +-
 .../ConsoleProxyBaseServerFactoryImpl.java      |     15 +-
 .../cloud/consoleproxy/ConsoleProxyClient.java  |     20 +-
 .../consoleproxy/ConsoleProxyClientBase.java    |    323 +-
 .../ConsoleProxyClientListener.java             |      2 +
 .../consoleproxy/ConsoleProxyClientParam.java   |     30 +-
 .../ConsoleProxyClientStatsCollector.java       |     22 +-
 .../consoleproxy/ConsoleProxyCmdHandler.java    |     15 +-
 .../consoleproxy/ConsoleProxyGCThread.java      |     59 +-
 .../ConsoleProxyHttpHandlerHelper.java          |     56 +-
 .../consoleproxy/ConsoleProxyLoggerFactory.java |     44 +-
 .../cloud/consoleproxy/ConsoleProxyMonitor.java |     67 +-
 .../ConsoleProxyPasswordBasedEncryptor.java     |    308 +-
 .../ConsoleProxyResourceHandler.java            |     83 +-
 .../ConsoleProxySecureServerFactoryImpl.java    |     64 +-
 .../consoleproxy/ConsoleProxyServerFactory.java |      2 +
 .../ConsoleProxyThumbnailHandler.java           |     54 +-
 .../consoleproxy/ConsoleProxyVncClient.java     |    144 +-
 .../com/cloud/consoleproxy/InputEventType.java  |     53 +-
 .../consoleproxy/util/ITileScanListener.java    |      1 +
 .../cloud/consoleproxy/util/ImageHelper.java    |      2 +-
 .../src/com/cloud/consoleproxy/util/Logger.java |    142 +-
 .../com/cloud/consoleproxy/util/RawHTTP.java    |     51 +-
 .../src/com/cloud/consoleproxy/util/Region.java |     34 +-
 .../consoleproxy/util/RegionClassifier.java     |     20 +-
 .../com/cloud/consoleproxy/util/TileInfo.java   |     12 +-
 .../cloud/consoleproxy/util/TileTracker.java    |    180 +-
 .../cloud/consoleproxy/vnc/RfbConstants.java    |      6 +-
 .../com/cloud/consoleproxy/vnc/VncClient.java   |     79 +-
 .../consoleproxy/vnc/VncClientPacketSender.java |    141 +-
 .../consoleproxy/vnc/VncScreenDescription.java  |     12 +-
 .../vnc/VncServerPacketReceiver.java            |     48 +-
 .../client/FramebufferUpdateRequestPacket.java  |      2 +-
 .../vnc/packet/client/SetPixelFormatPacket.java |      4 +-
 .../packet/server/FramebufferUpdatePacket.java  |     44 +-
 .../consoleproxy/vnc/packet/server/RawRect.java |     31 +-
 services/iam/plugin/pom.xml                     |      2 +-
 .../acl/RoleBasedAPIAccessChecker.java          |      6 +-
 .../acl/RoleBasedEntityAccessChecker.java       |      6 +-
 .../cloudstack/acl/AclApiServiceTest.java       |      2 +-
 services/iam/pom.xml                            |      2 +-
 services/iam/server/pom.xml                     |      2 +-
 .../cloudstack/iam/server/AclGroupVO.java       |      8 +-
 .../cloudstack/iam/server/AclPolicyVO.java      |      8 +-
 .../cloudstack/iam/server/IAMServiceImpl.java   |      8 +-
 .../cloudstack/iam/IAMServiceUnitTest.java      |     26 +-
 services/pom.xml                                |      3 +-
 services/secondary-storage/pom.xml              |      2 +-
 .../LocalNfsSecondaryStorageResource.java       |     36 +-
 .../resource/LocalSecondaryStorageResource.java |     68 +-
 .../resource/NfsSecondaryStorageResource.java   |    427 +-
 .../resource/SecondaryStorageDiscoverer.java    |    116 +-
 .../resource/SecondaryStorageResource.java      |      4 +-
 .../SecondaryStorageResourceHandler.java        |      2 +-
 .../storage/template/DownloadManager.java       |    124 +-
 .../storage/template/DownloadManagerImpl.java   |    296 +-
 .../storage/template/UploadManager.java         |     81 +-
 .../storage/template/UploadManagerImpl.java     |    280 +-
 .../LocalNfsSecondaryStorageResourceTest.java   |     14 +-
 .../NfsSecondaryStorageResourceTest.java        |     40 +-
 setup/bindir/cloud-setup-databases.in           |      7 +-
 setup/db/create-schema.sql                      |     10 +-
 setup/db/db/schema-40to410.sql                  |     14 +
 setup/db/db/schema-410to420.sql                 |     31 +-
 setup/db/db/schema-420to421.sql                 |     28 +-
 setup/db/db/schema-421to430.sql                 |    546 +-
 setup/db/db/schema-430to440-cleanup.sql         |     22 +
 setup/db/db/schema-430to440.sql                 |    544 +
 setup/db/hypervisor_capabilities.simulator.sql  |     19 +
 setup/db/templates.sql                          |      7 +-
 setup/dev/advanced.cfg                          |     10 +-
 setup/dev/advancedsg.cfg                        |     14 +-
 setup/dev/basic.cfg                             |     10 +-
 systemvm/js/ajaxviewer.js                       |     10 +-
 .../debian/config/etc/init.d/cloud-early-config |     16 +-
 .../config/opt/cloud/bin/monitor_service.sh     |     71 +
 systemvm/patches/debian/config/root/firewall.sh |      3 +-
 .../debian/config/root/monitorServices.py       |    384 +
 .../debian/vpn/opt/cloud/bin/vpn_l2tp.sh        |     36 +-
 systemvm/pom.xml                                |      5 +-
 systemvm/scripts/ssvm-check.sh                  |     20 +-
 .../component/cpu_limits/test_cpu_limits.py     |    745 -
 .../component/cpu_limits/test_domain_limits.py  |    764 -
 .../component/cpu_limits/test_maximum_limits.py |    377 -
 .../component/cpu_limits/test_project_limits.py |    347 -
 .../maint/test_egress_rules_host_maintenance.py |      2 +-
 .../component/maint/test_high_availability.py   |      2 +-
 .../maint/test_vpc_host_maintenance.py          |      2 +-
 .../memory_limits/test_domain_limits.py         |    781 -
 .../memory_limits/test_maximum_limits.py        |    352 -
 .../memory_limits/test_memory_limits.py         |    764 -
 .../memory_limits/test_project_limits.py        |    350 -
 test/integration/component/test_accounts.py     |      2 +-
 .../component/test_add_remove_network.py        |   1785 +
 .../component/test_advancedsg_networks.py       |   3785 +-
 .../component/test_affinity_groups.py           |      2 +-
 test/integration/component/test_asa1000v_fw.py  |      2 +-
 test/integration/component/test_assign_vm.py    |      4 +-
 test/integration/component/test_baremetal.py    |      2 +-
 .../component/test_base_image_updation.py       |     20 +-
 test/integration/component/test_blocker_bugs.py |      6 +-
 .../component/test_cpu_domain_limits.py         |    764 +
 test/integration/component/test_cpu_limits.py   |    745 +
 .../component/test_cpu_max_limits.py            |    377 +
 .../component/test_cpu_project_limits.py        |    347 +
 .../component/test_custom_hostname.py           |    127 +-
 .../component/test_deploy_vm_userdata_reg.py    |      2 +-
 .../component/test_egress_fw_rules.py           |    202 +-
 test/integration/component/test_egress_rules.py |    145 +-
 test/integration/component/test_eip_elb.py      |     18 +-
 .../component/test_explicit_dedication.py       |      2 +-
 test/integration/component/test_haproxy.py      |     10 +-
 .../component/test_implicit_planner.py          |      2 +-
 test/integration/component/test_ldap.py         |      9 -
 .../integration/component/test_memory_limits.py |    764 +
 .../component/test_mm_domain_limits.py          |    780 +
 .../integration/component/test_mm_max_limits.py |    352 +
 .../component/test_mm_project_limits.py         |    350 +
 .../component/test_netscaler_configs.py         |     16 +-
 test/integration/component/test_netscaler_lb.py |     56 +-
 .../component/test_netscaler_lb_algo.py         |     42 +-
 .../component/test_netscaler_lb_sticky.py       |     20 +-
 .../component/test_netscaler_nw_off.py          |      2 +-
 .../component/test_network_offering.py          |      1 -
 .../component/test_non_contiguous_vlan.py       |    199 +-
 test/integration/component/test_portable_ip.py  |     66 +-
 .../component/test_project_configs.py           |      2 +-
 .../component/test_project_limits.py            |     28 +-
 .../component/test_project_resources.py         |     84 +-
 .../integration/component/test_project_usage.py |      2 +-
 test/integration/component/test_projects.py     |      2 +-
 .../component/test_reset_ssh_keypair.py         |      2 +-
 .../component/test_resource_limits.py           |     91 +-
 test/integration/component/test_routers.py      |     41 +-
 .../component/test_security_groups.py           |     15 +-
 .../component/test_shared_networks.py           |     94 +-
 .../component/test_snapshot_limits.py           |      1 -
 test/integration/component/test_snapshots.py    |    179 +-
 .../component/test_snapshots_improvement.py     |      7 +-
 test/integration/component/test_stopped_vm.py   |      5 +-
 .../component/test_storage_motion.py            |      1 -
 test/integration/component/test_templates.py    |      6 +-
 test/integration/component/test_usage.py        |      2 +-
 .../component/test_vm_passwdenabled.py          |      2 +-
 test/integration/component/test_vmware_drs.py   |    713 +
 test/integration/component/test_vpc_network.py  |    168 +-
 .../component/test_vpc_network_lbrules.py       |      5 +-
 .../component/test_vpc_network_pfrules.py       |     33 +-
 .../component/test_vpc_network_staticnatrule.py |     35 +-
 .../integration/component/test_vpc_offerings.py |     14 +-
 test/integration/component/test_vpc_routers.py  |      1 -
 .../component/test_vpc_vm_life_cycle.py         |   1148 +-
 .../component/test_vpc_vms_deployment.py        |    307 +-
 test/integration/component/test_vpn_users.py    |      4 +-
 test/integration/smoke/test_affinity_groups.py  |      2 +-
 .../smoke/test_deploy_vm_with_userdata.py       |      7 +-
 ...deploy_vms_with_varied_deploymentplanners.py |      4 +-
 test/integration/smoke/test_guest_vlan_range.py |     53 +-
 test/integration/smoke/test_loadbalance.py      |      4 +-
 test/integration/smoke/test_network.py          |     10 +-
 test/integration/smoke/test_nic.py              |      2 +-
 test/integration/smoke/test_pvlan.py            |      2 +-
 test/integration/smoke/test_resource_detail.py  |      2 +-
 test/integration/smoke/test_routers.py          |      2 +-
 .../integration/smoke/test_service_offerings.py |     19 +-
 test/integration/smoke/test_ssvm.py             |      2 +-
 test/integration/smoke/test_templates.py        |      2 +-
 test/integration/smoke/test_volumes.py          |      6 +-
 test/pom.xml                                    |      2 +-
 .../com/cloud/sample/UserCloudAPIExecutor.java  |     20 +-
 .../cloud/test/longrun/BuildGuestNetwork.java   |    195 +-
 .../com/cloud/test/longrun/GuestNetwork.java    |    107 +
 .../cloud/test/longrun/PerformanceWithAPI.java  |    325 +-
 test/src/com/cloud/test/longrun/User.java       |    378 +-
 .../com/cloud/test/longrun/VirtualMachine.java  |    147 +-
 .../com/cloud/test/longrun/guestNetwork.java    |    107 -
 .../com/cloud/test/regression/ApiCommand.java   |    185 +-
 .../com/cloud/test/regression/ConfigTest.java   |    198 +-
 .../test/regression/DelegatedAdminTest.java     |    203 +-
 test/src/com/cloud/test/regression/Deploy.java  |    159 +-
 .../cloud/test/regression/EventsApiTest.java    |    294 +-
 test/src/com/cloud/test/regression/HA.java      |    104 +-
 .../test/regression/LoadBalancingTest.java      |    229 +-
 .../test/regression/PortForwardingTest.java     |    231 +-
 .../com/cloud/test/regression/SanityTest.java   |    124 +-
 test/src/com/cloud/test/regression/Test.java    |    114 +-
 .../src/com/cloud/test/regression/TestCase.java |    204 +-
 .../cloud/test/regression/TestCaseEngine.java   |    483 +-
 .../com/cloud/test/regression/VMApiTest.java    |    128 +-
 test/src/com/cloud/test/stress/SshTest.java     |     26 +-
 .../test/stress/StressTestDirectAttach.java     |    800 +-
 .../cloud/test/stress/TestClientWithAPI.java    |    536 +-
 test/src/com/cloud/test/stress/WgetTest.java    |    247 +-
 .../cloud/test/ui/AbstractSeleniumTestCase.java |     49 +-
 .../src/com/cloud/test/ui/AddAndDeleteAISO.java |    170 +-
 .../cloud/test/ui/AddAndDeleteATemplate.java    |    171 +-
 test/src/com/cloud/test/ui/UIScenarioTest.java  |    106 +-
 test/src/com/cloud/test/utils/ConsoleProxy.java |    152 +-
 .../com/cloud/test/utils/IpSqlGenerator.java    |    126 +-
 .../src/com/cloud/test/utils/ProxyLoadTemp.java |    163 +-
 test/src/com/cloud/test/utils/SignEC2.java      |    223 +-
 test/src/com/cloud/test/utils/SignRequest.java  |    168 +-
 .../com/cloud/test/utils/SqlDataGenerator.java  |     46 +-
 test/src/com/cloud/test/utils/SubmitCert.java   |     79 +-
 test/src/com/cloud/test/utils/TestClient.java   |    690 +-
 test/src/com/cloud/test/utils/UtilsForTest.java |     73 +-
 tools/apidoc/XmlToHtmlConverter.java            |    219 +-
 tools/apidoc/gen_toc.py                         |      6 +-
 tools/apidoc/pom.xml                            |      4 +-
 tools/appliance/build.sh                        |      8 +-
 tools/appliance/convert/Convert.class           |    Bin 0 -> 984 bytes
 tools/appliance/convert/Convert.java            |     34 +
 tools/appliance/convert_ovf_vbox_to_esx.xslt    |     42 +
 .../systemvm64template/postinstall.sh           |     24 +-
 .../definitions/systemvmtemplate/postinstall.sh |      6 +-
 tools/build/build_asf.sh                        |      9 +-
 tools/checkstyle/pom.xml                        |     43 +
 .../src/main/resources/cloud-style.xml          |     55 +
 tools/devcloud-kvm/pom.xml                      |      2 +-
 tools/devcloud/devcloud.cfg                     |     12 +-
 tools/devcloud/pom.xml                          |      2 +-
 tools/marvin/marvin/TestCaseExecuteEngine.py    |    102 -
 tools/marvin/marvin/asyncJobMgr.py              |      2 +-
 tools/marvin/marvin/cloudstackConnection.py     |     68 +-
 tools/marvin/marvin/cloudstackTestCase.py       |     14 +
 tools/marvin/marvin/cloudstackTestClient.py     |     24 +-
 tools/marvin/marvin/codes.py                    |      7 +
 tools/marvin/marvin/config/config.cfg           |    159 +
 tools/marvin/marvin/config/setup.cfg            |     10 +-
 tools/marvin/marvin/configGenerator.py          |     58 +-
 tools/marvin/marvin/deployAndRun.py             |    191 +-
 tools/marvin/marvin/deployDataCenter.py         |     58 +-
 tools/marvin/marvin/integration/lib/base.py     |     29 +-
 tools/marvin/marvin/integration/lib/common.py   |    196 +-
 tools/marvin/marvin/integration/lib/utils.py    |    201 +-
 tools/marvin/marvin/marvinInit.py               |    169 +
 tools/marvin/marvin/marvinLog.py                |     73 +
 tools/marvin/marvin/marvinPlugin.py             |    212 +-
 tools/marvin/marvin/misc/build/CI.md            |    178 +
 tools/marvin/marvin/misc/build/README.md        |     67 +
 tools/marvin/marvin/misc/build/advanced_env.py  |    210 +
 tools/marvin/marvin/misc/build/asf_test.cfg     |    180 +
 tools/marvin/marvin/misc/build/bashUtils.py     |    148 +
 .../marvin/marvin/misc/build/buildGenerator.py  |    170 +
 tools/marvin/marvin/misc/build/configure.py     |    411 +
 tools/marvin/marvin/misc/build/hudson.sh        |     90 +
 tools/marvin/marvin/misc/build/kvm.cfg          |    243 +
 tools/marvin/marvin/misc/build/kvm.properties   |     86 +
 tools/marvin/marvin/misc/build/openport.py      |     32 +
 tools/marvin/marvin/misc/build/redeploy.sh      |    127 +
 tools/marvin/marvin/misc/build/restartMgmt.py   |     53 +
 .../marvin/marvin/misc/build/system.properties  |     42 +
 .../marvin/misc/build/testSetupSuccess.py       |     81 +
 tools/marvin/marvin/misc/build/vm-start.sh      |     56 +
 tools/marvin/marvin/misc/build/vm-uninstall.sh  |     44 +
 tools/marvin/marvin/misc/build/xen.cfg          |    243 +
 tools/marvin/marvin/misc/build/xen.properties   |     86 +
 tools/marvin/marvin/misc/build/xunitmp/setup.py |     47 +
 .../misc/build/xunitmp/xunitmultiprocess.py     |    290 +
 tools/marvin/marvin/remoteSSHClient.py          |    108 -
 tools/marvin/marvin/sandbox/demo/__init__.py    |     17 +
 .../marvin/marvin/sandbox/demo/live/__init__.py |     17 +
 .../marvin/sandbox/demo/live/testSshDeployVM.py |      4 +-
 .../demo/simulator/testcase/libs/common.py      |      4 +-
 .../demo/simulator/testcase/libs/utils.py       |     13 +-
 .../simulator/testcase/test_vm_life_cycle.py    |      2 +-
 tools/marvin/marvin/sshClient.py                |    182 +
 tools/marvin/marvin/tcExecuteEngine.py          |     71 +
 tools/marvin/pom.xml                            |     16 +-
 tools/marvin/setup.py                           |      3 +-
 tools/pom.xml                                   |      2 +-
 tools/transifex/.tx/config                      |     16 +
 ui/css/cloudstack3.css                          |    251 +-
 ui/css/cloudstack3.ja.css                       |     20 +-
 ui/dictionary.jsp                               |     32 +-
 ui/images/infrastructure-icons.png              |    Bin 40266 -> 62257 bytes
 ui/index.jsp                                    |     10 +-
 .../vnmcNetworkProvider/vnmcNetworkProvider.js  |      3 -
 ui/scripts/accounts.js                          |    207 +-
 ui/scripts/accountsWizard.js                    |     69 +-
 ui/scripts/affinity.js                          |      3 +-
 ui/scripts/cloudStack.js                        |     10 +-
 ui/scripts/configuration.js                     |     53 +-
 ui/scripts/docs.js                              |     90 +-
 ui/scripts/domains.js                           |     23 +
 ui/scripts/events.js                            |      3 +-
 ui/scripts/globalSettings.js                    |     33 +-
 ui/scripts/instanceWizard.js                    |    147 +-
 ui/scripts/instances.js                         |    131 +-
 ui/scripts/network.js                           |    154 +-
 ui/scripts/regions.js                           |     50 +-
 ui/scripts/sharedFunctions.js                   |     58 +-
 ui/scripts/storage.js                           |     89 +-
 ui/scripts/system.js                            |  12094 +-
 ui/scripts/templates.js                         |     84 +-
 ui/scripts/ui-custom/accountsWizard.js          |    116 +-
 ui/scripts/ui-custom/enableStaticNAT.js         |      2 +
 ui/scripts/ui-custom/zoneWizard.js              |      8 +-
 ui/scripts/ui/dialog.js                         |      2 +-
 ui/scripts/ui/widgets/detailView.js             |     61 +-
 ui/scripts/ui/widgets/listView.js               |     44 +-
 ui/scripts/ui/widgets/multiEdit.js              |     21 +-
 ui/scripts/ui/widgets/tagger.js                 |      6 +-
 ui/scripts/vpc.js                               |     20 +-
 ui/scripts/zoneWizard.js                        |    745 +-
 ui/tests/index.html                             |     71 +-
 ui/tests/test.cloudBrowser.js                   |    116 -
 ui/tests/test.core.js                           |     79 -
 ui/tests/test.detailView.js                     |    799 -
 ui/tests/test.listView.js                       |    527 -
 ui/tests/test.multiEdit.js                      |     55 -
 ui/tests/test.notifications.js                  |    107 -
 ui/tests/test.widget.listView.js                |     89 +
 usage/pom.xml                                   |     60 +-
 .../com/cloud/usage/UsageAlertManagerImpl.java  |     71 +-
 usage/src/com/cloud/usage/UsageManager.java     |      2 +-
 usage/src/com/cloud/usage/UsageManagerImpl.java |    906 +-
 .../src/com/cloud/usage/UsageSanityChecker.java |    393 +-
 usage/src/com/cloud/usage/UsageServer.java      |     70 +-
 .../usage/parser/IPAddressUsageParser.java      |     56 +-
 .../usage/parser/LoadBalancerUsageParser.java   |     57 +-
 .../parser/NetworkOfferingUsageParser.java      |     65 +-
 .../cloud/usage/parser/NetworkUsageParser.java  |     70 +-
 .../usage/parser/PortForwardingUsageParser.java |     55 +-
 .../usage/parser/SecurityGroupUsageParser.java  |     52 +-
 .../cloud/usage/parser/StorageUsageParser.java  |     76 +-
 .../src/com/cloud/usage/parser/UsageParser.java |      8 +-
 .../usage/parser/VMInstanceUsageParser.java     |     65 +-
 .../usage/parser/VMSnapshotUsageParser.java     |     91 +-
 .../cloud/usage/parser/VPNUserUsageParser.java  |     58 +-
 .../cloud/usage/parser/VmDiskUsageParser.java   |     79 +-
 .../cloud/usage/parser/VolumeUsageParser.java   |     74 +-
 .../test/com/cloud/usage/UsageManagerTest.java  |     51 +-
 .../usage/UsageManagerTestConfiguration.java    |     85 +-
 .../com/cloud/usage/UsageSanityCheckerIT.java   |    159 +
 .../com/cloud/usage/UsageSanityCheckerTest.java |     68 +
 .../test/resources/UsageManagerTestContext.xml  |     20 +-
 usage/test/resources/cloud1.xml                 |     24 +
 usage/test/resources/cloud2.xml                 |     24 +
 usage/test/resources/cloud3.xml                 |     13 +
 usage/test/resources/cloud_usage1.xml           |     26 +
 usage/test/resources/cloud_usage2.xml           |     43 +
 usage/test/resources/cloud_usage3.xml           |     13 +
 utils/pom.xml                                   |      2 +-
 utils/src/com/cloud/maint/Version.java          |     38 +-
 utils/src/com/cloud/utils/ActionDelegate.java   |      4 +-
 .../com/cloud/utils/CloudResourceBundle.java    |     42 +-
 utils/src/com/cloud/utils/DateUtil.java         |    425 +-
 utils/src/com/cloud/utils/EnumUtils.java        |     26 +-
 utils/src/com/cloud/utils/FileUtil.java         |     23 +-
 utils/src/com/cloud/utils/IteratorUtil.java     |     65 +-
 utils/src/com/cloud/utils/Journal.java          |     22 +-
 utils/src/com/cloud/utils/LogUtils.java         |     32 +-
 utils/src/com/cloud/utils/MethodCapturer.java   |    151 +-
 utils/src/com/cloud/utils/NumbersUtil.java      |      2 +-
 utils/src/com/cloud/utils/Pair.java             |     33 +-
 .../src/com/cloud/utils/PasswordGenerator.java  |    139 +-
 utils/src/com/cloud/utils/Predicate.java        |      2 +-
 utils/src/com/cloud/utils/ProcessUtil.java      |    149 +-
 utils/src/com/cloud/utils/Profiler.java         |     85 +-
 utils/src/com/cloud/utils/PropertiesUtil.java   |     47 +-
 utils/src/com/cloud/utils/ReflectUtil.java      |     59 +-
 utils/src/com/cloud/utils/S3Utils.java          |    213 +-
 utils/src/com/cloud/utils/StringUtils.java      |     49 +-
 utils/src/com/cloud/utils/SwiftUtil.java        |     42 +-
 utils/src/com/cloud/utils/Ternary.java          |     78 +-
 utils/src/com/cloud/utils/UriUtils.java         |     82 +-
 .../cloud/utils/UsernamePasswordValidator.java  |     35 +-
 .../cloud/utils/backoff/BackoffAlgorithm.java   |      6 +-
 .../utils/backoff/impl/ConstantTimeBackoff.java |     13 +-
 .../backoff/impl/ConstantTimeBackoffMBean.java  |      6 +-
 .../utils/cisco/n1kv/vsm/NetconfHelper.java     |    172 +-
 .../cloud/utils/cisco/n1kv/vsm/VsmCommand.java  |    114 +-
 .../utils/cisco/n1kv/vsm/VsmOkResponse.java     |      3 +-
 .../cisco/n1kv/vsm/VsmPolicyMapResponse.java    |      7 +-
 .../cisco/n1kv/vsm/VsmPortProfileResponse.java  |     14 +-
 .../cloud/utils/cisco/n1kv/vsm/VsmResponse.java |     71 +-
 .../com/cloud/utils/component/AdapterBase.java  |      2 +-
 .../com/cloud/utils/component/AdapterList.java  |     20 +-
 .../cloud/utils/component/ComponentContext.java |      4 +-
 .../ComponentInstantiationPostProcessor.java    |    140 +-
 .../utils/component/ComponentLifecycle.java     |     33 +-
 .../component/ComponentMethodInterceptor.java   |      6 +-
 .../utils/component/ComponentNamingPolicy.java  |     27 +-
 .../src/com/cloud/utils/component/Manager.java  |      2 +-
 .../cloud/utils/component/PluggableService.java |      1 -
 .../utils/component/SystemIntegrityChecker.java |      6 +-
 .../utils/concurrency/NamedThreadFactory.java   |      2 +-
 .../com/cloud/utils/concurrency/Scheduler.java  |      5 +-
 .../utils/concurrency/SynchronizationEvent.java |    126 +-
 .../com/cloud/utils/concurrency/TestClock.java  |     18 +-
 .../com/cloud/utils/crypt/DBEncryptionUtil.java |     94 +-
 .../utils/crypt/EncryptionSecretKeyChecker.java |     38 +-
 .../utils/crypt/EncryptionSecretKeySender.java  |     10 +-
 utils/src/com/cloud/utils/crypt/RSAHelper.java  |     77 +-
 utils/src/com/cloud/utils/db/DbProperties.java  |     21 +-
 utils/src/com/cloud/utils/db/EntityManager.java |     10 +-
 .../com/cloud/utils/encoding/URLEncoder.java    |     30 +-
 utils/src/com/cloud/utils/events/EventArgs.java |     36 +-
 .../com/cloud/utils/events/SubscriptionMgr.java |    269 +-
 .../utils/exception/CSExceptionErrorCode.java   |      2 +-
 .../utils/exception/CloudRuntimeException.java  |     54 +-
 .../utils/exception/ExceptionProxyObject.java   |     16 +-
 .../cloud/utils/exception/ExceptionUtil.java    |     15 +-
 .../utils/exception/ExecutionException.java     |     27 +-
 .../cloud/utils/fsm/NoTransitionException.java  |      4 +-
 utils/src/com/cloud/utils/fsm/StateDao.java     |      5 +-
 .../src/com/cloud/utils/fsm/StateListener.java  |     38 +-
 utils/src/com/cloud/utils/fsm/StateMachine.java |     37 +-
 .../src/com/cloud/utils/fsm/StateMachine2.java  |     86 +-
 utils/src/com/cloud/utils/fsm/StateObject.java  |      6 +-
 .../cloud/utils/log/CglibThrowableRenderer.java |      6 +-
 utils/src/com/cloud/utils/mgmt/JmxUtil.java     |     68 +-
 .../utils/mgmt/PropertyMapDynamicBean.java      |    130 +-
 utils/src/com/cloud/utils/net/Ip.java           |     26 +-
 utils/src/com/cloud/utils/net/Ip4Address.java   |      2 +-
 utils/src/com/cloud/utils/net/MacAddress.java   |     47 +-
 utils/src/com/cloud/utils/net/NetUtils.java     |    117 +-
 utils/src/com/cloud/utils/net/NfsUtils.java     |      2 +-
 utils/src/com/cloud/utils/net/UrlUtil.java      |     18 +-
 .../src/com/cloud/utils/nio/HandlerFactory.java |      1 -
 utils/src/com/cloud/utils/nio/Link.java         |    130 +-
 utils/src/com/cloud/utils/nio/NioClient.java    |     46 +-
 .../src/com/cloud/utils/nio/NioConnection.java  |    100 +-
 utils/src/com/cloud/utils/nio/NioServer.java    |     14 +-
 utils/src/com/cloud/utils/nio/Task.java         |     38 +-
 .../com/cloud/utils/nio/TrustAllManager.java    |     27 +-
 .../cloud/utils/script/OutputInterpreter.java   |    110 +-
 utils/src/com/cloud/utils/script/Script.java    |     54 +-
 utils/src/com/cloud/utils/script/Script2.java   |     60 +-
 .../cloud/utils/security/CertificateHelper.java |     77 +-
 utils/src/com/cloud/utils/ssh/SSHCmdHelper.java |    260 +-
 .../src/com/cloud/utils/ssh/SSHKeysHelper.java  |    148 +-
 utils/src/com/cloud/utils/ssh/SshException.java |     27 +
 utils/src/com/cloud/utils/ssh/SshHelper.java    |    285 +-
 utils/src/com/cloud/utils/ssh/sshException.java |     26 -
 .../storage/encoding/DecodedDataObject.java     |     18 +-
 .../storage/encoding/DecodedDataStore.java      |     24 +-
 .../cloud/utils/storage/encoding/Decoder.java   |     27 +-
 .../com/cloud/utils/time/InaccurateClock.java   |      9 +-
 .../com/cloud/utils/xmlobject/XmlObject.java    |     11 +-
 .../cloud/utils/xmlobject/XmlObjectParser.java  |      2 +-
 .../utils/identity/ManagementServerNode.java    |     30 +-
 .../ssl/EasySSLProtocolSocketFactory.java       |     86 +-
 .../contrib/ssl/EasyX509TrustManager.java       |      7 +-
 utils/test/com/cloud/utils/DummyImpl.java       |      8 +-
 utils/test/com/cloud/utils/DummyInterface.java  |      2 +-
 .../test/com/cloud/utils/DummyPremiumImpl.java  |      8 +-
 utils/test/com/cloud/utils/NumbersUtilTest.java |     22 +-
 .../com/cloud/utils/PasswordGeneratorTest.java  |      4 +-
 .../com/cloud/utils/PropertiesUtilsTest.java    |      3 +-
 utils/test/com/cloud/utils/ReflectUtilTest.java |     31 +-
 utils/test/com/cloud/utils/ScriptTest.java      |      7 +-
 utils/test/com/cloud/utils/StringUtilsTest.java |     12 +-
 utils/test/com/cloud/utils/TernaryTest.java     |      9 +-
 .../backoff/impl/ConstantTimeBackoffTest.java   |      3 +-
 .../com/cloud/utils/crypto/RSAHelperTest.java   |     31 +-
 .../utils/exception/ExceptionUtilTest.java      |      6 +-
 .../test/com/cloud/utils/net/NetUtilsTest.java  |    149 +-
 .../com/cloud/utils/ssh/SSHKeysHelperTest.java  |     63 +-
 .../utils/testcase/Log4jEnabledTestCase.java    |     55 +-
 .../test/com/cloud/utils/testcase/NioTest.java  |     94 +-
 .../cloud/utils/xmlobject/TestXmlObject.java    |     28 +-
 .../cloud/utils/xmlobject/TestXmlObject2.java   |     10 +-
 vmware-base/pom.xml                             |      2 +-
 .../com/cloud/hypervisor/vmware/mo/BaseMO.java  |    184 +-
 .../cloud/hypervisor/vmware/mo/ClusterMO.java   |    999 +-
 .../vmware/mo/CustomFieldConstants.java         |      8 +-
 .../vmware/mo/CustomFieldsManagerMO.java        |    119 +-
 .../hypervisor/vmware/mo/DatacenterMO.java      |    743 +-
 .../hypervisor/vmware/mo/DatastoreFile.java     |    232 +-
 .../cloud/hypervisor/vmware/mo/DatastoreMO.java |    551 +-
 .../vmware/mo/DiskControllerType.java           |      3 +-
 .../vmware/mo/DistributedVirtualSwitchMO.java   |      5 +-
 .../vmware/mo/HostDatastoreBrowserMO.java       |    119 +-
 .../vmware/mo/HostDatastoreSystemMO.java        |    322 +-
 .../vmware/mo/HostFirewallSystemMO.java         |     45 +-
 .../com/cloud/hypervisor/vmware/mo/HostMO.java  |   1682 +-
 .../vmware/mo/HostNetworkSystemMO.java          |     76 +-
 .../vmware/mo/HostStorageSystemMO.java          |     50 +-
 .../vmware/mo/HostVirtualNicType.java           |      5 +-
 .../hypervisor/vmware/mo/HttpNfcLeaseMO.java    |    251 +-
 .../vmware/mo/HypervisorHostHelper.java         |    435 +-
 .../hypervisor/vmware/mo/LicenseManagerMO.java  |      3 +-
 .../hypervisor/vmware/mo/NetworkDetails.java    |     54 +-
 .../cloud/hypervisor/vmware/mo/NetworkMO.java   |      3 +-
 .../vmware/mo/PerfCounterInfoMapper.java        |     60 +-
 .../hypervisor/vmware/mo/PerfManagerMO.java     |     15 +-
 .../vmware/mo/SnapshotDescriptor.java           |    549 +-
 .../com/cloud/hypervisor/vmware/mo/TaskMO.java  |     41 +-
 .../vmware/mo/VersioningContants.java           |      8 +-
 .../vmware/mo/VirtualDiskManagerMO.java         |    137 +-
 .../vmware/mo/VirtualEthernetCardType.java      |      2 +-
 .../vmware/mo/VirtualMachineDiskInfo.java       |     36 +-
 .../mo/VirtualMachineDiskInfoBuilder.java       |    142 +-
 .../hypervisor/vmware/mo/VirtualMachineMO.java  |   4110 +-
 .../hypervisor/vmware/mo/VirtualSwitchType.java |      6 +-
 .../vmware/mo/VmdkFileDescriptor.java           |    251 +-
 .../hypervisor/vmware/mo/VmwareHostType.java    |      2 +-
 .../vmware/mo/VmwareHypervisorHost.java         |     90 +-
 .../mo/VmwareHypervisorHostNetworkSummary.java  |     60 +-
 .../mo/VmwareHypervisorHostResourceSummary.java |     69 +-
 .../hypervisor/vmware/util/VmwareClient.java    |    372 +-
 .../hypervisor/vmware/util/VmwareContext.java   |   1197 +-
 .../vmware/util/VmwareContextPool.java          |    339 +-
 .../vmware/util/VmwareGuestOsMapper.java        |    299 +-
 .../hypervisor/vmware/util/VmwareHelper.java    |   1011 +-
 .../vmware/mo/TestVmwareContextFactory.java     |     66 +-
 .../hypervisor/vmware/mo/VmwareMOTest.java      |     31 +-
 5529 files changed, 1028562 insertions(+), 1115198 deletions(-)
----------------------------------------------------------------------



Mime
View raw message