You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2013/02/01 20:38:12 UTC

[4/50] [abbrv] git commit: refs/heads/javelin - updated regions branch with changes from master

updated regions branch with changes from master


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

Branch: refs/heads/javelin
Commit: 4fcf64dd749e895fa382538fd0100f640271058d
Parents: 39d394a 81afcab
Author: Kishan Kavala <ki...@cloud.com>
Authored: Thu Sep 27 17:04:59 2012 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Thu Sep 27 17:04:59 2012 +0530

----------------------------------------------------------------------
 .../distro/ubuntu/SYSCONFDIR/init.d/cloud-agent.in |    9 +-
 agent/src/com/cloud/agent/Agent.java               |   30 +-
 agent/src/com/cloud/agent/AgentShell.java          | 1152 +-
 agent/src/com/cloud/agent/IAgentShell.java         |   32 +-
 .../configuration/AgentComponentLibraryBase.java   |   72 +-
 .../src/com/cloud/agent/dao/StorageComponent.java  |    4 +-
 .../cloud/agent/dao/impl/PropertiesStorage.java    |  156 +-
 .../src/com/cloud/agent/dhcp/DhcpPacketParser.java |  272 -
 .../cloud/agent/dhcp/DhcpProtocolParserServer.java |   58 +-
 agent/src/com/cloud/agent/dhcp/DhcpSnooper.java    |   12 +-
 .../src/com/cloud/agent/dhcp/DhcpSnooperImpl.java  |  324 -
 .../src/com/cloud/agent/dhcp/FakeDhcpSnooper.java  |  198 +-
 agent/src/com/cloud/agent/mockvm/MockVm.java       |   92 +-
 agent/src/com/cloud/agent/mockvm/MockVmMgr.java    |  582 +-
 agent/src/com/cloud/agent/mockvm/VmMgr.java        |   50 +-
 .../com/cloud/agent/resource/DummyResource.java    |  358 +-
 .../computing/CloudZonesComputingResource.java     |  293 -
 .../resource/computing/FakeComputingResource.java  | 1064 +-
 .../agent/resource/computing/KVMGuestOsMapper.java |  284 +-
 .../cloud/agent/resource/computing/KVMHABase.java  |  364 +-
 .../agent/resource/computing/KVMHAChecker.java     |   98 +-
 .../agent/resource/computing/KVMHAMonitor.java     |  182 +-
 .../resource/computing/LibvirtCapXMLParser.java    |  302 +-
 .../computing/LibvirtComputingResource.java        | 7724 +-
 .../resource/computing/LibvirtConnection.java      |   42 +-
 .../resource/computing/LibvirtDomainXMLParser.java |  408 +-
 .../resource/computing/LibvirtNetworkDef.java      |  338 +-
 .../resource/computing/LibvirtStoragePoolDef.java  |  120 +-
 .../computing/LibvirtStoragePoolXMLParser.java     |  154 +-
 .../computing/LibvirtStorageVolumeDef.java         |  126 +-
 .../computing/LibvirtStorageVolumeXMLParser.java   |  120 +-
 .../agent/resource/computing/LibvirtVMDef.java     | 1748 +-
 .../agent/resource/computing/LibvirtXMLParser.java |   66 +-
 .../ConsoleProxyAuthenticationResult.java          |   96 +-
 .../consoleproxy/ConsoleProxyResource.java         |  822 +-
 .../com/cloud/agent/storage/KVMPhysicalDisk.java   |   96 +-
 .../com/cloud/agent/storage/KVMStoragePool.java    |   32 +-
 .../cloud/agent/storage/KVMStoragePoolManager.java |  126 +-
 .../cloud/agent/storage/LibvirtStorageAdaptor.java | 1304 +-
 .../cloud/agent/storage/LibvirtStoragePool.java    |  262 +-
 .../com/cloud/agent/storage/StorageAdaptor.java    |   52 +-
 .../com/cloud/agent/vmdata/JettyVmDataServer.java  |  602 +-
 agent/src/com/cloud/agent/vmdata/VmDataServer.java |    6 +-
 agent/test/com/cloud/agent/TestAgentShell.java     |   12 +-
 api/src/com/cloud/agent/api/StartCommand.java      |   15 +-
 .../com/cloud/agent/api/to/VirtualMachineTO.java   |    9 +
 api/src/com/cloud/api/ApiConstants.java            |    7 +-
 api/src/com/cloud/api/BaseCmd.java                 |    5 +-
 api/src/com/cloud/api/ResponseGenerator.java       |   10 +
 api/src/com/cloud/api/commands/AddClusterCmd.java  |   11 +-
 api/src/com/cloud/api/commands/CreateTagsCmd.java  |  136 +
 api/src/com/cloud/api/commands/DeleteTagsCmd.java  |  128 +
 api/src/com/cloud/api/commands/DeployVMCmd.java    |    5 +-
 .../com/cloud/api/commands/ListNetworksCmd.java    |   13 +-
 api/src/com/cloud/api/commands/ListTagsCmd.java    |   99 +
 .../com/cloud/api/commands/UpgradeSystemVMCmd.java |   17 -
 .../cloud/api/response/CiscoNexusVSMResponse.java  |  112 -
 .../cloud/api/response/F5LoadBalancerResponse.java |  101 -
 .../response/NetscalerLoadBalancerResponse.java    |  116 -
 .../com/cloud/api/response/NetworkResponse.java    |    7 +
 .../cloud/api/response/ResourceTagResponse.java    |  104 +
 .../cloud/api/response/SrxFirewallResponse.java    |  138 -
 api/src/com/cloud/event/EventTypes.java            |    5 +
 api/src/com/cloud/network/CiscoNexusVSMDevice.java |   72 -
 api/src/com/cloud/network/NetworkService.java      |    6 +
 .../network/ovs/OvsCreateGreTunnelAnswer.java      |   81 -
 .../network/ovs/OvsCreateGreTunnelCommand.java     |   54 -
 .../cloud/network/ovs/OvsCreateTunnelAnswer.java   |   86 -
 .../cloud/network/ovs/OvsCreateTunnelCommand.java  |   69 -
 .../cloud/network/ovs/OvsDeleteFlowCommand.java    |   36 -
 .../cloud/network/ovs/OvsDestroyBridgeCommand.java |   61 -
 .../cloud/network/ovs/OvsDestroyTunnelCommand.java |   50 -
 .../cloud/network/ovs/OvsFetchInterfaceAnswer.java |   75 -
 .../network/ovs/OvsFetchInterfaceCommand.java      |   55 -
 .../cloud/network/ovs/OvsSetTagAndFlowAnswer.java  |   40 -
 .../cloud/network/ovs/OvsSetTagAndFlowCommand.java |   60 -
 .../cloud/network/ovs/OvsSetupBridgeCommand.java   |   67 -
 api/src/com/cloud/resource/ResourceService.java    |    3 +-
 api/src/com/cloud/server/ResourceTag.java          |   67 +
 .../com/cloud/server/TaggedResourceService.java    |   63 +
 awsapi-setup/db/mysql/cloudbridge_bucketpolicy.sql |   18 +
 awsapi-setup/db/mysql/cloudbridge_db.sql           |   18 +
 awsapi-setup/db/mysql/cloudbridge_index.sql        |  111 +-
 awsapi-setup/db/mysql/cloudbridge_multipart.sql    |   17 +
 .../db/mysql/cloudbridge_multipart_alter.sql       |   18 +
 awsapi-setup/db/mysql/cloudbridge_offering.sql     |   18 +
 .../db/mysql/cloudbridge_offering_alter.sql        |   18 +
 awsapi-setup/db/mysql/cloudbridge_policy_alter.sql |   18 +
 awsapi-setup/db/mysql/cloudbridge_schema.sql       |  306 +-
 awsapi-setup/db/mysql/deploy-db-bridge.sh          |   19 +-
 awsapi-setup/init/debian/cloud-bridge              |   16 +
 awsapi-setup/init/rpm/cloud-bridge                 |   17 +
 awsapi-setup/setup/cloud-setup-bridge              |   17 +
 awsapi-setup/setup/cloudstack-aws-api-register     |   17 +
 awsapi/deploy-cloud-bridge.sh                      |   18 +-
 awsapi/install.sh                                  |   16 +
 awsapi/scripts/run.sh                              |   16 +
 awsapi/src/com/amazon/ec2/ActivateLicense.java     |   16 +
 .../com/amazon/ec2/ActivateLicenseResponse.java    |   16 +
 .../amazon/ec2/ActivateLicenseResponseType.java    |   16 +
 awsapi/src/com/amazon/ec2/ActivateLicenseType.java |   16 +
 awsapi/src/com/amazon/ec2/AllocateAddress.java     |   16 +
 .../com/amazon/ec2/AllocateAddressResponse.java    |   16 +
 .../amazon/ec2/AllocateAddressResponseType.java    |   16 +
 awsapi/src/com/amazon/ec2/AllocateAddressType.java |   16 +
 .../amazon/ec2/AmazonEC2MessageReceiverInOut.java  |   16 +
 awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java   |   16 +
 .../com/amazon/ec2/AmazonEC2SkeletonInterface.java |   16 +
 awsapi/src/com/amazon/ec2/AssociateAddress.java    |   16 +
 .../com/amazon/ec2/AssociateAddressResponse.java   |   16 +
 .../amazon/ec2/AssociateAddressResponseType.java   |   16 +
 .../src/com/amazon/ec2/AssociateAddressType.java   |   16 +
 .../src/com/amazon/ec2/AssociateDhcpOptions.java   |   16 +
 .../amazon/ec2/AssociateDhcpOptionsResponse.java   |   16 +
 .../ec2/AssociateDhcpOptionsResponseType.java      |   16 +
 .../com/amazon/ec2/AssociateDhcpOptionsType.java   |   16 +
 awsapi/src/com/amazon/ec2/AttachVolume.java        |   16 +
 .../src/com/amazon/ec2/AttachVolumeResponse.java   |   16 +
 .../com/amazon/ec2/AttachVolumeResponseType.java   |   16 +
 awsapi/src/com/amazon/ec2/AttachVolumeType.java    |   16 +
 awsapi/src/com/amazon/ec2/AttachVpnGateway.java    |   16 +
 .../com/amazon/ec2/AttachVpnGatewayResponse.java   |   16 +
 .../amazon/ec2/AttachVpnGatewayResponseType.java   |   16 +
 .../src/com/amazon/ec2/AttachVpnGatewayType.java   |   16 +
 .../amazon/ec2/AttachmentSetItemResponseType.java  |   16 +
 .../com/amazon/ec2/AttachmentSetResponseType.java  |   16 +
 awsapi/src/com/amazon/ec2/AttachmentSetType.java   |   16 +
 awsapi/src/com/amazon/ec2/AttachmentType.java      |   16 +
 .../com/amazon/ec2/AttributeBooleanValueType.java  |   16 +
 awsapi/src/com/amazon/ec2/AttributeValueType.java  |   16 +
 .../amazon/ec2/AuthorizeSecurityGroupIngress.java  |   16 +
 .../ec2/AuthorizeSecurityGroupIngressResponse.java |   16 +
 .../AuthorizeSecurityGroupIngressResponseType.java |   16 +
 .../ec2/AuthorizeSecurityGroupIngressType.java     |   16 +
 .../com/amazon/ec2/AvailabilityZoneItemType.java   |   16 +
 .../amazon/ec2/AvailabilityZoneMessageSetType.java |   16 +
 .../amazon/ec2/AvailabilityZoneMessageType.java    |   16 +
 .../com/amazon/ec2/AvailabilityZoneSetType.java    |   16 +
 .../com/amazon/ec2/BlockDeviceMappingItemType.java |   16 +
 .../BlockDeviceMappingItemTypeChoice_type0.java    |   16 +
 .../src/com/amazon/ec2/BlockDeviceMappingType.java |   16 +
 awsapi/src/com/amazon/ec2/BundleInstance.java      |   16 +
 .../src/com/amazon/ec2/BundleInstanceResponse.java |   16 +
 .../com/amazon/ec2/BundleInstanceResponseType.java |   16 +
 .../amazon/ec2/BundleInstanceS3StorageType.java    |   16 +
 .../amazon/ec2/BundleInstanceTaskErrorType.java    |   16 +
 .../amazon/ec2/BundleInstanceTaskStorageType.java  |   16 +
 .../src/com/amazon/ec2/BundleInstanceTaskType.java |   16 +
 .../com/amazon/ec2/BundleInstanceTasksSetType.java |   16 +
 awsapi/src/com/amazon/ec2/BundleInstanceType.java  |   16 +
 awsapi/src/com/amazon/ec2/CancelBundleTask.java    |   16 +
 .../com/amazon/ec2/CancelBundleTaskResponse.java   |   16 +
 .../amazon/ec2/CancelBundleTaskResponseType.java   |   16 +
 .../src/com/amazon/ec2/CancelBundleTaskType.java   |   16 +
 .../src/com/amazon/ec2/CancelConversionTask.java   |   16 +
 .../amazon/ec2/CancelConversionTaskResponse.java   |   16 +
 .../ec2/CancelConversionTaskResponseType.java      |   16 +
 .../com/amazon/ec2/CancelConversionTaskType.java   |   16 +
 .../com/amazon/ec2/CancelSpotInstanceRequests.java |   16 +
 .../ec2/CancelSpotInstanceRequestsResponse.java    |   16 +
 ...celSpotInstanceRequestsResponseSetItemType.java |   16 +
 .../CancelSpotInstanceRequestsResponseSetType.java |   16 +
 .../CancelSpotInstanceRequestsResponseType.java    |   16 +
 .../amazon/ec2/CancelSpotInstanceRequestsType.java |   16 +
 .../src/com/amazon/ec2/ConfirmProductInstance.java |   16 +
 .../amazon/ec2/ConfirmProductInstanceResponse.java |   16 +
 .../ec2/ConfirmProductInstanceResponseType.java    |   16 +
 .../com/amazon/ec2/ConfirmProductInstanceType.java |   16 +
 .../com/amazon/ec2/ConversionTaskIdItemType.java   |   16 +
 .../com/amazon/ec2/ConversionTaskIdSetType.java    |   16 +
 .../src/com/amazon/ec2/ConversionTaskSetType.java  |   16 +
 awsapi/src/com/amazon/ec2/ConversionTaskType.java  |   16 +
 .../amazon/ec2/ConversionTaskTypeChoice_type0.java |   16 +
 .../src/com/amazon/ec2/CreateCustomerGateway.java  |   16 +
 .../amazon/ec2/CreateCustomerGatewayResponse.java  |   16 +
 .../ec2/CreateCustomerGatewayResponseType.java     |   16 +
 .../com/amazon/ec2/CreateCustomerGatewayType.java  |   16 +
 awsapi/src/com/amazon/ec2/CreateDhcpOptions.java   |   16 +
 .../com/amazon/ec2/CreateDhcpOptionsResponse.java  |   16 +
 .../amazon/ec2/CreateDhcpOptionsResponseType.java  |   16 +
 .../src/com/amazon/ec2/CreateDhcpOptionsType.java  |   16 +
 awsapi/src/com/amazon/ec2/CreateImage.java         |   16 +
 awsapi/src/com/amazon/ec2/CreateImageResponse.java |   16 +
 .../com/amazon/ec2/CreateImageResponseType.java    |   16 +
 awsapi/src/com/amazon/ec2/CreateImageType.java     |   16 +
 awsapi/src/com/amazon/ec2/CreateKeyPair.java       |   16 +
 .../src/com/amazon/ec2/CreateKeyPairResponse.java  |   16 +
 .../com/amazon/ec2/CreateKeyPairResponseType.java  |   16 +
 awsapi/src/com/amazon/ec2/CreateKeyPairType.java   |   16 +
 .../src/com/amazon/ec2/CreatePlacementGroup.java   |   16 +
 .../amazon/ec2/CreatePlacementGroupResponse.java   |   16 +
 .../ec2/CreatePlacementGroupResponseType.java      |   16 +
 .../com/amazon/ec2/CreatePlacementGroupType.java   |   16 +
 awsapi/src/com/amazon/ec2/CreateSecurityGroup.java |   16 +
 .../amazon/ec2/CreateSecurityGroupResponse.java    |   16 +
 .../ec2/CreateSecurityGroupResponseType.java       |   16 +
 .../com/amazon/ec2/CreateSecurityGroupType.java    |   16 +
 awsapi/src/com/amazon/ec2/CreateSnapshot.java      |   16 +
 .../src/com/amazon/ec2/CreateSnapshotResponse.java |   16 +
 .../com/amazon/ec2/CreateSnapshotResponseType.java |   16 +
 awsapi/src/com/amazon/ec2/CreateSnapshotType.java  |   16 +
 .../amazon/ec2/CreateSpotDatafeedSubscription.java |   16 +
 .../CreateSpotDatafeedSubscriptionResponse.java    |   16 +
 ...CreateSpotDatafeedSubscriptionResponseType.java |   16 +
 .../ec2/CreateSpotDatafeedSubscriptionType.java    |   16 +
 awsapi/src/com/amazon/ec2/CreateSubnet.java        |   16 +
 .../src/com/amazon/ec2/CreateSubnetResponse.java   |   16 +
 .../com/amazon/ec2/CreateSubnetResponseType.java   |   16 +
 awsapi/src/com/amazon/ec2/CreateSubnetType.java    |   16 +
 awsapi/src/com/amazon/ec2/CreateTags.java          |   16 +
 awsapi/src/com/amazon/ec2/CreateTagsResponse.java  |   16 +
 .../src/com/amazon/ec2/CreateTagsResponseType.java |   16 +
 awsapi/src/com/amazon/ec2/CreateTagsType.java      |   16 +
 awsapi/src/com/amazon/ec2/CreateVolume.java        |   16 +
 .../amazon/ec2/CreateVolumePermissionItemType.java |   16 +
 .../amazon/ec2/CreateVolumePermissionListType.java |   16 +
 .../ec2/CreateVolumePermissionOperationType.java   |   16 +
 .../src/com/amazon/ec2/CreateVolumeResponse.java   |   16 +
 .../com/amazon/ec2/CreateVolumeResponseType.java   |   16 +
 awsapi/src/com/amazon/ec2/CreateVolumeType.java    |   16 +
 awsapi/src/com/amazon/ec2/CreateVpc.java           |   16 +
 awsapi/src/com/amazon/ec2/CreateVpcResponse.java   |   16 +
 .../src/com/amazon/ec2/CreateVpcResponseType.java  |   16 +
 awsapi/src/com/amazon/ec2/CreateVpcType.java       |   16 +
 awsapi/src/com/amazon/ec2/CreateVpnConnection.java |   16 +
 .../amazon/ec2/CreateVpnConnectionResponse.java    |   16 +
 .../ec2/CreateVpnConnectionResponseType.java       |   16 +
 .../com/amazon/ec2/CreateVpnConnectionType.java    |   16 +
 awsapi/src/com/amazon/ec2/CreateVpnGateway.java    |   16 +
 .../com/amazon/ec2/CreateVpnGatewayResponse.java   |   16 +
 .../amazon/ec2/CreateVpnGatewayResponseType.java   |   16 +
 .../src/com/amazon/ec2/CreateVpnGatewayType.java   |   16 +
 .../amazon/ec2/CustomerGatewayIdSetItemType.java   |   16 +
 .../com/amazon/ec2/CustomerGatewayIdSetType.java   |   16 +
 .../src/com/amazon/ec2/CustomerGatewaySetType.java |   16 +
 awsapi/src/com/amazon/ec2/CustomerGatewayType.java |   16 +
 awsapi/src/com/amazon/ec2/DeactivateLicense.java   |   16 +
 .../com/amazon/ec2/DeactivateLicenseResponse.java  |   16 +
 .../amazon/ec2/DeactivateLicenseResponseType.java  |   16 +
 .../src/com/amazon/ec2/DeactivateLicenseType.java  |   16 +
 .../src/com/amazon/ec2/DeleteCustomerGateway.java  |   16 +
 .../amazon/ec2/DeleteCustomerGatewayResponse.java  |   16 +
 .../ec2/DeleteCustomerGatewayResponseType.java     |   16 +
 .../com/amazon/ec2/DeleteCustomerGatewayType.java  |   16 +
 awsapi/src/com/amazon/ec2/DeleteDhcpOptions.java   |   16 +
 .../com/amazon/ec2/DeleteDhcpOptionsResponse.java  |   16 +
 .../amazon/ec2/DeleteDhcpOptionsResponseType.java  |   16 +
 .../src/com/amazon/ec2/DeleteDhcpOptionsType.java  |   16 +
 awsapi/src/com/amazon/ec2/DeleteKeyPair.java       |   16 +
 .../src/com/amazon/ec2/DeleteKeyPairResponse.java  |   16 +
 .../com/amazon/ec2/DeleteKeyPairResponseType.java  |   16 +
 awsapi/src/com/amazon/ec2/DeleteKeyPairType.java   |   16 +
 .../src/com/amazon/ec2/DeletePlacementGroup.java   |   16 +
 .../amazon/ec2/DeletePlacementGroupResponse.java   |   16 +
 .../ec2/DeletePlacementGroupResponseType.java      |   16 +
 .../com/amazon/ec2/DeletePlacementGroupType.java   |   16 +
 awsapi/src/com/amazon/ec2/DeleteSecurityGroup.java |   16 +
 .../amazon/ec2/DeleteSecurityGroupResponse.java    |   16 +
 .../ec2/DeleteSecurityGroupResponseType.java       |   16 +
 .../com/amazon/ec2/DeleteSecurityGroupType.java    |   16 +
 awsapi/src/com/amazon/ec2/DeleteSnapshot.java      |   16 +
 .../src/com/amazon/ec2/DeleteSnapshotResponse.java |   16 +
 .../com/amazon/ec2/DeleteSnapshotResponseType.java |   16 +
 awsapi/src/com/amazon/ec2/DeleteSnapshotType.java  |   16 +
 .../amazon/ec2/DeleteSpotDatafeedSubscription.java |   16 +
 .../DeleteSpotDatafeedSubscriptionResponse.java    |   16 +
 ...DeleteSpotDatafeedSubscriptionResponseType.java |   16 +
 .../ec2/DeleteSpotDatafeedSubscriptionType.java    |   16 +
 awsapi/src/com/amazon/ec2/DeleteSubnet.java        |   16 +
 .../src/com/amazon/ec2/DeleteSubnetResponse.java   |   16 +
 .../com/amazon/ec2/DeleteSubnetResponseType.java   |   16 +
 awsapi/src/com/amazon/ec2/DeleteSubnetType.java    |   16 +
 awsapi/src/com/amazon/ec2/DeleteTags.java          |   16 +
 awsapi/src/com/amazon/ec2/DeleteTagsResponse.java  |   16 +
 .../src/com/amazon/ec2/DeleteTagsResponseType.java |   16 +
 .../src/com/amazon/ec2/DeleteTagsSetItemType.java  |   16 +
 awsapi/src/com/amazon/ec2/DeleteTagsSetType.java   |   16 +
 awsapi/src/com/amazon/ec2/DeleteTagsType.java      |   16 +
 awsapi/src/com/amazon/ec2/DeleteVolume.java        |   16 +
 .../src/com/amazon/ec2/DeleteVolumeResponse.java   |   16 +
 .../com/amazon/ec2/DeleteVolumeResponseType.java   |   16 +
 awsapi/src/com/amazon/ec2/DeleteVolumeType.java    |   16 +
 awsapi/src/com/amazon/ec2/DeleteVpc.java           |   16 +
 awsapi/src/com/amazon/ec2/DeleteVpcResponse.java   |   16 +
 .../src/com/amazon/ec2/DeleteVpcResponseType.java  |   16 +
 awsapi/src/com/amazon/ec2/DeleteVpcType.java       |   16 +
 awsapi/src/com/amazon/ec2/DeleteVpnConnection.java |   16 +
 .../amazon/ec2/DeleteVpnConnectionResponse.java    |   16 +
 .../ec2/DeleteVpnConnectionResponseType.java       |   16 +
 .../com/amazon/ec2/DeleteVpnConnectionType.java    |   16 +
 awsapi/src/com/amazon/ec2/DeleteVpnGateway.java    |   16 +
 .../com/amazon/ec2/DeleteVpnGatewayResponse.java   |   16 +
 .../amazon/ec2/DeleteVpnGatewayResponseType.java   |   16 +
 .../src/com/amazon/ec2/DeleteVpnGatewayType.java   |   16 +
 awsapi/src/com/amazon/ec2/DeregisterImage.java     |   16 +
 .../com/amazon/ec2/DeregisterImageResponse.java    |   16 +
 .../amazon/ec2/DeregisterImageResponseType.java    |   16 +
 awsapi/src/com/amazon/ec2/DeregisterImageType.java |   16 +
 awsapi/src/com/amazon/ec2/DescribeAddresses.java   |   16 +
 .../com/amazon/ec2/DescribeAddressesInfoType.java  |   16 +
 .../com/amazon/ec2/DescribeAddressesItemType.java  |   16 +
 .../com/amazon/ec2/DescribeAddressesResponse.java  |   16 +
 .../ec2/DescribeAddressesResponseInfoType.java     |   16 +
 .../ec2/DescribeAddressesResponseItemType.java     |   16 +
 .../amazon/ec2/DescribeAddressesResponseType.java  |   16 +
 .../src/com/amazon/ec2/DescribeAddressesType.java  |   16 +
 .../com/amazon/ec2/DescribeAvailabilityZones.java  |   16 +
 .../ec2/DescribeAvailabilityZonesResponse.java     |   16 +
 .../ec2/DescribeAvailabilityZonesResponseType.java |   16 +
 .../ec2/DescribeAvailabilityZonesSetItemType.java  |   16 +
 .../ec2/DescribeAvailabilityZonesSetType.java      |   16 +
 .../amazon/ec2/DescribeAvailabilityZonesType.java  |   16 +
 awsapi/src/com/amazon/ec2/DescribeBundleTasks.java |   16 +
 .../amazon/ec2/DescribeBundleTasksInfoType.java    |   16 +
 .../amazon/ec2/DescribeBundleTasksItemType.java    |   16 +
 .../amazon/ec2/DescribeBundleTasksResponse.java    |   16 +
 .../ec2/DescribeBundleTasksResponseType.java       |   16 +
 .../com/amazon/ec2/DescribeBundleTasksType.java    |   16 +
 .../com/amazon/ec2/DescribeConversionTasks.java    |   16 +
 .../ec2/DescribeConversionTasksResponse.java       |   16 +
 .../ec2/DescribeConversionTasksResponseType.java   |   16 +
 .../amazon/ec2/DescribeConversionTasksType.java    |   16 +
 .../com/amazon/ec2/DescribeCustomerGateways.java   |   16 +
 .../ec2/DescribeCustomerGatewaysResponse.java      |   16 +
 .../ec2/DescribeCustomerGatewaysResponseType.java  |   16 +
 .../amazon/ec2/DescribeCustomerGatewaysType.java   |   16 +
 awsapi/src/com/amazon/ec2/DescribeDhcpOptions.java |   16 +
 .../amazon/ec2/DescribeDhcpOptionsResponse.java    |   16 +
 .../ec2/DescribeDhcpOptionsResponseType.java       |   16 +
 .../com/amazon/ec2/DescribeDhcpOptionsType.java    |   16 +
 .../src/com/amazon/ec2/DescribeImageAttribute.java |   16 +
 .../amazon/ec2/DescribeImageAttributeResponse.java |   16 +
 .../ec2/DescribeImageAttributeResponseType.java    |   16 +
 ...ribeImageAttributeResponseTypeChoice_type0.java |   16 +
 .../com/amazon/ec2/DescribeImageAttributeType.java |   16 +
 .../amazon/ec2/DescribeImageAttributesGroup.java   |   16 +
 awsapi/src/com/amazon/ec2/DescribeImages.java      |   16 +
 .../ec2/DescribeImagesExecutableBySetType.java     |   16 +
 .../amazon/ec2/DescribeImagesExecutableByType.java |   16 +
 .../src/com/amazon/ec2/DescribeImagesInfoType.java |   16 +
 .../src/com/amazon/ec2/DescribeImagesItemType.java |   16 +
 .../com/amazon/ec2/DescribeImagesOwnerType.java    |   16 +
 .../com/amazon/ec2/DescribeImagesOwnersType.java   |   16 +
 .../src/com/amazon/ec2/DescribeImagesResponse.java |   16 +
 .../amazon/ec2/DescribeImagesResponseInfoType.java |   16 +
 .../amazon/ec2/DescribeImagesResponseItemType.java |   16 +
 .../com/amazon/ec2/DescribeImagesResponseType.java |   16 +
 awsapi/src/com/amazon/ec2/DescribeImagesType.java  |   16 +
 .../com/amazon/ec2/DescribeInstanceAttribute.java  |   16 +
 .../ec2/DescribeInstanceAttributeResponse.java     |   16 +
 .../ec2/DescribeInstanceAttributeResponseType.java |   16 +
 ...eInstanceAttributeResponseTypeChoice_type0.java |   16 +
 .../amazon/ec2/DescribeInstanceAttributeType.java  |   16 +
 .../ec2/DescribeInstanceAttributesGroup.java       |   16 +
 awsapi/src/com/amazon/ec2/DescribeInstances.java   |   16 +
 .../com/amazon/ec2/DescribeInstancesInfoType.java  |   16 +
 .../com/amazon/ec2/DescribeInstancesItemType.java  |   16 +
 .../com/amazon/ec2/DescribeInstancesResponse.java  |   16 +
 .../amazon/ec2/DescribeInstancesResponseType.java  |   16 +
 .../src/com/amazon/ec2/DescribeInstancesType.java  |   16 +
 awsapi/src/com/amazon/ec2/DescribeKeyPairs.java    |   16 +
 .../com/amazon/ec2/DescribeKeyPairsInfoType.java   |   16 +
 .../com/amazon/ec2/DescribeKeyPairsItemType.java   |   16 +
 .../com/amazon/ec2/DescribeKeyPairsResponse.java   |   16 +
 .../ec2/DescribeKeyPairsResponseInfoType.java      |   16 +
 .../ec2/DescribeKeyPairsResponseItemType.java      |   16 +
 .../amazon/ec2/DescribeKeyPairsResponseType.java   |   16 +
 .../src/com/amazon/ec2/DescribeKeyPairsType.java   |   16 +
 awsapi/src/com/amazon/ec2/DescribeLicenses.java    |   16 +
 .../com/amazon/ec2/DescribeLicensesResponse.java   |   16 +
 .../amazon/ec2/DescribeLicensesResponseType.java   |   16 +
 .../src/com/amazon/ec2/DescribeLicensesType.java   |   16 +
 .../amazon/ec2/DescribePlacementGroupItemType.java |   16 +
 .../com/amazon/ec2/DescribePlacementGroups.java    |   16 +
 .../ec2/DescribePlacementGroupsInfoType.java       |   16 +
 .../ec2/DescribePlacementGroupsResponse.java       |   16 +
 .../ec2/DescribePlacementGroupsResponseType.java   |   16 +
 .../amazon/ec2/DescribePlacementGroupsType.java    |   16 +
 awsapi/src/com/amazon/ec2/DescribeRegions.java     |   16 +
 .../com/amazon/ec2/DescribeRegionsResponse.java    |   16 +
 .../amazon/ec2/DescribeRegionsResponseType.java    |   16 +
 .../com/amazon/ec2/DescribeRegionsSetItemType.java |   16 +
 .../src/com/amazon/ec2/DescribeRegionsSetType.java |   16 +
 awsapi/src/com/amazon/ec2/DescribeRegionsType.java |   16 +
 .../com/amazon/ec2/DescribeReservedInstances.java  |   16 +
 .../ec2/DescribeReservedInstancesOfferings.java    |   16 +
 ...DescribeReservedInstancesOfferingsResponse.java |   16 +
 ...ervedInstancesOfferingsResponseSetItemType.java |   16 +
 ...eReservedInstancesOfferingsResponseSetType.java |   16 +
 ...ribeReservedInstancesOfferingsResponseType.java |   16 +
 ...cribeReservedInstancesOfferingsSetItemType.java |   16 +
 .../DescribeReservedInstancesOfferingsSetType.java |   16 +
 .../DescribeReservedInstancesOfferingsType.java    |   16 +
 .../ec2/DescribeReservedInstancesResponse.java     |   16 +
 ...scribeReservedInstancesResponseSetItemType.java |   16 +
 .../DescribeReservedInstancesResponseSetType.java  |   16 +
 .../ec2/DescribeReservedInstancesResponseType.java |   16 +
 .../ec2/DescribeReservedInstancesSetItemType.java  |   16 +
 .../ec2/DescribeReservedInstancesSetType.java      |   16 +
 .../amazon/ec2/DescribeReservedInstancesType.java  |   16 +
 .../src/com/amazon/ec2/DescribeSecurityGroups.java |   16 +
 .../amazon/ec2/DescribeSecurityGroupsResponse.java |   16 +
 .../ec2/DescribeSecurityGroupsResponseType.java    |   16 +
 .../ec2/DescribeSecurityGroupsSetItemType.java     |   16 +
 .../amazon/ec2/DescribeSecurityGroupsSetType.java  |   16 +
 .../com/amazon/ec2/DescribeSecurityGroupsType.java |   16 +
 .../com/amazon/ec2/DescribeSnapshotAttribute.java  |   16 +
 .../ec2/DescribeSnapshotAttributeResponse.java     |   16 +
 .../ec2/DescribeSnapshotAttributeResponseType.java |   16 +
 .../amazon/ec2/DescribeSnapshotAttributeType.java  |   16 +
 .../ec2/DescribeSnapshotAttributesGroup.java       |   16 +
 awsapi/src/com/amazon/ec2/DescribeSnapshots.java   |   16 +
 .../com/amazon/ec2/DescribeSnapshotsOwnerType.java |   16 +
 .../amazon/ec2/DescribeSnapshotsOwnersType.java    |   16 +
 .../com/amazon/ec2/DescribeSnapshotsResponse.java  |   16 +
 .../amazon/ec2/DescribeSnapshotsResponseType.java  |   16 +
 .../ec2/DescribeSnapshotsRestorableBySetType.java  |   16 +
 .../ec2/DescribeSnapshotsRestorableByType.java     |   16 +
 .../ec2/DescribeSnapshotsSetItemResponseType.java  |   16 +
 .../amazon/ec2/DescribeSnapshotsSetItemType.java   |   16 +
 .../ec2/DescribeSnapshotsSetResponseType.java      |   16 +
 .../com/amazon/ec2/DescribeSnapshotsSetType.java   |   16 +
 .../src/com/amazon/ec2/DescribeSnapshotsType.java  |   16 +
 .../ec2/DescribeSpotDatafeedSubscription.java      |   16 +
 .../DescribeSpotDatafeedSubscriptionResponse.java  |   16 +
 ...scribeSpotDatafeedSubscriptionResponseType.java |   16 +
 .../ec2/DescribeSpotDatafeedSubscriptionType.java  |   16 +
 .../amazon/ec2/DescribeSpotInstanceRequests.java   |   16 +
 .../ec2/DescribeSpotInstanceRequestsResponse.java  |   16 +
 .../DescribeSpotInstanceRequestsResponseType.java  |   16 +
 .../ec2/DescribeSpotInstanceRequestsType.java      |   16 +
 .../com/amazon/ec2/DescribeSpotPriceHistory.java   |   16 +
 .../ec2/DescribeSpotPriceHistoryResponse.java      |   16 +
 .../ec2/DescribeSpotPriceHistoryResponseType.java  |   16 +
 .../amazon/ec2/DescribeSpotPriceHistoryType.java   |   16 +
 awsapi/src/com/amazon/ec2/DescribeSubnets.java     |   16 +
 .../com/amazon/ec2/DescribeSubnetsResponse.java    |   16 +
 .../amazon/ec2/DescribeSubnetsResponseType.java    |   16 +
 awsapi/src/com/amazon/ec2/DescribeSubnetsType.java |   16 +
 awsapi/src/com/amazon/ec2/DescribeTags.java        |   16 +
 .../src/com/amazon/ec2/DescribeTagsResponse.java   |   16 +
 .../com/amazon/ec2/DescribeTagsResponseType.java   |   16 +
 awsapi/src/com/amazon/ec2/DescribeTagsType.java    |   16 +
 awsapi/src/com/amazon/ec2/DescribeVolumes.java     |   16 +
 .../com/amazon/ec2/DescribeVolumesResponse.java    |   16 +
 .../amazon/ec2/DescribeVolumesResponseType.java    |   16 +
 .../ec2/DescribeVolumesSetItemResponseType.java    |   16 +
 .../com/amazon/ec2/DescribeVolumesSetItemType.java |   16 +
 .../amazon/ec2/DescribeVolumesSetResponseType.java |   16 +
 .../src/com/amazon/ec2/DescribeVolumesSetType.java |   16 +
 awsapi/src/com/amazon/ec2/DescribeVolumesType.java |   16 +
 awsapi/src/com/amazon/ec2/DescribeVpcs.java        |   16 +
 .../src/com/amazon/ec2/DescribeVpcsResponse.java   |   16 +
 .../com/amazon/ec2/DescribeVpcsResponseType.java   |   16 +
 awsapi/src/com/amazon/ec2/DescribeVpcsType.java    |   16 +
 .../src/com/amazon/ec2/DescribeVpnConnections.java |   16 +
 .../amazon/ec2/DescribeVpnConnectionsResponse.java |   16 +
 .../ec2/DescribeVpnConnectionsResponseType.java    |   16 +
 .../com/amazon/ec2/DescribeVpnConnectionsType.java |   16 +
 awsapi/src/com/amazon/ec2/DescribeVpnGateways.java |   16 +
 .../amazon/ec2/DescribeVpnGatewaysResponse.java    |   16 +
 .../ec2/DescribeVpnGatewaysResponseType.java       |   16 +
 .../com/amazon/ec2/DescribeVpnGatewaysType.java    |   16 +
 awsapi/src/com/amazon/ec2/DetachVolume.java        |   16 +
 .../src/com/amazon/ec2/DetachVolumeResponse.java   |   16 +
 .../com/amazon/ec2/DetachVolumeResponseType.java   |   16 +
 awsapi/src/com/amazon/ec2/DetachVolumeType.java    |   16 +
 awsapi/src/com/amazon/ec2/DetachVpnGateway.java    |   16 +
 .../com/amazon/ec2/DetachVpnGatewayResponse.java   |   16 +
 .../amazon/ec2/DetachVpnGatewayResponseType.java   |   16 +
 .../src/com/amazon/ec2/DetachVpnGatewayType.java   |   16 +
 .../amazon/ec2/DhcpConfigurationItemSetType.java   |   16 +
 .../com/amazon/ec2/DhcpConfigurationItemType.java  |   16 +
 .../com/amazon/ec2/DhcpOptionsIdSetItemType.java   |   16 +
 .../src/com/amazon/ec2/DhcpOptionsIdSetType.java   |   16 +
 awsapi/src/com/amazon/ec2/DhcpOptionsSetType.java  |   16 +
 awsapi/src/com/amazon/ec2/DhcpOptionsType.java     |   16 +
 awsapi/src/com/amazon/ec2/DhcpValueSetType.java    |   16 +
 awsapi/src/com/amazon/ec2/DhcpValueType.java       |   16 +
 awsapi/src/com/amazon/ec2/DisassociateAddress.java |   16 +
 .../amazon/ec2/DisassociateAddressResponse.java    |   16 +
 .../ec2/DisassociateAddressResponseType.java       |   16 +
 .../com/amazon/ec2/DisassociateAddressType.java    |   16 +
 .../com/amazon/ec2/DiskImageDescriptionType.java   |   16 +
 awsapi/src/com/amazon/ec2/DiskImageDetailType.java |   16 +
 awsapi/src/com/amazon/ec2/DiskImageSetType.java    |   16 +
 awsapi/src/com/amazon/ec2/DiskImageType.java       |   16 +
 .../amazon/ec2/DiskImageVolumeDescriptionType.java |   16 +
 awsapi/src/com/amazon/ec2/DiskImageVolumeType.java |   16 +
 awsapi/src/com/amazon/ec2/EbsBlockDeviceType.java  |   16 +
 .../EbsInstanceBlockDeviceMappingResponseType.java |   16 +
 awsapi/src/com/amazon/ec2/EmptyElementType.java    |   16 +
 awsapi/src/com/amazon/ec2/ExtensionMapper.java     |   16 +
 awsapi/src/com/amazon/ec2/FilterSetType.java       |   16 +
 awsapi/src/com/amazon/ec2/FilterType.java          |   16 +
 awsapi/src/com/amazon/ec2/GetConsoleOutput.java    |   16 +
 .../com/amazon/ec2/GetConsoleOutputResponse.java   |   16 +
 .../amazon/ec2/GetConsoleOutputResponseType.java   |   16 +
 .../src/com/amazon/ec2/GetConsoleOutputType.java   |   16 +
 awsapi/src/com/amazon/ec2/GetPasswordData.java     |   16 +
 .../com/amazon/ec2/GetPasswordDataResponse.java    |   16 +
 .../amazon/ec2/GetPasswordDataResponseType.java    |   16 +
 awsapi/src/com/amazon/ec2/GetPasswordDataType.java |   16 +
 awsapi/src/com/amazon/ec2/GroupItemType.java       |   16 +
 awsapi/src/com/amazon/ec2/GroupSetType.java        |   16 +
 awsapi/src/com/amazon/ec2/ImportInstance.java      |   16 +
 .../ec2/ImportInstanceLaunchSpecificationType.java |   16 +
 .../src/com/amazon/ec2/ImportInstanceResponse.java |   16 +
 .../com/amazon/ec2/ImportInstanceResponseType.java |   16 +
 .../amazon/ec2/ImportInstanceTaskDetailsType.java  |   16 +
 awsapi/src/com/amazon/ec2/ImportInstanceType.java  |   16 +
 .../ec2/ImportInstanceVolumeDetailItemType.java    |   16 +
 .../ec2/ImportInstanceVolumeDetailSetType.java     |   16 +
 awsapi/src/com/amazon/ec2/ImportKeyPair.java       |   16 +
 .../src/com/amazon/ec2/ImportKeyPairResponse.java  |   16 +
 .../com/amazon/ec2/ImportKeyPairResponseType.java  |   16 +
 awsapi/src/com/amazon/ec2/ImportKeyPairType.java   |   16 +
 awsapi/src/com/amazon/ec2/ImportVolume.java        |   16 +
 .../src/com/amazon/ec2/ImportVolumeResponse.java   |   16 +
 .../com/amazon/ec2/ImportVolumeResponseType.java   |   16 +
 .../amazon/ec2/ImportVolumeTaskDetailsType.java    |   16 +
 awsapi/src/com/amazon/ec2/ImportVolumeType.java    |   16 +
 .../ec2/InstanceBlockDeviceMappingItemType.java    |   16 +
 ...anceBlockDeviceMappingItemTypeChoice_type0.java |   16 +
 ...InstanceBlockDeviceMappingResponseItemType.java |   16 +
 ...kDeviceMappingResponseItemTypeChoice_type0.java |   16 +
 .../InstanceBlockDeviceMappingResponseType.java    |   16 +
 .../amazon/ec2/InstanceBlockDeviceMappingType.java |   16 +
 .../com/amazon/ec2/InstanceEbsBlockDeviceType.java |   16 +
 awsapi/src/com/amazon/ec2/InstanceIdSetType.java   |   16 +
 awsapi/src/com/amazon/ec2/InstanceIdType.java      |   16 +
 .../com/amazon/ec2/InstanceLicenseRequestType.java |   16 +
 .../amazon/ec2/InstanceLicenseResponseType.java    |   16 +
 .../amazon/ec2/InstanceMonitoringStateType.java    |   16 +
 .../src/com/amazon/ec2/InstancePlacementType.java  |   16 +
 .../com/amazon/ec2/InstanceStateChangeSetType.java |   16 +
 .../com/amazon/ec2/InstanceStateChangeType.java    |   16 +
 awsapi/src/com/amazon/ec2/InstanceStateType.java   |   16 +
 .../com/amazon/ec2/InstanceTypeSetItemType.java    |   16 +
 awsapi/src/com/amazon/ec2/InstanceTypeSetType.java |   16 +
 awsapi/src/com/amazon/ec2/IpPermissionSetType.java |   16 +
 awsapi/src/com/amazon/ec2/IpPermissionType.java    |   16 +
 awsapi/src/com/amazon/ec2/IpRangeItemType.java     |   16 +
 awsapi/src/com/amazon/ec2/IpRangeSetType.java      |   16 +
 .../com/amazon/ec2/LaunchPermissionItemType.java   |   16 +
 .../com/amazon/ec2/LaunchPermissionListType.java   |   16 +
 .../amazon/ec2/LaunchPermissionOperationType.java  |   16 +
 .../amazon/ec2/LaunchSpecificationRequestType.java |   16 +
 .../ec2/LaunchSpecificationResponseType.java       |   16 +
 .../com/amazon/ec2/LicenseCapacitySetItemType.java |   16 +
 .../src/com/amazon/ec2/LicenseCapacitySetType.java |   16 +
 .../src/com/amazon/ec2/LicenseIdSetItemType.java   |   16 +
 awsapi/src/com/amazon/ec2/LicenseIdSetType.java    |   16 +
 awsapi/src/com/amazon/ec2/LicenseSetItemType.java  |   16 +
 awsapi/src/com/amazon/ec2/LicenseSetType.java      |   16 +
 .../src/com/amazon/ec2/ModifyImageAttribute.java   |   16 +
 .../amazon/ec2/ModifyImageAttributeResponse.java   |   16 +
 .../ec2/ModifyImageAttributeResponseType.java      |   16 +
 .../com/amazon/ec2/ModifyImageAttributeType.java   |   16 +
 .../ec2/ModifyImageAttributeTypeChoice_type0.java  |   16 +
 .../com/amazon/ec2/ModifyInstanceAttribute.java    |   16 +
 .../ec2/ModifyInstanceAttributeResponse.java       |   16 +
 .../ec2/ModifyInstanceAttributeResponseType.java   |   16 +
 .../amazon/ec2/ModifyInstanceAttributeType.java    |   16 +
 .../ModifyInstanceAttributeTypeChoice_type0.java   |   16 +
 .../com/amazon/ec2/ModifySnapshotAttribute.java    |   16 +
 .../ec2/ModifySnapshotAttributeResponse.java       |   16 +
 .../ec2/ModifySnapshotAttributeResponseType.java   |   16 +
 .../amazon/ec2/ModifySnapshotAttributeType.java    |   16 +
 awsapi/src/com/amazon/ec2/MonitorInstances.java    |   16 +
 .../com/amazon/ec2/MonitorInstancesResponse.java   |   16 +
 .../ec2/MonitorInstancesResponseSetItemType.java   |   16 +
 .../ec2/MonitorInstancesResponseSetType.java       |   16 +
 .../amazon/ec2/MonitorInstancesResponseType.java   |   16 +
 .../amazon/ec2/MonitorInstancesSetItemType.java    |   16 +
 .../com/amazon/ec2/MonitorInstancesSetType.java    |   16 +
 .../src/com/amazon/ec2/MonitorInstancesType.java   |   16 +
 .../src/com/amazon/ec2/MonitoringInstanceType.java |   16 +
 .../ec2/NullableAttributeBooleanValueType.java     |   16 +
 .../com/amazon/ec2/NullableAttributeValueType.java |   16 +
 .../src/com/amazon/ec2/PlacementGroupInfoType.java |   16 +
 .../src/com/amazon/ec2/PlacementGroupSetType.java  |   16 +
 .../src/com/amazon/ec2/PlacementRequestType.java   |   16 +
 .../src/com/amazon/ec2/PlacementResponseType.java  |   16 +
 awsapi/src/com/amazon/ec2/ProductCodeItemType.java |   16 +
 awsapi/src/com/amazon/ec2/ProductCodeListType.java |   16 +
 awsapi/src/com/amazon/ec2/ProductCodeSetType.java  |   16 +
 awsapi/src/com/amazon/ec2/ProductCodeType.java     |   16 +
 .../com/amazon/ec2/ProductCodesSetItemType.java    |   16 +
 awsapi/src/com/amazon/ec2/ProductCodesSetType.java |   16 +
 .../amazon/ec2/ProductDescriptionSetItemType.java  |   16 +
 .../com/amazon/ec2/ProductDescriptionSetType.java  |   16 +
 .../ec2/PurchaseReservedInstancesOffering.java     |   16 +
 .../PurchaseReservedInstancesOfferingResponse.java |   16 +
 ...chaseReservedInstancesOfferingResponseType.java |   16 +
 .../ec2/PurchaseReservedInstancesOfferingType.java |   16 +
 awsapi/src/com/amazon/ec2/RebootInstances.java     |   16 +
 .../com/amazon/ec2/RebootInstancesInfoType.java    |   16 +
 .../com/amazon/ec2/RebootInstancesItemType.java    |   16 +
 .../com/amazon/ec2/RebootInstancesResponse.java    |   16 +
 .../amazon/ec2/RebootInstancesResponseType.java    |   16 +
 awsapi/src/com/amazon/ec2/RebootInstancesType.java |   16 +
 awsapi/src/com/amazon/ec2/RegionItemType.java      |   16 +
 awsapi/src/com/amazon/ec2/RegionSetType.java       |   16 +
 awsapi/src/com/amazon/ec2/RegisterImage.java       |   16 +
 .../src/com/amazon/ec2/RegisterImageResponse.java  |   16 +
 .../com/amazon/ec2/RegisterImageResponseType.java  |   16 +
 awsapi/src/com/amazon/ec2/RegisterImageType.java   |   16 +
 awsapi/src/com/amazon/ec2/ReleaseAddress.java      |   16 +
 .../src/com/amazon/ec2/ReleaseAddressResponse.java |   16 +
 .../com/amazon/ec2/ReleaseAddressResponseType.java |   16 +
 awsapi/src/com/amazon/ec2/ReleaseAddressType.java  |   16 +
 .../src/com/amazon/ec2/RequestSpotInstances.java   |   16 +
 .../amazon/ec2/RequestSpotInstancesResponse.java   |   16 +
 .../ec2/RequestSpotInstancesResponseType.java      |   16 +
 .../com/amazon/ec2/RequestSpotInstancesType.java   |   16 +
 awsapi/src/com/amazon/ec2/ReservationInfoType.java |   16 +
 awsapi/src/com/amazon/ec2/ReservationSetType.java  |   16 +
 awsapi/src/com/amazon/ec2/ResetImageAttribute.java |   16 +
 .../amazon/ec2/ResetImageAttributeResponse.java    |   16 +
 .../ec2/ResetImageAttributeResponseType.java       |   16 +
 .../com/amazon/ec2/ResetImageAttributeType.java    |   16 +
 .../com/amazon/ec2/ResetImageAttributesGroup.java  |   16 +
 .../src/com/amazon/ec2/ResetInstanceAttribute.java |   16 +
 .../amazon/ec2/ResetInstanceAttributeResponse.java |   16 +
 .../ec2/ResetInstanceAttributeResponseType.java    |   16 +
 .../com/amazon/ec2/ResetInstanceAttributeType.java |   16 +
 .../amazon/ec2/ResetInstanceAttributesGroup.java   |   16 +
 .../src/com/amazon/ec2/ResetSnapshotAttribute.java |   16 +
 .../amazon/ec2/ResetSnapshotAttributeResponse.java |   16 +
 .../ec2/ResetSnapshotAttributeResponseType.java    |   16 +
 .../com/amazon/ec2/ResetSnapshotAttributeType.java |   16 +
 .../amazon/ec2/ResetSnapshotAttributesGroup.java   |   16 +
 .../src/com/amazon/ec2/ResourceIdSetItemType.java  |   16 +
 awsapi/src/com/amazon/ec2/ResourceIdSetType.java   |   16 +
 .../src/com/amazon/ec2/ResourceTagSetItemType.java |   16 +
 awsapi/src/com/amazon/ec2/ResourceTagSetType.java  |   16 +
 .../com/amazon/ec2/RevokeSecurityGroupIngress.java |   16 +
 .../ec2/RevokeSecurityGroupIngressResponse.java    |   16 +
 .../RevokeSecurityGroupIngressResponseType.java    |   16 +
 .../amazon/ec2/RevokeSecurityGroupIngressType.java |   16 +
 awsapi/src/com/amazon/ec2/RunInstances.java        |   16 +
 .../src/com/amazon/ec2/RunInstancesResponse.java   |   16 +
 .../com/amazon/ec2/RunInstancesResponseType.java   |   16 +
 awsapi/src/com/amazon/ec2/RunInstancesType.java    |   16 +
 .../com/amazon/ec2/RunningInstancesItemType.java   |   16 +
 .../com/amazon/ec2/RunningInstancesSetType.java    |   16 +
 .../src/com/amazon/ec2/SecurityGroupItemType.java  |   16 +
 .../src/com/amazon/ec2/SecurityGroupSetType.java   |   16 +
 .../amazon/ec2/SpotDatafeedSubscriptionType.java   |   16 +
 .../ec2/SpotInstanceRequestIdSetItemType.java      |   16 +
 .../amazon/ec2/SpotInstanceRequestIdSetType.java   |   16 +
 .../amazon/ec2/SpotInstanceRequestSetItemType.java |   16 +
 .../com/amazon/ec2/SpotInstanceRequestSetType.java |   16 +
 .../com/amazon/ec2/SpotInstanceStateFaultType.java |   16 +
 .../amazon/ec2/SpotPriceHistorySetItemType.java    |   16 +
 .../com/amazon/ec2/SpotPriceHistorySetType.java    |   16 +
 awsapi/src/com/amazon/ec2/StartInstances.java      |   16 +
 .../src/com/amazon/ec2/StartInstancesResponse.java |   16 +
 .../com/amazon/ec2/StartInstancesResponseType.java |   16 +
 awsapi/src/com/amazon/ec2/StartInstancesType.java  |   16 +
 awsapi/src/com/amazon/ec2/StateReasonType.java     |   16 +
 awsapi/src/com/amazon/ec2/StopInstances.java       |   16 +
 .../src/com/amazon/ec2/StopInstancesResponse.java  |   16 +
 .../com/amazon/ec2/StopInstancesResponseType.java  |   16 +
 awsapi/src/com/amazon/ec2/StopInstancesType.java   |   16 +
 awsapi/src/com/amazon/ec2/SubnetIdSetItemType.java |   16 +
 awsapi/src/com/amazon/ec2/SubnetIdSetType.java     |   16 +
 awsapi/src/com/amazon/ec2/SubnetSetType.java       |   16 +
 awsapi/src/com/amazon/ec2/SubnetType.java          |   16 +
 awsapi/src/com/amazon/ec2/TagSetItemType.java      |   16 +
 awsapi/src/com/amazon/ec2/TagSetType.java          |   16 +
 awsapi/src/com/amazon/ec2/TerminateInstances.java  |   16 +
 .../com/amazon/ec2/TerminateInstancesResponse.java |   16 +
 .../amazon/ec2/TerminateInstancesResponseType.java |   16 +
 .../src/com/amazon/ec2/TerminateInstancesType.java |   16 +
 awsapi/src/com/amazon/ec2/UnmonitorInstances.java  |   16 +
 .../com/amazon/ec2/UnmonitorInstancesResponse.java |   16 +
 awsapi/src/com/amazon/ec2/UserDataType.java        |   16 +
 .../src/com/amazon/ec2/UserIdGroupPairSetType.java |   16 +
 awsapi/src/com/amazon/ec2/UserIdGroupPairType.java |   16 +
 awsapi/src/com/amazon/ec2/ValueSetType.java        |   16 +
 awsapi/src/com/amazon/ec2/ValueType.java           |   16 +
 awsapi/src/com/amazon/ec2/VpcIdSetItemType.java    |   16 +
 awsapi/src/com/amazon/ec2/VpcIdSetType.java        |   16 +
 awsapi/src/com/amazon/ec2/VpcSetType.java          |   16 +
 awsapi/src/com/amazon/ec2/VpcType.java             |   16 +
 .../com/amazon/ec2/VpnConnectionIdSetItemType.java |   16 +
 .../src/com/amazon/ec2/VpnConnectionIdSetType.java |   16 +
 .../src/com/amazon/ec2/VpnConnectionSetType.java   |   16 +
 awsapi/src/com/amazon/ec2/VpnConnectionType.java   |   16 +
 .../com/amazon/ec2/VpnGatewayIdSetItemType.java    |   16 +
 awsapi/src/com/amazon/ec2/VpnGatewayIdSetType.java |   16 +
 awsapi/src/com/amazon/ec2/VpnGatewaySetType.java   |   16 +
 awsapi/src/com/amazon/ec2/VpnGatewayType.java      |   16 +
 .../ec2/client/AmazonEC2CallbackHandler.java       |   16 +
 .../src/com/amazon/ec2/client/AmazonEC2Stub.java   |   16 +
 awsapi/src/com/amazon/s3/AccessControlList.java    | 1142 +-
 awsapi/src/com/amazon/s3/AccessControlPolicy.java  | 1040 +-
 .../src/com/amazon/s3/AmazonCustomerByEmail.java   |  978 +-
 .../amazon/s3/AmazonS3MessageReceiverInOut.java    | 2752 +-
 awsapi/src/com/amazon/s3/AmazonS3Skeleton.java     |  556 +-
 .../com/amazon/s3/AmazonS3SkeletonInterface.java   |  498 +-
 awsapi/src/com/amazon/s3/BucketLoggingStatus.java  |  944 +-
 awsapi/src/com/amazon/s3/CanonicalUser.java        | 1188 +-
 awsapi/src/com/amazon/s3/CopyObject.java           | 4380 +-
 awsapi/src/com/amazon/s3/CopyObjectResponse.java   |  920 +-
 awsapi/src/com/amazon/s3/CopyObjectResult.java     | 1164 +-
 awsapi/src/com/amazon/s3/CreateBucket.java         | 1760 +-
 .../com/amazon/s3/CreateBucketConfiguration.java   |  918 +-
 awsapi/src/com/amazon/s3/CreateBucketResponse.java |  920 +-
 awsapi/src/com/amazon/s3/CreateBucketResult.java   |  980 +-
 awsapi/src/com/amazon/s3/DeleteBucket.java         | 1822 +-
 awsapi/src/com/amazon/s3/DeleteBucketResponse.java |  920 +-
 awsapi/src/com/amazon/s3/DeleteMarkerEntry.java    | 1664 +-
 awsapi/src/com/amazon/s3/DeleteObject.java         | 2006 +-
 awsapi/src/com/amazon/s3/DeleteObjectResponse.java |  920 +-
 awsapi/src/com/amazon/s3/ExtensionMapper.java      |  824 +-
 .../amazon/s3/GetBucketAccessControlPolicy.java    | 1822 +-
 .../s3/GetBucketAccessControlPolicyResponse.java   |  920 +-
 .../src/com/amazon/s3/GetBucketLoggingStatus.java  | 1822 +-
 .../amazon/s3/GetBucketLoggingStatusResponse.java  |  920 +-
 awsapi/src/com/amazon/s3/GetObject.java            | 2510 +-
 .../amazon/s3/GetObjectAccessControlPolicy.java    | 2006 +-
 .../s3/GetObjectAccessControlPolicyResponse.java   |  920 +-
 awsapi/src/com/amazon/s3/GetObjectExtended.java    | 4322 +-
 .../com/amazon/s3/GetObjectExtendedResponse.java   |  920 +-
 awsapi/src/com/amazon/s3/GetObjectResponse.java    |  920 +-
 awsapi/src/com/amazon/s3/GetObjectResult.java      | 1770 +-
 awsapi/src/com/amazon/s3/Grant.java                | 1040 +-
 awsapi/src/com/amazon/s3/Grantee.java              |  786 +-
 awsapi/src/com/amazon/s3/Group.java                |  978 +-
 awsapi/src/com/amazon/s3/ListAllMyBuckets.java     | 1428 +-
 .../src/com/amazon/s3/ListAllMyBucketsEntry.java   | 1164 +-
 awsapi/src/com/amazon/s3/ListAllMyBucketsList.java | 1134 +-
 .../com/amazon/s3/ListAllMyBucketsResponse.java    |  920 +-
 .../src/com/amazon/s3/ListAllMyBucketsResult.java  | 1040 +-
 awsapi/src/com/amazon/s3/ListBucket.java           | 2652 +-
 awsapi/src/com/amazon/s3/ListBucketResponse.java   |  920 +-
 awsapi/src/com/amazon/s3/ListBucketResult.java     | 3118 +-
 awsapi/src/com/amazon/s3/ListEntry.java            | 1786 +-
 awsapi/src/com/amazon/s3/ListVersionsResponse.java |  920 +-
 awsapi/src/com/amazon/s3/ListVersionsResult.java   | 3500 +-
 .../amazon/s3/ListVersionsResultChoice_type0.java  |  980 +-
 awsapi/src/com/amazon/s3/LocationConstraint.java   |  984 +-
 awsapi/src/com/amazon/s3/LoggingSettings.java      | 1312 +-
 awsapi/src/com/amazon/s3/MetadataDirective.java    |  946 +-
 awsapi/src/com/amazon/s3/MetadataEntry.java        | 1164 +-
 awsapi/src/com/amazon/s3/MfaDeleteStatus.java      |  946 +-
 .../com/amazon/s3/NotificationConfiguration.java   | 1134 +-
 awsapi/src/com/amazon/s3/Payer.java                |  946 +-
 awsapi/src/com/amazon/s3/Permission.java           |  982 +-
 awsapi/src/com/amazon/s3/PostResponse.java         | 1534 +-
 awsapi/src/com/amazon/s3/PrefixEntry.java          |  980 +-
 awsapi/src/com/amazon/s3/PutObject.java            | 2816 +-
 awsapi/src/com/amazon/s3/PutObjectInline.java      | 3024 +-
 .../src/com/amazon/s3/PutObjectInlineResponse.java |  920 +-
 awsapi/src/com/amazon/s3/PutObjectResponse.java    |  920 +-
 awsapi/src/com/amazon/s3/PutObjectResult.java      | 1164 +-
 .../com/amazon/s3/RequestPaymentConfiguration.java |  918 +-
 awsapi/src/com/amazon/s3/Result.java               |  918 +-
 .../amazon/s3/SetBucketAccessControlPolicy.java    | 1970 +-
 .../s3/SetBucketAccessControlPolicyResponse.java   |  798 +-
 .../src/com/amazon/s3/SetBucketLoggingStatus.java  | 1944 +-
 .../amazon/s3/SetBucketLoggingStatusResponse.java  |  798 +-
 .../amazon/s3/SetObjectAccessControlPolicy.java    | 2128 +-
 .../s3/SetObjectAccessControlPolicyResponse.java   |  798 +-
 awsapi/src/com/amazon/s3/Status.java               | 1148 +-
 awsapi/src/com/amazon/s3/StorageClass.java         |  946 +-
 awsapi/src/com/amazon/s3/TopicConfiguration.java   | 1346 +-
 awsapi/src/com/amazon/s3/User.java                 |  784 +-
 awsapi/src/com/amazon/s3/VersionEntry.java         | 2138 +-
 .../src/com/amazon/s3/VersioningConfiguration.java | 1092 +-
 awsapi/src/com/amazon/s3/VersioningStatus.java     |  946 +-
 .../amazon/s3/client/AmazonS3CallbackHandler.java  |  626 +-
 awsapi/src/com/amazon/s3/client/AmazonS3Stub.java  |92182 ++++++++-------
 .../bridge/auth/ec2/AuthenticationHandler.java     |  305 +-
 .../bridge/auth/ec2/AuthenticationModule.java      |  113 +-
 awsapi/src/com/cloud/bridge/auth/ec2/module.xml    |   34 +-
 .../bridge/auth/s3/AuthenticationHandler.java      |   31 +-
 .../cloud/bridge/auth/s3/AuthenticationModule.java |  117 +-
 awsapi/src/com/cloud/bridge/auth/s3/module.xml     |   34 +-
 .../cloud/bridge/io/DimeDelimitedInputStream.java  | 1250 +-
 .../com/cloud/bridge/io/FileRangeDataSource.java   |  123 +-
 .../com/cloud/bridge/io/FileRangeInputStream.java  |  193 +-
 .../bridge/io/MTOMAwareResultStreamWriter.java     |   16 +
 .../cloud/bridge/io/MultiPartDimeInputStream.java  |  343 +-
 .../cloud/bridge/io/S3FileSystemBucketAdapter.java |  497 +-
 .../bridge/lifecycle/ServiceEngineLifecycle.java   |  109 +-
 awsapi/src/com/cloud/bridge/model/MHost.hbm.xml    |   74 +-
 awsapi/src/com/cloud/bridge/model/MHost.java       |  227 +-
 .../src/com/cloud/bridge/model/MHostMount.hbm.xml  |   56 +-
 awsapi/src/com/cloud/bridge/model/MHostMount.java  |  189 +-
 awsapi/src/com/cloud/bridge/model/SAcl.hbm.xml     |   72 +-
 awsapi/src/com/cloud/bridge/model/SAcl.java        |  479 +-
 awsapi/src/com/cloud/bridge/model/SBucket.hbm.xml  |   76 +-
 awsapi/src/com/cloud/bridge/model/SBucket.java     |  257 +-
 awsapi/src/com/cloud/bridge/model/SHost.hbm.xml    |   84 +-
 awsapi/src/com/cloud/bridge/model/SHost.java       |  235 +-
 awsapi/src/com/cloud/bridge/model/SMeta.hbm.xml    |   46 +-
 awsapi/src/com/cloud/bridge/model/SMeta.java       |  193 +-
 awsapi/src/com/cloud/bridge/model/SObject.hbm.xml  |   82 +-
 awsapi/src/com/cloud/bridge/model/SObject.java     |  417 +-
 .../src/com/cloud/bridge/model/SObjectItem.hbm.xml |   88 +-
 awsapi/src/com/cloud/bridge/model/SObjectItem.java |  303 +-
 .../com/cloud/bridge/model/UserCredentials.hbm.xml |   40 +-
 .../com/cloud/bridge/model/UserCredentials.java    |  189 +-
 awsapi/src/com/cloud/bridge/persist/EntityDao.java |  237 +-
 .../cloud/bridge/persist/GMTDateTimeUserType.java  |  205 +-
 .../com/cloud/bridge/persist/PersistContext.java   |  719 +-
 .../com/cloud/bridge/persist/PersistException.java |   77 +-
 .../src/com/cloud/bridge/persist/dao/BaseDao.java  |  151 +-
 .../cloud/bridge/persist/dao/BucketPolicyDao.java  |   31 +-
 .../bridge/persist/dao/CloudStackAccountDao.java   |   69 +-
 .../persist/dao/CloudStackConfigurationDao.java    |   83 +-
 .../persist/dao/CloudStackSvcOfferingDao.java      |   83 +-
 .../src/com/cloud/bridge/persist/dao/MHostDao.java |   65 +-
 .../cloud/bridge/persist/dao/MHostMountDao.java    |   65 +-
 .../cloud/bridge/persist/dao/MultipartLoadDao.java |   31 +-
 .../com/cloud/bridge/persist/dao/OfferingDao.java  |   31 +-
 .../src/com/cloud/bridge/persist/dao/SAclDao.java  |  157 +-
 .../com/cloud/bridge/persist/dao/SBucketDao.java   |   79 +-
 .../src/com/cloud/bridge/persist/dao/SHostDao.java |   75 +-
 .../src/com/cloud/bridge/persist/dao/SMetaDao.java |  115 +-
 .../com/cloud/bridge/persist/dao/SObjectDao.java   |  157 +-
 .../cloud/bridge/persist/dao/SObjectItemDao.java   |   65 +-
 .../bridge/persist/dao/UserCredentialsDao.java     |  337 +-
 .../com/cloud/bridge/service/EC2MainServlet.java   |   16 +
 .../com/cloud/bridge/service/EC2RestServlet.java   |   79 +-
 .../com/cloud/bridge/service/EC2SoapService.java   |   33 +-
 .../cloud/bridge/service/EC2SoapServiceImpl.java   |   70 +-
 .../src/com/cloud/bridge/service/S3Constants.java  |   51 +-
 .../com/cloud/bridge/service/S3RestServlet.java    |   36 +-
 .../src/com/cloud/bridge/service/UserContext.java  |  220 +-
 awsapi/src/com/cloud/bridge/service/UserInfo.java  |  120 +-
 .../service/controller/s3/S3BucketAction.java      |   31 +-
 .../service/controller/s3/S3ObjectAction.java      |   33 +-
 .../s3/S3SerializableServiceImplementation.java    | 1449 +-
 .../service/controller/s3/ServiceProvider.java     |   33 +-
 .../service/controller/s3/ServletAction.java       |   59 +-
 .../com/cloud/bridge/service/core/ec2/Account.java |   16 +
 .../cloud/bridge/service/core/ec2/DiskOffer.java   |  165 +-
 .../bridge/service/core/ec2/DiskOfferings.java     |   71 +-
 .../cloud/bridge/service/core/ec2/EC2Address.java  |   31 +-
 .../service/core/ec2/EC2AddressFilterSet.java      |   31 +-
 .../service/core/ec2/EC2AssociateAddress.java      |   31 +-
 .../core/ec2/EC2AuthorizeRevokeSecurityGroup.java  |   76 +-
 .../core/ec2/EC2AvailabilityZonesFilterSet.java    |  100 +
 .../bridge/service/core/ec2/EC2CreateImage.java    |  107 +-
 .../service/core/ec2/EC2CreateImageResponse.java   |   67 +-
 .../bridge/service/core/ec2/EC2CreateKeyPair.java  |   35 +-
 .../bridge/service/core/ec2/EC2CreateVolume.java   |  153 +-
 .../bridge/service/core/ec2/EC2DeleteKeyPair.java  |   35 +-
 .../service/core/ec2/EC2DescribeAddresses.java     |   31 +-
 .../core/ec2/EC2DescribeAddressesResponse.java     |   31 +-
 .../core/ec2/EC2DescribeAvailabilityZones.java     |   81 +-
 .../ec2/EC2DescribeAvailabilityZonesResponse.java  |   99 +-
 .../core/ec2/EC2DescribeImageAttribute.java        |   93 +-
 .../bridge/service/core/ec2/EC2DescribeImages.java |  107 +-
 .../core/ec2/EC2DescribeImagesResponse.java        |   71 +-
 .../service/core/ec2/EC2DescribeInstances.java     |   89 +-
 .../core/ec2/EC2DescribeInstancesResponse.java     |   71 +-
 .../service/core/ec2/EC2DescribeKeyPairs.java      |   31 +-
 .../core/ec2/EC2DescribeKeyPairsResponse.java      |   31 +-
 .../core/ec2/EC2DescribeSecurityGroups.java        |   74 +-
 .../ec2/EC2DescribeSecurityGroupsResponse.java     |   56 +-
 .../service/core/ec2/EC2DescribeSnapshots.java     |   89 +-
 .../core/ec2/EC2DescribeSnapshotsResponse.java     |   71 +-
 .../service/core/ec2/EC2DescribeVolumes.java       |   89 +-
 .../core/ec2/EC2DescribeVolumesResponse.java       |   79 +-
 .../service/core/ec2/EC2DisassociateAddress.java   |   35 +-
 .../cloud/bridge/service/core/ec2/EC2Engine.java   |   45 +-
 .../cloud/bridge/service/core/ec2/EC2Filter.java   |   31 +-
 .../bridge/service/core/ec2/EC2GroupFilterSet.java |   31 +-
 .../cloud/bridge/service/core/ec2/EC2Image.java    |  215 +-
 .../service/core/ec2/EC2ImageAttributes.java       |  173 +-
 .../bridge/service/core/ec2/EC2ImportKeyPair.java  |   35 +-
 .../cloud/bridge/service/core/ec2/EC2Instance.java |  401 +-
 .../service/core/ec2/EC2InstanceFilterSet.java     |   31 +-
 .../bridge/service/core/ec2/EC2IpPermission.java   |  241 +-
 .../service/core/ec2/EC2KeyPairFilterSet.java      |   31 +-
 .../service/core/ec2/EC2ModifyImageAttribute.java  |  189 +-
 .../bridge/service/core/ec2/EC2PasswordData.java   |   16 +
 .../service/core/ec2/EC2RebootInstances.java       |   71 +-
 .../bridge/service/core/ec2/EC2RegisterImage.java  |  189 +-
 .../bridge/service/core/ec2/EC2ReleaseAddress.java |   31 +-
 .../bridge/service/core/ec2/EC2RunInstances.java   |  251 +-
 .../service/core/ec2/EC2RunInstancesResponse.java  |   75 +-
 .../bridge/service/core/ec2/EC2SSHKeyPair.java     |   16 +
 .../bridge/service/core/ec2/EC2SecurityGroup.java  |  174 +-
 .../cloud/bridge/service/core/ec2/EC2Snapshot.java |  237 +-
 .../service/core/ec2/EC2SnapshotFilterSet.java     |   50 +-
 .../bridge/service/core/ec2/EC2StartInstances.java |   71 +-
 .../core/ec2/EC2StartInstancesResponse.java        |   73 +-
 .../bridge/service/core/ec2/EC2StopInstances.java  |   93 +-
 .../service/core/ec2/EC2StopInstancesResponse.java |   71 +-
 .../cloud/bridge/service/core/ec2/EC2Volume.java   |  467 +-
 .../service/core/ec2/EC2VolumeFilterSet.java       |   63 +-
 .../service/core/ec2/IpForwardingRuleResponse.java |   33 +-
 .../bridge/service/core/ec2/OfferingBundle.java    |   69 +-
 .../bridge/service/core/ec2/ServiceOffer.java      |  175 +-
 .../bridge/service/core/ec2/ServiceOfferings.java  |   73 +-
 .../service/core/s3/S3AccessControlList.java       |   85 +-
 .../service/core/s3/S3AccessControlPolicy.java     |   89 +-
 .../cloud/bridge/service/core/s3/S3AuthParams.java |  100 +-
 .../bridge/service/core/s3/S3BucketAdapter.java    |   72 +-
 .../bridge/service/core/s3/S3BucketPolicy.java     |   31 +-
 .../bridge/service/core/s3/S3CanonicalUser.java    |   99 +-
 .../bridge/service/core/s3/S3ConditionFactory.java |   31 +-
 .../service/core/s3/S3ConditionalHeaders.java      |  350 +-
 .../service/core/s3/S3CopyObjectRequest.java       |   24 +-
 .../service/core/s3/S3CopyObjectResponse.java      |   16 +
 .../core/s3/S3CreateBucketConfiguration.java       |   82 +-
 .../service/core/s3/S3CreateBucketRequest.java     |  122 +-
 .../service/core/s3/S3CreateBucketResponse.java    |   68 +-
 .../service/core/s3/S3DeleteBucketRequest.java     |   68 +-
 .../service/core/s3/S3DeleteObjectRequest.java     |  106 +-
 .../com/cloud/bridge/service/core/s3/S3Engine.java | 3758 +-
 .../s3/S3GetBucketAccessControlPolicyRequest.java  |   68 +-
 .../s3/S3GetObjectAccessControlPolicyRequest.java  |  104 +-
 .../bridge/service/core/s3/S3GetObjectRequest.java |  234 +-
 .../service/core/s3/S3GetObjectResponse.java       |  188 +-
 .../com/cloud/bridge/service/core/s3/S3Grant.java  |  168 +-
 .../service/core/s3/S3HostCallingFormat.java       |   20 +-
 .../service/core/s3/S3ListAllMyBucketsEntry.java   |  114 +-
 .../service/core/s3/S3ListAllMyBucketsRequest.java |   48 +-
 .../core/s3/S3ListAllMyBucketsResponse.java        |   90 +-
 .../service/core/s3/S3ListBucketObjectEntry.java   |  280 +-
 .../service/core/s3/S3ListBucketPrefixEntry.java   |   76 +-
 .../service/core/s3/S3ListBucketRequest.java       |  158 +-
 .../service/core/s3/S3ListBucketResponse.java      |  246 +-
 .../bridge/service/core/s3/S3MetaDataEntry.java    |   84 +-
 .../bridge/service/core/s3/S3MultipartPart.java    |   31 +-
 .../bridge/service/core/s3/S3MultipartUpload.java  |   31 +-
 .../bridge/service/core/s3/S3PolicyAction.java     |   31 +-
 .../service/core/s3/S3PolicyArnCondition.java      |   31 +-
 .../service/core/s3/S3PolicyBoolCondition.java     |   31 +-
 .../bridge/service/core/s3/S3PolicyCondition.java  |   31 +-
 .../service/core/s3/S3PolicyConditionBlock.java    |   31 +-
 .../bridge/service/core/s3/S3PolicyContext.java    |   31 +-
 .../service/core/s3/S3PolicyDateCondition.java     |   31 +-
 .../core/s3/S3PolicyIPAddressCondition.java        |   31 +-
 .../service/core/s3/S3PolicyNumericCondition.java  |   31 +-
 .../bridge/service/core/s3/S3PolicyPrincipal.java  |   31 +-
 .../bridge/service/core/s3/S3PolicyStatement.java  |   31 +-
 .../service/core/s3/S3PolicyStringCondition.java   |   31 +-
 .../service/core/s3/S3PutObjectInlineRequest.java  |  223 +-
 .../service/core/s3/S3PutObjectInlineResponse.java |  135 +-
 .../bridge/service/core/s3/S3PutObjectRequest.java |  219 +-
 .../service/core/s3/S3PutObjectResponse.java       |   93 +-
 .../cloud/bridge/service/core/s3/S3Request.java    |  109 +-
 .../cloud/bridge/service/core/s3/S3Response.java   |  112 +-
 .../s3/S3SetBucketAccessControlPolicyRequest.java  |   86 +-
 .../s3/S3SetObjectAccessControlPolicyRequest.java  |  122 +-
 .../service/exception/ConfigurationException.java  |   74 +-
 .../service/exception/EC2ServiceException.java     |  303 +-
 .../service/exception/FileNotExistException.java   |   74 +-
 .../service/exception/HostNotMountedException.java |   74 +-
 .../service/exception/InternalErrorException.java  |   74 +-
 .../service/exception/InvalidBucketName.java       |   16 +
 .../exception/InvalidRequestContentException.java  |   74 +-
 .../service/exception/NetworkIOException.java      |   74 +-
 .../service/exception/NoSuchObjectException.java   |   76 +-
 .../exception/ObjectAlreadyExistsException.java    |   74 +-
 .../service/exception/OutOfServiceException.java   |   74 +-
 .../service/exception/OutOfStorageException.java   |   74 +-
 .../exception/PermissionDeniedException.java       |   74 +-
 .../service/exception/UnsupportedException.java    |   56 +-
 .../src/com/cloud/bridge/tool/CloudS3CmdTool.java  |  648 +-
 .../com/cloud/bridge/util/AuthenticationUtils.java |   93 +-
 .../com/cloud/bridge/util/CalendarDateParam.java   |   66 +-
 .../com/cloud/bridge/util/CloudSessionFactory.java |  214 +-
 .../bridge/util/CloudStackSessionFactory.java      |  219 +-
 .../com/cloud/bridge/util/ConfigurationHelper.java |  206 +-
 awsapi/src/com/cloud/bridge/util/Converter.java    |  134 +-
 awsapi/src/com/cloud/bridge/util/CryptoHelper.java |   42 +-
 .../bridge/util/DatabindingConverterUtil.java      |   32 +-
 awsapi/src/com/cloud/bridge/util/DateHelper.java   |  190 +-
 awsapi/src/com/cloud/bridge/util/EC2RestAuth.java  |  547 +-
 .../util/EncryptionSecretKeyCheckerUtil.java       |  260 +-
 awsapi/src/com/cloud/bridge/util/EntityParam.java  |   60 +-
 awsapi/src/com/cloud/bridge/util/HeaderParam.java  |   82 +-
 .../bridge/util/ISO8601SimpleDateTimeFormat.java   |   31 +-
 .../src/com/cloud/bridge/util/IpAddressRange.java  |   31 +-
 .../src/com/cloud/bridge/util/IteratorHelper.java  |  110 +-
 awsapi/src/com/cloud/bridge/util/JsonAccessor.java |  502 +-
 awsapi/src/com/cloud/bridge/util/NetHelper.java    |  192 +-
 awsapi/src/com/cloud/bridge/util/OrderedPair.java  |  104 +-
 awsapi/src/com/cloud/bridge/util/PolicyParser.java |   31 +-
 awsapi/src/com/cloud/bridge/util/QueryHelper.java  |  172 +-
 awsapi/src/com/cloud/bridge/util/RestAuth.java     |   32 +-
 awsapi/src/com/cloud/bridge/util/S3SoapAuth.java   |  147 +-
 .../bridge/util/ServletRequestDataSource.java      |  120 +-
 awsapi/src/com/cloud/bridge/util/StringHelper.java |  222 +-
 awsapi/src/com/cloud/bridge/util/TextParam.java    |   60 +-
 awsapi/src/com/cloud/bridge/util/TimeParam.java    |   64 +-
 .../src/com/cloud/bridge/util/TimestampParam.java  |   64 +-
 awsapi/src/com/cloud/bridge/util/Triple.java       |   34 +-
 awsapi/src/com/cloud/bridge/util/XElement.java     |   64 +-
 awsapi/src/com/cloud/bridge/util/XFlatten.java     |   61 +-
 awsapi/src/com/cloud/bridge/util/XOmitNull.java    |   58 +-
 .../src/com/cloud/bridge/util/XSerializable.java   |   54 +-
 awsapi/src/com/cloud/bridge/util/XSerializer.java  |  994 +-
 .../com/cloud/bridge/util/XSerializerAdapter.java  |   62 +-
 .../cloud/bridge/util/XSerializerJsonAdapter.java  |  328 +-
 .../cloud/bridge/util/XSerializerXmlAdapter.java   |  344 +-
 awsapi/src/com/cloud/bridge/util/XmlHelper.java    |  348 +-
 awsapi/src/com/cloud/stack/CloudStackApi.java      |   32 +-
 awsapi/src/com/cloud/stack/CloudStackClient.java   |  394 +-
 awsapi/src/com/cloud/stack/CloudStackCommand.java  |  298 +-
 .../src/com/cloud/stack/models/ApiConstants.java   | 1013 +-
 .../cloud/stack/models/CloudStackAccount.hbm.xml   |   32 +-
 .../com/cloud/stack/models/CloudStackAccount.java  |   35 +-
 .../cloud/stack/models/CloudStackCapabilities.java |   35 +-
 .../stack/models/CloudStackConfiguration.hbm.xml   |   38 +-
 .../stack/models/CloudStackConfiguration.java      |  128 +-
 .../cloud/stack/models/CloudStackDiskOffering.java |   35 +-
 .../com/cloud/stack/models/CloudStackEvent.java    |   35 +-
 .../cloud/stack/models/CloudStackEventType.java    |   35 +-
 .../stack/models/CloudStackExtractTemplate.java    |   35 +-
 .../cloud/stack/models/CloudStackIdentifier.java   |   35 +-
 .../cloud/stack/models/CloudStackInfoResponse.java |  117 +-
 .../cloud/stack/models/CloudStackIngressRule.java  |  175 +-
 .../stack/models/CloudStackInstanceGroup.java      |   35 +-
 .../cloud/stack/models/CloudStackIpAddress.java    |  303 +-
 .../com/cloud/stack/models/CloudStackKeyPair.java  |   31 +-
 .../com/cloud/stack/models/CloudStackKeyValue.java |   35 +-
 .../stack/models/CloudStackLoadBalancerRule.java   |   35 +-
 .../com/cloud/stack/models/CloudStackNetwork.java  |   35 +-
 .../stack/models/CloudStackNetworkOffering.java    |   35 +-
 .../stack/models/CloudStackNetworkService.java     |   35 +-
 .../models/CloudStackNetworkServiceCapability.java |   35 +-
 .../src/com/cloud/stack/models/CloudStackNic.java  |  209 +-
 .../cloud/stack/models/CloudStackOsCategory.java   |   35 +-
 .../com/cloud/stack/models/CloudStackOsType.java   |   35 +-
 .../cloud/stack/models/CloudStackPasswordData.java |   35 +-
 .../stack/models/CloudStackPortForwardingRule.java |   35 +-
 .../stack/models/CloudStackResourceLimit.java      |  111 +-
 .../stack/models/CloudStackSecurityGroup.java      |  163 +-
 .../models/CloudStackSecurityGroupIngress.java     |   35 +-
 .../stack/models/CloudStackServiceOffering.hbm.xml |   32 +-
 .../stack/models/CloudStackServiceOffering.java    |   35 +-
 .../com/cloud/stack/models/CloudStackSnapshot.java |  217 +-
 .../stack/models/CloudStackSnapshotPolicy.java     |   35 +-
 .../com/cloud/stack/models/CloudStackTemplate.java |   35 +-
 .../stack/models/CloudStackTemplatePermission.java |   35 +-
 .../src/com/cloud/stack/models/CloudStackUser.java |   35 +-
 .../com/cloud/stack/models/CloudStackUserVm.java   |  795 +-
 .../com/cloud/stack/models/CloudStackVolume.java   |  673 +-
 .../src/com/cloud/stack/models/CloudStackZone.java |  355 +-
 .../test/com/cloud/gate/model/ModelTestCase.java   |  720 +-
 .../com/cloud/gate/persist/PersitTestCase.java     |  130 +-
 .../com/cloud/gate/service/ServiceTestCase.java    |  140 +-
 .../test/com/cloud/gate/testcase/BaseTestCase.java |  100 +-
 .../cloud/gate/util/CloudStackClientTestCase.java  |  124 +-
 .../com/cloud/gate/util/JsonAccessorTestCase.java  |  118 +-
 awsapi/test/com/cloud/gate/util/UtilTestCase.java  |  362 +-
 .../test/com/cloud/gate/util/Xml2JavaTestData.xml  |   72 +-
 build.xml                                          |    2 +
 build/build-cloud-plugins.xml                      |  322 +
 build/build-cloud.xml                              |   22 +-
 build/build-common.xml                             |    2 +-
 build/build-devcloud.xml                           |   98 +
 build/developer.xml                                |    8 +-
 build/package.xml                                  |    3 +-
 build/replace.properties                           |   10 -
 .../WEB-INF/classes/resources/messages.properties  |   16 +-
 client/tomcatconf/commands.properties.in           |    7 +-
 client/tomcatconf/components.xml.in                |   22 +-
 cloud.spec                                         |   13 +
 console-proxy/conf/log4j-cloud.xml                 |    2 +-
 console-proxy/scripts/_run.sh                      |    2 +-
 console-proxy/scripts/config_auth.sh               |    2 +-
 console-proxy/scripts/config_ssl.sh                |    2 +-
 console-proxy/scripts/ipfirewall.sh                |    2 +-
 console-proxy/scripts/run-proxy.sh                 |    2 +-
 console-proxy/scripts/run.sh                       |    2 +-
 console-proxy/scripts/ssvm-check.sh                |    2 +-
 .../cloud/consoleproxy/ConsoleProxyVncClient.java  |   35 +-
 core/src/com/cloud/agent/IAgentControl.java        |   28 +-
 .../src/com/cloud/agent/IAgentControlListener.java |   28 +-
 core/src/com/cloud/agent/Listener.java             |   28 +-
 core/src/com/cloud/agent/RecoveryHandler.java      |   28 +-
 .../com/cloud/agent/StartupCommandProcessor.java   |   28 +-
 .../cloud/agent/api/DirectNetworkUsageAnswer.java  |   28 +-
 .../cloud/agent/api/DirectNetworkUsageCommand.java |   28 +-
 .../api/ExternalNetworkResourceUsageAnswer.java    |   28 +-
 .../api/ExternalNetworkResourceUsageCommand.java   |   28 +-
 .../agent/api/NetworkRulesSystemVmCommand.java     |   28 +-
 .../agent/api/RecurringNetworkUsageAnswer.java     |   28 +-
 .../agent/api/RecurringNetworkUsageCommand.java    |   28 +-
 .../cloud/agent/api/StartupVMMAgentCommand.java    |   28 +-
 .../virtualnetwork/VirtualRoutingResource.java     |   28 +-
 .../cloud/agent/transport/ArrayTypeAdaptor.java    |   28 +-
 .../agent/transport/LoggingExclusionStrategy.java  |   28 +-
 core/src/com/cloud/agent/transport/Request.java    |   28 +-
 core/src/com/cloud/agent/transport/Response.java   |   28 +-
 core/src/com/cloud/alert/AlertAdapter.java         |   28 +-
 core/src/com/cloud/alert/AlertManager.java         |   28 +-
 core/src/com/cloud/alert/AlertVO.java              |   28 +-
 core/src/com/cloud/async/AsyncJobVO.java           |   28 +-
 core/src/com/cloud/async/SyncQueueItemVO.java      |   28 +-
 core/src/com/cloud/async/SyncQueueVO.java          |   28 +-
 core/src/com/cloud/capacity/CapacityVO.java        |   28 +-
 core/src/com/cloud/certificate/CertificateVO.java  |   28 +-
 .../com/cloud/configuration/ConfigurationVO.java   |   28 +-
 .../com/cloud/configuration/ResourceCountVO.java   |   28 +-
 .../com/cloud/configuration/ResourceLimitVO.java   |   28 +-
 .../cloud/consoleproxy/ConsoleProxyAllocator.java  |   28 +-
 core/src/com/cloud/event/EventVO.java              |   28 +-
 core/src/com/cloud/event/UsageEvent.java           |   28 +-
 core/src/com/cloud/event/UsageEventVO.java         |   28 +-
 core/src/com/cloud/event/dao/EventDao.java         |   28 +-
 core/src/com/cloud/event/dao/EventDaoImpl.java     |   28 +-
 core/src/com/cloud/event/dao/UsageEventDao.java    |   28 +-
 .../src/com/cloud/event/dao/UsageEventDaoImpl.java |   28 +-
 .../exception/AgentControlChannelException.java    |   28 +-
 .../exception/OperationTimedoutException.java      |   28 +-
 .../exception/UnsupportedVersionException.java     |   28 +-
 .../com/cloud/exception/UsageServerException.java  |   28 +-
 core/src/com/cloud/host/DetailVO.java              |   28 +-
 core/src/com/cloud/host/HostInfo.java              |   28 +-
 core/src/com/cloud/host/HostTagVO.java             |   28 +-
 core/src/com/cloud/host/HostVO.java                |   28 +-
 .../cloud/hypervisor/HypervisorCapabilitiesVO.java |   28 +-
 .../hyperv/resource/HypervDummyResourceBase.java   |   28 +-
 .../hypervisor/hyperv/resource/HypervResource.java |   30 +-
 .../kvm/resource/KvmDummyResourceBase.java         |   28 +-
 .../vmware/manager/VmwareHostService.java          |   25 -
 .../hypervisor/vmware/manager/VmwareManager.java   |   73 -
 .../vmware/manager/VmwareStorageManager.java       |   30 -
 .../vmware/manager/VmwareStorageManagerImpl.java   |  880 -
 .../vmware/manager/VmwareStorageMount.java         |   17 -
 .../hypervisor/vmware/resource/SshHelper.java      |  201 -
 .../vmware/resource/VmwareContextFactory.java      |   60 -
 .../hypervisor/vmware/resource/VmwareResource.java | 4201 -
 .../hypervisor/xen/resource/CitrixHelper.java      |  635 -
 .../xen/resource/CitrixResourceBase.java           | 6963 --
 .../hypervisor/xen/resource/XcpServerResource.java |  103 -
 .../xen/resource/XenServer56FP1Resource.java       |  213 -
 .../xen/resource/XenServer56Resource.java          |  307 -
 .../xen/resource/XenServer56SP2Resource.java       |   56 -
 .../xen/resource/XenServer600Resource.java         |   55 -
 .../xen/resource/XenServer602Resource.java         |   55 -
 .../xen/resource/XenServerConnectionPool.java      |  979 -
 .../hypervisor/xen/resource/XenServerPoolVms.java  |   82 -
 .../com/cloud/info/ConsoleProxyConnectionInfo.java |   28 +-
 core/src/com/cloud/info/ConsoleProxyInfo.java      |   28 +-
 core/src/com/cloud/info/ConsoleProxyLoadInfo.java  |   28 +-
 core/src/com/cloud/info/ConsoleProxyStatus.java    |   28 +-
 core/src/com/cloud/info/RunningHostCountInfo.java  |   28 +-
 .../com/cloud/info/RunningHostInfoAgregator.java   |   28 +-
 core/src/com/cloud/info/SecStorageVmLoadInfo.java  |   28 +-
 .../src/com/cloud/network/HAProxyConfigurator.java |   28 +-
 .../cloud/network/LoadBalancerConfigurator.java    |   28 +-
 .../com/cloud/network/LoadBalancerValidator.java   |   28 +-
 core/src/com/cloud/network/VpnUserVO.java          |   28 +-
 .../CreateLoadBalancerApplianceAnswer.java         |   28 +-
 .../DestroyLoadBalancerApplianceAnswer.java        |   28 +-
 .../cloud/network/resource/F5BigIpResource.java    | 1081 -
 .../cloud/network/resource/JuniperSrxResource.java | 3204 -
 .../cloud/network/resource/NetscalerResource.java  | 1533 -
 .../network/resource/TrafficSentinelResource.java  |   28 +-
 .../com/cloud/network/resource/XTrustProvider.java |   16 +
 .../network/security/SecurityGroupRuleVO.java      |   28 +-
 .../network/security/SecurityGroupRulesVO.java     |   28 +-
 .../network/security/SecurityGroupVMMapVO.java     |   28 +-
 .../cloud/network/security/SecurityGroupVO.java    |   28 +-
 .../cloud/network/security/SecurityGroupWork.java  |   28 +-
 .../network/security/SecurityGroupWorkVO.java      |   28 +-
 .../com/cloud/network/security/VmRulesetLogVO.java |   28 +-
 core/src/com/cloud/resource/DiskPreparer.java      |   28 +-
 core/src/com/cloud/resource/NetworkPreparer.java   |   28 +-
 core/src/com/cloud/resource/ResourceListener.java  |   28 +-
 core/src/com/cloud/resource/ServerResource.java    |   28 +-
 .../src/com/cloud/resource/ServerResourceBase.java |   28 +-
 .../cloud/resource/UnableDeleteHostException.java  |   28 +-
 .../resource/hypervisor/HypervisorResource.java    |   28 +-
 .../storage/PrimaryStorageHeadResource.java        |   28 +-
 core/src/com/cloud/serializer/GsonHelper.java      |   28 +-
 .../src/com/cloud/serializer/SerializerHelper.java |   28 +-
 core/src/com/cloud/storage/DiskOfferingVO.java     |   28 +-
 core/src/com/cloud/storage/GuestOSCategoryVO.java  |   28 +-
 core/src/com/cloud/storage/GuestOSVO.java          |   28 +-
 core/src/com/cloud/storage/JavaStorageLayer.java   |   28 +-
 core/src/com/cloud/storage/LaunchPermissionVO.java |   28 +-
 core/src/com/cloud/storage/SecondaryStorage.java   |   28 +-
 .../com/cloud/storage/SecondaryStorageLayer.java   |   28 +-
 core/src/com/cloud/storage/SnapshotPolicyVO.java   |   28 +-
 core/src/com/cloud/storage/SnapshotScheduleVO.java |   28 +-
 core/src/com/cloud/storage/SnapshotVO.java         |   28 +-
 core/src/com/cloud/storage/StorageLayer.java       |   28 +-
 .../src/com/cloud/storage/StoragePoolDetailVO.java |   28 +-
 .../com/cloud/storage/StoragePoolDiscoverer.java   |   28 +-
 .../com/cloud/storage/StoragePoolHostAssoc.java    |   28 +-
 core/src/com/cloud/storage/StoragePoolHostVO.java  |   28 +-
 core/src/com/cloud/storage/StoragePoolVO.java      |   28 +-
 core/src/com/cloud/storage/StoragePoolWorkVO.java  |   28 +-
 core/src/com/cloud/storage/SwiftVO.java            |   28 +-
 core/src/com/cloud/storage/UploadVO.java           |   28 +-
 core/src/com/cloud/storage/VMTemplateDetailVO.java |   28 +-
 core/src/com/cloud/storage/VMTemplateHostVO.java   |   28 +-
 .../com/cloud/storage/VMTemplateStoragePoolVO.java |   28 +-
 core/src/com/cloud/storage/VMTemplateSwiftVO.java  |   28 +-
 core/src/com/cloud/storage/VMTemplateVO.java       |   28 +-
 core/src/com/cloud/storage/VMTemplateZoneVO.java   |   28 +-
 core/src/com/cloud/storage/VolumeHostVO.java       |  608 +-
 core/src/com/cloud/storage/VolumeVO.java           |   28 +-
 .../resource/CifsSecondaryStorageResource.java     |   28 +-
 .../resource/LocalSecondaryStorageResource.java    |   28 +-
 .../resource/NfsSecondaryStorageResource.java      |   28 +-
 .../resource/PremiumSecondaryStorageResource.java  |  101 -
 .../storage/resource/SecondaryStorageResource.java |   28 +-
 .../resource/SecondaryStorageResourceHandler.java  |   28 +-
 .../storage/resource/StoragePoolResource.java      |   28 +-
 .../VmwareSecondaryStorageContextFactory.java      |   68 -
 .../VmwareSecondaryStorageResourceHandler.java     |  301 -
 .../cloud/storage/snapshot/SnapshotSchedule.java   |   28 +-
 .../cloud/storage/template/DownloadManager.java    |   28 +-
 .../storage/template/DownloadManagerImpl.java      |   30 +-
 .../storage/template/FtpTemplateUploader.java      |   28 +-
 .../storage/template/HttpTemplateDownloader.java   |   29 +-
 .../com/cloud/storage/template/IsoProcessor.java   |   28 +-
 .../storage/template/LocalTemplateDownloader.java  |   28 +-
 core/src/com/cloud/storage/template/Processor.java |   28 +-
 .../com/cloud/storage/template/QCOW2Processor.java |   28 +-
 .../cloud/storage/template/RawImageProcessor.java  |   28 +-
 .../storage/template/ScpTemplateDownloader.java    |   28 +-
 .../cloud/storage/template/TemplateConstants.java  |   28 +-
 .../cloud/storage/template/TemplateDownloader.java |   28 +-
 .../storage/template/TemplateDownloaderBase.java   |   28 +-
 .../cloud/storage/template/TemplateLocation.java   |   28 +-
 .../cloud/storage/template/TemplateUploader.java   |   28 +-
 .../com/cloud/storage/template/UploadManager.java  |   28 +-
 .../cloud/storage/template/UploadManagerImpl.java  |   28 +-
 .../com/cloud/storage/template/VhdProcessor.java   |   28 +-
 .../com/cloud/storage/template/VmdkProcessor.java  |   28 +-
 core/src/com/cloud/user/AccountVO.java             |   28 +-
 core/src/com/cloud/user/SSHKeyPairVO.java          |   28 +-
 core/src/com/cloud/user/UserAccountVO.java         |   28 +-
 core/src/com/cloud/user/UserStatisticsVO.java      |   28 +-
 core/src/com/cloud/user/UserStatsLogVO.java        |   28 +-
 core/src/com/cloud/user/UserVO.java                |   28 +-
 core/src/com/cloud/vm/ConsoleProxy.java            |   28 +-
 core/src/com/cloud/vm/ConsoleProxyVO.java          |   28 +-
 core/src/com/cloud/vm/DomainRouterVO.java          |   28 +-
 core/src/com/cloud/vm/InstanceGroupVMMapVO.java    |   28 +-
 core/src/com/cloud/vm/InstanceGroupVO.java         |   28 +-
 core/src/com/cloud/vm/SecondaryStorageVm.java      |   28 +-
 core/src/com/cloud/vm/SecondaryStorageVmVO.java    |   28 +-
 core/src/com/cloud/vm/SystemVm.java                |   28 +-
 core/src/com/cloud/vm/UserVmDetailVO.java          |   28 +-
 core/src/com/cloud/vm/UserVmVO.java                |   28 +-
 core/src/com/cloud/vm/VMInstanceVO.java            |   28 +-
 core/src/com/cloud/vm/VirtualDisk.java             |   28 +-
 core/src/com/cloud/vm/VirtualEnvironment.java      |   28 +-
 core/src/com/cloud/vm/VirtualMachineName.java      |   28 +-
 core/src/com/cloud/vm/VirtualNetwork.java          |   28 +-
 core/src/com/cloud/vm/VmDetailConstants.java       |   28 +-
 .../com/cloud/agent/transport/RequestTest.java     |   28 +-
 .../vmware/mo/TestVmwareContextFactory.java        |   28 +-
 .../cloud/hypervisor/vmware/mo/TestVmwareMO.java   |   28 +-
 .../hypervisor/vmware/util/TestVmwareUtil.java     |   28 +-
 core/test/com/cloud/vmware/TestVMWare.java         |   28 +-
 debian/control                                     |    2 +-
 .../com/xensource/xenapi/APIVersion.java           |  147 +-
 deps/XenServerJava/com/xensource/xenapi/Auth.java  |    5 -
 deps/XenServerJava/com/xensource/xenapi/Blob.java  |    5 -
 deps/XenServerJava/com/xensource/xenapi/Bond.java  |    5 -
 .../com/xensource/xenapi/Connection.java           |    5 -
 .../com/xensource/xenapi/Console.java              |    5 -
 .../com/xensource/xenapi/Crashdump.java            |    5 -
 .../com/xensource/xenapi/DataSource.java           |    5 -
 deps/XenServerJava/com/xensource/xenapi/Event.java |    5 -
 deps/XenServerJava/com/xensource/xenapi/Host.java  |    5 -
 .../com/xensource/xenapi/HostCpu.java              |    5 -
 .../com/xensource/xenapi/HostCrashdump.java        |    5 -
 .../com/xensource/xenapi/HostMetrics.java          |    5 -
 .../com/xensource/xenapi/HostPatch.java            |    5 -
 .../com/xensource/xenapi/Marshalling.java          |    5 -
 .../com/xensource/xenapi/Message.java              |    5 -
 .../com/xensource/xenapi/Network.java              |    5 -
 deps/XenServerJava/com/xensource/xenapi/PBD.java   |    5 -
 deps/XenServerJava/com/xensource/xenapi/PIF.java   |    5 -
 .../com/xensource/xenapi/PIFMetrics.java           |    5 -
 deps/XenServerJava/com/xensource/xenapi/Pool.java  |    5 -
 .../com/xensource/xenapi/PoolPatch.java            |    5 -
 deps/XenServerJava/com/xensource/xenapi/Role.java  |    5 -
 deps/XenServerJava/com/xensource/xenapi/SM.java    |    5 -
 deps/XenServerJava/com/xensource/xenapi/SR.java    |    5 -
 .../XenServerJava/com/xensource/xenapi/Secret.java |    5 -
 .../com/xensource/xenapi/Session.java              |    5 -
 .../com/xensource/xenapi/Subject.java              |    5 -
 deps/XenServerJava/com/xensource/xenapi/Task.java  |    5 -
 .../XenServerJava/com/xensource/xenapi/Tunnel.java |    5 -
 deps/XenServerJava/com/xensource/xenapi/Types.java |    5 -
 deps/XenServerJava/com/xensource/xenapi/User.java  |    5 -
 deps/XenServerJava/com/xensource/xenapi/VBD.java   |    5 -
 .../com/xensource/xenapi/VBDMetrics.java           |    5 -
 deps/XenServerJava/com/xensource/xenapi/VDI.java   |    5 -
 deps/XenServerJava/com/xensource/xenapi/VIF.java   |    5 -
 .../com/xensource/xenapi/VIFMetrics.java           |    5 -
 deps/XenServerJava/com/xensource/xenapi/VLAN.java  |    5 -
 deps/XenServerJava/com/xensource/xenapi/VM.java    |    5 -
 .../com/xensource/xenapi/VMGuestMetrics.java       |    5 -
 .../com/xensource/xenapi/VMMetrics.java            |    5 -
 deps/XenServerJava/com/xensource/xenapi/VMPP.java  |    5 -
 deps/XenServerJava/com/xensource/xenapi/VTPM.java  |    5 -
 .../com/xensource/xenapi/XenAPIObject.java         |    5 -
 docs/2.0/CloudStack2.0AdapterFrameworkGuide.docx   |  Bin 34851 -> 0 bytes
 docs/2.0/downloads.html                            |  856 -
 .../2.1/CloudStack 2.1 Adapter Framework Guide.pdf |  Bin 399851 -> 0 bytes
 ...oudStack 2.1.3 User Interface Customization.pdf |  Bin 566459 -> 0 bytes
 docs/2.1/CloudStack2.1.1ReleaseNotes.docx          |  Bin 62587 -> 0 bytes
 docs/2.1/CloudStack2.1.2ReleaseNotes.docx          |  Bin 68281 -> 0 bytes
 docs/2.1/CloudStack2.1.3FOSSReleaseNotes.docx      |  Bin 62241 -> 0 bytes
 docs/2.1/CloudStack2.1.3ReleaseNotes.docx          |  Bin 69397 -> 0 bytes
 docs/2.1/CloudStack2.1AdminGuide.docx              |  Bin 524916 -> 0 bytes
 docs/2.1/CloudStack2.1FOSSInstallationGuide.docx   |  Bin 143470 -> 0 bytes
 docs/2.1/CloudStack2.1InstallGuide.docx            |  Bin 288162 -> 0 bytes
 docs/2.1/CloudStack2.1ReleaseNotes.docx            |  Bin 59857 -> 0 bytes
 .../CloudStack2.1UserInterfaceCustomization.docx   |  Bin 359013 -> 0 bytes
 docs/2.2/CloudBridgeGuide.docx                     |  Bin 123960 -> 0 bytes
 docs/2.2/CloudStack2.2.11AdminGuide.docx           |  Bin 681440 -> 0 bytes
 docs/2.2/CloudStack2.2.11AdminGuide.pdf            |  Bin 1225090 -> 0 bytes
 docs/2.2/CloudStack2.2.11InstallGuide.docx         |  Bin 1115663 -> 0 bytes
 docs/2.2/CloudStack2.2.11InstallGuide.pdf          |  Bin 1619630 -> 0 bytes
 docs/2.2/CloudStack2.2.11ReleaseNotes.docx         |  Bin 96186 -> 0 bytes
 docs/2.2/CloudStack2.2.11ReleaseNotes.pdf          |  Bin 470007 -> 0 bytes
 docs/2.2/CloudStack2.2.12AdminGuide.docx           |  Bin 767339 -> 0 bytes
 docs/2.2/CloudStack2.2.12AdminGuide.pdf            |  Bin 1236017 -> 0 bytes
 docs/2.2/CloudStack2.2.12InstallGuide.docx         |  Bin 1118075 -> 0 bytes
 docs/2.2/CloudStack2.2.12InstallGuide.pdf          |  Bin 1633038 -> 0 bytes
 docs/2.2/CloudStack2.2.12ReleaseNotes.docx         |  Bin 98534 -> 0 bytes
 docs/2.2/CloudStack2.2.12ReleaseNotes.pdf          |  Bin 483310 -> 0 bytes
 docs/2.2/CloudStack2.2.13AdminGuide.docx           |  Bin 834604 -> 0 bytes
 docs/2.2/CloudStack2.2.13InstallGuide.docx         |  Bin 1840874 -> 0 bytes
 docs/2.2/CloudStack2.2.13ReleaseNotes.docx         |  Bin 74835 -> 0 bytes
 docs/2.2/CloudStack2.2.14InstallGuide.docx         |  Bin 1842608 -> 0 bytes
 docs/2.2/CloudStack2.2.14ReleaseNotes.docx         |  Bin 88565 -> 0 bytes
 docs/2.2/CloudStack2.2.1ReleaseNotes.docx          |  Bin 60050 -> 0 bytes
 docs/2.2/CloudStack2.2.2ReleaseNotes.docx          |  Bin 63189 -> 0 bytes
 docs/2.2/CloudStack2.2.3ReleaseNotes.docx          |  Bin 67169 -> 0 bytes
 docs/2.2/CloudStack2.2.4AdminGuide.docx            |  Bin 604397 -> 0 bytes
 docs/2.2/CloudStack2.2.4AdminGuide.pdf             |  Bin 1120090 -> 0 bytes
 docs/2.2/CloudStack2.2.4InstallGuide.docx          |  Bin 999654 -> 0 bytes
 docs/2.2/CloudStack2.2.4InstallGuide.pdf           |  Bin 1433849 -> 0 bytes
 docs/2.2/CloudStack2.2.4ReleaseNotes.docx          |  Bin 75756 -> 0 bytes
 docs/2.2/CloudStack2.2.5ReleaseNotes.docx          |  Bin 78216 -> 0 bytes
 docs/2.2/CloudStack2.2.8AdminGuide.docx            |  Bin 661207 -> 0 bytes
 docs/2.2/CloudStack2.2.8AdminGuide.pdf             |  Bin 2097152 -> 0 bytes
 docs/2.2/CloudStack2.2.8InstallGuide.docx          |  Bin 1113785 -> 0 bytes
 docs/2.2/CloudStack2.2.8InstallGuide.pdf           |  Bin 2097152 -> 0 bytes
 docs/2.2/CloudStack2.2.9AdminGuide.pdf             |  Bin 1209165 -> 0 bytes
 docs/2.2/CloudStack2.2.9InstallGuide.pdf           |  Bin 1621703 -> 0 bytes
 docs/2.2/CloudStack2.2.9ReleaseNotes.docx          |  Bin 93019 -> 0 bytes
 docs/2.2/CloudStack2.2.9ReleaseNotes.pdf           |  Bin 421316 -> 0 bytes
 docs/2.2/CloudStack2.2AdminGuide.docx              |  Bin 631360 -> 0 bytes
 docs/2.2/CloudStack2.2AdminGuide.pdf               |  Bin 1106127 -> 0 bytes
 .../CloudStack2.2AllocatorImplementationGuide.docx |  Bin 30122 -> 0 bytes
 docs/2.2/CloudStack2.2DeveloperGuide.docx          |  Bin 75226 -> 0 bytes
 docs/2.2/CloudStack2.2InstallGuide.docx            |  Bin 1023751 -> 0 bytes
 docs/2.2/CloudStack2.2InstallGuide.pdf             |  Bin 1472659 -> 0 bytes
 docs/2.2/CloudStack2.2ReleaseNotes.docx            |  Bin 57934 -> 0 bytes
 .../CloudStack2.2UserInterfaceCustomization.docx   |  Bin 445284 -> 0 bytes
 .../CloudStack2.2UserInterfaceCustomization.pdf    |  Bin 495979 -> 0 bytes
 docs/2.2/downloads-supp3.html                      |   89 -
 docs/2.2/downloads.html                            | 1305 -
 docs/3.0/CloudPortal1.3FeaturesList.docx           |  Bin 304840 -> 0 bytes
 docs/3.0/CloudStack2.2_3.0DeveloperGuide.docx      |  Bin 125605 -> 0 bytes
 docs/3.0/CloudStack3.0.0ReleaseNotes.docx          |  Bin 86354 -> 0 bytes
 docs/3.0/CloudStack3.0.1ReleaseNotes.docx          |  Bin 93943 -> 0 bytes
 docs/3.0/CloudStack3.0.2ReleaseNotes.docx          |  Bin 138119 -> 0 bytes
 docs/3.0/CloudStack3.0AdminGuide.docx              |  Bin 1148712 -> 0 bytes
 docs/3.0/CloudStack3.0AdminGuide.pdf               |  Bin 2013127 -> 0 bytes
 docs/3.0/CloudStack3.0AdminGuide_BareMetal.docx    |  Bin 1128407 -> 0 bytes
 docs/3.0/CloudStack3.0FeaturesList.docx            |  Bin 304364 -> 0 bytes
 docs/3.0/CloudStack3.0InstallGuide.docx            |  Bin 1636469 -> 0 bytes
 docs/3.0/CloudStack3.0InstallGuide_BareMetal.docx  |  Bin 1584627 -> 0 bytes
 docs/3.0/CloudStack3.0NewFeatures.docx             |  Bin 98103 -> 0 bytes
 docs/3.0/CloudStack3.0Overview.docx                |  Bin 305066 -> 0 bytes
 docs/3.0/CloudStack3.0QuickInstallGuide.docx       |  Bin 554347 -> 0 bytes
 .../CloudStack3.0UserInterfaceCustomization.docx   |  Bin 474232 -> 0 bytes
 docs/3.0/CloudStackAndCloudPortalFeaturesList.docx |  Bin 402844 -> 0 bytes
 docs/CloudStack2.0AdapterFrameworkGuide.docx       |  Bin 34851 -> 0 bytes
 docs/CloudStack2.1.1ReleaseNotes.docx              |  Bin 62587 -> 0 bytes
 docs/CloudStack2.1.2ReleaseNotes.docx              |  Bin 68281 -> 0 bytes
 docs/CloudStack2.1.3FOSSReleaseNotes.docx          |  Bin 62241 -> 0 bytes
 docs/CloudStack2.1.3ReleaseNotes.docx              |  Bin 69397 -> 0 bytes
 docs/CloudStack2.1AdminGuide.docx                  |  Bin 524916 -> 0 bytes
 docs/CloudStack2.1FOSSInstallationGuide.docx       |  Bin 143470 -> 0 bytes
 docs/CloudStack2.1InstallGuide.docx                |  Bin 288162 -> 0 bytes
 docs/CloudStack2.1ReleaseNotes.docx                |  Bin 59857 -> 0 bytes
 docs/CloudStack2.1UserInterfaceCustomization.docx  |  Bin 359013 -> 0 bytes
 docs/publican-cloudstack/LICENSE                   |  202 +
 docs/publican-cloudstack/NOTICE                    |    5 +
 docs/publican-cloudstack/README                    |    8 +
 docs/publican-cloudstack/en-US/Feedback.xml        |   27 +
 docs/publican-cloudstack/en-US/Legal_Notice.xml    |   39 +
 docs/publican-cloudstack/en-US/css/overrides.css   |   57 +
 docs/publican-cloudstack/en-US/images/.directory   |    4 +
 docs/publican-cloudstack/en-US/images/1.png        |  Bin 0 -> 1365 bytes
 docs/publican-cloudstack/en-US/images/1.svg        |   28 +
 docs/publican-cloudstack/en-US/images/10.png       |  Bin 0 -> 1705 bytes
 docs/publican-cloudstack/en-US/images/10.svg       |   28 +
 docs/publican-cloudstack/en-US/images/11.png       |  Bin 0 -> 1379 bytes
 docs/publican-cloudstack/en-US/images/11.svg       |   28 +
 docs/publican-cloudstack/en-US/images/12.png       |  Bin 0 -> 1721 bytes
 docs/publican-cloudstack/en-US/images/12.svg       |   28 +
 docs/publican-cloudstack/en-US/images/13.png       |  Bin 0 -> 1810 bytes
 docs/publican-cloudstack/en-US/images/13.svg       |   28 +
 docs/publican-cloudstack/en-US/images/14.png       |  Bin 0 -> 1597 bytes
 docs/publican-cloudstack/en-US/images/14.svg       |   28 +
 docs/publican-cloudstack/en-US/images/15.png       |  Bin 0 -> 1689 bytes
 docs/publican-cloudstack/en-US/images/15.svg       |   28 +
 docs/publican-cloudstack/en-US/images/16.png       |  Bin 0 -> 1817 bytes
 docs/publican-cloudstack/en-US/images/16.svg       |   28 +
 docs/publican-cloudstack/en-US/images/17.png       |  Bin 0 -> 1688 bytes
 docs/publican-cloudstack/en-US/images/17.svg       |   28 +
 docs/publican-cloudstack/en-US/images/18.png       |  Bin 0 -> 1832 bytes
 docs/publican-cloudstack/en-US/images/18.svg       |   28 +
 docs/publican-cloudstack/en-US/images/19.png       |  Bin 0 -> 1823 bytes
 docs/publican-cloudstack/en-US/images/19.svg       |   28 +
 docs/publican-cloudstack/en-US/images/2.png        |  Bin 0 -> 1608 bytes
 docs/publican-cloudstack/en-US/images/2.svg        |   28 +
 docs/publican-cloudstack/en-US/images/20.png       |  Bin 0 -> 1937 bytes
 docs/publican-cloudstack/en-US/images/20.svg       |   28 +
 docs/publican-cloudstack/en-US/images/21.png       |  Bin 0 -> 1723 bytes
 docs/publican-cloudstack/en-US/images/21.svg       |   28 +
 docs/publican-cloudstack/en-US/images/22.png       |  Bin 0 -> 1620 bytes
 docs/publican-cloudstack/en-US/images/22.svg       |   28 +
 docs/publican-cloudstack/en-US/images/23.png       |  Bin 0 -> 2007 bytes
 docs/publican-cloudstack/en-US/images/23.svg       |   28 +
 docs/publican-cloudstack/en-US/images/24.png       |  Bin 0 -> 1774 bytes
 docs/publican-cloudstack/en-US/images/24.svg       |   28 +
 docs/publican-cloudstack/en-US/images/25.png       |  Bin 0 -> 1937 bytes
 docs/publican-cloudstack/en-US/images/25.svg       |   28 +
 docs/publican-cloudstack/en-US/images/26.png       |  Bin 0 -> 1975 bytes
 docs/publican-cloudstack/en-US/images/26.svg       |   28 +
 docs/publican-cloudstack/en-US/images/27.png       |  Bin 0 -> 1873 bytes
 docs/publican-cloudstack/en-US/images/27.svg       |   28 +
 docs/publican-cloudstack/en-US/images/28.png       |  Bin 0 -> 2055 bytes
 docs/publican-cloudstack/en-US/images/28.svg       |   28 +
 docs/publican-cloudstack/en-US/images/29.png       |  Bin 0 -> 2033 bytes
 docs/publican-cloudstack/en-US/images/29.svg       |   28 +
 docs/publican-cloudstack/en-US/images/3.png        |  Bin 0 -> 1677 bytes
 docs/publican-cloudstack/en-US/images/3.svg        |   28 +
 docs/publican-cloudstack/en-US/images/4.png        |  Bin 0 -> 1457 bytes
 docs/publican-cloudstack/en-US/images/4.svg        |   28 +
 docs/publican-cloudstack/en-US/images/5.png        |  Bin 0 -> 1597 bytes
 docs/publican-cloudstack/en-US/images/5.svg        |   28 +
 docs/publican-cloudstack/en-US/images/6.png        |  Bin 0 -> 1691 bytes
 docs/publican-cloudstack/en-US/images/6.svg        |   28 +
 docs/publican-cloudstack/en-US/images/7.png        |  Bin 0 -> 1567 bytes
 docs/publican-cloudstack/en-US/images/7.svg        |   28 +
 docs/publican-cloudstack/en-US/images/8.png        |  Bin 0 -> 1711 bytes
 docs/publican-cloudstack/en-US/images/8.svg        |   28 +
 docs/publican-cloudstack/en-US/images/9.png        |  Bin 0 -> 1696 bytes
 docs/publican-cloudstack/en-US/images/9.svg        |   28 +
 docs/publican-cloudstack/en-US/images/dot.png      |  Bin 0 -> 341 bytes
 docs/publican-cloudstack/en-US/images/dot.svg      |   21 +
 docs/publican-cloudstack/en-US/images/dot2.png     |  Bin 0 -> 342 bytes
 docs/publican-cloudstack/en-US/images/dot2.svg     |   21 +
 docs/publican-cloudstack/en-US/images/h1-bg.png    |  Bin 0 -> 565 bytes
 docs/publican-cloudstack/en-US/images/h1-bg.svg    |   21 +
 .../en-US/images/image_left.png                    |  Bin 0 -> 4044 bytes
 .../en-US/images/image_left.svg                    |  331 +
 .../en-US/images/image_right.png                   |  Bin 0 -> 2260 bytes
 .../en-US/images/image_right.svg                   |   21 +
 .../publican-cloudstack/en-US/images/important.png |  Bin 0 -> 2318 bytes
 .../publican-cloudstack/en-US/images/important.svg |   30 +
 docs/publican-cloudstack/en-US/images/note.png     |  Bin 0 -> 2086 bytes
 docs/publican-cloudstack/en-US/images/note.svg     |   28 +
 .../en-US/images/stock-go-back.png                 |  Bin 0 -> 790 bytes
 .../en-US/images/stock-go-back.svg                 |   21 +
 .../en-US/images/stock-go-forward.png              |  Bin 0 -> 860 bytes
 .../en-US/images/stock-go-forward.svg              |   21 +
 .../en-US/images/stock-go-up.png                   |  Bin 0 -> 753 bytes
 .../en-US/images/stock-go-up.svg                   |   21 +
 .../en-US/images/stock-home.png                    |  Bin 0 -> 819 bytes
 .../en-US/images/stock-home.svg                    |   21 +
 .../en-US/images/title_logo.png                    |  Bin 0 -> 585 bytes
 .../en-US/images/title_logo.svg                    |  335 +
 docs/publican-cloudstack/en-US/images/warning.png  |  Bin 0 -> 1941 bytes
 docs/publican-cloudstack/en-US/images/warning.svg  |  130 +
 .../en-US/images/watermark-draft.png               |  Bin 0 -> 25365 bytes
 .../en-US/images/watermark-draft.svg               |   21 +
 docs/publican-cloudstack/publican-cloudstack.spec  |   46 +
 docs/runbook/README                                |   19 +
 docs/runbook/en-US/Author_Group.xml                |   32 +
 docs/runbook/en-US/Book_Info.xml                   |   52 +
 docs/runbook/en-US/Chapter.xml                     |   53 +
 docs/runbook/en-US/Environment.xml                 |  244 +
 docs/runbook/en-US/Management.xml                  |  127 +
 docs/runbook/en-US/Overview.xml                    |  100 +
 docs/runbook/en-US/Preface.xml                     |   33 +
 docs/runbook/en-US/Revision_History.xml            |   42 +
 docs/runbook/en-US/Runbook.ent                     |    4 +
 docs/runbook/en-US/Runbook.xml                     |   37 +
 docs/runbook/en-US/config.xml                      |  179 +
 docs/runbook/en-US/images/icon.svg                 |   19 +
 docs/runbook/en-US/kvm.xml                         |  103 +
 ovm/.classpath                                     |   15 -
 ovm/.project                                       |   23 -
 ovm/scripts/vm/hypervisor/ovm/ConfigFileOps.py     |  171 -
 ..._reposExceptionDueToWrongReturnValueCheck.patch |   13 -
 ovm/scripts/vm/hypervisor/ovm/OvmCommonModule.py   |  156 -
 ovm/scripts/vm/hypervisor/ovm/OvmDiskModule.py     |   62 -
 ovm/scripts/vm/hypervisor/ovm/OvmDispatcher.py     |   58 -
 .../OvmDontTouchOCFS2ClusterWhenAgentStart.patch   |   13 -
 ovm/scripts/vm/hypervisor/ovm/OvmFaultConstants.py |   95 -
 .../vm/hypervisor/ovm/OvmHaHeartBeatModule.py      |  102 -
 ovm/scripts/vm/hypervisor/ovm/OvmHostModule.py     |  304 -
 ovm/scripts/vm/hypervisor/ovm/OvmLoggerModule.py   |   51 -
 ovm/scripts/vm/hypervisor/ovm/OvmNetworkModule.py  |  429 -
 ovm/scripts/vm/hypervisor/ovm/OvmOCFS2Module.py    |   76 -
 ovm/scripts/vm/hypervisor/ovm/OvmObjectModule.py   |   20 -
 ovm/scripts/vm/hypervisor/ovm/OvmPatch.patch       |   23 -
 .../vm/hypervisor/ovm/OvmSecurityGroupModule.py    |  478 -
 .../vm/hypervisor/ovm/OvmStoragePoolModule.py      |  428 -
 ovm/scripts/vm/hypervisor/ovm/OvmVifModule.py      |   62 -
 ovm/scripts/vm/hypervisor/ovm/OvmVmModule.py       |  538 -
 ovm/scripts/vm/hypervisor/ovm/OvmVolumeModule.py   |  156 -
 ovm/scripts/vm/hypervisor/ovm/configureOvm.sh      |  127 -
 .../com/cloud/ovm/hypervisor/OvmDiscoverer.java    |  287 -
 ovm/src/com/cloud/ovm/hypervisor/OvmFencer.java    |  122 -
 ovm/src/com/cloud/ovm/hypervisor/OvmGuru.java      |   57 -
 ovm/src/com/cloud/ovm/hypervisor/OvmHelper.java    |   61 -
 .../com/cloud/ovm/hypervisor/OvmResourceBase.java  | 1381 -
 ovm/src/com/cloud/ovm/object/Coder.java            |   81 -
 ovm/src/com/cloud/ovm/object/Connection.java       |  135 -
 ovm/src/com/cloud/ovm/object/OvmBridge.java        |   66 -
 ovm/src/com/cloud/ovm/object/OvmDisk.java          |   27 -
 ovm/src/com/cloud/ovm/object/OvmHost.java          |   89 -
 ovm/src/com/cloud/ovm/object/OvmObject.java        |   16 -
 ovm/src/com/cloud/ovm/object/OvmSecurityGroup.java |   50 -
 ovm/src/com/cloud/ovm/object/OvmStoragePool.java   |  101 -
 ovm/src/com/cloud/ovm/object/OvmVif.java           |   26 -
 ovm/src/com/cloud/ovm/object/OvmVlan.java          |   39 -
 ovm/src/com/cloud/ovm/object/OvmVm.java            |  108 -
 ovm/src/com/cloud/ovm/object/OvmVolume.java        |   49 -
 ovm/src/com/cloud/ovm/object/Test.java             |  179 -
 patches/systemvm/debian/buildsystemvm.sh           |   26 +-
 patches/systemvm/debian/convert.sh                 |   26 +-
 patches/systemvm/debian/qemuconvert.sh             |   26 +-
 patches/systemvm/debian/vhdconvert.sh              |   26 +-
 .../user-concentrated-pod/.classpath               |   10 +
 .../user-concentrated-pod/.project                 |   17 +
 .../user-concentrated-pod/build.xml                |  128 +
 .../cloud/deploy/UserConcentratedPodPlanner.java   |  151 +
 .../deployment-planners/user-dispersing/.classpath |   10 +
 .../deployment-planners/user-dispersing/.project   |   17 +
 .../.settings/org.eclipse.jdt.core.prefs           |   12 +
 .../deployment-planners/user-dispersing/build.xml  |  128 +
 .../com/cloud/deploy/UserDispersingPlanner.java    |  215 +
 plugins/file-systems/netapp/.classpath             |   11 +
 plugins/file-systems/netapp/.project               |   17 +
 plugins/file-systems/netapp/build.xml              |  129 +
 .../cloud/api/commands/netapp/AssociateLunCmd.java |  100 +
 .../cloud/api/commands/netapp/CreateLunCmd.java    |   98 +
 .../commands/netapp/CreateVolumeOnFilerCmd.java    |  146 +
 .../api/commands/netapp/CreateVolumePoolCmd.java   |   84 +
 .../api/commands/netapp/DeleteVolumePoolCmd.java   |   76 +
 .../cloud/api/commands/netapp/DestroyLunCmd.java   |   78 +
 .../commands/netapp/DestroyVolumeOnFilerCmd.java   |   87 +
 .../api/commands/netapp/DissociateLunCmd.java      |   79 +
 .../com/cloud/api/commands/netapp/ListLunsCmd.java |   88 +
 .../api/commands/netapp/ListVolumePoolsCmd.java    |   84 +
 .../api/commands/netapp/ListVolumesOnFilerCmd.java |   94 +
 .../api/commands/netapp/ModifyVolumePoolCmd.java   |   73 +
 .../netapp/src/com/cloud/netapp/LunVO.java         |  121 +
 .../src/com/cloud/netapp/NetappAllocator.java      |   25 +
 .../cloud/netapp/NetappDefaultAllocatorImpl.java   |  142 +
 .../netapp/src/com/cloud/netapp/NetappManager.java |   66 +
 .../src/com/cloud/netapp/NetappManagerImpl.java    | 1040 +
 .../src/com/cloud/netapp/NetappVolumeVO.java       |  183 +
 .../netapp/src/com/cloud/netapp/PoolVO.java        |   74 +
 .../netapp/src/com/cloud/netapp/dao/LunDao.java    |   31 +
 .../src/com/cloud/netapp/dao/LunDaoImpl.java       |   70 +
 .../netapp/src/com/cloud/netapp/dao/PoolDao.java   |   28 +
 .../src/com/cloud/netapp/dao/PoolDaoImpl.java      |   67 +
 .../netapp/src/com/cloud/netapp/dao/VolumeDao.java |   30 +
 .../src/com/cloud/netapp/dao/VolumeDaoImpl.java    |   99 +
 plugins/host-allocators/random/.classpath          |   10 +
 plugins/host-allocators/random/.project            |   17 +
 plugins/host-allocators/random/build.xml           |  128 +
 .../manager/allocator/impl/RandomAllocator.java    |  142 +
 plugins/hypervisors/ovm/.classpath                 |   15 +
 plugins/hypervisors/ovm/.project                   |   23 +
 plugins/hypervisors/ovm/build.xml                  |  136 +
 .../ovm/scripts/vm/hypervisor/ovm/ConfigFileOps.py |  175 +
 ..._reposExceptionDueToWrongReturnValueCheck.patch |   13 +
 .../scripts/vm/hypervisor/ovm/OvmCommonModule.py   |  160 +
 .../ovm/scripts/vm/hypervisor/ovm/OvmDiskModule.py |   66 +
 .../ovm/scripts/vm/hypervisor/ovm/OvmDispatcher.py |   62 +
 .../OvmDontTouchOCFS2ClusterWhenAgentStart.patch   |   13 +
 .../scripts/vm/hypervisor/ovm/OvmFaultConstants.py |   99 +
 .../vm/hypervisor/ovm/OvmHaHeartBeatModule.py      |  106 +
 .../ovm/scripts/vm/hypervisor/ovm/OvmHostModule.py |  307 +
 .../scripts/vm/hypervisor/ovm/OvmLoggerModule.py   |   55 +
 .../scripts/vm/hypervisor/ovm/OvmNetworkModule.py  |  433 +
 .../scripts/vm/hypervisor/ovm/OvmOCFS2Module.py    |   80 +
 .../scripts/vm/hypervisor/ovm/OvmObjectModule.py   |   24 +
 .../ovm/scripts/vm/hypervisor/ovm/OvmPatch.patch   |   23 +
 .../vm/hypervisor/ovm/OvmSecurityGroupModule.py    |  482 +
 .../vm/hypervisor/ovm/OvmStoragePoolModule.py      |  432 +
 .../ovm/scripts/vm/hypervisor/ovm/OvmVifModule.py  |   66 +
 .../ovm/scripts/vm/hypervisor/ovm/OvmVmModule.py   |  542 +
 .../scripts/vm/hypervisor/ovm/OvmVolumeModule.py   |  160 +
 .../ovm/scripts/vm/hypervisor/ovm/configureOvm.sh  |  131 +
 .../com/cloud/ovm/hypervisor/OvmDiscoverer.java    |  291 +
 .../src/com/cloud/ovm/hypervisor/OvmFencer.java    |  126 +
 .../ovm/src/com/cloud/ovm/hypervisor/OvmGuru.java  |   61 +
 .../src/com/cloud/ovm/hypervisor/OvmHelper.java    |   65 +
 .../com/cloud/ovm/hypervisor/OvmResourceBase.java  | 1385 +
 .../ovm/src/com/cloud/ovm/object/Coder.java        |   85 +
 .../ovm/src/com/cloud/ovm/object/Connection.java   |  139 +
 .../ovm/src/com/cloud/ovm/object/OvmBridge.java    |   70 +
 .../ovm/src/com/cloud/ovm/object/OvmDisk.java      |   31 +
 .../ovm/src/com/cloud/ovm/object/OvmHost.java      |   93 +
 .../ovm/src/com/cloud/ovm/object/OvmObject.java    |   20 +
 .../src/com/cloud/ovm/object/OvmSecurityGroup.java |   54 +
 .../src/com/cloud/ovm/object/OvmStoragePool.java   |  105 +
 .../ovm/src/com/cloud/ovm/object/OvmVif.java       |   30 +
 .../ovm/src/com/cloud/ovm/object/OvmVlan.java      |   43 +
 .../ovm/src/com/cloud/ovm/object/OvmVm.java        |  112 +
 .../ovm/src/com/cloud/ovm/object/OvmVolume.java    |   53 +
 .../ovm/src/com/cloud/ovm/object/Test.java         |  183 +
 plugins/hypervisors/vmware/.classpath              |   12 +
 plugins/hypervisors/vmware/.project                |   23 +
 plugins/hypervisors/vmware/build.xml               |  135 +
 .../cloud/api/commands/DeleteCiscoNexusVSMCmd.java |   98 +
 .../api/commands/DisableCiscoNexusVSMCmd.java      |   98 +
 .../cloud/api/commands/EnableCiscoNexusVSMCmd.java |   98 +
 .../cloud/api/commands/ListCiscoNexusVSMsCmd.java  |  117 +
 .../cloud/api/response/CiscoNexusVSMResponse.java  |  112 +
 .../vmware/src/com/cloud/ha/VmwareFencer.java      |   56 +
 .../src/com/cloud/ha/VmwareInvestigator.java       |   44 +
 .../src/com/cloud/hypervisor/guru/VMwareGuru.java  |  311 +
 .../cloud/hypervisor/vmware/VmwareCleanupMaid.java |  143 +
 .../hypervisor/vmware/VmwareServerDiscoverer.java  |  364 +
 .../vmware/manager/VmwareHostService.java          |   25 +
 .../hypervisor/vmware/manager/VmwareManager.java   |   73 +
 .../vmware/manager/VmwareManagerImpl.java          |  992 +
 .../vmware/manager/VmwareStorageManager.java       |   30 +
 .../vmware/manager/VmwareStorageManagerImpl.java   |  880 +
 .../vmware/manager/VmwareStorageMount.java         |   17 +
 .../vmware/resource/VmwareContextFactory.java      |   60 +
 .../hypervisor/vmware/resource/VmwareResource.java | 4202 +
 .../src/com/cloud/network/CiscoNexusVSMDevice.java |   72 +
 .../network/CiscoNexusVSMDeviceManagerImpl.java    |  408 +
 .../com/cloud/network/CiscoNexusVSMDeviceVO.java   |  222 +
 .../cloud/network/dao/CiscoNexusVSMDeviceDao.java  |  107 +
 .../network/dao/CiscoNexusVSMDeviceDaoImpl.java    |  108 +
 .../network/element/CiscoNexusVSMElement.java      |  238 +
 .../element/CiscoNexusVSMElementService.java       |   72 +
 .../resource/PremiumSecondaryStorageResource.java  |  101 +
 .../VmwareSecondaryStorageContextFactory.java      |   68 +
 .../VmwareSecondaryStorageResourceHandler.java     |  301 +
 plugins/hypervisors/xen/.classpath                 |   11 +
 plugins/hypervisors/xen/.project                   |   23 +
 plugins/hypervisors/xen/build.xml                  |  135 +
 .../xen/src/com/cloud/ha/XenServerFencer.java      |  121 +
 .../src/com/cloud/hypervisor/XenServerGuru.java    |   61 +
 .../xen/discoverer/XcpServerDiscoverer.java        |  729 +
 .../hypervisor/xen/resource/CitrixHelper.java      |  635 +
 .../xen/resource/CitrixResourceBase.java           | 7011 ++
 .../hypervisor/xen/resource/XcpOssResource.java    |  166 +
 .../hypervisor/xen/resource/XcpServerResource.java |  103 +
 .../xen/resource/XenServer56FP1Resource.java       |  213 +
 .../xen/resource/XenServer56Resource.java          |  307 +
 .../xen/resource/XenServer56SP2Resource.java       |   56 +
 .../xen/resource/XenServer600Resource.java         |   55 +
 .../xen/resource/XenServer602Resource.java         |   55 +
 .../xen/resource/XenServerConnectionPool.java      |  979 +
 .../hypervisor/xen/resource/XenServerPoolVms.java  |   82 +
 .../elastic-loadbalancer/.classpath                |   11 +
 .../network-elements/elastic-loadbalancer/.project |   17 +
 .../elastic-loadbalancer/build.xml                 |  129 +
 .../src/com/cloud/network/ElasticLbVmMapVO.java    |  101 +
 .../element/ElasticLoadBalancerElement.java        |  199 +
 .../network/lb/ElasticLoadBalancerManager.java     |   41 +
 .../network/lb/ElasticLoadBalancerManagerImpl.java |  990 +
 .../cloud/network/lb/dao/ElasticLbVmMapDao.java    |   37 +
 .../network/lb/dao/ElasticLbVmMapDaoImpl.java      |  134 +
 plugins/network-elements/f5/.classpath             |   11 +
 plugins/network-elements/f5/.project               |   17 +
 plugins/network-elements/f5/build.xml              |  129 +
 .../api/commands/AddExternalLoadBalancerCmd.java   |  105 +
 .../cloud/api/commands/AddF5LoadBalancerCmd.java   |  130 +
 .../api/commands/ConfigureF5LoadBalancerCmd.java   |  109 +
 .../commands/DeleteExternalLoadBalancerCmd.java    |   83 +
 .../api/commands/DeleteF5LoadBalancerCmd.java      |  100 +
 .../api/commands/ListExternalLoadBalancersCmd.java |   82 +
 .../commands/ListF5LoadBalancerNetworksCmd.java    |   94 +
 .../cloud/api/commands/ListF5LoadBalancersCmd.java |  101 +
 .../cloud/api/response/F5LoadBalancerResponse.java |  101 +
 .../element/F5ExternalLoadBalancerElement.java     |  470 +
 .../F5ExternalLoadBalancerElementService.java      |   84 +
 .../cloud/network/resource/F5BigIpResource.java    | 1081 +
 plugins/network-elements/juniper-srx/.classpath    |   11 +
 plugins/network-elements/juniper-srx/.project      |   17 +
 plugins/network-elements/juniper-srx/build.xml     |  129 +
 .../cloud/api/commands/AddExternalFirewallCmd.java |  106 +
 .../com/cloud/api/commands/AddSrxFirewallCmd.java  |  129 +
 .../api/commands/ConfigureSrxFirewallCmd.java      |  109 +
 .../api/commands/DeleteExternalFirewallCmd.java    |   82 +
 .../cloud/api/commands/DeleteSrxFirewallCmd.java   |   99 +
 .../api/commands/ListExternalFirewallsCmd.java     |   82 +
 .../api/commands/ListSrxFirewallNetworksCmd.java   |   94 +
 .../cloud/api/commands/ListSrxFirewallsCmd.java    |  102 +
 .../cloud/api/response/SrxFirewallResponse.java    |  138 +
 .../element/JuniperSRXExternalFirewallElement.java |  545 +
 .../element/JuniperSRXFirewallElementService.java  |   83 +
 .../cloud/network/resource/JuniperSrxResource.java | 3204 +
 plugins/network-elements/netscaler/.classpath      |   11 +
 plugins/network-elements/netscaler/.project        |   17 +
 plugins/network-elements/netscaler/build.xml       |  129 +
 .../api/commands/AddNetscalerLoadBalancerCmd.java  |  129 +
 .../ConfigureNetscalerLoadBalancerCmd.java         |  136 +
 .../commands/DeleteNetscalerLoadBalancerCmd.java   |  100 +
 .../ListNetscalerLoadBalancerNetworksCmd.java      |   94 +
 .../commands/ListNetscalerLoadBalancersCmd.java    |  102 +
 .../response/NetscalerLoadBalancerResponse.java    |  116 +
 .../src/com/cloud/network/NetScalerPodVO.java      |   61 +
 .../src/com/cloud/network/dao/NetScalerPodDao.java |   24 +
 .../com/cloud/network/dao/NetScalerPodDaoImpl.java |   57 +
 .../cloud/network/element/NetscalerElement.java    |  784 +
 .../NetscalerLoadBalancerElementService.java       |   69 +
 .../cloud/network/resource/NetscalerResource.java  | 1533 +
 plugins/network-elements/ovs/.classpath            |   11 +
 plugins/network-elements/ovs/.project              |   17 +
 plugins/network-elements/ovs/build.xml             |  129 +
 .../src/com/cloud/network/element/OvsElement.java  |  132 +
 .../cloud/network/guru/OvsGuestNetworkGuru.java    |   91 +
 .../com/cloud/network/ovs/GreTunnelException.java  |   19 +
 .../network/ovs/OvsCreateGreTunnelAnswer.java      |   81 +
 .../network/ovs/OvsCreateGreTunnelCommand.java     |   54 +
 .../cloud/network/ovs/OvsCreateTunnelAnswer.java   |   86 +
 .../cloud/network/ovs/OvsCreateTunnelCommand.java  |   69 +
 .../cloud/network/ovs/OvsDeleteFlowCommand.java    |   36 +
 .../cloud/network/ovs/OvsDestroyBridgeCommand.java |   61 +
 .../cloud/network/ovs/OvsDestroyTunnelCommand.java |   50 +
 .../cloud/network/ovs/OvsFetchInterfaceAnswer.java |   75 +
 .../network/ovs/OvsFetchInterfaceCommand.java      |   55 +
 .../cloud/network/ovs/OvsSetTagAndFlowAnswer.java  |   40 +
 .../cloud/network/ovs/OvsSetTagAndFlowCommand.java |   60 +
 .../cloud/network/ovs/OvsSetupBridgeCommand.java   |   67 +
 .../com/cloud/network/ovs/OvsTunnelManager.java    |   30 +
 .../cloud/network/ovs/OvsTunnelManagerImpl.java    |  512 +
 .../network/ovs/dao/OvsTunnelInterfaceDao.java     |   32 +
 .../network/ovs/dao/OvsTunnelInterfaceDaoImpl.java |   65 +
 .../network/ovs/dao/OvsTunnelInterfaceVO.java      |  111 +
 .../cloud/network/ovs/dao/OvsTunnelNetworkDao.java |   31 +
 .../network/ovs/dao/OvsTunnelNetworkDaoImpl.java   |   91 +
 .../cloud/network/ovs/dao/OvsTunnelNetworkVO.java  |  106 +
 plugins/storage-allocators/random/.classpath       |   10 +
 plugins/storage-allocators/random/.project         |   17 +
 plugins/storage-allocators/random/build.xml        |  128 +
 .../allocator/RandomStoragePoolAllocator.java      |   85 +
 plugins/user-authenticators/ldap/.classpath        |   10 +
 plugins/user-authenticators/ldap/.project          |   17 +
 plugins/user-authenticators/ldap/build.xml         |  128 +
 .../cloud/server/auth/LDAPUserAuthenticator.java   |  159 +
 plugins/user-authenticators/md5/.classpath         |   10 +
 plugins/user-authenticators/md5/.project           |   17 +
 plugins/user-authenticators/md5/build.xml          |  128 +
 .../cloud/server/auth/MD5UserAuthenticator.java    |   88 +
 plugins/user-authenticators/plain-text/.classpath  |   10 +
 plugins/user-authenticators/plain-text/.project    |   17 +
 plugins/user-authenticators/plain-text/build.xml   |  128 +
 .../server/auth/PlainTextUserAuthenticator.java    |   87 +
 scripts/installer/createtmplt.sh                   |   29 +-
 scripts/installer/createvolume.sh                  |   29 +-
 scripts/installer/installcentos.sh                 |   29 +-
 scripts/installer/installdomp.sh                   |   29 +-
 scripts/installer/run_installer.sh                 |   29 +-
 scripts/network/domr/bumpUpPriority.sh             |   27 +-
 scripts/network/domr/call_firewall.sh              |   29 +-
 scripts/network/domr/call_loadbalancer.sh          |   29 +-
 scripts/network/domr/dhcp_entry.sh                 |   29 +-
 scripts/network/domr/getDomRVersion.sh             |   26 +-
 scripts/network/domr/getRouterStatus.sh            |   26 +-
 scripts/network/domr/ipassoc.sh                    |   28 +-
 scripts/network/domr/l2tp_vpn.sh                   |   29 +-
 scripts/network/domr/networkUsage.sh               |   29 +-
 scripts/network/domr/save_password_to_domr.sh      |   29 +-
 scripts/network/domr/vm_data.sh                    |   29 +-
 scripts/network/exdhcp/dhcpd_edithosts.py          |   30 +-
 scripts/network/exdhcp/dnsmasq_edithosts.sh        |   29 +-
 scripts/network/exdhcp/prepare_dhcpd.sh            |   29 +-
 scripts/network/exdhcp/prepare_dnsmasq.sh          |   30 +-
 scripts/network/ping/prepare_tftp_bootfile.py      |   29 +-
 scripts/storage/checkchildren.sh                   |   29 +-
 scripts/storage/installIso.sh                      |   29 +-
 scripts/storage/qcow2/cleanupmyvms.sh              |   28 +-
 scripts/storage/qcow2/create_private_template.sh   |   28 +-
 scripts/storage/qcow2/createtmplt.sh               |   29 +-
 scripts/storage/qcow2/createvm.sh                  |   29 +-
 scripts/storage/qcow2/createvolume.sh              |   29 +-
 scripts/storage/qcow2/delvm.sh                     |   29 +-
 scripts/storage/qcow2/get_domr_kernel.sh           |   29 +-
 scripts/storage/qcow2/get_iqn.sh                   |   29 +-
 scripts/storage/qcow2/importmpl.sh                 |   29 +-
 scripts/storage/qcow2/listvmdisk.sh                |   29 +-
 scripts/storage/qcow2/listvmdisksize.sh            |   28 +-
 scripts/storage/qcow2/listvmtmplt.sh               |   28 +-
 scripts/storage/qcow2/listvolume.sh                |   29 +-
 scripts/storage/qcow2/managesnapshot.sh            |   28 +-
 scripts/storage/qcow2/managevolume.sh              |   28 +-
 scripts/storage/qcow2/modifyvlan.sh                |   29 +-
 scripts/storage/secondary/cloud-install-sys-tmplt  |   73 +-
 scripts/storage/secondary/createtmplt.sh           |   28 +-
 scripts/storage/secondary/createvolume.sh          |   29 +-
 scripts/storage/secondary/installIso.sh            |   29 +-
 scripts/storage/secondary/listvmtmplt.sh           |   29 +-
 scripts/storage/secondary/listvolume.sh            |   30 +-
 scripts/util/ipmi.py                               |   28 +-
 scripts/util/macgen.py                             |   28 +-
 scripts/util/prepare_linmin.sh                     |   29 +-
 scripts/util/qemu-ifup                             |   19 +-
 scripts/vm/hypervisor/kvm/kvmheartbeat.sh          |   27 +-
 scripts/vm/hypervisor/kvm/rundomrpre.sh            |   29 +-
 scripts/vm/hypervisor/kvm/setup_agent.sh           |   27 +-
 scripts/vm/hypervisor/versions.sh                  |   27 +-
 scripts/vm/hypervisor/xenserver/check_heartbeat.sh |   27 +-
 .../vm/hypervisor/xenserver/cloud-clean-vlan.sh    |   26 +-
 .../hypervisor/xenserver/cloud-prepare-upgrade.sh  |   26 +-
 .../hypervisor/xenserver/cloud-propagate-vlan.sh   |   26 +-
 .../vm/hypervisor/xenserver/cloud-setup-bonding.sh |   26 +-
 .../hypervisor/xenserver/cloudstack_pluginlib.py   |   19 +-
 .../hypervisor/xenserver/cloudstack_plugins.conf   |   17 +
 .../xenserver/copy_vhd_from_secondarystorage.sh    |   26 +-
 .../xenserver/copy_vhd_to_secondarystorage.sh      |   26 +-
 .../create_privatetemplate_from_snapshot.sh        |   26 +-
 scripts/vm/hypervisor/xenserver/hostvmstats.py     |   26 +-
 .../vm/hypervisor/xenserver/kill_copy_process.sh   |   26 +-
 scripts/vm/hypervisor/xenserver/launch_hb.sh       |   26 +-
 scripts/vm/hypervisor/xenserver/make_migratable.sh |   26 +-
 scripts/vm/hypervisor/xenserver/network_info.sh    |   26 +-
 scripts/vm/hypervisor/xenserver/ovs-vif-flows.py   |   19 +-
 scripts/vm/hypervisor/xenserver/ovstunnel          |   18 +
 .../hypervisor/xenserver/setup_heartbeat_file.sh   |   26 +-
 .../vm/hypervisor/xenserver/setup_heartbeat_sr.sh  |   26 +-
 scripts/vm/hypervisor/xenserver/setup_iscsi.sh     |   26 +-
 scripts/vm/hypervisor/xenserver/setupxenserver.sh  |   26 +-
 scripts/vm/hypervisor/xenserver/swiftxen           |   17 +
 .../vm/hypervisor/xenserver/upgrade_snapshot.sh    |   26 +-
 .../vm/hypervisor/xenserver/upgrade_vnc_config.sh  |   17 +
 scripts/vm/hypervisor/xenserver/vmops              |   17 +
 scripts/vm/hypervisor/xenserver/vmopsSnapshot      |   17 +
 scripts/vm/hypervisor/xenserver/vmopspremium       |   17 +
 scripts/vm/hypervisor/xenserver/xcposs/NFSSR.py    |  262 +
 .../xcposs/copy_vhd_from_secondarystorage.sh       |  188 +
 .../xcposs/copy_vhd_to_secondarystorage.sh         |  130 +
 .../xcposs/create_privatetemplate_from_snapshot.sh |  138 +
 scripts/vm/hypervisor/xenserver/xcposs/patch       |   66 +
 scripts/vm/hypervisor/xenserver/xcposs/vmops       | 1549 +
 .../vm/hypervisor/xenserver/xcposs/vmopsSnapshot   |  569 +
 .../vm/hypervisor/xenserver/xcposs/vmopspremium    |  146 +
 scripts/vm/hypervisor/xenserver/xcpserver/NFSSR.py |   26 +-
 scripts/vm/hypervisor/xenserver/xcpserver/patch    |   17 +
 .../hypervisor/xenserver/xen-ovs-vif-flows.rules   |   19 +-
 scripts/vm/hypervisor/xenserver/xenheartbeat.sh    |   26 +-
 .../xenserver/xenserver56/InterfaceReconfigure.py  |   27 +-
 .../vm/hypervisor/xenserver/xenserver56/NFSSR.py   |   27 +-
 scripts/vm/hypervisor/xenserver/xenserver56/patch  |   17 +
 .../hypervisor/xenserver/xenserver56fp1/NFSSR.py   |   27 +-
 .../vm/hypervisor/xenserver/xenserver56fp1/patch   |   17 +
 .../vm/hypervisor/xenserver/xenserver60/NFSSR.py   |   27 +-
 scripts/vm/hypervisor/xenserver/xenserver60/patch  |   17 +
 scripts/vm/hypervisor/xenserver/xs_cleanup.sh      |   26 +-
 scripts/vm/network/security_group.py               |   92 +-
 scripts/vm/network/vnet/modifyvlan.sh              |   29 +-
 scripts/vm/pingtest.sh                             |   29 +-
 scripts/vm/systemvm/injectkeys.sh                  |   29 +-
 server/src/com/cloud/account/SecurityManager.java  |   28 +-
 server/src/com/cloud/acl/DomainChecker.java        |   28 +-
 server/src/com/cloud/agent/AgentManager.java       |   28 +-
 server/src/com/cloud/agent/VmmAgentShell.java      |   28 +-
 .../src/com/cloud/agent/manager/AgentAttache.java  |   28 +-
 .../com/cloud/agent/manager/AgentManagerImpl.java  |   28 +-
 .../src/com/cloud/agent/manager/AgentMonitor.java  |   28 +-
 .../cloud/agent/manager/ClusteredAgentAttache.java |   28 +-
 .../agent/manager/ClusteredAgentManagerImpl.java   |   28 +-
 .../agent/manager/ClusteredDirectAgentAttache.java |   28 +-
 server/src/com/cloud/agent/manager/Commands.java   |   28 +-
 .../cloud/agent/manager/ConnectedAgentAttache.java |   28 +-
 .../cloud/agent/manager/DirectAgentAttache.java    |   28 +-
 .../src/com/cloud/agent/manager/DummyAttache.java  |   28 +-
 server/src/com/cloud/agent/manager/Routable.java   |   28 +-
 .../cloud/agent/manager/SynchronousListener.java   |   28 +-
 .../agent/manager/allocator/HostAllocator.java     |   28 +-
 .../agent/manager/allocator/PodAllocator.java      |   28 +-
 .../manager/allocator/impl/FirstFitAllocator.java  |   28 +-
 .../allocator/impl/FirstFitRoutingAllocator.java   |   28 +-
 .../manager/allocator/impl/RandomAllocator.java    |  142 -
 .../allocator/impl/RecreateHostAllocator.java      |   28 +-
 .../manager/allocator/impl/TestingAllocator.java   |   28 +-
 .../allocator/impl/UserConcentratedAllocator.java  |   28 +-
 .../agent/manager/authn/AgentAuthnException.java   |   28 +-
 .../cloud/agent/manager/authn/AgentAuthorizer.java |   28 +-
 .../manager/authn/impl/BasicAgentAuthManager.java  |   28 +-
 server/src/com/cloud/alert/AlertManagerImpl.java   |   28 +-
 .../src/com/cloud/alert/ClusterAlertAdapter.java   |   28 +-
 .../com/cloud/alert/ConsoleProxyAlertAdapter.java  |   28 +-
 .../alert/SecondaryStorageVmAlertAdapter.java      |   28 +-
 server/src/com/cloud/alert/dao/AlertDao.java       |   28 +-
 server/src/com/cloud/alert/dao/AlertDaoImpl.java   |   28 +-
 server/src/com/cloud/api/ApiDBUtils.java           |   48 +-
 server/src/com/cloud/api/ApiDispatcher.java        |   28 +-
 server/src/com/cloud/api/ApiGsonHelper.java        |   28 +-
 .../src/com/cloud/api/ApiResponseGsonHelper.java   |   28 +-
 server/src/com/cloud/api/ApiResponseHelper.java    |   87 +-
 server/src/com/cloud/api/ApiSerializerHelper.java  |   28 +-
 server/src/com/cloud/api/ApiServer.java            |   32 +-
 server/src/com/cloud/api/ApiServlet.java           |   38 +-
 .../com/cloud/api/EncodedStringTypeAdapter.java    |   28 +-
 server/src/com/cloud/api/IdentityTypeAdapter.java  |   28 +-
 .../com/cloud/api/ResponseObjectTypeAdapter.java   |   28 +-
 server/src/com/cloud/api/SerializationContext.java |   28 +-
 server/src/com/cloud/api/StringMapTypeAdapter.java |   28 +-
 .../cloud/api/commands/AddExternalFirewallCmd.java |  106 -
 .../api/commands/AddExternalLoadBalancerCmd.java   |  105 -
 .../cloud/api/commands/AddF5LoadBalancerCmd.java   |  130 -
 .../api/commands/AddNetscalerLoadBalancerCmd.java  |  129 -
 .../cloud/api/commands/AddNetworkDeviceCmd.java    |   28 +-
 .../com/cloud/api/commands/AddSrxFirewallCmd.java  |  129 -
 .../cloud/api/commands/AddTrafficMonitorCmd.java   |   28 +-
 .../api/commands/ConfigureF5LoadBalancerCmd.java   |  109 -
 .../ConfigureNetscalerLoadBalancerCmd.java         |  136 -
 .../api/commands/ConfigureSrxFirewallCmd.java      |  109 -
 .../cloud/api/commands/DeleteCiscoNexusVSMCmd.java |   98 -
 .../api/commands/DeleteExternalFirewallCmd.java    |   82 -
 .../commands/DeleteExternalLoadBalancerCmd.java    |   83 -
 .../api/commands/DeleteF5LoadBalancerCmd.java      |  100 -
 .../commands/DeleteNetscalerLoadBalancerCmd.java   |  100 -
 .../cloud/api/commands/DeleteNetworkDeviceCmd.java |   28 +-
 .../cloud/api/commands/DeleteSrxFirewallCmd.java   |   99 -
 .../api/commands/DeleteTrafficMonitorCmd.java      |   28 +-
 .../api/commands/DisableCiscoNexusVSMCmd.java      |   98 -
 .../cloud/api/commands/EnableCiscoNexusVSMCmd.java |   98 -
 .../api/commands/GenerateUsageRecordsCmd.java      |   28 +-
 .../com/cloud/api/commands/GetUsageRecordsCmd.java |   28 +-
 .../cloud/api/commands/ListCiscoNexusVSMsCmd.java  |  117 -
 .../api/commands/ListExternalFirewallsCmd.java     |   82 -
 .../api/commands/ListExternalLoadBalancersCmd.java |   82 -
 .../commands/ListF5LoadBalancerNetworksCmd.java    |   94 -
 .../cloud/api/commands/ListF5LoadBalancersCmd.java |  101 -
 .../ListNetscalerLoadBalancerNetworksCmd.java      |   94 -
 .../commands/ListNetscalerLoadBalancersCmd.java    |  102 -
 .../cloud/api/commands/ListNetworkDeviceCmd.java   |   28 +-
 .../api/commands/ListSrxFirewallNetworksCmd.java   |   94 -
 .../cloud/api/commands/ListSrxFirewallsCmd.java    |  102 -
 .../cloud/api/commands/ListTrafficMonitorsCmd.java |   28 +-
 .../com/cloud/api/commands/ListUsageTypesCmd.java  |   28 +-
 .../cloud/api/commands/netapp/AssociateLunCmd.java |   96 -
 .../cloud/api/commands/netapp/CreateLunCmd.java    |   94 -
 .../commands/netapp/CreateVolumeOnFilerCmd.java    |  142 -
 .../api/commands/netapp/CreateVolumePoolCmd.java   |   80 -
 .../api/commands/netapp/DeleteVolumePoolCmd.java   |   72 -
 .../cloud/api/commands/netapp/DestroyLunCmd.java   |   74 -
 .../commands/netapp/DestroyVolumeOnFilerCmd.java   |   83 -
 .../api/commands/netapp/DissociateLunCmd.java      |   75 -
 .../com/cloud/api/commands/netapp/ListLunsCmd.java |   84 -
 .../api/commands/netapp/ListVolumePoolsCmd.java    |   80 -
 .../api/commands/netapp/ListVolumesOnFilerCmd.java |   90 -
 .../api/commands/netapp/ModifyVolumePoolCmd.java   |   69 -
 server/src/com/cloud/api/doc/Alert.java            |   28 +-
 server/src/com/cloud/api/doc/ApiXmlDocReader.java  |   28 +-
 server/src/com/cloud/api/doc/ApiXmlDocWriter.java  |   28 +-
 server/src/com/cloud/api/doc/Argument.java         |   28 +-
 server/src/com/cloud/api/doc/Command.java          |   28 +-
 .../cloud/api/response/ApiResponseSerializer.java  |   28 +-
 .../api/response/SecurityGroupResultObject.java    |   28 +-
 .../response/SecurityGroupRuleResultObject.java    |   28 +-
 server/src/com/cloud/async/AsyncCommandQueued.java |   28 +-
 server/src/com/cloud/async/AsyncJobExecutor.java   |   28 +-
 .../com/cloud/async/AsyncJobExecutorContext.java   |   28 +-
 .../cloud/async/AsyncJobExecutorContextImpl.java   |   28 +-
 server/src/com/cloud/async/AsyncJobMBean.java      |   28 +-
 server/src/com/cloud/async/AsyncJobMBeanImpl.java  |   28 +-
 server/src/com/cloud/async/AsyncJobManager.java    |   28 +-
 .../src/com/cloud/async/AsyncJobManagerImpl.java   |   16 +
 server/src/com/cloud/async/AsyncJobResult.java     |   28 +-
 .../src/com/cloud/async/BaseAsyncJobExecutor.java  |   28 +-
 server/src/com/cloud/async/SyncQueueManager.java   |   28 +-
 .../src/com/cloud/async/SyncQueueManagerImpl.java  |   28 +-
 server/src/com/cloud/async/dao/AsyncJobDao.java    |   28 +-
 .../src/com/cloud/async/dao/AsyncJobDaoImpl.java   |   28 +-
 server/src/com/cloud/async/dao/SyncQueueDao.java   |   28 +-
 .../src/com/cloud/async/dao/SyncQueueDaoImpl.java  |   28 +-
 .../src/com/cloud/async/dao/SyncQueueItemDao.java  |   28 +-
 .../com/cloud/async/dao/SyncQueueItemDaoImpl.java  |   28 +-
 .../async/executor/ExtractJobResultObject.java     |   28 +-
 .../com/cloud/baremetal/BareMetalDiscoverer.java   |   28 +-
 server/src/com/cloud/baremetal/BareMetalGuru.java  |   28 +-
 .../cloud/baremetal/BareMetalPingServiceImpl.java  |   28 +-
 .../cloud/baremetal/BareMetalPxeServiceBase.java   |   28 +-
 .../com/cloud/baremetal/BareMetalResourceBase.java |   29 +-
 .../cloud/baremetal/BareMetalTemplateAdapter.java  |   28 +-
 .../com/cloud/baremetal/BareMetalVmManager.java    |   28 +-
 .../cloud/baremetal/BareMetalVmManagerImpl.java    |   28 +-
 .../com/cloud/baremetal/DhcpServerResponse.java    |   28 +-
 server/src/com/cloud/baremetal/DhcpdResource.java  |   28 +-
 .../src/com/cloud/baremetal/DnsmasqResource.java   |   28 +-
 .../cloud/baremetal/ExternalDhcpEntryListener.java |   28 +-
 .../com/cloud/baremetal/ExternalDhcpManager.java   |   28 +-
 .../cloud/baremetal/ExternalDhcpManagerImpl.java   |   28 +-
 .../cloud/baremetal/ExternalDhcpResourceBase.java  |   28 +-
 .../src/com/cloud/baremetal/HttpCallException.java |   28 +-
 .../com/cloud/baremetal/PingPxeServerResource.java |   28 +-
 .../src/com/cloud/baremetal/PxeServerManager.java  |   28 +-
 .../com/cloud/baremetal/PxeServerManagerImpl.java  |   28 +-
 .../src/com/cloud/baremetal/PxeServerProfile.java  |   28 +-
 .../com/cloud/baremetal/PxeServerResourceBase.java |   28 +-
 .../src/com/cloud/baremetal/PxeServerResponse.java |   28 +-
 .../src/com/cloud/baremetal/PxeServerService.java  |   28 +-
 server/src/com/cloud/capacity/CapacityManager.java |   28 +-
 .../com/cloud/capacity/CapacityManagerImpl.java    |   28 +-
 .../cloud/capacity/ComputeCapacityListener.java    |   28 +-
 .../cloud/capacity/StorageCapacityListener.java    |   28 +-
 server/src/com/cloud/capacity/dao/CapacityDao.java |   28 +-
 .../com/cloud/capacity/dao/CapacityDaoImpl.java    |   28 +-
 .../com/cloud/certificate/dao/CertificateDao.java  |   28 +-
 .../cloud/certificate/dao/CertificateDaoImpl.java  |   28 +-
 .../com/cloud/cluster/ActiveFencingException.java  |   28 +-
 .../src/com/cloud/cluster/CheckPointManager.java   |   28 +-
 .../com/cloud/cluster/CheckPointManagerImpl.java   |   28 +-
 server/src/com/cloud/cluster/CheckPointVO.java     |   28 +-
 server/src/com/cloud/cluster/CleanupMaid.java      |   28 +-
 .../src/com/cloud/cluster/ClusterFenceManager.java |   28 +-
 .../com/cloud/cluster/ClusterFenceManagerImpl.java |   28 +-
 .../cluster/ClusterInvalidSessionException.java    |   28 +-
 server/src/com/cloud/cluster/ClusterManager.java   |   28 +-
 .../src/com/cloud/cluster/ClusterManagerImpl.java  |   28 +-
 .../com/cloud/cluster/ClusterManagerListener.java  |   28 +-
 .../src/com/cloud/cluster/ClusterManagerMBean.java |   28 +-
 .../com/cloud/cluster/ClusterManagerMBeanImpl.java |   28 +-
 .../com/cloud/cluster/ClusterManagerMessage.java   |   28 +-
 .../cloud/cluster/ClusterNodeJoinEventArgs.java    |   28 +-
 .../cloud/cluster/ClusterNodeLeftEventArgs.java    |   28 +-
 server/src/com/cloud/cluster/ClusterService.java   |   28 +-
 .../com/cloud/cluster/ClusterServiceAdapter.java   |   28 +-
 .../src/com/cloud/cluster/ClusterServicePdu.java   |   28 +-
 .../cloud/cluster/ClusterServiceRequestPdu.java    |   28 +-
 .../cluster/ClusterServiceServletAdapter.java      |   28 +-
 .../cluster/ClusterServiceServletContainer.java    |   28 +-
 .../cluster/ClusterServiceServletHttpHandler.java  |   28 +-
 .../cloud/cluster/ClusterServiceServletImpl.java   |   28 +-
 .../cluster/ClusteredAgentRebalanceService.java    |   28 +-
 .../com/cloud/cluster/DummyClusterManagerImpl.java |   28 +-
 .../src/com/cloud/cluster/LockMasterListener.java  |   28 +-
 .../cloud/cluster/ManagementServerHostPeerVO.java  |   28 +-
 .../com/cloud/cluster/ManagementServerHostVO.java  |   28 +-
 .../com/cloud/cluster/ManagementServerNode.java    |   28 +-
 .../com/cloud/cluster/RemoteMethodConstants.java   |   28 +-
 server/src/com/cloud/cluster/StackMaid.java        |   28 +-
 .../cluster/agentlb/AgentLoadBalancerPlanner.java  |   28 +-
 .../ClusterBasedAgentLoadBalancerPlanner.java      |   28 +-
 .../cloud/cluster/agentlb/HostTransferMapVO.java   |   28 +-
 .../cluster/agentlb/dao/HostTransferMapDao.java    |   28 +-
 .../agentlb/dao/HostTransferMapDaoImpl.java        |   28 +-
 .../cloud/cluster/dao/ManagementServerHostDao.java |   28 +-
 .../cluster/dao/ManagementServerHostDaoImpl.java   |   28 +-
 .../cluster/dao/ManagementServerHostPeerDao.java   |   28 +-
 .../dao/ManagementServerHostPeerDaoImpl.java       |   28 +-
 server/src/com/cloud/cluster/dao/StackMaidDao.java |   28 +-
 .../com/cloud/cluster/dao/StackMaidDaoImpl.java    |   28 +-
 .../configuration/CloudZonesComponentLibrary.java  |   28 +-
 server/src/com/cloud/configuration/Config.java     |   28 +-
 .../cloud/configuration/ConfigurationManager.java  |   28 +-
 .../configuration/ConfigurationManagerImpl.java    |   33 +-
 .../configuration/DefaultComponentLibrary.java     |   62 +-
 .../configuration/DefaultInterceptorLibrary.java   |   28 +-
 .../configuration/PremiumComponentLibrary.java     |   38 +-
 server/src/com/cloud/configuration/ZoneConfig.java |   28 +-
 .../cloud/configuration/dao/ConfigurationDao.java  |   28 +-
 .../configuration/dao/ConfigurationDaoImpl.java    |   28 +-
 .../cloud/configuration/dao/ResourceCountDao.java  |   28 +-
 .../configuration/dao/ResourceCountDaoImpl.java    |   28 +-
 .../cloud/configuration/dao/ResourceLimitDao.java  |   28 +-
 .../configuration/dao/ResourceLimitDaoImpl.java    |   28 +-
 .../AgentBasedConsoleProxyManager.java             |   28 +-
 .../AgentBasedStandaloneConsoleProxyManager.java   |   28 +-
 server/src/com/cloud/consoleproxy/AgentHook.java   |   28 +-
 .../consoleproxy/ConsoleProxyAlertEventArgs.java   |   28 +-
 .../consoleproxy/ConsoleProxyBalanceAllocator.java |   28 +-
 .../cloud/consoleproxy/ConsoleProxyListener.java   |   28 +-
 .../consoleproxy/ConsoleProxyManagementState.java  |   28 +-
 .../cloud/consoleproxy/ConsoleProxyManager.java    |   28 +-
 .../consoleproxy/ConsoleProxyManagerImpl.java      |   47 +-
 .../consoleproxy/StaticConsoleProxyManager.java    |   28 +-
 server/src/com/cloud/dao/EntityManagerImpl.java    |   28 +-
 server/src/com/cloud/dc/AccountVlanMapVO.java      |   28 +-
 server/src/com/cloud/dc/ClusterDetailsDao.java     |   28 +-
 server/src/com/cloud/dc/ClusterDetailsDaoImpl.java |   69 +-
 server/src/com/cloud/dc/ClusterDetailsVO.java      |   28 +-
 server/src/com/cloud/dc/ClusterVO.java             |   28 +-
 server/src/com/cloud/dc/ClusterVSMMapVO.java       |   28 +-
 server/src/com/cloud/dc/DataCenterIpAddressVO.java |   28 +-
 .../cloud/dc/DataCenterLinkLocalIpAddressVO.java   |   28 +-
 server/src/com/cloud/dc/DataCenterVO.java          |   28 +-
 server/src/com/cloud/dc/DataCenterVnetVO.java      |   28 +-
 server/src/com/cloud/dc/DcDetailVO.java            |   28 +-
 server/src/com/cloud/dc/HostPodVO.java             |   28 +-
 server/src/com/cloud/dc/PodCluster.java            |   28 +-
 server/src/com/cloud/dc/PodVlanMapVO.java          |   28 +-
 server/src/com/cloud/dc/PodVlanVO.java             |   28 +-
 .../com/cloud/dc/StorageNetworkIpAddressVO.java    |   28 +-
 .../src/com/cloud/dc/StorageNetworkIpRangeVO.java  |   28 +-
 server/src/com/cloud/dc/VlanVO.java                |   28 +-
 server/src/com/cloud/dc/dao/AccountVlanMapDao.java |   28 +-
 .../com/cloud/dc/dao/AccountVlanMapDaoImpl.java    |   28 +-
 server/src/com/cloud/dc/dao/ClusterDao.java        |   28 +-
 server/src/com/cloud/dc/dao/ClusterDaoImpl.java    |   28 +-
 server/src/com/cloud/dc/dao/ClusterVSMMapDao.java  |   28 +-
 .../src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java |   28 +-
 server/src/com/cloud/dc/dao/DataCenterDao.java     |   28 +-
 server/src/com/cloud/dc/dao/DataCenterDaoImpl.java |   28 +-
 .../com/cloud/dc/dao/DataCenterIpAddressDao.java   |   28 +-
 .../cloud/dc/dao/DataCenterIpAddressDaoImpl.java   |   28 +-
 .../dao/DataCenterLinkLocalIpAddressDaoImpl.java   |   28 +-
 .../com/cloud/dc/dao/DataCenterVnetDaoImpl.java    |   28 +-
 server/src/com/cloud/dc/dao/DcDetailsDao.java      |   28 +-
 server/src/com/cloud/dc/dao/DcDetailsDaoImpl.java  |   28 +-
 server/src/com/cloud/dc/dao/HostPodDao.java        |   28 +-
 server/src/com/cloud/dc/dao/HostPodDaoImpl.java    |   28 +-
 server/src/com/cloud/dc/dao/PodVlanDaoImpl.java    |   28 +-
 server/src/com/cloud/dc/dao/PodVlanMapDao.java     |   28 +-
 server/src/com/cloud/dc/dao/PodVlanMapDaoImpl.java |   28 +-
 .../cloud/dc/dao/StorageNetworkIpAddressDao.java   |   28 +-
 .../dc/dao/StorageNetworkIpAddressDaoImpl.java     |   28 +-
 .../com/cloud/dc/dao/StorageNetworkIpRangeDao.java |   28 +-
 .../cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java |   28 +-
 server/src/com/cloud/dc/dao/VlanDao.java           |   28 +-
 server/src/com/cloud/dc/dao/VlanDaoImpl.java       |   28 +-
 server/src/com/cloud/deploy/BareMetalPlanner.java  |   28 +-
 server/src/com/cloud/deploy/FirstFitPlanner.java   |   28 +-
 server/src/com/cloud/deploy/PlannerBase.java       |   28 +-
 .../cloud/deploy/UserConcentratedPodPlanner.java   |  151 -
 .../com/cloud/deploy/UserDispersingPlanner.java    |  215 -
 server/src/com/cloud/domain/DomainVO.java          |   28 +-
 server/src/com/cloud/domain/dao/DomainDao.java     |   28 +-
 server/src/com/cloud/domain/dao/DomainDaoImpl.java |   28 +-
 .../src/com/cloud/event/ActionEventCallback.java   |   28 +-
 server/src/com/cloud/event/EventUtils.java         |   28 +-
 .../src/com/cloud/ha/AbstractInvestigatorImpl.java |   28 +-
 .../src/com/cloud/ha/CheckOnAgentInvestigator.java |   28 +-
 server/src/com/cloud/ha/FenceBuilder.java          |   28 +-
 server/src/com/cloud/ha/HaWorkVO.java              |   28 +-
 .../src/com/cloud/ha/HighAvailabilityManager.java  |   28 +-
 .../cloud/ha/HighAvailabilityManagerExtImpl.java   |   28 +-
 .../com/cloud/ha/HighAvailabilityManagerImpl.java  |   28 +-
 server/src/com/cloud/ha/Investigator.java          |   28 +-
 server/src/com/cloud/ha/KVMFencer.java             |   28 +-
 .../cloud/ha/ManagementIPSystemVMInvestigator.java |   28 +-
 server/src/com/cloud/ha/RecreatableFencer.java     |   28 +-
 .../src/com/cloud/ha/UserVmDomRInvestigator.java   |   28 +-
 server/src/com/cloud/ha/VmwareFencer.java          |   56 -
 server/src/com/cloud/ha/VmwareInvestigator.java    |   44 -
 server/src/com/cloud/ha/XenServerFencer.java       |  121 -
 server/src/com/cloud/ha/XenServerInvestigator.java |   28 +-
 .../src/com/cloud/ha/dao/HighAvailabilityDao.java  |   28 +-
 .../com/cloud/ha/dao/HighAvailabilityDaoImpl.java  |   28 +-
 server/src/com/cloud/host/dao/HostDao.java         |   28 +-
 server/src/com/cloud/host/dao/HostDaoImpl.java     |   28 +-
 server/src/com/cloud/host/dao/HostDetailsDao.java  |   28 +-
 .../src/com/cloud/host/dao/HostDetailsDaoImpl.java |   28 +-
 server/src/com/cloud/host/dao/HostTagsDao.java     |   28 +-
 server/src/com/cloud/host/dao/HostTagsDaoImpl.java |   28 +-
 .../hypervisor/CloudZonesStartupProcessor.java     |   28 +-
 .../com/cloud/hypervisor/HypervisorGuruBase.java   |   28 +-
 .../cloud/hypervisor/HypervisorGuruManager.java    |   28 +-
 .../hypervisor/HypervisorGuruManagerImpl.java      |   28 +-
 server/src/com/cloud/hypervisor/KVMGuru.java       |   28 +-
 server/src/com/cloud/hypervisor/XenServerGuru.java |   61 -
 .../hypervisor/dao/HypervisorCapabilitiesDao.java  |   28 +-
 .../dao/HypervisorCapabilitiesDaoImpl.java         |   28 +-
 .../src/com/cloud/hypervisor/guru/HypervGuru.java  |   28 +-
 .../src/com/cloud/hypervisor/guru/VMwareGuru.java  |  311 -
 .../hypervisor/hyperv/HypervServerDiscoverer.java  |   28 +-
 .../kvm/discoverer/KvmServerDiscoverer.java        |   28 +-
 .../cloud/hypervisor/vmware/VmwareCleanupMaid.java |  143 -
 .../cloud/hypervisor/vmware/VmwareManagerImpl.java |  991 -
 .../hypervisor/vmware/VmwareServerDiscoverer.java  |  364 -
 .../xen/discoverer/XcpServerDiscoverer.java        |  704 -
 server/src/com/cloud/keystore/KeystoreDao.java     |   28 +-
 server/src/com/cloud/keystore/KeystoreDaoImpl.java |   28 +-
 server/src/com/cloud/keystore/KeystoreManager.java |   28 +-
 .../com/cloud/keystore/KeystoreManagerImpl.java    |   28 +-
 server/src/com/cloud/keystore/KeystoreVO.java      |   28 +-
 server/src/com/cloud/maint/AgentUpgradeVO.java     |   28 +-
 server/src/com/cloud/maint/UpgradeManager.java     |   28 +-
 server/src/com/cloud/maint/UpgradeManagerImpl.java |   28 +-
 .../src/com/cloud/maint/UpgradeManagerMBean.java   |   28 +-
 server/src/com/cloud/maint/UpgradeMonitor.java     |   28 +-
 server/src/com/cloud/maint/Version.java            |   28 +-
 .../src/com/cloud/maint/dao/AgentUpgradeDao.java   |   28 +-
 .../com/cloud/maint/dao/AgentUpgradeDaoImpl.java   |   28 +-
 .../com/cloud/migration/Db21to22MigrationUtil.java |   34 +-
 .../migration/Db22beta4to22GAMigrationUtil.java    |   28 +-
 .../src/com/cloud/migration/DiskOffering20Dao.java |   28 +-
 .../com/cloud/migration/DiskOffering20DaoImpl.java |   28 +-
 .../src/com/cloud/migration/DiskOffering20VO.java  |   28 +-
 .../src/com/cloud/migration/DiskOffering21Dao.java |   28 +-
 .../com/cloud/migration/DiskOffering21DaoImpl.java |   28 +-
 .../src/com/cloud/migration/DiskOffering21VO.java  |   28 +-
 .../com/cloud/migration/ServiceOffering20Dao.java  |   28 +-
 .../cloud/migration/ServiceOffering20DaoImpl.java  |   28 +-
 .../com/cloud/migration/ServiceOffering20VO.java   |   28 +-
 .../com/cloud/migration/ServiceOffering21Dao.java  |   28 +-
 .../cloud/migration/ServiceOffering21DaoImpl.java  |   28 +-
 .../com/cloud/migration/ServiceOffering21VO.java   |   28 +-
 server/src/com/cloud/netapp/LunVO.java             |  117 -
 server/src/com/cloud/netapp/NetappAllocator.java   |   21 -
 .../cloud/netapp/NetappDefaultAllocatorImpl.java   |  138 -
 server/src/com/cloud/netapp/NetappManager.java     |   62 -
 server/src/com/cloud/netapp/NetappManagerImpl.java | 1036 -
 server/src/com/cloud/netapp/NetappVolumeVO.java    |  179 -
 server/src/com/cloud/netapp/PoolVO.java            |   70 -
 server/src/com/cloud/netapp/dao/LunDao.java        |   27 -
 server/src/com/cloud/netapp/dao/LunDaoImpl.java    |   66 -
 server/src/com/cloud/netapp/dao/PoolDao.java       |   24 -
 server/src/com/cloud/netapp/dao/PoolDaoImpl.java   |   63 -
 server/src/com/cloud/netapp/dao/VolumeDao.java     |   26 -
 server/src/com/cloud/netapp/dao/VolumeDaoImpl.java |   95 -
 .../network/CiscoNexusVSMDeviceManagerImpl.java    |  315 -
 .../com/cloud/network/CiscoNexusVSMDeviceVO.java   |  222 -
 server/src/com/cloud/network/ElasticLbVmMapVO.java |   97 -
 .../cloud/network/ExteralIpAddressAllocator.java   |   28 +-
 .../network/ExternalFirewallDeviceManager.java     |   28 +-
 .../network/ExternalFirewallDeviceManagerImpl.java |   28 +-
 .../cloud/network/ExternalFirewallDeviceVO.java    |   28 +-
 .../network/ExternalLoadBalancerDeviceManager.java |   28 +-
 .../ExternalLoadBalancerDeviceManagerImpl.java     |   28 +-
 .../network/ExternalLoadBalancerDeviceVO.java      |   28 +-
 .../network/ExternalLoadBalancerUsageManager.java  |   28 +-
 .../ExternalLoadBalancerUsageManagerImpl.java      |   28 +-
 .../network/ExternalNetworkDeviceManager.java      |   28 +-
 .../network/ExternalNetworkDeviceManagerImpl.java  |  103 +-
 .../com/cloud/network/FirewallRulesCidrsVO.java    |   28 +-
 server/src/com/cloud/network/IPAddressVO.java      |   28 +-
 .../cloud/network/InlineLoadBalancerNicMapVO.java  |   28 +-
 server/src/com/cloud/network/IpAddrAllocator.java  |   28 +-
 .../com/cloud/network/LBStickinessPolicyVO.java    |   28 +-
 .../src/com/cloud/network/LoadBalancerVMMapVO.java |   28 +-
 server/src/com/cloud/network/LoadBalancerVO.java   |   28 +-
 server/src/com/cloud/network/NetScalerPodVO.java   |   61 -
 .../com/cloud/network/NetworkAccountDaoImpl.java   |   28 +-
 server/src/com/cloud/network/NetworkAccountVO.java |   28 +-
 server/src/com/cloud/network/NetworkDomainVO.java  |   28 +-
 .../cloud/network/NetworkExternalFirewallVO.java   |   28 +-
 .../network/NetworkExternalLoadBalancerVO.java     |   28 +-
 server/src/com/cloud/network/NetworkManager.java   |   28 +-
 .../src/com/cloud/network/NetworkManagerImpl.java  |  132 +-
 .../src/com/cloud/network/NetworkRuleConfigVO.java |   28 +-
 .../src/com/cloud/network/NetworkServiceMapVO.java |   28 +-
 .../src/com/cloud/network/NetworkUsageManager.java |   28 +-
 .../com/cloud/network/NetworkUsageManagerImpl.java |   28 +-
 server/src/com/cloud/network/NetworkVO.java        |   28 +-
 .../src/com/cloud/network/PhysicalNetworkVO.java   |   28 +-
 .../com/cloud/network/PortProfileManagerImpl.java  |   28 +-
 server/src/com/cloud/network/PortProfileVO.java    |   16 +
 .../src/com/cloud/network/RemoteAccessVpnVO.java   |   28 +-
 .../com/cloud/network/SshKeysDistriMonitor.java    |   28 +-
 .../com/cloud/network/StorageNetworkManager.java   |   28 +-
 .../cloud/network/StorageNetworkManagerImpl.java   |   28 +-
 server/src/com/cloud/network/addr/PublicIp.java    |   28 +-
 .../cloud/network/dao/CiscoNexusVSMDeviceDao.java  |  107 -
 .../network/dao/CiscoNexusVSMDeviceDaoImpl.java    |  108 -
 .../network/dao/ExternalFirewallDeviceDao.java     |   28 +-
 .../network/dao/ExternalFirewallDeviceDaoImpl.java |   28 +-
 .../network/dao/ExternalLoadBalancerDeviceDao.java |   28 +-
 .../dao/ExternalLoadBalancerDeviceDaoImpl.java     |   28 +-
 .../cloud/network/dao/FirewallRulesCidrsDao.java   |   28 +-
 .../network/dao/FirewallRulesCidrsDaoImpl.java     |   28 +-
 .../com/cloud/network/dao/FirewallRulesDao.java    |   28 +-
 .../cloud/network/dao/FirewallRulesDaoImpl.java    |   28 +-
 server/src/com/cloud/network/dao/IPAddressDao.java |   34 +-
 .../com/cloud/network/dao/IPAddressDaoImpl.java    |   39 +-
 .../network/dao/InlineLoadBalancerNicMapDao.java   |   28 +-
 .../dao/InlineLoadBalancerNicMapDaoImpl.java       |   28 +-
 .../cloud/network/dao/LBStickinessPolicyDao.java   |   28 +-
 .../network/dao/LBStickinessPolicyDaoImpl.java     |   28 +-
 .../src/com/cloud/network/dao/LoadBalancerDao.java |   28 +-
 .../com/cloud/network/dao/LoadBalancerDaoImpl.java |   28 +-
 .../cloud/network/dao/LoadBalancerVMMapDao.java    |   28 +-
 .../network/dao/LoadBalancerVMMapDaoImpl.java      |   28 +-
 .../src/com/cloud/network/dao/NetScalerPodDao.java |   24 -
 .../com/cloud/network/dao/NetScalerPodDaoImpl.java |   57 -
 server/src/com/cloud/network/dao/NetworkDao.java   |   32 +-
 .../src/com/cloud/network/dao/NetworkDaoImpl.java  |   57 +-
 .../com/cloud/network/dao/NetworkDomainDao.java    |   28 +-
 .../cloud/network/dao/NetworkDomainDaoImpl.java    |   28 +-
 .../network/dao/NetworkExternalFirewallDao.java    |   28 +-
 .../dao/NetworkExternalFirewallDaoImpl.java        |   28 +-
 .../dao/NetworkExternalLoadBalancerDao.java        |   28 +-
 .../dao/NetworkExternalLoadBalancerDaoImpl.java    |   28 +-
 .../com/cloud/network/dao/NetworkOpDaoImpl.java    |   28 +-
 server/src/com/cloud/network/dao/NetworkOpVO.java  |   28 +-
 .../cloud/network/dao/NetworkRuleConfigDao.java    |   28 +-
 .../network/dao/NetworkRuleConfigDaoImpl.java      |   28 +-
 .../cloud/network/dao/NetworkServiceMapDao.java    |   28 +-
 .../network/dao/NetworkServiceMapDaoImpl.java      |   28 +-
 .../com/cloud/network/dao/PhysicalNetworkDao.java  |   28 +-
 .../cloud/network/dao/PhysicalNetworkDaoImpl.java  |   28 +-
 .../dao/PhysicalNetworkIsolationMethodDaoImpl.java |   28 +-
 .../dao/PhysicalNetworkIsolationMethodVO.java      |   28 +-
 .../dao/PhysicalNetworkServiceProviderDao.java     |   28 +-
 .../dao/PhysicalNetworkServiceProviderDaoImpl.java |   28 +-
 .../dao/PhysicalNetworkServiceProviderVO.java      |   28 +-
 .../network/dao/PhysicalNetworkTagDaoImpl.java     |   28 +-
 .../cloud/network/dao/PhysicalNetworkTagVO.java    |   28 +-
 .../network/dao/PhysicalNetworkTrafficTypeDao.java |   28 +-
 .../dao/PhysicalNetworkTrafficTypeDaoImpl.java     |   28 +-
 .../network/dao/PhysicalNetworkTrafficTypeVO.java  |   28 +-
 .../src/com/cloud/network/dao/PortProfileDao.java  |   28 +-
 .../com/cloud/network/dao/PortProfileDaoImpl.java  |   28 +-
 .../com/cloud/network/dao/RemoteAccessVpnDao.java  |   28 +-
 .../cloud/network/dao/RemoteAccessVpnDaoImpl.java  |   28 +-
 .../network/dao/VirtualRouterProviderDao.java      |   28 +-
 .../network/dao/VirtualRouterProviderDaoImpl.java  |   28 +-
 server/src/com/cloud/network/dao/VpnUserDao.java   |   28 +-
 .../src/com/cloud/network/dao/VpnUserDaoImpl.java  |   28 +-
 .../cloud/network/element/BareMetalElement.java    |   28 +-
 .../network/element/CiscoNexusVSMElement.java      |  238 -
 .../element/CiscoNexusVSMElementService.java       |   72 -
 .../network/element/CloudZonesNetworkElement.java  |   28 +-
 .../element/ElasticLoadBalancerElement.java        |  195 -
 .../cloud/network/element/ExternalDhcpElement.java |   28 +-
 .../element/F5ExternalLoadBalancerElement.java     |  470 -
 .../F5ExternalLoadBalancerElementService.java      |   84 -
 .../element/JuniperSRXExternalFirewallElement.java |  545 -
 .../element/JuniperSRXFirewallElementService.java  |   83 -
 .../cloud/network/element/NetscalerElement.java    |  784 -
 .../NetscalerLoadBalancerElementService.java       |   69 -
 .../src/com/cloud/network/element/OvsElement.java  |  132 -
 .../network/element/SecurityGroupElement.java      |   28 +-
 .../network/element/VirtualRouterElement.java      |   28 +-
 .../network/element/VirtualRouterProviderVO.java   |   28 +-
 .../network/firewall/FirewallManagerImpl.java      |   28 +-
 .../com/cloud/network/guru/ControlNetworkGuru.java |   28 +-
 .../com/cloud/network/guru/DirectNetworkGuru.java  |   28 +-
 .../network/guru/DirectPodBasedNetworkGuru.java    |   28 +-
 .../network/guru/ExternalGuestNetworkGuru.java     |   49 +-
 .../com/cloud/network/guru/GuestNetworkGuru.java   |   28 +-
 server/src/com/cloud/network/guru/GuruUtils.java   |   28 +-
 .../cloud/network/guru/OvsGuestNetworkGuru.java    |   91 -
 .../cloud/network/guru/PodBasedNetworkGuru.java    |   28 +-
 .../com/cloud/network/guru/PublicNetworkGuru.java  |   28 +-
 .../com/cloud/network/guru/StorageNetworkGuru.java |   28 +-
 .../network/lb/ElasticLoadBalancerManager.java     |   37 -
 .../network/lb/ElasticLoadBalancerManagerImpl.java |  986 -
 .../network/lb/LoadBalancingRulesManager.java      |   28 +-
 .../network/lb/LoadBalancingRulesManagerImpl.java  |   39 +-
 .../cloud/network/lb/dao/ElasticLbVmMapDao.java    |   33 -
 .../network/lb/dao/ElasticLbVmMapDaoImpl.java      |  130 -
 .../com/cloud/network/ovs/GreTunnelException.java  |   19 -
 .../com/cloud/network/ovs/OvsTunnelManager.java    |   30 -
 .../cloud/network/ovs/OvsTunnelManagerImpl.java    |  512 -
 .../network/ovs/dao/OvsTunnelInterfaceDao.java     |   32 -
 .../network/ovs/dao/OvsTunnelInterfaceDaoImpl.java |   65 -
 .../network/ovs/dao/OvsTunnelInterfaceVO.java      |  111 -
 .../cloud/network/ovs/dao/OvsTunnelNetworkDao.java |   31 -
 .../network/ovs/dao/OvsTunnelNetworkDaoImpl.java   |   91 -
 .../cloud/network/ovs/dao/OvsTunnelNetworkVO.java  |  106 -
 .../router/VirtualNetworkApplianceManager.java     |   28 +-
 .../router/VirtualNetworkApplianceManagerImpl.java |   32 +-
 .../com/cloud/network/rules/FirewallManager.java   |   28 +-
 .../com/cloud/network/rules/FirewallRuleVO.java    |   28 +-
 .../cloud/network/rules/PortForwardingRuleVO.java  |   28 +-
 .../src/com/cloud/network/rules/RulesManager.java  |   28 +-
 .../com/cloud/network/rules/RulesManagerImpl.java  |   28 +-
 .../src/com/cloud/network/rules/StaticNatImpl.java |   28 +-
 .../com/cloud/network/rules/StaticNatRuleImpl.java |   28 +-
 .../network/rules/dao/PortForwardingRulesDao.java  |   28 +-
 .../rules/dao/PortForwardingRulesDaoImpl.java      |   28 +-
 .../security/LocalSecurityGroupWorkQueue.java      |   28 +-
 .../com/cloud/network/security/RuleUpdateLog.java  |   28 +-
 .../network/security/SecurityGroupListener.java    |   28 +-
 .../network/security/SecurityGroupManager.java     |   28 +-
 .../network/security/SecurityGroupManagerImpl.java |   28 +-
 .../security/SecurityGroupManagerImpl2.java        |   28 +-
 .../security/SecurityGroupManagerMBean.java        |   28 +-
 .../network/security/SecurityGroupWorkQueue.java   |   28 +-
 .../network/security/SecurityGroupWorkTracker.java |   28 +-
 .../network/security/SecurityManagerMBeanImpl.java |   28 +-
 .../network/security/dao/SecurityGroupDao.java     |   28 +-
 .../network/security/dao/SecurityGroupDaoImpl.java |   28 +-
 .../network/security/dao/SecurityGroupRuleDao.java |   28 +-
 .../security/dao/SecurityGroupRuleDaoImpl.java     |   28 +-
 .../security/dao/SecurityGroupRulesDao.java        |   28 +-
 .../security/dao/SecurityGroupRulesDaoImpl.java    |   28 +-
 .../security/dao/SecurityGroupVMMapDao.java        |   28 +-
 .../security/dao/SecurityGroupVMMapDaoImpl.java    |   28 +-
 .../network/security/dao/SecurityGroupWorkDao.java |   28 +-
 .../security/dao/SecurityGroupWorkDaoImpl.java     |   28 +-
 .../network/security/dao/VmRulesetLogDao.java      |   28 +-
 .../network/security/dao/VmRulesetLogDaoImpl.java  |   28 +-
 .../network/vpn/RemoteAccessVpnManagerImpl.java    |   28 +-
 .../offerings/NetworkOfferingServiceMapVO.java     |   28 +-
 .../src/com/cloud/offerings/NetworkOfferingVO.java |   28 +-
 .../cloud/offerings/dao/NetworkOfferingDao.java    |   28 +-
 .../offerings/dao/NetworkOfferingDaoImpl.java      |   28 +-
 .../dao/NetworkOfferingServiceMapDao.java          |   28 +-
 .../dao/NetworkOfferingServiceMapDaoImpl.java      |   28 +-
 .../src/com/cloud/projects/ProjectAccountVO.java   |   28 +-
 .../com/cloud/projects/ProjectInvitationVO.java    |   28 +-
 server/src/com/cloud/projects/ProjectManager.java  |   28 +-
 .../src/com/cloud/projects/ProjectManagerImpl.java |   28 +-
 server/src/com/cloud/projects/ProjectVO.java       |   28 +-
 .../com/cloud/projects/dao/ProjectAccountDao.java  |   28 +-
 .../cloud/projects/dao/ProjectAccountDaoImpl.java  |   28 +-
 server/src/com/cloud/projects/dao/ProjectDao.java  |   28 +-
 .../src/com/cloud/projects/dao/ProjectDaoImpl.java |   28 +-
 .../cloud/projects/dao/ProjectInvitationDao.java   |   28 +-
 .../projects/dao/ProjectInvitationDaoImpl.java     |   28 +-
 server/src/com/cloud/resource/Discoverer.java      |   28 +-
 server/src/com/cloud/resource/DiscovererBase.java  |   28 +-
 .../com/cloud/resource/DummyHostDiscoverer.java    |   28 +-
 .../cloud/resource/DummyHostServerResource.java    |   28 +-
 server/src/com/cloud/resource/ResourceManager.java |   28 +-
 .../com/cloud/resource/ResourceManagerImpl.java    | 1659 +-
 .../com/cloud/resource/ResourceStateAdapter.java   |   28 +-
 .../resourcelimit/ResourceLimitManagerImpl.java    |   55 +-
 .../com/cloud/secstorage/CommandExecLogDao.java    |   28 +-
 .../cloud/secstorage/CommandExecLogDaoImpl.java    |   28 +-
 .../src/com/cloud/secstorage/CommandExecLogVO.java |   28 +-
 .../PremiumSecondaryStorageManagerImpl.java        |   28 +-
 .../src/com/cloud/server/ConfigurationServer.java  |   28 +-
 .../com/cloud/server/ConfigurationServerImpl.java  |   65 +-
 server/src/com/cloud/server/Criteria.java          |   28 +-
 server/src/com/cloud/server/ManagementServer.java  |   28 +-
 .../src/com/cloud/server/ManagementServerExt.java  |   28 +-
 .../com/cloud/server/ManagementServerExtImpl.java  |   28 +-
 .../src/com/cloud/server/ManagementServerImpl.java |   28 +-
 server/src/com/cloud/server/StatsCollector.java    |   28 +-
 .../api/response/BaremetalTemplateResponse.java    |   28 +-
 .../api/response/ExternalFirewallResponse.java     |   28 +-
 .../api/response/ExternalLoadBalancerResponse.java |   28 +-
 .../server/api/response/NetworkDeviceResponse.java |   28 +-
 .../server/api/response/NwDeviceDhcpResponse.java  |   28 +-
 .../api/response/NwDevicePxeServerResponse.java    |   28 +-
 .../cloud/server/api/response/PxePingResponse.java |   28 +-
 .../api/response/TrafficMonitorResponse.java       |   28 +-
 .../server/api/response/UsageRecordResponse.java   |   28 +-
 .../server/api/response/UsageTypeResponse.java     |   28 +-
 .../response/netapp/AssociateLunCmdResponse.java   |   28 +-
 .../api/response/netapp/CreateLunCmdResponse.java  |   28 +-
 .../netapp/CreateVolumeOnFilerCmdResponse.java     |   28 +-
 .../netapp/CreateVolumePoolCmdResponse.java        |   28 +-
 .../api/response/netapp/DeleteLUNCmdResponse.java  |   28 +-
 .../netapp/DeleteVolumeOnFilerCmdResponse.java     |   28 +-
 .../netapp/DeleteVolumePoolCmdResponse.java        |   28 +-
 .../response/netapp/DissociateLunCmdResponse.java  |   28 +-
 .../api/response/netapp/ListLunsCmdResponse.java   |   28 +-
 .../netapp/ListVolumePoolsCmdResponse.java         |   28 +-
 .../netapp/ListVolumesOnFilerCmdResponse.java      |   28 +-
 .../netapp/ModifyVolumePoolCmdResponse.java        |   28 +-
 .../server/auth/DefaultUserAuthenticator.java      |   28 +-
 .../cloud/server/auth/LDAPUserAuthenticator.java   |  159 -
 .../cloud/server/auth/MD5UserAuthenticator.java    |   88 -
 .../server/auth/PlainTextUserAuthenticator.java    |   87 -
 .../com/cloud/server/auth/UserAuthenticator.java   |   28 +-
 .../src/com/cloud/service/ServiceOfferingVO.java   |   28 +-
 .../com/cloud/service/dao/ServiceOfferingDao.java  |   28 +-
 .../cloud/service/dao/ServiceOfferingDaoImpl.java  |   28 +-
 .../src/com/cloud/servlet/CloudStartupServlet.java |   28 +-
 .../com/cloud/servlet/ConsoleProxyClientParam.java |  208 +-
 .../ConsoleProxyPasswordBasedEncryptor.java        |  258 +-
 .../src/com/cloud/servlet/ConsoleProxyServlet.java |  286 +-
 .../com/cloud/servlet/RegisterCompleteServlet.java |   28 +-
 .../cloud/storage/LocalStoragePoolListener.java    |   28 +-
 server/src/com/cloud/storage/OCFS2Manager.java     |   28 +-
 server/src/com/cloud/storage/OCFS2ManagerImpl.java |   28 +-
 server/src/com/cloud/storage/StorageManager.java   |   28 +-
 .../src/com/cloud/storage/StorageManagerImpl.java  |   28 +-
 .../cloud/storage/StorageMigrationCleanupMaid.java |   28 +-
 .../allocator/AbstractStoragePoolAllocator.java    |   28 +-
 .../allocator/FirstFitStoragePoolAllocator.java    |   28 +-
 .../GarbageCollectingStoragePoolAllocator.java     |   28 +-
 .../allocator/LocalStoragePoolAllocator.java       |   28 +-
 .../allocator/RandomStoragePoolAllocator.java      |   85 -
 .../storage/allocator/StoragePoolAllocator.java    |   28 +-
 .../allocator/UseLocalForRootAllocator.java        |   28 +-
 .../src/com/cloud/storage/dao/DiskOfferingDao.java |   28 +-
 .../com/cloud/storage/dao/DiskOfferingDaoImpl.java |   28 +-
 .../com/cloud/storage/dao/GuestOSCategoryDao.java  |   28 +-
 .../cloud/storage/dao/GuestOSCategoryDaoImpl.java  |   28 +-
 server/src/com/cloud/storage/dao/GuestOSDao.java   |   28 +-
 .../src/com/cloud/storage/dao/GuestOSDaoImpl.java  |   28 +-
 .../com/cloud/storage/dao/LaunchPermissionDao.java |   28 +-
 .../cloud/storage/dao/LaunchPermissionDaoImpl.java |   28 +-
 server/src/com/cloud/storage/dao/SnapshotDao.java  |   28 +-
 .../src/com/cloud/storage/dao/SnapshotDaoImpl.java |   28 +-
 .../com/cloud/storage/dao/SnapshotPolicyDao.java   |   28 +-
 .../cloud/storage/dao/SnapshotPolicyDaoImpl.java   |   28 +-
 .../com/cloud/storage/dao/SnapshotScheduleDao.java |   28 +-
 .../cloud/storage/dao/SnapshotScheduleDaoImpl.java |   28 +-
 .../src/com/cloud/storage/dao/StoragePoolDao.java  |   28 +-
 .../com/cloud/storage/dao/StoragePoolDaoImpl.java  |   28 +-
 .../cloud/storage/dao/StoragePoolDetailsDao.java   |   28 +-
 .../storage/dao/StoragePoolDetailsDaoImpl.java     |   28 +-
 .../com/cloud/storage/dao/StoragePoolHostDao.java  |   28 +-
 .../cloud/storage/dao/StoragePoolHostDaoImpl.java  |   28 +-
 .../com/cloud/storage/dao/StoragePoolWorkDao.java  |   28 +-
 .../cloud/storage/dao/StoragePoolWorkDaoImpl.java  |   28 +-
 server/src/com/cloud/storage/dao/SwiftDao.java     |   28 +-
 server/src/com/cloud/storage/dao/SwiftDaoImpl.java |   28 +-
 server/src/com/cloud/storage/dao/UploadDao.java    |   28 +-
 .../src/com/cloud/storage/dao/UploadDaoImpl.java   |   28 +-
 .../src/com/cloud/storage/dao/VMTemplateDao.java   |   28 +-
 .../com/cloud/storage/dao/VMTemplateDaoImpl.java   |   28 +-
 .../cloud/storage/dao/VMTemplateDetailsDao.java    |   28 +-
 .../storage/dao/VMTemplateDetailsDaoImpl.java      |   28 +-
 .../com/cloud/storage/dao/VMTemplateHostDao.java   |   28 +-
 .../cloud/storage/dao/VMTemplateHostDaoImpl.java   |   28 +-
 .../com/cloud/storage/dao/VMTemplatePoolDao.java   |   28 +-
 .../cloud/storage/dao/VMTemplatePoolDaoImpl.java   |   28 +-
 .../com/cloud/storage/dao/VMTemplateSwiftDao.java  |   28 +-
 .../cloud/storage/dao/VMTemplateSwiftDaoImpl.java  |   28 +-
 .../com/cloud/storage/dao/VMTemplateZoneDao.java   |   28 +-
 .../cloud/storage/dao/VMTemplateZoneDaoImpl.java   |   28 +-
 server/src/com/cloud/storage/dao/VolumeDao.java    |   28 +-
 .../src/com/cloud/storage/dao/VolumeDaoImpl.java   |   28 +-
 .../src/com/cloud/storage/dao/VolumeHostDao.java   |   58 +-
 .../com/cloud/storage/dao/VolumeHostDaoImpl.java   |  212 +-
 .../storage/download/DownloadAbandonedState.java   |   28 +-
 .../storage/download/DownloadActiveState.java      |   28 +-
 .../storage/download/DownloadCompleteState.java    |   28 +-
 .../cloud/storage/download/DownloadErrorState.java |   28 +-
 .../storage/download/DownloadInProgressState.java  |   28 +-
 .../storage/download/DownloadInactiveState.java    |   28 +-
 .../cloud/storage/download/DownloadListener.java   |   28 +-
 .../cloud/storage/download/DownloadMonitor.java    |   28 +-
 .../storage/download/DownloadMonitorImpl.java      |   28 +-
 .../com/cloud/storage/download/DownloadState.java  |   28 +-
 .../cloud/storage/download/NotDownloadedState.java |   28 +-
 .../cloud/storage/listener/StoragePoolMonitor.java |   28 +-
 .../storage/listener/StorageSyncListener.java      |   28 +-
 .../cloud/storage/monitor/StorageHostMonitor.java  |   28 +-
 .../resource/DummySecondaryStorageResource.java    |   28 +-
 .../secondary/SecStorageVmAlertEventArgs.java      |   28 +-
 .../secondary/SecondaryStorageDiscoverer.java      |   28 +-
 .../secondary/SecondaryStorageListener.java        |   28 +-
 .../secondary/SecondaryStorageManagerImpl.java     |   34 +-
 .../secondary/SecondaryStorageVmAllocator.java     |   28 +-
 .../SecondaryStorageVmDefaultAllocator.java        |   28 +-
 .../secondary/SecondaryStorageVmManager.java       |   28 +-
 .../cloud/storage/snapshot/SnapshotManager.java    |   28 +-
 .../storage/snapshot/SnapshotManagerImpl.java      |   28 +-
 .../cloud/storage/snapshot/SnapshotScheduler.java  |   28 +-
 .../storage/snapshot/SnapshotSchedulerImpl.java    |   28 +-
 .../src/com/cloud/storage/swift/SwiftManager.java  |   28 +-
 .../com/cloud/storage/swift/SwiftManagerImpl.java  |   28 +-
 .../com/cloud/storage/upload/NotUploadedState.java |   28 +-
 .../cloud/storage/upload/UploadAbandonedState.java |   28 +-
 .../cloud/storage/upload/UploadActiveState.java    |   28 +-
 .../cloud/storage/upload/UploadCompleteState.java  |   28 +-
 .../com/cloud/storage/upload/UploadErrorState.java |   28 +-
 .../storage/upload/UploadInProgressState.java      |   28 +-
 .../cloud/storage/upload/UploadInactiveState.java  |   28 +-
 .../com/cloud/storage/upload/UploadListener.java   |   28 +-
 .../com/cloud/storage/upload/UploadMonitor.java    |   28 +-
 .../cloud/storage/upload/UploadMonitorImpl.java    |   28 +-
 .../src/com/cloud/storage/upload/UploadState.java  |   28 +-
 server/src/com/cloud/tags/ResourceTagVO.java       |  152 +
 .../com/cloud/tags/TaggedResourceManagerImpl.java  |  414 +
 server/src/com/cloud/tags/dao/ResourceTagDao.java  |   27 +
 .../com/cloud/tags/dao/ResourceTagsDaoImpl.java    |   33 +
 .../cloud/template/HyervisorTemplateAdapter.java   |   28 +-
 server/src/com/cloud/template/TemplateAdapter.java |   28 +-
 .../com/cloud/template/TemplateAdapterBase.java    |   28 +-
 server/src/com/cloud/template/TemplateManager.java |   28 +-
 .../com/cloud/template/TemplateManagerImpl.java    |   28 +-
 server/src/com/cloud/template/TemplateProfile.java |   28 +-
 server/src/com/cloud/test/DatabaseConfig.java      |   30 +-
 server/src/com/cloud/test/IPRangeConfig.java       |   28 +-
 server/src/com/cloud/test/PodZoneConfig.java       |   28 +-
 .../cloud/upgrade/DatabaseIntegrityChecker.java    |   28 +-
 .../com/cloud/upgrade/DatabaseUpgradeChecker.java  |   28 +-
 .../upgrade/PremiumDatabaseUpgradeChecker.java     |   28 +-
 server/src/com/cloud/upgrade/dao/DbUpgrade.java    |   28 +-
 .../src/com/cloud/upgrade/dao/DbUpgradeUtils.java  |   28 +-
 .../src/com/cloud/upgrade/dao/Upgrade217to218.java |   28 +-
 .../src/com/cloud/upgrade/dao/Upgrade218to22.java  |   28 +-
 .../upgrade/dao/Upgrade218to224DomainVlans.java    |   28 +-
 .../cloud/upgrade/dao/Upgrade218to22Premium.java   |   28 +-
 .../com/cloud/upgrade/dao/Upgrade2210to2211.java   |   28 +-
 .../com/cloud/upgrade/dao/Upgrade2211to2212.java   |   28 +-
 .../upgrade/dao/Upgrade2211to2212Premium.java      |   28 +-
 .../com/cloud/upgrade/dao/Upgrade2212to2213.java   |   28 +-
 .../com/cloud/upgrade/dao/Upgrade2213to2214.java   |   28 +-
 .../src/com/cloud/upgrade/dao/Upgrade2214to30.java |   28 +-
 .../src/com/cloud/upgrade/dao/Upgrade221to222.java |   28 +-
 .../cloud/upgrade/dao/Upgrade221to222Premium.java  |   28 +-
 .../src/com/cloud/upgrade/dao/Upgrade222to224.java |   28 +-
 .../cloud/upgrade/dao/Upgrade222to224Premium.java  |   28 +-
 .../src/com/cloud/upgrade/dao/Upgrade224to225.java |   28 +-
 .../src/com/cloud/upgrade/dao/Upgrade225to226.java |   28 +-
 .../src/com/cloud/upgrade/dao/Upgrade227to228.java |   28 +-
 .../cloud/upgrade/dao/Upgrade227to228Premium.java  |   28 +-
 .../src/com/cloud/upgrade/dao/Upgrade228to229.java |   28 +-
 .../com/cloud/upgrade/dao/Upgrade229to2210.java    |   28 +-
 .../src/com/cloud/upgrade/dao/Upgrade301to302.java |   25 +-
 .../src/com/cloud/upgrade/dao/Upgrade302to303.java |   16 +
 .../src/com/cloud/upgrade/dao/Upgrade30to301.java  |   28 +-
 .../cloud/upgrade/dao/UpgradeSnapshot217to224.java |   28 +-
 .../cloud/upgrade/dao/UpgradeSnapshot223to224.java |   28 +-
 server/src/com/cloud/upgrade/dao/VersionDao.java   |   28 +-
 .../src/com/cloud/upgrade/dao/VersionDaoImpl.java  |   28 +-
 server/src/com/cloud/upgrade/dao/VersionVO.java    |   28 +-
 .../cloud/usage/ExternalPublicIpStatisticsVO.java  |   28 +-
 server/src/com/cloud/usage/StorageTypes.java       |   28 +-
 server/src/com/cloud/usage/UsageIPAddressVO.java   |   28 +-
 server/src/com/cloud/usage/UsageJobVO.java         |   28 +-
 .../com/cloud/usage/UsageLoadBalancerPolicyVO.java |   28 +-
 .../com/cloud/usage/UsageNetworkOfferingVO.java    |   28 +-
 server/src/com/cloud/usage/UsageNetworkVO.java     |   28 +-
 .../com/cloud/usage/UsagePortForwardingRuleVO.java |   28 +-
 .../src/com/cloud/usage/UsageSecurityGroupVO.java  |   28 +-
 server/src/com/cloud/usage/UsageStorageVO.java     |   28 +-
 server/src/com/cloud/usage/UsageTypes.java         |   28 +-
 server/src/com/cloud/usage/UsageVMInstanceVO.java  |   28 +-
 server/src/com/cloud/usage/UsageVO.java            |   28 +-
 server/src/com/cloud/usage/UsageVPNUserVO.java     |   28 +-
 server/src/com/cloud/usage/UsageVolumeVO.java      |   28 +-
 .../usage/dao/ExternalPublicIpStatisticsDao.java   |   28 +-
 .../dao/ExternalPublicIpStatisticsDaoImpl.java     |   28 +-
 server/src/com/cloud/usage/dao/UsageDao.java       |   28 +-
 server/src/com/cloud/usage/dao/UsageDaoImpl.java   |   28 +-
 .../src/com/cloud/usage/dao/UsageIPAddressDao.java |   28 +-
 .../com/cloud/usage/dao/UsageIPAddressDaoImpl.java |   28 +-
 server/src/com/cloud/usage/dao/UsageJobDao.java    |   28 +-
 .../src/com/cloud/usage/dao/UsageJobDaoImpl.java   |   28 +-
 .../usage/dao/UsageLoadBalancerPolicyDao.java      |   28 +-
 .../usage/dao/UsageLoadBalancerPolicyDaoImpl.java  |   28 +-
 .../src/com/cloud/usage/dao/UsageNetworkDao.java   |   28 +-
 .../com/cloud/usage/dao/UsageNetworkDaoImpl.java   |   28 +-
 .../cloud/usage/dao/UsageNetworkOfferingDao.java   |   28 +-
 .../usage/dao/UsageNetworkOfferingDaoImpl.java     |   28 +-
 .../usage/dao/UsagePortForwardingRuleDao.java      |   28 +-
 .../usage/dao/UsagePortForwardingRuleDaoImpl.java  |   28 +-
 .../com/cloud/usage/dao/UsageSecurityGroupDao.java |   28 +-
 .../cloud/usage/dao/UsageSecurityGroupDaoImpl.java |   28 +-
 .../src/com/cloud/usage/dao/UsageStorageDao.java   |   28 +-
 .../com/cloud/usage/dao/UsageStorageDaoImpl.java   |   28 +-
 .../com/cloud/usage/dao/UsageVMInstanceDao.java    |   28 +-
 .../cloud/usage/dao/UsageVMInstanceDaoImpl.java    |   28 +-
 .../src/com/cloud/usage/dao/UsageVPNUserDao.java   |   28 +-
 .../com/cloud/usage/dao/UsageVPNUserDaoImpl.java   |   28 +-
 server/src/com/cloud/usage/dao/UsageVolumeDao.java |   28 +-
 .../com/cloud/usage/dao/UsageVolumeDaoImpl.java    |   28 +-
 server/src/com/cloud/user/AccountDetailVO.java     |   28 +-
 server/src/com/cloud/user/AccountDetailsDao.java   |   28 +-
 .../src/com/cloud/user/AccountDetailsDaoImpl.java  |   28 +-
 server/src/com/cloud/user/AccountManager.java      |   30 +-
 server/src/com/cloud/user/AccountManagerImpl.java  |   38 +-
 server/src/com/cloud/user/DomainManager.java       |   28 +-
 server/src/com/cloud/user/DomainManagerImpl.java   |   49 +-
 server/src/com/cloud/user/dao/AccountDao.java      |   28 +-
 server/src/com/cloud/user/dao/AccountDaoImpl.java  |   28 +-
 server/src/com/cloud/user/dao/SSHKeyPairDao.java   |   28 +-
 .../src/com/cloud/user/dao/SSHKeyPairDaoImpl.java  |   28 +-
 server/src/com/cloud/user/dao/UserAccountDao.java  |   28 +-
 .../src/com/cloud/user/dao/UserAccountDaoImpl.java |   28 +-
 server/src/com/cloud/user/dao/UserDao.java         |   28 +-
 server/src/com/cloud/user/dao/UserDaoImpl.java     |   28 +-
 .../src/com/cloud/user/dao/UserStatisticsDao.java  |   28 +-
 .../com/cloud/user/dao/UserStatisticsDaoImpl.java  |   28 +-
 server/src/com/cloud/user/dao/UserStatsLogDao.java |   28 +-
 .../com/cloud/user/dao/UserStatsLogDaoImpl.java    |   28 +-
 .../cloud/uuididentity/IdentityServiceImpl.java    |   28 +-
 .../com/cloud/uuididentity/dao/IdentityDao.java    |   36 +-
 .../cloud/uuididentity/dao/IdentityDaoImpl.java    |   74 +-
 .../src/com/cloud/uuididentity/dao/IdentityVO.java |   28 +-
 .../vm/ClusteredVirtualMachineManagerImpl.java     |   28 +-
 server/src/com/cloud/vm/ItWorkDao.java             |   28 +-
 server/src/com/cloud/vm/ItWorkDaoImpl.java         |   28 +-
 server/src/com/cloud/vm/ItWorkVO.java              |   28 +-
 server/src/com/cloud/vm/NicVO.java                 |   28 +-
 .../src/com/cloud/vm/ReservationContextImpl.java   |   28 +-
 .../src/com/cloud/vm/SystemVmLoadScanHandler.java  |   28 +-
 server/src/com/cloud/vm/SystemVmLoadScanner.java   |   28 +-
 server/src/com/cloud/vm/UserVmManager.java         |   28 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java     |   33 +-
 server/src/com/cloud/vm/UserVmStateListener.java   |   28 +-
 server/src/com/cloud/vm/VirtualMachineGuru.java    |   28 +-
 server/src/com/cloud/vm/VirtualMachineManager.java |   28 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |   30 +-
 .../com/cloud/vm/VirtualMachineProfileImpl.java    |   28 +-
 server/src/com/cloud/vm/dao/ConsoleProxyDao.java   |   28 +-
 .../src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java  |   28 +-
 server/src/com/cloud/vm/dao/DomainRouterDao.java   |   28 +-
 .../src/com/cloud/vm/dao/DomainRouterDaoImpl.java  |   28 +-
 server/src/com/cloud/vm/dao/InstanceGroupDao.java  |   28 +-
 .../src/com/cloud/vm/dao/InstanceGroupDaoImpl.java |   28 +-
 .../com/cloud/vm/dao/InstanceGroupVMMapDao.java    |   28 +-
 .../cloud/vm/dao/InstanceGroupVMMapDaoImpl.java    |   28 +-
 server/src/com/cloud/vm/dao/NicDao.java            |   28 +-
 server/src/com/cloud/vm/dao/NicDaoImpl.java        |   28 +-
 .../dao/RandomlyIncreasingVMInstanceDaoImpl.java   |   28 +-
 .../com/cloud/vm/dao/SecondaryStorageVmDao.java    |   28 +-
 .../cloud/vm/dao/SecondaryStorageVmDaoImpl.java    |   28 +-
 server/src/com/cloud/vm/dao/UserVmDao.java         |   28 +-
 server/src/com/cloud/vm/dao/UserVmDaoImpl.java     |   28 +-
 server/src/com/cloud/vm/dao/UserVmData.java        |   28 +-
 server/src/com/cloud/vm/dao/UserVmDetailsDao.java  |   28 +-
 .../src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java |   28 +-
 server/src/com/cloud/vm/dao/VMInstanceDao.java     |   28 +-
 server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java |   28 +-
 .../test/com/cloud/agent/MockAgentManagerImpl.java |   28 +-
 .../cloud/agent/manager/ResourceManagerTest.java   |   28 +-
 .../cloud/agent/manager/SearchCriteria2Test.java   |   28 +-
 server/test/com/cloud/async/CleanupDelegate.java   |   28 +-
 server/test/com/cloud/async/TestAsync.java         |   28 +-
 .../test/com/cloud/async/TestAsyncJobManager.java  |   28 +-
 .../test/com/cloud/async/TestSyncQueueManager.java |   28 +-
 .../com/cloud/cluster/CheckPointManagerTest.java   |   28 +-
 server/test/com/cloud/keystore/KeystoreTest.java   |   28 +-
 .../com/cloud/network/MockNetworkManagerImpl.java  |   34 +-
 .../com/cloud/network/dao/ElbVmMapDaoTest.java     |   28 +-
 .../test/com/cloud/network/dao/NetworkDaoTest.java |   28 +-
 .../security/SecurityGroupManagerImpl2Test.java    |   28 +-
 .../network/security/SecurityGroupQueueTest.java   |   28 +-
 .../test/com/cloud/snapshot/SnapshotDaoTest.java   |   28 +-
 .../com/cloud/storage/dao/StoragePoolDaoTest.java  |   28 +-
 .../upgrade/AdvanceZone217To224UpgradeTest.java    |   28 +-
 .../upgrade/AdvanceZone223To224UpgradeTest.java    |   28 +-
 .../upgrade/BasicZone218To224UpgradeTest.java      |   28 +-
 server/test/com/cloud/upgrade/DbUpgrade22Test.java |   28 +-
 .../com/cloud/upgrade/HostCapacity218to22Test.java |   28 +-
 .../upgrade/InstanceGroup218To224UpgradeTest.java  |   28 +-
 .../upgrade/PortForwarding218To224UpgradeTest.java |   28 +-
 .../cloud/upgrade/Sanity220To224UpgradeTest.java   |   28 +-
 .../cloud/upgrade/Sanity222To224UpgradeTest.java   |   28 +-
 .../cloud/upgrade/Sanity223To225UpgradeTest.java   |   28 +-
 .../cloud/upgrade/Sanity224To225UpgradeTest.java   |   28 +-
 .../cloud/upgrade/Template2214To30UpgradeTest.java |   28 +-
 .../com/cloud/upgrade/Test2214To30DBUpgrade.java   |   28 +-
 .../cloud/upgrade/Usage217To224UpgradeTest.java    |   28 +-
 .../upgrade/UsageEvents218To224UpgradeTest.java    |   28 +-
 .../com/cloud/user/MockAccountManagerImpl.java     |   30 +-
 server/test/com/cloud/utils/db/GlobalLockTest.java |   28 +-
 .../test/com/cloud/vm/MockUserVmManagerImpl.java   |   28 +-
 .../cloud/vm/MockVirtualMachineManagerImpl.java    |   28 +-
 .../test/com/cloud/vm/dao/UserVmDaoImplTest.java   |   28 +-
 setup/apidoc/XmlToHtmlConverter.java               |   29 +-
 setup/apidoc/build-apidoc.sh                       |   26 +-
 setup/apidoc/gen_toc.py                            |   27 +-
 setup/bindir/cloud-migrate-databases.in            |   18 +
 setup/bindir/cloud-set-guest-password.in           |   18 +
 setup/bindir/cloud-set-guest-sshkey.in             |   18 +
 setup/bindir/cloud-setup-databases.in              |   18 +
 setup/bindir/cloud-setup-encryption.in             |   18 +
 setup/bindir/cloud-sysvmadm.in                     |   18 +
 setup/db/221to222upgrade.sh                        |   26 +-
 setup/db/22beta4to22GA.sql                         |   29 +-
 setup/db/clouddev.sql                              |   33 +
 setup/db/create-database-premium.sql               |   29 +-
 setup/db/create-database.sql                       |  127 +-
 setup/db/create-index-fk.sql                       |  185 +-
 setup/db/create-schema-premium.sql                 |   29 +-
 setup/db/create-schema-simulator.sql               |   29 +-
 setup/db/create-schema.sql                         |   16 +
 setup/db/data-20to21.sql                           |   72 +-
 setup/db/data-22beta1to22beta2.sql                 |   29 +-
 setup/db/db/data-217to218.sql                      |   29 +-
 setup/db/db/schema-20to21.sql                      |  397 +-
 setup/db/db/schema-217to218.sql                    |   32 +-
 setup/db/db/schema-21to22-cleanup.sql              |   29 +-
 setup/db/db/schema-21to22-premium.sql              |  157 +-
 setup/db/db/schema-21to22.sql                      | 2033 +-
 setup/db/db/schema-2210to2211.sql                  |   29 +-
 setup/db/db/schema-2211to2212-premium.sql          |  119 +-
 setup/db/db/schema-2211to2212.sql                  |  121 +-
 setup/db/db/schema-2212to2213.sql                  |  161 +-
 setup/db/db/schema-2213to2214.sql                  |  171 +-
 setup/db/db/schema-2214to30-cleanup.sql            |   28 +-
 setup/db/db/schema-2214to30.sql                    |   31 +-
 setup/db/db/schema-221to222-cleanup.sql            |   29 +-
 setup/db/db/schema-221to222-premium.sql            |   47 +-
 setup/db/db/schema-221to222.sql                    |   29 +-
 setup/db/db/schema-222to224-cleanup.sql            |   30 +-
 setup/db/db/schema-222to224-premium.sql            |   43 +-
 setup/db/db/schema-222to224.sql                    |  387 +-
 setup/db/db/schema-224to225-cleanup.sql            |   29 +-
 setup/db/db/schema-224to225.sql                    |   29 +-
 setup/db/db/schema-225to226.sql                    |   29 +-
 setup/db/db/schema-227to228-premium.sql            |  147 +-
 setup/db/db/schema-227to228.sql                    |  331 +-
 setup/db/db/schema-228to229.sql                    |  187 +-
 setup/db/db/schema-229to2210.sql                   |  157 +-
 setup/db/db/schema-22beta1to22beta2.sql            |   29 +-
 setup/db/db/schema-22beta3to22beta4.sql            |   29 +-
 setup/db/db/schema-301to302-cleanup.sql            |   29 +-
 setup/db/db/schema-301to302.sql                    |  119 +-
 setup/db/db/schema-302to303.sql                    |  358 +-
 setup/db/db/schema-30to301.sql                     |   67 +-
 setup/db/db/schema-level.sql                       |   29 +-
 setup/db/db/schema-snapshot-217to224.sql           |   29 +-
 setup/db/db/schema-snapshot-223to224.sql           |   30 +-
 setup/db/deploy-db-clouddev.sh                     |   43 +
 setup/db/deploy-db-dev.sh                          |   26 +-
 setup/db/deploy-db-simulator.sh                    |   72 +-
 setup/db/index-20to21.sql                          |  115 +-
 setup/db/index-212to213.sql                        |   30 +-
 setup/db/postprocess-20to21.sql                    |   65 +-
 setup/db/server-setup.sql                          |   29 +-
 setup/db/templates.kvm.sql                         |   29 +-
 setup/db/templates.simulator.sql                   |   30 +-
 setup/db/templates.sql                             |   29 +-
 setup/db/templates.vmware.sql                      |  195 +-
 setup/db/templates.xenserver.sql                   |   29 +-
 test/bindirbak/cloud-run-test.in                   |   18 +
 test/integration/__init__.py                       |   16 +
 test/integration/component/__init__.py             |   27 +-
 test/integration/component/test_accounts.py        |   27 +-
 test/integration/component/test_blocker_bugs.py    |   27 +-
 test/integration/component/test_egress_rules.py    |   29 +-
 test/integration/component/test_eip_elb.py         |   29 +-
 .../component/test_high_availability.py            |   29 +-
 .../integration/component/test_network_offering.py |   29 +-
 test/integration/component/test_project_configs.py |   29 +-
 test/integration/component/test_project_limits.py  |   27 +-
 .../component/test_project_resources.py            |   27 +-
 test/integration/component/test_project_usage.py   |   27 +-
 test/integration/component/test_projects.py        |   27 +-
 test/integration/component/test_resource_limits.py |   27 +-
 test/integration/component/test_routers.py         |   27 +-
 test/integration/component/test_security_groups.py |   27 +-
 test/integration/component/test_snapshots.py       |   27 +-
 test/integration/component/test_templates.py       |   27 +-
 test/integration/component/test_usage.py           |   27 +-
 test/integration/component/test_volumes.py         |   27 +-
 test/integration/lib/__init__.py                   |   27 +-
 test/integration/lib/base.py                       |   29 +-
 test/integration/lib/common.py                     |   29 +-
 test/integration/lib/utils.py                      |   29 +-
 test/integration/smoke/__init__.py                 |   27 +-
 test/integration/smoke/test_disk_offerings.py      |   27 +-
 test/integration/smoke/test_hosts.py               |   27 +-
 test/integration/smoke/test_iso.py                 |   27 +-
 test/integration/smoke/test_network.py             |   27 +-
 test/integration/smoke/test_primary_storage.py     |   27 +-
 test/integration/smoke/test_routers.py             |   27 +-
 test/integration/smoke/test_secondary_storage.py   |   27 +-
 test/integration/smoke/test_service_offerings.py   |   27 +-
 test/integration/smoke/test_snapshots.py           |   27 +-
 test/integration/smoke/test_ssvm.py                |   27 +-
 test/integration/smoke/test_templates.py           |   27 +-
 test/integration/smoke/test_vm_life_cycle.py       |   27 +-
 test/integration/smoke/test_volumes.py             |   27 +-
 test/scripts/bootstrap-regression.sh               |   26 +-
 test/scripts/build-env.sh                          |   26 +-
 test/scripts/certDeleteEC2.sh                      |   26 +-
 test/scripts/certSubmitEC2.sh                      |   26 +-
 test/scripts/checkLog.sh                           |   26 +-
 test/scripts/checkOutOfMemory.sh                   |   56 +-
 test/scripts/cleanparallel.sh                      |   26 +-
 test/scripts/deploy-and-run-regression.sh          |   26 +-
 test/scripts/deploy.sh                             |   26 +-
 test/scripts/deploycluster.sh                      |   26 +-
 test/scripts/executeUserAPI.sh                     |   26 +-
 test/scripts/invoke.sh                             |   26 +-
 test/scripts/regression.sh                         |   26 +-
 test/scripts/run.sh                                |   26 +-
 test/scripts/script_lock_test/test.sh              |   26 +-
 test/scripts/script_lock_test/test_task.sh         |   26 +-
 test/scripts/sign.sh                               |   26 +-
 test/scripts/signEC2.sh                            |   26 +-
 test/scripts/usage/allocated.sh                    |   26 +-
 test/scripts/usage/network.sh                      |   26 +-
 test/scripts/usage/running.sh                      |   26 +-
 test/scripts/usage/volume_usage.sh                 |   26 +-
 test/scripts/xen/corrupttemplate.sh                |   26 +-
 test/scripts/xen/createfaketemplate.sh             |   26 +-
 test/scripts/xen/killvm.sh                         |   26 +-
 test/scripts/xen/listtemplate.sh                   |   26 +-
 test/scripts/xen/listvdi.sh                        |   26 +-
 test/scripts/xen/listvm.sh                         |   26 +-
 test/scripts/xen/ms.sh                             |   26 +-
 test/scripts/xen/removetemplate.sh                 |   26 +-
 test/scripts/xen/shutdown.sh                       |   26 +-
 test/scripts/xen/sleep.sh                          |   26 +-
 test/scripts/xen/ssh.sh                            |   26 +-
 test/src/com/cloud/sample/Base64.java              |   28 +-
 .../src/com/cloud/sample/UserCloudAPIExecutor.java |  366 +-
 .../com/cloud/test/longrun/BuildGuestNetwork.java  |  252 +-
 .../com/cloud/test/longrun/PerformanceWithAPI.java |  410 +-
 test/src/com/cloud/test/longrun/User.java          |  470 +-
 .../src/com/cloud/test/longrun/VirtualMachine.java |  226 +-
 test/src/com/cloud/test/longrun/guestNetwork.java  |  210 +-
 test/src/com/cloud/test/regression/ApiCommand.java |   28 +-
 test/src/com/cloud/test/regression/ConfigTest.java |   28 +-
 .../cloud/test/regression/DelegatedAdminTest.java  |  260 +-
 test/src/com/cloud/test/regression/Deploy.java     |  216 +-
 .../com/cloud/test/regression/EventsApiTest.java   |  350 +-
 test/src/com/cloud/test/regression/HA.java         |  152 +-
 .../cloud/test/regression/LoadBalancingTest.java   |  286 +-
 .../cloud/test/regression/PortForwardingTest.java  |  272 +-
 test/src/com/cloud/test/regression/SanityTest.java |  164 +-
 test/src/com/cloud/test/regression/Test.java       |  168 +-
 test/src/com/cloud/test/regression/TestCase.java   |  162 +-
 .../com/cloud/test/regression/TestCaseEngine.java  |   28 +-
 test/src/com/cloud/test/regression/VMApiTest.java  |  164 +-
 test/src/com/cloud/test/stress/SshTest.java        |   28 +-
 .../cloud/test/stress/StressTestDirectAttach.java  | 3052 +-
 .../com/cloud/test/stress/TestClientWithAPI.java   |   28 +-
 test/src/com/cloud/test/stress/WgetTest.java       |  318 +-
 .../cloud/test/ui/AbstractSeleniumTestCase.java    |   28 +-
 test/src/com/cloud/test/ui/AddAndDeleteAISO.java   |  228 +-
 .../com/cloud/test/ui/AddAndDeleteATemplate.java   |  224 +-
 test/src/com/cloud/test/ui/UIScenarioTest.java     |   28 +-
 test/src/com/cloud/test/utils/ConsoleProxy.java    |  220 +-
 test/src/com/cloud/test/utils/IpSqlGenerator.java  |  172 +-
 test/src/com/cloud/test/utils/ProxyLoadTemp.java   |  238 +-
 test/src/com/cloud/test/utils/SignEC2.java         |   28 +-
 test/src/com/cloud/test/utils/SignRequest.java     |  200 +-
 .../src/com/cloud/test/utils/SqlDataGenerator.java |   92 +-
 test/src/com/cloud/test/utils/SubmitCert.java      |   28 +-
 test/src/com/cloud/test/utils/TestClient.java      |  758 +-
 test/src/com/cloud/test/utils/UtilsForTest.java    |  420 +-
 tools/bugs-wiki/search-bugs.py                     |   16 +
 tools/bugs-wiki/search-wiki.py                     |   16 +
 tools/marvin/LICENSE.txt                           |   26 +-
 tools/marvin/marvin/NoseTestExecuteEngine.py       |   17 +
 tools/marvin/marvin/TestCaseExecuteEngine.py       |   28 +-
 tools/marvin/marvin/asyncJobMgr.py                 |   27 +-
 tools/marvin/marvin/cloudstackConnection.py        |   27 +-
 tools/marvin/marvin/cloudstackException.py         |   28 +-
 tools/marvin/marvin/cloudstackTestCase.py          |   27 +-
 tools/marvin/marvin/cloudstackTestClient.py        |   29 +-
 tools/marvin/marvin/codegenerator.py               |   27 +-
 tools/marvin/marvin/configGenerator.py             |   44 +-
 tools/marvin/marvin/dbConnection.py                |   27 +-
 tools/marvin/marvin/deployAndRun.py                |   27 +-
 tools/marvin/marvin/deployDataCenter.py            |   60 +-
 tools/marvin/marvin/jsonHelper.py                  |   27 +-
 tools/marvin/marvin/remoteSSHClient.py             |   29 +-
 .../marvin/marvin/sandbox/advanced/advanced_env.py |   41 +-
 .../marvin/sandbox/advanced/setup.properties       |   22 +-
 tools/marvin/marvin/sandbox/basic/basic_env.py     |  134 +
 .../marvin/sandbox/demo/live/testSshDeployVM.py    |   26 +-
 .../sandbox/demo/simulator/simulator_setup.py      |   17 +
 .../sandbox/demo/simulator/testcase/libs/base.py   |   19 +-
 .../sandbox/demo/simulator/testcase/libs/common.py |   21 +-
 .../sandbox/demo/simulator/testcase/libs/utils.py  |   19 +-
 .../demo/simulator/testcase/test_vm_life_cycle.py  |   27 +-
 tools/marvin/setup.py                              |   21 +-
 tools/test/apisession.py                           |   27 +-
 tools/test/cloudkit.py                             |   27 +-
 tools/test/db.py                                   |   27 +-
 tools/test/globalconfig.py                         |   27 +-
 tools/test/physicalresource.py                     |   27 +-
 tools/test/vm.py                                   |   27 +-
 tools/test/vmcreate.py                             |   27 +-
 tools/testClient/.project                          |   17 -
 tools/testClient/.pydevproject                     |   10 -
 tools/testClient/README                            |   24 -
 tools/testClient/TestCaseExecuteEngine.py          |   74 -
 tools/testClient/asyncJobMgr.py                    |  230 -
 tools/testClient/automated/automated.sh            |   60 -
 tools/testClient/automated/automated.xml           | 4425 -
 tools/testClient/cloudstackConnection.py           |  174 -
 tools/testClient/cloudstackException.py            |   36 -
 tools/testClient/cloudstackTestCase.py             |   53 -
 tools/testClient/cloudstackTestClient.py           |  153 -
 tools/testClient/codegenerator.py                  |  289 -
 tools/testClient/configGenerator.py                |  396 -
 tools/testClient/dbConnection.py                   |   92 -
 tools/testClient/demo/README                       |    4 -
 tools/testClient/demo/demo.cfg                     |   25 -
 tools/testClient/demo/testDeployVM.py              |   98 -
 tools/testClient/demo/testSshDeployVM.py           |  143 -
 tools/testClient/deployAndRun.py                   |   44 -
 tools/testClient/deployDataCenter.py               |  395 -
 tools/testClient/jsonHelper.py                     |  192 -
 tools/testClient/pymysql/__init__.py               |  143 -
 tools/testClient/pymysql/charset.py                |  186 -
 tools/testClient/pymysql/connections.py            |  940 -
 tools/testClient/pymysql/constants/CLIENT.py       |   32 -
 tools/testClient/pymysql/constants/COMMAND.py      |   35 -
 tools/testClient/pymysql/constants/ER.py           |  484 -
 tools/testClient/pymysql/constants/FIELD_TYPE.py   |   44 -
 tools/testClient/pymysql/constants/FLAG.py         |   27 -
 .../testClient/pymysql/constants/SERVER_STATUS.py  |   24 -
 tools/testClient/pymysql/constants/__init__.py     |   12 -
 tools/testClient/pymysql/converters.py             |  360 -
 tools/testClient/pymysql/cursors.py                |  309 -
 tools/testClient/pymysql/err.py                    |  159 -
 tools/testClient/pymysql/tests/__init__.py         |   25 -
 tools/testClient/pymysql/tests/base.py             |   32 -
 tools/testClient/pymysql/tests/test_DictCursor.py  |   68 -
 tools/testClient/pymysql/tests/test_basic.py       |  205 -
 tools/testClient/pymysql/tests/test_example.py     |   44 -
 tools/testClient/pymysql/tests/test_issues.py      |  280 -
 .../pymysql/tests/thirdparty/__init__.py           |   17 -
 .../tests/thirdparty/test_MySQLdb/__init__.py      |   19 -
 .../tests/thirdparty/test_MySQLdb/capabilities.py  |  304 -
 .../tests/thirdparty/test_MySQLdb/dbapi20.py       |  856 -
 .../test_MySQLdb/test_MySQLdb_capabilities.py      |  127 -
 .../test_MySQLdb/test_MySQLdb_dbapi20.py           |  217 -
 .../test_MySQLdb/test_MySQLdb_nonstandard.py       |  102 -
 tools/testClient/pymysql/times.py                  |   28 -
 tools/testClient/pymysql/util.py                   |   31 -
 tools/testClient/remoteSSHClient.py                |   48 -
 tools/testClient/resourceMgrTest/__init__.py       |   12 -
 tools/testClient/resourceMgrTest/setup.py          |   85 -
 .../resourceMgrTest/testDeploy100Host.py           |  106 -
 tools/testClient/sandbox/advanced/advanced_env.py  |  131 -
 tools/testClient/sandbox/advanced/kvm.properties   |   37 -
 tools/testClient/sandbox/advanced/setup.properties |   36 -
 .../sandbox/advanced/tests/test_scenarios.py       |  138 -
 tools/testClient/sandbox/advanced/xen.properties   |   36 -
 tools/testClient/sandbox/basic/basic_env.py        |  129 -
 tools/testClient/sandbox/basic/setup.properties    |   34 -
 tools/testClient/sandbox/simulator/sandbox.cfg     |  138 -
 tools/testClient/sandbox/simulator/setup.py        |  128 -
 .../sandbox/simulator/simulator.properties         |   35 -
 .../sandbox/simulator/tests/testProvision.py       |  131 -
 tools/testClient/testcase/test_1.py                |   31 -
 tools/testClient/testcase/test_2.py                |   35 -
 tools/testClient/testcase/test_3.py                |  122 -
 tools/testClient/testcase/test_userDecorator.py    |   69 -
 tools/testClient/translator.py                     |  212 -
 tools/testClient/unitTest/test_advanced.py         |  107 -
 tools/testClient/unitTest/test_async.py            |   70 -
 tools/testClient/unitTest/test_basic_zone.py       |  227 -
 tools/testClient/unitTest/test_local_storage.py    |  255 -
 ui/css/cloudstack3.css                             |  434 +-
 ui/images/bg-gradients.png                         |  Bin 8322 -> 7539 bytes
 ui/images/sprites.png                              |  Bin 178421 -> 178569 bytes
 ui/index.jsp                                       |    5 +-
 ui/lib/jquery.timers.js                            |  138 -
 ui/scripts/accounts.js                             |   91 +-
 ui/scripts/cloud.core.callbacks.js                 |   28 +-
 ui/scripts/cloudStack.js                           |   51 +-
 ui/scripts/configuration.js                        |   52 +-
 ui/scripts/dashboard.js                            |   31 +-
 ui/scripts/domains.js                              |   32 +-
 ui/scripts/events.js                               |   28 +-
 ui/scripts/globalSettings.js                       |   28 +-
 ui/scripts/installWizard.js                        |   28 +-
 ui/scripts/instanceWizard.js                       |  529 +
 ui/scripts/instances.js                            |  522 +-
 ui/scripts/lbStickyPolicy.js                       |   28 +-
 ui/scripts/network.js                              |  115 +-
 ui/scripts/projects.js                             |   28 +-
 ui/scripts/sharedFunctions.js                      |   37 +-
 ui/scripts/storage.js                              |   30 +-
 ui/scripts/system.js                               |  174 +-
 ui/scripts/templates.js                            |   89 +-
 ui/scripts/ui-custom/dashboard.js                  |   26 +-
 ui/scripts/ui-custom/enableStaticNAT.js            |   26 +-
 ui/scripts/ui-custom/installWizard.js              |   26 +-
 ui/scripts/ui-custom/instanceWizard.js             |   63 +-
 ui/scripts/ui-custom/ipRules.js                    |   26 +-
 ui/scripts/ui-custom/login.js                      |   26 +-
 ui/scripts/ui-custom/physicalResources.js          |   33 +-
 ui/scripts/ui-custom/projects.js                   |   26 +-
 ui/scripts/ui-custom/recurringSnapshots.js         |   26 +-
 ui/scripts/ui-custom/securityRules.js              |   26 +-
 ui/scripts/ui-custom/uploadVolume.js               |   16 +
 ui/scripts/ui-custom/vpc.js                        |  566 +
 ui/scripts/ui-custom/zoneChart.js                  |   26 +-
 ui/scripts/ui-custom/zoneWizard.js                 |  102 +-
 ui/scripts/ui/core.js                              |   26 +-
 ui/scripts/ui/dialog.js                            |   29 +-
 ui/scripts/ui/events.js                            |   26 +-
 ui/scripts/ui/utils.js                             |   26 +-
 ui/scripts/ui/widgets/cloudBrowser.js              |   26 +-
 ui/scripts/ui/widgets/dataTable.js                 |   26 +-
 ui/scripts/ui/widgets/detailView.js                |  129 +-
 ui/scripts/ui/widgets/listView.js                  |   38 +-
 ui/scripts/ui/widgets/multiEdit.js                 |   26 +-
 ui/scripts/ui/widgets/notifications.js             |   26 +-
 ui/scripts/ui/widgets/overlay.js                   |   30 +-
 ui/scripts/ui/widgets/treeView.js                  |   26 +-
 ui/scripts/vpc.js                                  |  496 +
 ui/scripts/zoneWizard.js                           |  361 +-
 ui/tests/test.cloudBrowser.js                      |   28 +-
 ui/tests/test.core.js                              |   28 +-
 ui/tests/test.detailView.js                        |   26 +-
 ui/tests/test.listView.js                          |   28 +-
 ui/tests/test.multiEdit.js                         |   28 +-
 ui/tests/test.notifications.js                     |   28 +-
 utils/src/com/cloud/utils/db/DbUtil.java           |    5 +
 utils/src/com/cloud/utils/db/GenericDao.java       |    5 +
 utils/src/com/cloud/utils/db/GenericDaoBase.java   |    1 +
 .../utils/exception/CSExceptionErrorCode.java      |    4 +-
 utils/src/com/cloud/utils/ssh/SshHelper.java       |  206 +
 .../src/com/cloud/hypervisor/vmware/mo/BaseMO.java |   28 +-
 .../com/cloud/hypervisor/vmware/mo/ClusterMO.java  |   28 +-
 .../hypervisor/vmware/mo/CustomFieldConstants.java |   28 +-
 .../vmware/mo/CustomFieldsManagerMO.java           |   28 +-
 .../cloud/hypervisor/vmware/mo/DatacenterMO.java   |  502 +-
 .../cloud/hypervisor/vmware/mo/DatastoreFile.java  |   28 +-
 .../cloud/hypervisor/vmware/mo/DatastoreMO.java    |   28 +-
 .../hypervisor/vmware/mo/DiskControllerType.java   |   28 +-
 .../vmware/mo/HostDatastoreBrowserMO.java          |   28 +-
 .../vmware/mo/HostDatastoreSystemMO.java           |   28 +-
 .../hypervisor/vmware/mo/HostFirewallSystemMO.java |   28 +-
 .../src/com/cloud/hypervisor/vmware/mo/HostMO.java |   42 +-
 .../hypervisor/vmware/mo/HostNetworkSystemMO.java  |   28 +-
 .../hypervisor/vmware/mo/HostVirtualNicType.java   |   28 +-
 .../cloud/hypervisor/vmware/mo/HttpNfcLeaseMO.java |   28 +-
 .../hypervisor/vmware/mo/HypervisorHostHelper.java |  542 +-
 .../cloud/hypervisor/vmware/mo/NetworkDetails.java |   28 +-
 .../com/cloud/hypervisor/vmware/mo/NetworkMO.java  |   28 +-
 .../vmware/mo/PerfCounterInfoMapper.java           |   28 +-
 .../cloud/hypervisor/vmware/mo/PerfManagerMO.java  |   28 +-
 .../hypervisor/vmware/mo/SnapshotDescriptor.java   |  164 +-
 .../src/com/cloud/hypervisor/vmware/mo/TaskMO.java |   28 +-
 .../hypervisor/vmware/mo/VersioningContants.java   |   28 +-
 .../hypervisor/vmware/mo/VirtualDiskManagerMO.java |   28 +-
 .../vmware/mo/VirtualEthernetCardType.java         |   28 +-
 .../hypervisor/vmware/mo/VirtualMachineMO.java     |  712 +-
 .../hypervisor/vmware/mo/VirtualSwitchType.java    |   44 +-
 .../hypervisor/vmware/mo/VmdkFileDescriptor.java   |   28 +-
 .../cloud/hypervisor/vmware/mo/VmwareHostType.java |   28 +-
 .../hypervisor/vmware/mo/VmwareHypervisorHost.java |   28 +-
 .../mo/VmwareHypervisorHostNetworkSummary.java     |   28 +-
 .../mo/VmwareHypervisorHostResourceSummary.java    |   28 +-
 .../hypervisor/vmware/util/VmwareContext.java      |  536 +-
 .../vmware/util/VmwareGuestOsMapper.java           |   28 +-
 .../cloud/hypervisor/vmware/util/VmwareHelper.java |  270 +-
 wscript                                            |    1 +
 wscript_build                                      |    5 +-
 wscript_configure                                  |    4 +-
 3131 files changed, 231770 insertions(+), 218840 deletions(-)
----------------------------------------------------------------------