cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wid...@apache.org
Subject [32/50] [abbrv] git commit: updated refs/heads/disk-cache to 72f2f12
Date Tue, 03 Sep 2013 11:09:37 GMT
Bring up to date with master


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

Branch: refs/heads/disk-cache
Commit: bdba0ddeedd7ea16d67ab8aef5df24ee8f53747a
Parents: a6c1b75 4b157fc
Author: Ian Duffy <ian@ianduffy.ie>
Authored: Sat Aug 31 00:25:48 2013 +0100
Committer: Ian Duffy <ian@ianduffy.ie>
Committed: Sat Aug 31 00:25:48 2013 +0100

----------------------------------------------------------------------
 INSTALL.md                                      |     7 +
 LICENSE                                         |    13 +-
 .../tomcatconf/commands-simulator.properties.in |     2 +-
 agent/conf/agent.properties                     |    20 +
 agent/pom.xml                                   |     5 +-
 api/pom.xml                                     |    25 +-
 api/src/com/cloud/agent/api/Command.java        |     4 +
 api/src/com/cloud/agent/api/to/VolumeTO.java    |     9 +
 .../cloud/async/AsyncInstanceCreateStatus.java  |    24 -
 api/src/com/cloud/async/AsyncJob.java           |    71 -
 api/src/com/cloud/async/SyncQueueItem.java      |    26 -
 .../com/cloud/cluster/ManagementServerHost.java |    32 -
 .../com/cloud/configuration/Configuration.java  |    33 -
 .../configuration/ConfigurationService.java     |    33 +-
 .../consoleproxy/ConsoleProxyAllocator.java     |    34 +
 api/src/com/cloud/deploy/DeploymentPlanner.java |     7 +
 api/src/com/cloud/event/EventTypes.java         |     9 +-
 .../exception/OperationTimedoutException.java   |    62 +
 api/src/com/cloud/hypervisor/Hypervisor.java    |    22 +
 api/src/com/cloud/network/Network.java          |    19 +-
 api/src/com/cloud/network/NetworkProfile.java   |   119 +-
 api/src/com/cloud/network/NetworkService.java   |     2 +-
 api/src/com/cloud/network/Networks.java         |   179 +-
 .../network/lb/LoadBalancingRulesService.java   |     5 +-
 .../cloud/network/security/SecurityRule.java    |     8 +-
 api/src/com/cloud/network/vpc/VpcGateway.java   |     2 +-
 api/src/com/cloud/offering/DiskOffering.java    |     9 +
 api/src/com/cloud/offering/ServiceOffering.java |     9 +-
 api/src/com/cloud/server/ManagementService.java |     5 +-
 api/src/com/cloud/storage/S3.java               |    50 -
 api/src/com/cloud/storage/StorageService.java   |     9 +-
 api/src/com/cloud/storage/Swift.java            |    37 -
 api/src/com/cloud/storage/Volume.java           |     1 +
 api/src/com/cloud/storage/VolumeApiService.java |     1 +
 .../com/cloud/template/TemplateApiService.java  |     3 -
 .../cloud/template/VirtualMachineTemplate.java  |     6 +
 .../org/apache/cloudstack/api/ApiConstants.java |     2 +-
 .../org/apache/cloudstack/api/BaseAsyncCmd.java |    16 +-
 .../cloudstack/api/BaseAsyncCreateCmd.java      |    13 -
 .../cloudstack/api/ResponseGenerator.java       |   167 +-
 .../command/admin/cluster/AddClusterCmd.java    |    18 +-
 .../api/command/admin/config/ListCfgsByCmd.java |     3 +-
 .../api/command/admin/config/UpdateCfgCmd.java  |     3 +-
 .../admin/network/UpdatePhysicalNetworkCmd.java |     8 +-
 .../admin/region/ListPortableIpRangesCmd.java   |     2 -
 .../command/admin/storage/AddImageStoreCmd.java |    36 +-
 .../api/command/admin/storage/AddS3Cmd.java     |    49 +-
 .../admin/storage/CreateCacheStoreCmd.java      |   135 -
 .../storage/CreateSecondaryStagingStoreCmd.java |   135 +
 .../storage/DeleteSecondaryStagingStoreCmd.java |    79 +
 .../admin/storage/ListCacheStoresCmd.java       |   104 -
 .../admin/storage/ListImageStoresCmd.java       |     2 +-
 .../storage/ListSecondaryStagingStoresCmd.java  |   104 +
 .../admin/storage/UpdateStoragePoolCmd.java     |    15 +
 .../api/command/admin/swift/AddSwiftCmd.java    |   122 +
 .../api/command/admin/swift/ListSwiftsCmd.java  |    70 +
 .../admin/systemvm/MigrateSystemVMCmd.java      |    25 +-
 .../admin/systemvm/ScaleSystemVMCmd.java        |    34 +-
 .../admin/systemvm/UpgradeSystemVMCmd.java      |     8 +-
 .../api/command/admin/vm/AssignVMCmd.java       |     2 +-
 .../user/address/AssociateIPAddrCmd.java        |    27 +-
 .../autoscale/CreateAutoScaleVmProfileCmd.java  |     4 +-
 .../user/config/ListCapabilitiesCmd.java        |     4 +-
 .../user/firewall/CreateFirewallRuleCmd.java    |     2 +-
 .../firewall/UpdatePortForwardingRuleCmd.java   |    19 +
 .../CreateLBStickinessPolicyCmd.java            |    15 +
 .../loadbalancer/CreateLoadBalancerRuleCmd.java |    14 +-
 .../ListLoadBalancerRuleInstancesCmd.java       |    10 +-
 .../loadbalancer/UpdateLoadBalancerRuleCmd.java |    15 +
 .../user/network/CreateNetworkACLCmd.java       |    13 +-
 .../command/user/network/CreateNetworkCmd.java  |    17 +-
 .../user/network/DeleteNetworkACLCmd.java       |    13 +-
 .../user/network/DeleteNetworkACLListCmd.java   |    24 +-
 .../command/user/network/UpdateNetworkCmd.java  |    10 +
 .../api/command/user/vm/DeployVMCmd.java        |    20 +-
 .../api/command/user/vm/ListVMsCmd.java         |     6 +-
 .../api/command/user/vm/ScaleVMCmd.java         |    21 +-
 .../api/command/user/vm/UpgradeVMCmd.java       |     8 +-
 .../user/volume/AddResourceDetailCmd.java       |    22 +-
 .../command/user/volume/MigrateVolumeCmd.java   |     1 +
 .../api/command/user/vpc/DeleteVPCCmd.java      |     9 +
 .../api/command/user/vpc/RestartVPCCmd.java     |    10 +
 .../api/command/user/vpc/UpdateVPCCmd.java      |    10 +
 .../api/response/AccountResponse.java           |    20 +-
 .../api/response/AsyncJobResponse.java          |     8 +-
 .../api/response/CapabilitiesResponse.java      |    10 +-
 .../api/response/CreateCmdResponse.java         |     5 +
 .../api/response/NetworkOfferingResponse.java   |     6 +
 .../api/response/NetworkResponse.java           |     9 +-
 .../api/response/ProjectResponse.java           |    22 +-
 .../cloudstack/api/response/RegionResponse.java |    15 +-
 .../response/ResourceLimitAndCountResponse.java |     6 +
 .../cloudstack/api/response/S3Response.java     |   218 -
 .../api/response/ServiceOfferingResponse.java   |    17 +-
 .../cloudstack/api/response/SwiftResponse.java  |    86 -
 .../cloudstack/api/response/UserVmResponse.java |   907 +-
 .../apache/cloudstack/config/Configuration.java |    84 +
 api/src/org/apache/cloudstack/jobs/JobInfo.java |    81 +
 .../apache/cloudstack/query/QueryService.java   |     4 +-
 .../org/apache/cloudstack/region/Region.java    |     4 +-
 api/src/org/apache/cloudstack/usage/Usage.java  |    13 +-
 .../org/apache/cloudstack/usage/UsageTypes.java |     2 +
 api/test/com/cloud/network/NetworksTest.java    |    21 +-
 .../api/command/test/AddClusterCmdTest.java     |    15 +-
 .../api/command/test/AddHostCmdTest.java        |    29 +-
 .../api/command/test/ListCfgCmdTest.java        |     5 +-
 .../api/command/test/ScaleVMCmdTest.java        |     5 +-
 .../api/command/test/UpdateCfgCmdTest.java      |     5 +-
 .../cloudstack/test/utils/SpringUtils.java      |   113 +
 awsapi/pom.xml                                  |    18 +-
 .../classes/resources/messages.properties       |    12 +
 .../classes/resources/messages_ja.properties    |   494 +-
 .../classes/resources/messages_zh_CN.properties |   514 +-
 client/pom.xml                                  |    21 +-
 client/tomcatconf/applicationContext.xml.in     |    42 +-
 client/tomcatconf/commands.properties.in        |    19 +-
 client/tomcatconf/componentContext.xml.in       |     4 +-
 client/tomcatconf/log4j-cloud.xml.in            |    14 +-
 client/tomcatconf/nonossComponentContext.xml.in |     4 +-
 .../tomcatconf/simulatorComponentContext.xml.in |    32 +-
 core/pom.xml                                    |    24 +-
 .../api/DownloadSnapshotFromS3Command.java      |    61 -
 .../api/DownloadSnapshotFromSwiftCommand.java   |    60 -
 ...TemplateFromS3ToSecondaryStorageCommand.java |    66 -
 ...plateFromSwiftToSecondaryStorageCommand.java |    90 -
 .../src/com/cloud/agent/api/ScaleVmCommand.java |     3 +-
 .../agent/api/ScheduleHostScanTaskCommand.java  |     0
 ...TemplateToS3FromSecondaryStorageCommand.java |   121 -
 ...plateToSwiftFromSecondaryStorageCommand.java |    80 -
 .../GlobalLoadBalancerConfigCommand.java        |     4 +
 .../storage/CreateEntityDownloadURLCommand.java |    15 +-
 .../virtualnetwork/VirtualRoutingResource.java  |     3 +-
 .../consoleproxy/ConsoleProxyAllocator.java     |    27 -
 .../exception/OperationTimedoutException.java   |    62 -
 .../com/cloud/storage/GuestOSHypervisorVO.java  |    73 -
 core/src/com/cloud/storage/VolumeDetailVO.java  |    85 -
 .../storage/resource/StoragePoolResource.java   |     2 -
 .../StorageSubsystemCommandHandlerBase.java     |     2 +-
 .../cloud/storage/template/IsoProcessor.java    |     5 +
 .../com/cloud/storage/template/Processor.java   |     5 +
 .../cloud/storage/template/QCOW2Processor.java  |    23 +
 .../storage/template/RawImageProcessor.java     |     5 +
 .../storage/template/TemplateLocation.java      |     4 +-
 .../cloud/storage/template/VhdProcessor.java    |    28 +
 .../cloud/storage/template/VmdkProcessor.java   |    11 +
 .../storage/command/AttachAnswer.java           |    47 +
 .../storage/command/AttachCommand.java          |   126 +
 .../command/AttachPrimaryDataStoreAnswer.java   |    56 +
 .../command/AttachPrimaryDataStoreCmd.java      |    39 +
 .../storage/command/CopyCmdAnswer.java          |    37 +
 .../cloudstack/storage/command/CopyCommand.java |    66 +
 .../storage/command/CreateObjectAnswer.java     |    43 +
 .../storage/command/CreateObjectCommand.java    |    45 +
 .../command/CreatePrimaryDataStoreCmd.java      |    38 +
 .../storage/command/DeleteCommand.java          |    45 +
 .../storage/command/DettachAnswer.java          |    47 +
 .../storage/command/DettachCommand.java         |    90 +
 .../command/StorageSubSystemCommand.java        |    23 +
 .../cloudstack/storage/to/ImageStoreTO.java     |    79 +
 .../storage/to/PrimaryDataStoreTO.java          |   103 +
 .../cloudstack/storage/to/SnapshotObjectTO.java |   137 +
 .../cloudstack/storage/to/TemplateObjectTO.java |   217 +
 .../cloudstack/storage/to/VolumeObjectTO.java   |   223 +
 .../com/cloud/agent/transport/RequestTest.java  |    22 +-
 debian/changelog                                |     6 +
 debian/control                                  |     2 +-
 deps/XenServerJava/pom.xml                      |     2 +-
 developer/pom.xml                               |     8 +-
 docs/en-US/Book_Info_Release_Notes_4-0.xml      |    38 -
 docs/en-US/Book_Info_Release_Notes_4.xml        |    38 +
 docs/en-US/Developers_Guide.xml                 |     2 +
 docs/en-US/Release_Notes.xml                    |  2196 ++-
 docs/en-US/about-primary-storage.xml            |     5 +-
 docs/en-US/about-regions.xml                    |     5 +-
 docs/en-US/about-secondary-storage.xml          |    22 +-
 docs/en-US/about-zones.xml                      |    22 +-
 docs/en-US/accessing-system-vms.xml             |    66 +
 docs/en-US/accounts-users-domains.xml           |    88 +-
 docs/en-US/add-gateway-vpc.xml                  |    74 +-
 docs/en-US/add-ip-range.xml                     |   173 +-
 docs/en-US/add-load-balancer-rule.xml           |    20 +-
 docs/en-US/add-loadbalancer-rule-vpc.xml        |    47 +-
 docs/en-US/add-remove-nic-ui.xml                |     6 +-
 docs/en-US/add-tier.xml                         |     3 +-
 docs/en-US/added-API-commands-4.2.xml           |   327 +-
 docs/en-US/admin-alerts.xml                     |    95 +-
 ...nced-zone-physical-network-configuration.xml |     1 +
 docs/en-US/attaching-volume.xml                 |     2 +-
 docs/en-US/basic-zone-configuration.xml         |     2 +-
 docs/en-US/best-practices-for-vms.xml           |    30 +-
 docs/en-US/best-practices-primary-storage.xml   |     6 +-
 docs/en-US/build-nonoss.xml                     |     4 +-
 docs/en-US/build-rpm.xml                        |    11 +-
 ...change-network-offering-on-guest-network.xml |    75 +-
 docs/en-US/changed-API-commands-4.2.xml         |    15 +-
 docs/en-US/changing-service-offering-for-vm.xml |   194 +-
 docs/en-US/citrix-xenserver-installation.xml    |     6 +
 docs/en-US/configure-acl.xml                    |    14 +-
 docs/en-US/create-linux-template.xml            |    41 +
 docs/en-US/creating-compute-offerings.xml       |     4 +
 docs/en-US/creating-disk-offerings.xml          |    10 +-
 docs/en-US/creating-network-offerings.xml       |    15 +-
 docs/en-US/creating-shared-network.xml          |   132 +
 docs/en-US/creating-vms.xml                     |    35 +-
 docs/en-US/delete-event-alerts.xml              |    49 +-
 docs/en-US/detach-move-volumes.xml              |     5 +-
 docs/en-US/egress-firewall-rule.xml             |   220 +-
 docs/en-US/getting-release.xml                  |     2 +-
 docs/en-US/global-config.xml                    |   189 +-
 docs/en-US/gsoc-midsummer-dharmesh.xml          |   169 +-
 docs/en-US/gsoc-midsummer-ian.xml               |    73 +-
 docs/en-US/gsoc-midsummer-meng.xml              |   196 +-
 docs/en-US/gsoc-midsummer-nguyen.xml            |   456 +-
 docs/en-US/gsoc-midsummer-shiva.xml             |   257 +-
 docs/en-US/guest-traffic.xml                    |    23 +-
 docs/en-US/hardware-firewall.xml                |     8 +-
 docs/en-US/health-checks-for-lb-rules.xml       |    51 +
 docs/en-US/host-allocation.xml                  |   105 +-
 docs/en-US/hypervisor-host-install-agent.xml    |    45 +
 docs/en-US/hypervisor-host-install-libvirt.xml  |     5 +
 docs/en-US/images/add-account-screen.png        |   Bin 0 -> 71491 bytes
 docs/en-US/images/add-cluster.png               |   Bin 35697 -> 37800 bytes
 docs/en-US/images/add-guest-network.png         |   Bin 20547 -> 24669 bytes
 .../images/add-ldap-configuration-failure.png   |   Bin 27841 -> 84858 bytes
 docs/en-US/images/add-ldap-configuration.png    |   Bin 27393 -> 78542 bytes
 docs/en-US/images/add-tier.png                  |   Bin 14891 -> 19054 bytes
 docs/en-US/images/addAccount-icon.png           |   Bin 0 -> 605 bytes
 docs/en-US/images/async-calls.png               |   Bin 0 -> 126157 bytes
 docs/en-US/images/change-affinity-button.png    |   Bin 0 -> 7300 bytes
 docs/en-US/images/clusterDefinition.png         |   Bin 0 -> 52607 bytes
 .../en-US/images/configuration-edit-success.png |   Bin 0 -> 86909 bytes
 docs/en-US/images/configurations-screen.png     |   Bin 0 -> 85285 bytes
 docs/en-US/images/create-account-post.png       |   Bin 0 -> 116063 bytes
 docs/en-US/images/create-account-request.png    |   Bin 0 -> 169834 bytes
 docs/en-US/images/dedicate-resource-button.png  |   Bin 0 -> 7144 bytes
 .../delete-ldap-configuration-failure.png       |   Bin 29262 -> 39952 bytes
 docs/en-US/images/delete-ldap-configuration.png |   Bin 0 -> 69084 bytes
 docs/en-US/images/edit-configuration.png        |   Bin 0 -> 86589 bytes
 docs/en-US/images/gslb.png                      |   Bin 60354 -> 68556 bytes
 docs/en-US/images/instances-screen.png          |   Bin 0 -> 66865 bytes
 docs/en-US/images/l3_services.png               |   Bin 0 -> 30362 bytes
 docs/en-US/images/launchHadoopClusterApi.png    |   Bin 0 -> 13427 bytes
 docs/en-US/images/launchHadoopClusterCmd.png    |   Bin 0 -> 83972 bytes
 docs/en-US/images/ldap-list-users.png           |   Bin 56047 -> 85922 bytes
 docs/en-US/images/list-domain-vms.png           |   Bin 0 -> 130442 bytes
 docs/en-US/images/list-ldap-configuration.png   |   Bin 30977 -> 38909 bytes
 docs/en-US/images/list-specific-vm.png          |   Bin 0 -> 86323 bytes
 docs/en-US/images/list-virtualmachines.png      |   Bin 0 -> 124665 bytes
 docs/en-US/images/network_service.png           |   Bin 0 -> 28162 bytes
 docs/en-US/images/odl_structure.jpg             |   Bin 0 -> 116542 bytes
 docs/en-US/images/plugin1.jpg                   |   Bin 0 -> 32999 bytes
 docs/en-US/images/plugin2.jpg                   |   Bin 0 -> 35149 bytes
 docs/en-US/images/plugin3.jpg                   |   Bin 0 -> 41983 bytes
 docs/en-US/images/plugin4.jpg                   |   Bin 0 -> 32125 bytes
 docs/en-US/images/plugin_intro.jpg              |   Bin 0 -> 22247 bytes
 docs/en-US/images/replace-acl-icon.png          |   Bin 930 -> 982 bytes
 docs/en-US/images/start-vm-screen.png           |   Bin 0 -> 65228 bytes
 docs/en-US/images/traffic-label.png             |   Bin 0 -> 15520 bytes
 docs/en-US/images/vds-name.png                  |   Bin 0 -> 64739 bytes
 docs/en-US/images/view-systemvm-details.png     |   Bin 0 -> 25483 bytes
 docs/en-US/images/vm-running.png                |   Bin 0 -> 67708 bytes
 docs/en-US/images/whirrDependency.png           |   Bin 0 -> 10794 bytes
 docs/en-US/images/whirrOutput.png               |   Bin 0 -> 61831 bytes
 docs/en-US/ip-forwarding-firewalling.xml        |     9 +-
 docs/en-US/ip-vlan-tenant.xml                   |    15 +-
 docs/en-US/isolated-networks.xml                |    25 +-
 docs/en-US/limit-accounts-domains.xml           |     2 +-
 docs/en-US/linux-installation.xml               |    55 +-
 docs/en-US/load-balancer-rules.xml              |     1 +
 docs/en-US/manual-live-migration.xml            |    13 +-
 ...migrate-datadisk-volume-new-storage-pool.xml |    61 +-
 ...te-vm-rootvolume-volume-new-storage-pool.xml |    34 +-
 docs/en-US/multiple-ip-nic.xml                  |     6 +-
 docs/en-US/networks.xml                         |     9 +-
 docs/en-US/non-contiguous-vlan.xml              |    81 +-
 ...ver-provisioning-service-offering-limits.xml |   140 +-
 docs/en-US/password-storage-engine.xml          |    30 +-
 docs/en-US/portable-ip.xml                      |    34 +-
 docs/en-US/prepare-linux-template.xml           |   190 +
 docs/en-US/primary-storage-add.xml              |    99 +-
 docs/en-US/pvlan.xml                            |    28 +-
 docs/en-US/region-add.xml                       |    69 +-
 docs/en-US/reserved-ip-addresses-non-csvms.xml  |     7 +-
 docs/en-US/reset-volume-on-reboot.xml           |    32 +
 .../runtime-behavior-of-primary-storage.xml     |     5 +-
 docs/en-US/secondary-storage-add.xml            |    45 +-
 docs/en-US/shared-networks.xml                  |    40 +-
 docs/en-US/site-to-site-vpn.xml                 |    11 +-
 docs/en-US/snapshot-performance-vmware.xml      |    39 +
 docs/en-US/stopping-and-starting-vms.xml        |     2 +-
 docs/en-US/storage-plugins.xml                  |   144 +
 docs/en-US/third-party-ui-plugin.xml            |   364 +
 docs/en-US/update-iso-vm.xml                    |    47 +
 docs/en-US/user-data-and-meta-data.xml          |     2 +-
 docs/en-US/user-services-overview.xml           |     6 +-
 docs/en-US/verifying-source.xml                 |     2 +-
 docs/en-US/virtual-machines.xml                 |     6 +
 docs/en-US/vlan-assign-isolated-nw.xml          |     8 +-
 docs/en-US/vm-storage-migration.xml             |    26 +-
 docs/en-US/vmware-cluster-config-dvswitch.xml   |   168 +-
 docs/en-US/vmware-install.xml                   |     2 +-
 docs/en-US/vnmc-cisco.xml                       |   272 +-
 docs/en-US/whats-new.xml                        |     2 +-
 docs/en-US/working-with-hosts.xml               |     2 +-
 docs/en-US/working-with-iso.xml                 |     1 +
 docs/en-US/working-with-snapshots.xml           |     3 +-
 docs/en-US/working-with-system-vm.xml           |     1 +
 docs/en-US/working-with-templates.xml           |     1 +
 docs/en-US/working-with-volumes.xml             |     1 +
 docs/en-US/zone-add.xml                         |    33 +-
 docs/qig/en-US/Book_Info.xml                    |     2 +-
 docs/qig/publican.cfg                           |    22 +
 engine/api/pom.xml                              |    12 +-
 .../src/com/cloud/network/NetworkManager.java   |   230 +
 .../src/com/cloud/vm/VirtualMachineGuru.java    |    62 +
 .../src/com/cloud/vm/VirtualMachineManager.java |   198 +
 .../service/VolumeOrchestrationService.java     |    95 +
 .../engine/service/api/OperationsServices.java  |    19 +-
 .../subsystem/api/storage/DataStoreManager.java |     4 +-
 .../engine/subsystem/api/storage/HostScope.java |     9 +-
 .../storage/command/AttachAnswer.java           |    47 -
 .../storage/command/AttachCommand.java          |   126 -
 .../command/AttachPrimaryDataStoreAnswer.java   |    56 -
 .../command/AttachPrimaryDataStoreCmd.java      |    39 -
 .../storage/command/CopyCmdAnswer.java          |    37 -
 .../cloudstack/storage/command/CopyCommand.java |    58 -
 .../storage/command/CreateObjectAnswer.java     |    43 -
 .../storage/command/CreateObjectCommand.java    |    45 -
 .../command/CreatePrimaryDataStoreCmd.java      |    38 -
 .../storage/command/DeleteCommand.java          |    45 -
 .../storage/command/DettachAnswer.java          |    47 -
 .../storage/command/DettachCommand.java         |    90 -
 .../command/StorageSubSystemCommand.java        |    23 -
 .../storage/datastore/db/ImageStoreDao.java     |    37 -
 .../datastore/db/ImageStoreDetailVO.java        |    82 -
 .../datastore/db/ImageStoreDetailsDao.java      |    30 -
 .../storage/datastore/db/ImageStoreVO.java      |   193 -
 .../datastore/db/PrimaryDataStoreDao.java       |   120 -
 .../datastore/db/PrimaryDataStoreDaoImpl.java   |   432 -
 .../datastore/db/PrimaryDataStoreDetailVO.java  |    79 -
 .../db/PrimaryDataStoreDetailsDao.java          |    28 -
 .../datastore/db/SnapshotDataStoreDao.java      |    41 -
 .../datastore/db/SnapshotDataStoreVO.java       |   271 -
 .../datastore/db/StoragePoolDetailVO.java       |    81 -
 .../datastore/db/StoragePoolDetailsDao.java     |    30 -
 .../storage/datastore/db/StoragePoolVO.java     |   346 -
 .../datastore/db/TemplateDataStoreDao.java      |    63 -
 .../datastore/db/TemplateDataStoreVO.java       |   372 -
 .../datastore/db/VolumeDataStoreDao.java        |    41 -
 .../storage/datastore/db/VolumeDataStoreVO.java |   348 -
 .../image/datastore/ImageStoreEntity.java       |     2 +-
 .../cloudstack/storage/to/ImageStoreTO.java     |    79 -
 .../storage/to/PrimaryDataStoreTO.java          |   103 -
 .../cloudstack/storage/to/SnapshotObjectTO.java |   128 -
 .../cloudstack/storage/to/TemplateObjectTO.java |   208 -
 .../cloudstack/storage/to/VolumeObjectTO.java   |   223 -
 .../engine/subsystem/api/storage/ScopeTest.java |     6 +-
 engine/components-api/pom.xml                   |    12 +-
 .../cloudstack/context/ServerContexts.java      |     3 +-
 engine/compute/pom.xml                          |    52 -
 .../cloudstack/compute/ComputeOrchestrator.java |    34 -
 .../compute/ComputeOrchestratorImpl.java        |    42 -
 engine/network/pom.xml                          |     2 +-
 engine/orchestration/pom.xml                    |    19 +-
 .../vm/ClusteredVirtualMachineManagerImpl.java  |    64 +
 .../com/cloud/vm/VirtualMachineManagerImpl.java |  3323 ++++
 .../entity/api/VirtualMachineEntityFactory.java |    41 -
 .../entity/api/db/ClusterDetailsVO.java         |    38 +-
 .../datacenter/entity/api/db/DcDetailVO.java    |    38 +-
 .../entity/api/db/EngineClusterVO.java          |    30 +-
 .../entity/api/db/EngineDataCenterVO.java       |    38 +-
 .../entity/api/db/EngineHostPodVO.java          |    28 +-
 .../entity/api/db/dao/DcDetailsDao.java         |    34 +-
 .../entity/api/db/dao/DcDetailsDaoImpl.java     |    42 +-
 .../entity/api/db/dao/EngineClusterDao.java     |    28 +-
 .../entity/api/db/dao/EngineClusterDaoImpl.java |    36 +-
 .../entity/api/db/dao/EngineDataCenterDao.java  |    36 +-
 .../api/db/dao/EngineDataCenterDaoImpl.java     |    40 +-
 .../entity/api/db/dao/EngineHostPodDao.java     |    26 +-
 .../entity/api/db/dao/EngineHostPodDaoImpl.java |    40 +-
 .../engine/orchestration/CloudOrchestrator.java |   294 +
 .../orchestration/VolumeOrchestrator.java       |  1130 ++
 .../orchestration/CloudOrchestrator.java        |   284 -
 .../cloud/vm/VirtualMachineManagerImplTest.java |   477 +
 .../cloudstack/platform/planning/Concierge.java |    36 -
 engine/pom.xml                                  |     3 +-
 engine/schema/pom.xml                           |     7 +-
 .../com/cloud/capacity/dao/CapacityDaoImpl.java |   180 +-
 .../cluster/ClusterInvalidSessionException.java |    33 -
 .../cluster/ManagementServerHostPeerVO.java     |   120 -
 .../cloud/cluster/ManagementServerHostVO.java   |   182 -
 .../cluster/dao/ManagementServerHostDao.java    |    48 -
 .../dao/ManagementServerHostDaoImpl.java        |   276 -
 .../dao/ManagementServerHostPeerDao.java        |    27 -
 .../dao/ManagementServerHostPeerDaoImpl.java    |   108 -
 .../cloud/configuration/ConfigurationVO.java    |   107 -
 .../configuration/dao/ConfigurationDao.java     |    69 -
 .../configuration/dao/ConfigurationDaoImpl.java |   205 -
 .../schema/src/com/cloud/dc/dao/ClusterDao.java |     1 +
 .../src/com/cloud/dc/dao/ClusterDaoImpl.java    |    20 +-
 .../src/com/cloud/dc/dao/DataCenterVnetDao.java |     4 +-
 .../com/cloud/dc/dao/DataCenterVnetDaoImpl.java |    30 +-
 .../schema/src/com/cloud/dc/dao/HostPodDao.java |     7 +-
 .../src/com/cloud/dc/dao/HostPodDaoImpl.java    |    22 +-
 .../schema/src/com/cloud/host/dao/HostDao.java  |    13 +-
 .../src/com/cloud/host/dao/HostDaoImpl.java     |    86 +-
 .../src/com/cloud/keystore/KeystoreDaoImpl.java |    10 +-
 .../com/cloud/migration/DiskOffering20Dao.java  |    22 -
 .../cloud/migration/DiskOffering20DaoImpl.java  |    27 -
 .../com/cloud/migration/DiskOffering20VO.java   |   113 -
 .../com/cloud/migration/DiskOffering21Dao.java  |    23 -
 .../cloud/migration/DiskOffering21DaoImpl.java  |    27 -
 .../com/cloud/migration/DiskOffering21VO.java   |   257 -
 .../cloud/migration/ServiceOffering20Dao.java   |    22 -
 .../migration/ServiceOffering20DaoImpl.java     |    27 -
 .../cloud/migration/ServiceOffering20VO.java    |   199 -
 .../cloud/migration/ServiceOffering21Dao.java   |    22 -
 .../migration/ServiceOffering21DaoImpl.java     |    27 -
 .../cloud/migration/ServiceOffering21VO.java    |   183 -
 .../cloud/network/dao/NetworkRuleConfigVO.java  |    18 +-
 .../cloud/network/dao/PhysicalNetworkVO.java    |     2 +-
 .../network/dao/Site2SiteCustomerGatewayVO.java |     2 +
 .../network/security/SecurityGroupRuleVO.java   |    41 +-
 .../src/com/cloud/network/vpc/VpcGatewayVO.java |     6 +-
 .../cloud/network/vpc/dao/VpcGatewayDao.java    |     5 +-
 .../network/vpc/dao/VpcGatewayDaoImpl.java      |     8 -
 .../com/cloud/offerings/NetworkOfferingVO.java  |     7 +-
 .../src/com/cloud/storage/DiskOfferingVO.java   |    57 +-
 .../com/cloud/storage/GuestOSHypervisorVO.java  |    73 +
 engine/schema/src/com/cloud/storage/S3VO.java   |   205 -
 .../schema/src/com/cloud/storage/SwiftVO.java   |   113 -
 .../src/com/cloud/storage/VMTemplateS3VO.java   |   194 -
 .../cloud/storage/VMTemplateStoragePoolVO.java  |     5 +
 .../src/com/cloud/storage/VMTemplateVO.java     |    82 +-
 .../src/com/cloud/storage/VolumeDetailVO.java   |    85 +
 .../schema/src/com/cloud/storage/VolumeVO.java  |    23 +
 .../schema/src/com/cloud/storage/dao/S3Dao.java |    29 -
 .../src/com/cloud/storage/dao/S3DaoImpl.java    |    51 -
 .../com/cloud/storage/dao/VMTemplateDao.java    |     2 +-
 .../cloud/storage/dao/VMTemplateDaoImpl.java    |    49 +-
 .../com/cloud/storage/dao/VMTemplateS3Dao.java  |    36 -
 .../cloud/storage/dao/VMTemplateS3DaoImpl.java  |    96 -
 .../src/com/cloud/storage/dao/VolumeDao.java    |    10 +-
 .../com/cloud/storage/dao/VolumeDaoImpl.java    |   110 +-
 .../cloud/upgrade/DatabaseUpgradeChecker.java   |    90 +-
 .../com/cloud/upgrade/dao/Upgrade2214to30.java  |   135 +-
 .../com/cloud/upgrade/dao/Upgrade302to303.java  |   312 +
 .../com/cloud/upgrade/dao/Upgrade302to40.java   |    89 +-
 .../com/cloud/upgrade/dao/Upgrade303to304.java  |   492 +
 .../com/cloud/upgrade/dao/Upgrade304to305.java  |   499 +
 .../com/cloud/upgrade/dao/Upgrade305to306.java  |   312 +
 .../com/cloud/upgrade/dao/Upgrade306to307.java  |   119 +
 .../com/cloud/upgrade/dao/Upgrade307to410.java  |    96 +
 .../com/cloud/upgrade/dao/Upgrade410to420.java  |  1174 +-
 .../com/cloud/upgrade/dao/Upgrade420to430.java  |    70 +
 .../src/com/cloud/usage/UsageVMSnapshotVO.java  |   122 +
 .../src/com/cloud/usage/dao/UsageDaoImpl.java   |     2 +-
 .../com/cloud/usage/dao/UsageVMSnapshotDao.java |    29 +
 .../cloud/usage/dao/UsageVMSnapshotDaoImpl.java |   182 +
 .../schema/src/com/cloud/vm/VMInstanceVO.java   |    10 +
 engine/schema/src/com/cloud/vm/dao/NicDao.java  |     2 +
 .../schema/src/com/cloud/vm/dao/NicDaoImpl.java |    52 +-
 .../schema/src/com/cloud/vm/dao/UserVmDao.java  |     2 +-
 .../src/com/cloud/vm/dao/UserVmDaoImpl.java     |     3 +-
 .../src/com/cloud/vm/dao/VMInstanceDaoImpl.java |    58 +-
 .../org/apache/cloudstack/region/RegionVO.java  |    39 +-
 .../storage/datastore/db/ImageStoreDao.java     |    39 +
 .../datastore/db/ImageStoreDetailVO.java        |    82 +
 .../datastore/db/ImageStoreDetailsDao.java      |    30 +
 .../storage/datastore/db/ImageStoreVO.java      |   193 +
 .../datastore/db/PrimaryDataStoreDao.java       |   117 +
 .../datastore/db/PrimaryDataStoreDaoImpl.java   |   431 +
 .../datastore/db/PrimaryDataStoreDetailVO.java  |    79 +
 .../db/PrimaryDataStoreDetailsDao.java          |    28 +
 .../datastore/db/SnapshotDataStoreDao.java      |    43 +
 .../datastore/db/SnapshotDataStoreVO.java       |   271 +
 .../datastore/db/StoragePoolDetailVO.java       |    81 +
 .../datastore/db/StoragePoolDetailsDao.java     |    30 +
 .../storage/datastore/db/StoragePoolVO.java     |   346 +
 .../datastore/db/TemplateDataStoreDao.java      |    65 +
 .../datastore/db/TemplateDataStoreVO.java       |   372 +
 .../datastore/db/VolumeDataStoreDao.java        |    43 +
 .../storage/datastore/db/VolumeDataStoreVO.java |   358 +
 engine/service/pom.xml                          |    15 +-
 engine/storage/cache/pom.xml                    |    41 +-
 .../allocator/StorageCacheRandomAllocator.java  |     2 +-
 .../cache/manager/StorageCacheManagerImpl.java  |     5 +-
 .../StorageCacheReplacementAlgorithmLRU.java    |     5 +-
 engine/storage/datamotion/pom.xml               |    23 +-
 .../motion/AncientDataMotionStrategy.java       |    49 +-
 engine/storage/image/pom.xml                    |    24 +-
 .../storage/image/TemplateServiceImpl.java      |   351 +-
 .../storage/image/store/ImageStoreImpl.java     |     4 +-
 .../storage/image/store/TemplateObject.java     |   136 +-
 engine/storage/integration-test/pom.xml         |    21 +-
 .../storage/allocator/StorageAllocatorTest.java |    84 +-
 .../storage/test/ChildTestConfiguration.java    |    14 +-
 .../test/DirectAgentManagerSimpleImpl.java      |    39 +-
 .../storage/test/EndpointSelectorTest.java      |   327 +
 .../test/FakeDriverTestConfiguration.java       |    67 +
 .../test/FakePrimaryDataStoreDriver.java        |   107 +
 .../storage/test/SnapshotTestWithFakeData.java  |   194 +
 .../resource/StorageAllocatorTestContext.xml    |    45 -
 .../test/resource/component.xml                 |   192 -
 .../test/resource/fakeDriverTestContext.xml     |    87 +
 .../test/resource/s3_testng.xml                 |    47 -
 .../test/resource/storageContext.xml            |    91 -
 .../integration-test/test/resource/testng.xml   |    53 -
 .../resources/StorageAllocatorTestContext.xml   |    45 +
 .../test/resources/component.xml                |   192 +
 .../test/resources/s3_testng.xml                |    47 +
 .../test/resources/storageContext.xml           |    88 +
 .../integration-test/test/resources/testng.xml  |    53 +
 engine/storage/pom.xml                          |    22 +-
 engine/storage/snapshot/pom.xml                 |    27 +-
 .../storage/snapshot/SnapshotObject.java        |     6 +-
 .../storage/snapshot/SnapshotServiceImpl.java   |    12 +-
 .../snapshot/XenserverSnapshotStrategy.java     |    62 +-
 .../resource/SnapshotManagerTestContext.xml     |    42 -
 .../resources/SnapshotManagerTestContext.xml    |    42 +
 .../cloudstack/storage/LocalHostEndpoint.java   |     5 +-
 .../allocator/AbstractStoragePoolAllocator.java |    10 +-
 .../GarbageCollectingStoragePoolAllocator.java  |     3 +-
 .../allocator/LocalStoragePoolAllocator.java    |     3 +-
 .../allocator/ZoneWideStoragePoolAllocator.java |    34 +
 .../storage/datastore/DataStoreManagerImpl.java |    25 +-
 .../datastore/ObjectInDataStoreManager.java     |     2 +
 .../datastore/ObjectInDataStoreManagerImpl.java |    54 +
 .../endpoint/DefaultEndPointSelector.java       |    36 +-
 .../storage/image/BaseImageStoreDriverImpl.java |    20 +-
 .../storage/image/ImageStoreDriver.java         |     3 +-
 .../storage/image/TemplateEntityImpl.java       |    11 +-
 .../storage/image/db/ImageStoreDaoImpl.java     |    16 +-
 .../image/db/SnapshotDataStoreDaoImpl.java      |    46 +-
 .../image/db/TemplateDataStoreDaoImpl.java      |    59 +-
 .../image/db/VolumeDataStoreDaoImpl.java        |    33 +-
 .../cloudstack/storage/image/format/RAW.java    |    32 +
 engine/storage/volume/pom.xml                   |    21 +-
 .../storage/datastore/PrimaryDataStoreImpl.java |    44 +-
 .../storage/volume/VolumeDataFactoryImpl.java   |     3 +
 .../cloudstack/storage/volume/VolumeObject.java |    49 +-
 .../storage/volume/VolumeServiceImpl.java       |   331 +-
 .../volume/test/resource/testContext.xml        |     2 +-
 framework/cluster/pom.xml                       |    45 +
 .../cloud/cluster/ActiveFencingException.java   |    30 +
 .../com/cloud/cluster/ClusterFenceManager.java  |    23 +
 .../cloud/cluster/ClusterFenceManagerImpl.java  |    58 +
 .../cluster/ClusterInvalidSessionException.java |    32 +
 .../src/com/cloud/cluster/ClusterManager.java   |    58 +
 .../com/cloud/cluster/ClusterManagerImpl.java   |  1209 ++
 .../cloud/cluster/ClusterManagerListener.java   |    26 +
 .../com/cloud/cluster/ClusterManagerMBean.java  |    26 +
 .../cloud/cluster/ClusterManagerMBeanImpl.java  |    67 +
 .../cloud/cluster/ClusterManagerMessage.java    |    44 +
 .../cloud/cluster/ClusterNodeJoinEventArgs.java |    43 +
 .../cloud/cluster/ClusterNodeLeftEventArgs.java |    44 +
 .../src/com/cloud/cluster/ClusterService.java   |    25 +
 .../cloud/cluster/ClusterServiceAdapter.java    |    28 +
 .../com/cloud/cluster/ClusterServicePdu.java    |   112 +
 .../cloud/cluster/ClusterServiceRequestPdu.java |    54 +
 .../cluster/ClusterServiceServletAdapter.java   |   152 +
 .../cluster/ClusterServiceServletContainer.java |   179 +
 .../ClusterServiceServletHttpHandler.java       |   192 +
 .../cluster/ClusterServiceServletImpl.java      |   148 +
 .../com/cloud/cluster/ManagementServerHost.java |    34 +
 .../cluster/ManagementServerHostPeerVO.java     |   119 +
 .../cloud/cluster/ManagementServerHostVO.java   |   182 +
 .../cloud/cluster/RemoteMethodConstants.java    |    23 +
 .../cluster/dao/ManagementServerHostDao.java    |    48 +
 .../dao/ManagementServerHostDaoImpl.java        |   274 +
 .../dao/ManagementServerHostPeerDao.java        |    27 +
 .../dao/ManagementServerHostPeerDaoImpl.java    |   106 +
 framework/config/pom.xml                        |    45 +
 .../framework/config/ConfigDepot.java           |    27 +
 .../framework/config/ConfigDepotAdmin.java      |    36 +
 .../framework/config/ConfigDepotImpl.java       |   106 +
 .../cloudstack/framework/config/ConfigKey.java  |    84 +
 .../framework/config/ConfigValue.java           |    78 +
 .../framework/config/Configurable.java          |    32 +
 .../framework/config/ConfigurationVO.java       |   175 +
 .../framework/config/ScopedConfigValue.java     |    43 +
 .../framework/config/dao/ConfigurationDao.java  |    70 +
 .../config/dao/ConfigurationDaoImpl.java        |   206 +
 .../framework/config/ConfigDepotAdminTest.java  |   131 +
 framework/db/pom.xml                            |    62 +
 .../db/src/com/cloud/dao/EntityManagerImpl.java |   125 +
 .../utils/crypt/EncryptionSecretKeyChanger.java |   427 +
 .../db/src/com/cloud/utils/db/Attribute.java    |   253 +
 .../com/cloud/utils/db/ConnectionConcierge.java |   223 +
 .../utils/db/ConnectionConciergeMBean.java      |    30 +
 framework/db/src/com/cloud/utils/db/DB.java     |    59 +
 framework/db/src/com/cloud/utils/db/DbUtil.java |   342 +
 framework/db/src/com/cloud/utils/db/EcInfo.java |   106 +
 .../db/src/com/cloud/utils/db/Encrypt.java      |    32 +
 framework/db/src/com/cloud/utils/db/Filter.java |   115 +
 .../db/src/com/cloud/utils/db/GenericDao.java   |   282 +
 .../src/com/cloud/utils/db/GenericDaoBase.java  |  1890 +++
 .../cloud/utils/db/GenericSearchBuilder.java    |   548 +
 .../db/src/com/cloud/utils/db/GlobalLock.java   |   244 +
 .../db/src/com/cloud/utils/db/GroupBy.java      |   108 +
 .../db/src/com/cloud/utils/db/JoinBuilder.java  |    79 +
 .../db/src/com/cloud/utils/db/JoinType.java     |    32 +
 .../db/src/com/cloud/utils/db/Merovingian2.java |   461 +
 .../com/cloud/utils/db/MerovingianMBean.java    |    32 +
 .../db/src/com/cloud/utils/db/ScriptRunner.java |   233 +
 .../src/com/cloud/utils/db/SearchBuilder.java   |    64 +
 .../src/com/cloud/utils/db/SearchCriteria.java  |   364 +
 .../src/com/cloud/utils/db/SearchCriteria2.java |   213 +
 .../cloud/utils/db/SearchCriteriaService.java   |    29 +
 .../src/com/cloud/utils/db/SequenceFetcher.java |   171 +
 .../db/src/com/cloud/utils/db/SqlGenerator.java |   668 +
 .../db/src/com/cloud/utils/db/StateMachine.java |    30 +
 .../db/src/com/cloud/utils/db/Transaction.java  |  1174 ++
 .../cloud/utils/db/TransactionAttachment.java   |    34 +
 .../utils/db/TransactionContextBuilder.java     |    65 +
 .../com/cloud/utils/db/TransactionMBean.java    |    33 +
 .../cloud/utils/db/TransactionMBeanImpl.java    |   113 +
 .../src/com/cloud/utils/db/UpdateBuilder.java   |   147 +
 .../db/src/com/cloud/utils/db/UpdateFilter.java |    29 +
 .../com/cloud/utils/db/DbAnnotatedBase.java     |    44 +
 .../cloud/utils/db/DbAnnotatedBaseDerived.java  |    27 +
 .../db/test/com/cloud/utils/db/DbTestDao.java   |    66 +
 .../db/test/com/cloud/utils/db/DbTestUtils.java |    90 +
 .../db/test/com/cloud/utils/db/DbTestVO.java    |    56 +
 .../test/com/cloud/utils/db/DummyComponent.java |    27 +
 .../cloud/utils/db/ElementCollectionTest.java   |    72 +
 .../test/com/cloud/utils/db/GlobalLockTest.java |    81 +
 .../com/cloud/utils/db/Merovingian2Test.java    |    77 +
 .../utils/db/TransactionContextBuilderTest.java |    63 +
 .../com/cloud/utils/db/TransactionTest.java     |   214 +
 framework/events/pom.xml                        |     4 +-
 framework/ipc/pom.xml                           |    17 +-
 .../src/com/cloud/agent/manager/Commands.java   |   153 +
 .../async/AsyncCallbackDispatcher.java          |    10 +-
 .../framework/client/ClientEventBus.java        |    31 -
 .../framework/client/ClientMessageBus.java      |    31 +
 .../framework/messagebus/MessageBusBase.java    |    34 +-
 .../framework/messagebus/MessageDetector.java   |    75 +
 .../framework/server/ServerEventBus.java        |    31 -
 .../framework/server/ServerMessageBus.java      |    31 +
 .../sampleserver/SampleManagementServer.java    |     3 -
 .../cloudstack/messagebus/TestMessageBus.java   |    39 +
 .../SampleManagementServerAppContext.xml        |     3 +-
 framework/jobs/pom.xml                          |    30 +-
 .../apache/cloudstack/framework/job/Job.java    |    32 -
 .../framework/job/JobInterceptor.java           |    23 -
 .../cloudstack/framework/jobs/AsyncJob.java     |   117 +
 .../framework/jobs/AsyncJobDispatcher.java      |    28 +
 .../jobs/AsyncJobExecutionContext.java          |   167 +
 .../framework/jobs/AsyncJobMBean.java           |    37 +
 .../framework/jobs/AsyncJobManager.java         |   125 +
 .../jobs/JobCancellationException.java          |    49 +
 .../cloudstack/framework/jobs/Outcome.java      |    62 +
 .../framework/jobs/dao/AsyncJobDao.java         |    37 +
 .../framework/jobs/dao/AsyncJobDaoImpl.java     |   198 +
 .../framework/jobs/dao/AsyncJobJoinMapDao.java  |    46 +
 .../jobs/dao/AsyncJobJoinMapDaoImpl.java        |   303 +
 .../framework/jobs/dao/AsyncJobJournalDao.java  |    27 +
 .../jobs/dao/AsyncJobJournalDaoImpl.java        |    45 +
 .../framework/jobs/dao/SyncQueueDao.java        |    26 +
 .../framework/jobs/dao/SyncQueueDaoImpl.java    |    78 +
 .../framework/jobs/dao/SyncQueueItemDao.java    |    31 +
 .../jobs/dao/SyncQueueItemDaoImpl.java          |   155 +
 .../framework/jobs/impl/AsyncJobJoinMapVO.java  |   215 +
 .../framework/jobs/impl/AsyncJobJournalVO.java  |   111 +
 .../framework/jobs/impl/AsyncJobMBeanImpl.java  |   165 +
 .../jobs/impl/AsyncJobManagerImpl.java          |   992 ++
 .../framework/jobs/impl/AsyncJobMonitor.java    |   185 +
 .../framework/jobs/impl/AsyncJobVO.java         |   398 +
 .../jobs/impl/JobSerializerHelper.java          |   203 +
 .../framework/jobs/impl/OutcomeImpl.java        |   124 +
 .../framework/jobs/impl/SyncQueueItem.java      |    41 +
 .../framework/jobs/impl/SyncQueueItemVO.java    |   143 +
 .../framework/jobs/impl/SyncQueueManager.java   |    34 +
 .../jobs/impl/SyncQueueManagerImpl.java         |   258 +
 .../framework/jobs/impl/SyncQueueVO.java        |   137 +
 framework/pom.xml                               |     5 +-
 framework/rest/pom.xml                          |     5 +-
 packaging/centos63/cloud.spec                   |    73 +-
 packaging/centos63/package.sh                   |    13 +-
 patches/pom.xml                                 |     9 +-
 .../debian/config/etc/dnsmasq.conf.tmpl         |     2 +
 .../debian/config/etc/init.d/cloud-early-config |   149 +-
 .../config/opt/cloud/bin/passwd_server_ip       |     2 +-
 .../config/opt/cloud/bin/serve_password.sh      |     2 +-
 .../debian/config/opt/cloud/bin/vmdata.py       |   204 +
 .../debian/config/opt/cloud/bin/vmdata_kvm.py   |   140 -
 .../debian/config/root/createIpAlias.sh         |    54 +
 .../debian/config/root/deleteIpAlias.sh         |    17 +-
 patches/systemvm/debian/config/root/dnsmasq.sh  |    17 +-
 .../root/redundant_router/enable_pubip.sh.templ |     8 +-
 plugins/acl/static-role-based/pom.xml           |     2 +-
 .../explicit-dedication/pom.xml                 |     2 +-
 .../host-anti-affinity/pom.xml                  |     2 +-
 .../affinity/HostAntiAffinityProcessor.java     |     3 +-
 plugins/alert-handlers/snmp-alerts/pom.xml      |     4 +-
 plugins/alert-handlers/syslog-alerts/pom.xml    |     3 +-
 plugins/api/discovery/pom.xml                   |    10 +-
 plugins/api/rate-limit/pom.xml                  |    10 +-
 .../admin/ratelimit/ResetApiLimitCmd.java       |     2 +-
 .../command/user/ratelimit/GetApiLimitCmd.java  |     2 +-
 .../ratelimit/ApiRateLimitServiceImpl.java      |     4 +-
 .../cloudstack/ratelimit/ApiRateLimitTest.java  |     3 +-
 plugins/dedicated-resources/pom.xml             |     2 +-
 .../dedicated/DedicatedResourceManagerImpl.java |     2 +-
 .../dedicated/manager/DedicatedApiUnitTest.java |     2 +-
 .../implicit-dedication/pom.xml                 |     2 +-
 .../implicitplanner/ImplicitPlannerTest.java    |     2 +-
 .../user-concentrated-pod/pom.xml               |     2 +-
 .../deployment-planners/user-dispersing/pom.xml |     2 +-
 plugins/event-bus/rabbitmq/pom.xml              |     2 +-
 plugins/file-systems/netapp/pom.xml             |     2 +-
 plugins/host-allocators/random/pom.xml          |     2 +-
 plugins/hypervisors/baremetal/pom.xml           |     2 +-
 .../baremetal/manager/BareMetalDiscoverer.java  |     3 +-
 .../baremetal/manager/BareMetalPlanner.java     |     3 +-
 .../BareMetalPingServiceImpl.java               |    30 +-
 .../networkservice/BareMetalResourceBase.java   |    19 +-
 .../networkservice/BaremetaNetworkGuru.java     |    15 +-
 .../networkservice/BaremetalDhcpElement.java    |     3 +-
 .../BaremetalDhcpManagerImpl.java               |    43 +-
 .../BaremetalDhcpResourceBase.java              |    13 -
 .../networkservice/BaremetalDhcpResponse.java   |    11 +
 .../BaremetalDnsmasqResource.java               |     4 +-
 .../BaremetalKickStartServiceImpl.java          |    39 +-
 .../networkservice/BaremetalPxeManager.java     |     4 +-
 .../networkservice/BaremetalPxeManagerImpl.java |    11 +-
 .../networkservice/BaremetalPxeResponse.java    |    18 +-
 .../networkservice/BaremetalPxeService.java     |     4 +-
 .../cloudstack/api/AddBaremetalDhcpCmd.java     |    14 +-
 .../cloudstack/api/AddBaremetalPxeCmd.java      |     6 +-
 .../cloudstack/api/ListBaremetalDhcpCmd.java    |    14 +-
 .../api/ListBaremetalPxePingServersCmd.java     |    97 -
 .../api/ListBaremetalPxeServersCmd.java         |    79 +
 plugins/hypervisors/kvm/agent-descriptor.xml    |     2 +-
 plugins/hypervisors/kvm/pom.xml                 |    27 +-
 .../kvm/src/com/cloud/ha/KVMInvestigator.java   |    74 +
 .../kvm/resource/LibvirtComputingResource.java  |   403 +-
 .../hypervisor/kvm/resource/LibvirtVMDef.java   |    29 +-
 .../hypervisor/kvm/storage/KVMPhysicalDisk.java |     6 +-
 .../kvm/storage/KVMStoragePoolManager.java      |     5 -
 .../kvm/storage/KVMStorageProcessor.java        |   429 +-
 .../kvm/storage/LibvirtStorageAdaptor.java      |   313 +-
 .../hypervisor/kvm/storage/StorageAdaptor.java  |     2 -
 .../resource/LibvirtComputingResourceTest.java  |    14 +-
 .../kvm/resource/LibvirtVMDefTest.java          |    20 +
 .../kvm/storage/KVMStorageProcessorTest.java    |    42 +
 plugins/hypervisors/ovm/pom.xml                 |     2 +-
 plugins/hypervisors/simulator/pom.xml           |     2 +-
 .../agent/manager/SimulatorManagerImpl.java     |    15 +-
 .../cloud/api/commands/ConfigureSimulator.java  |    84 -
 .../api/commands/ConfigureSimulatorCmd.java     |    84 +
 .../resource/SimulatorStorageProcessor.java     |    13 +-
 .../server/ManagementServerSimulatorImpl.java   |    31 -
 .../driver/SimulatorImageStoreDriverImpl.java   |    36 +-
 plugins/hypervisors/ucs/pom.xml                 |    43 +-
 .../src/com/cloud/ucs/manager/UcsManager.java   |     2 +
 .../com/cloud/ucs/manager/UcsManagerImpl.java   |   109 +-
 .../api/AssociateUcsProfileToBladeCmd.java      |    15 +-
 .../cloudstack/api/DeleteUcsManagerCmd.java     |    74 +
 .../apache/cloudstack/api/ListUcsBladeCmd.java  |     2 +-
 .../cloudstack/api/ListUcsManagerCmd.java       |    18 +-
 .../cloudstack/api/ListUcsProfileCmd.java       |     2 +-
 plugins/hypervisors/vmware/pom.xml              |    22 +-
 .../com/cloud/hypervisor/guru/VMwareGuru.java   |    34 +-
 .../hypervisor/vmware/VmwareDatacenterVO.java   |     8 +-
 .../vmware/VmwareServerDiscoverer.java          |    66 +-
 .../vmware/manager/VmwareManagerImpl.java       |    95 +-
 .../vmware/manager/VmwareStorageManager.java    |     9 +-
 .../manager/VmwareStorageManagerImpl.java       |  1345 +-
 .../vmware/resource/VmwareResource.java         |   288 +-
 .../com/cloud/network/VmwareTrafficLabel.java   |    16 +-
 .../network/element/CiscoNexusVSMElement.java   |    36 +-
 .../element/CiscoNexusVSMElementService.java    |     7 +-
 .../VmwareSecondaryStorageResourceHandler.java  |    42 +-
 .../resource/VmwareStorageProcessor.java        |  2256 +--
 .../VmwareStorageSubsystemCommandHandler.java   |   150 +
 .../vmware/VmwareDatacenterApiUnitTest.java     |     2 +-
 plugins/hypervisors/xen/pom.xml                 |     8 +-
 .../xen/discoverer/XcpServerDiscoverer.java     |    34 +-
 .../hypervisor/xen/resource/CitrixHelper.java   |   546 +-
 .../xen/resource/CitrixResourceBase.java        |   422 +-
 .../xen/resource/XenServer56FP1Resource.java    |    16 +-
 .../xen/resource/XenServer620Resource.java      |    86 +
 .../xen/resource/XenServerConnectionPool.java   |     2 +-
 .../xen/resource/XenServerStorageProcessor.java |   398 +-
 .../xen/resource/CitrixResourceBaseTest.java    |     4 +-
 plugins/network-elements/bigswitch-vns/pom.xml  |     2 +-
 plugins/network-elements/cisco-vnmc/pom.xml     |     2 +-
 .../cloud/network/element/CiscoVnmcElement.java |    31 +-
 .../network/element/CiscoVnmcElementTest.java   |    27 +-
 plugins/network-elements/dns-notifier/pom.xml   |     2 +-
 .../elastic-loadbalancer/pom.xml                |     2 +-
 .../element/ElasticLoadBalancerElement.java     |     3 +-
 .../lb/ElasticLoadBalancerManagerImpl.java      |    26 +-
 plugins/network-elements/f5/pom.xml             |     3 +-
 .../element/F5ExternalLoadBalancerElement.java  |     4 +-
 .../internal-loadbalancer/pom.xml               |     2 +-
 .../element/InternalLoadBalancerElement.java    |    58 +-
 .../lb/InternalLoadBalancerVMManagerImpl.java   |    33 +-
 .../ElementChildTestConfiguration.java          |    22 +-
 .../InternalLbElementTest.java                  |    41 +-
 .../LbChildTestConfiguration.java               |    18 +-
 plugins/network-elements/juniper-srx/pom.xml    |     3 +-
 .../JuniperSRXExternalFirewallElement.java      |    73 +-
 plugins/network-elements/midonet/pom.xml        |    10 +-
 .../cloud/network/element/MidoNetElement.java   |     6 +-
 .../network/guru/MidoNetPublicNetworkGuru.java  |    39 +-
 plugins/network-elements/netscaler/pom.xml      |     2 +-
 .../cloud/network/element/NetscalerElement.java |     4 +-
 .../network/resource/NetscalerResource.java     |   142 +-
 plugins/network-elements/nicira-nvp/pom.xml     |     2 +-
 .../cloud/network/element/NiciraNvpElement.java |    33 +-
 .../guru/NiciraNvpGuestNetworkGuruTest.java     |     2 +-
 plugins/network-elements/ovs/pom.xml            |     2 +-
 .../cloud/network/ovs/OvsTunnelManagerImpl.java |     3 +-
 .../network-elements/stratosphere-ssp/pom.xml   |     2 +-
 .../cloudstack/network/element/SspElement.java  |     3 +-
 .../network/element/SspElementTest.java         |     3 +-
 plugins/pom.xml                                 |    12 +-
 plugins/storage-allocators/random/pom.xml       |     2 +-
 plugins/storage/image/default/pom.xml           |    11 +-
 .../driver/CloudStackImageStoreDriverImpl.java  |     9 +-
 plugins/storage/image/s3/pom.xml                |     7 +-
 .../driver/S3ImageStoreDriverImpl.java          |    14 +-
 .../lifecycle/S3ImageStoreLifeCycleImpl.java    |     1 -
 plugins/storage/image/sample/pom.xml            |    11 +-
 .../driver/SampleImageStoreDriverImpl.java      |     3 +-
 plugins/storage/image/swift/pom.xml             |    11 +-
 .../driver/SwiftImageStoreDriverImpl.java       |     2 +-
 plugins/storage/volume/default/pom.xml          |    11 +-
 .../CloudStackPrimaryDataStoreDriverImpl.java   |    46 +-
 ...CloudStackPrimaryDataStoreLifeCycleImpl.java |    45 +-
 plugins/storage/volume/sample/pom.xml           |    11 +-
 plugins/storage/volume/solidfire/pom.xml        |    11 +-
 .../driver/SolidfirePrimaryDataStoreDriver.java |    17 +-
 .../SolidFirePrimaryDataStoreLifeCycle.java     |    11 +
 .../storage/datastore/util/SolidFireUtil.java   |     2 +
 plugins/user-authenticators/ldap/pom.xml        |     2 +-
 .../cloudstack/ldap/LdapConfiguration.java      |     2 +-
 .../ldap/LdapConfigurationSpec.groovy           |     2 +-
 plugins/user-authenticators/md5/pom.xml         |     2 +-
 plugins/user-authenticators/plain-text/pom.xml  |     2 +-
 .../user-authenticators/sha256salted/pom.xml    |     2 +-
 .../auth/SHA256SaltedUserAuthenticator.java     |    39 +-
 .../server/auth/test/AuthenticatorTest.java     |    78 +-
 pom.xml                                         |   235 +-
 scripts/network/domr/save_password_to_domr.sh   |     2 +-
 .../storage/secondary/cloud-install-sys-tmplt   |     2 +-
 .../vm/hypervisor/xenserver/ovs-vif-flows.py    |    23 +-
 scripts/vm/hypervisor/xenserver/s3xen           |    29 +-
 scripts/vm/hypervisor/xenserver/vmops           |    95 +-
 scripts/vm/hypervisor/xenserver/vmopsSnapshot   |     2 +-
 scripts/vm/hypervisor/xenserver/xcposs/patch    |     1 -
 scripts/vm/hypervisor/xenserver/xcposs/vmops    |    82 +-
 .../hypervisor/xenserver/xcposs/vmopsSnapshot   |    77 +-
 scripts/vm/hypervisor/xenserver/xcpserver/patch |     1 -
 .../vm/hypervisor/xenserver/xenserver56/patch   |     1 -
 .../hypervisor/xenserver/xenserver56fp1/patch   |     1 -
 .../vm/hypervisor/xenserver/xenserver60/patch   |     1 -
 scripts/vm/network/security_group.py            |   133 +-
 server/conf/log4j-cloud.xml.in                  |    12 +-
 server/pom.xml                                  |    36 +-
 server/src/com/cloud/agent/AgentManager.java    |    14 +-
 .../com/cloud/agent/manager/AgentAttache.java   |     8 +-
 .../cloud/agent/manager/AgentManagerImpl.java   |   404 +-
 .../com/cloud/agent/manager/AgentMonitor.java   |   283 -
 .../agent/manager/AgentMonitorService.java      |     2 -
 .../manager/ClusteredAgentManagerImpl.java      |   363 +-
 .../src/com/cloud/agent/manager/Commands.java   |   153 -
 .../agent/manager/ConnectedAgentAttache.java    |     8 +-
 .../cloud/agent/manager/DirectAgentAttache.java |     5 -
 .../com/cloud/agent/manager/DummyAttache.java   |     8 -
 .../allocator/impl/FirstFitAllocator.java       |     3 +-
 .../impl/UserConcentratedAllocator.java         |     3 +-
 .../authn/impl/BasicAgentAuthManager.java       |     3 +-
 .../src/com/cloud/alert/AlertManagerImpl.java   |     7 +-
 .../com/cloud/api/ApiAsyncJobDispatcher.java    |   126 +
 server/src/com/cloud/api/ApiDBUtils.java        |   316 +-
 server/src/com/cloud/api/ApiDispatcher.java     |    18 +-
 server/src/com/cloud/api/ApiResponseHelper.java |   493 +-
 .../src/com/cloud/api/ApiSerializerHelper.java  |     5 +-
 server/src/com/cloud/api/ApiServer.java         |    78 +-
 server/src/com/cloud/api/ApiServlet.java        |    10 +-
 .../com/cloud/api/query/QueryManagerImpl.java   |    43 +-
 .../com/cloud/api/query/ViewResponseHelper.java |     7 +-
 .../cloud/api/query/dao/AccountJoinDaoImpl.java |     6 +-
 .../api/query/dao/AffinityGroupJoinDaoImpl.java |     5 +-
 .../cloud/api/query/dao/AsyncJobJoinDao.java    |     4 +-
 .../api/query/dao/AsyncJobJoinDaoImpl.java      |    14 +-
 .../api/query/dao/DomainRouterJoinDaoImpl.java  |     3 +-
 .../cloud/api/query/dao/HostJoinDaoImpl.java    |     3 +-
 .../api/query/dao/ImageStoreJoinDaoImpl.java    |     3 +-
 .../cloud/api/query/dao/ProjectJoinDaoImpl.java |     5 +-
 .../api/query/dao/ResourceTagJoinDaoImpl.java   |     3 +-
 .../api/query/dao/SecurityGroupJoinDaoImpl.java |     3 +-
 .../query/dao/ServiceOfferingJoinDaoImpl.java   |     4 +
 .../api/query/dao/StoragePoolJoinDaoImpl.java   |     8 +-
 .../api/query/dao/TemplateJoinDaoImpl.java      |     2 +-
 .../cloud/api/query/dao/UserVmJoinDaoImpl.java  |     3 +-
 .../cloud/api/query/dao/VolumeJoinDaoImpl.java  |    21 +-
 .../com/cloud/api/query/vo/UserVmJoinVO.java    |     2 +-
 .../src/com/cloud/async/AsyncCommandQueued.java |    35 -
 .../src/com/cloud/async/AsyncJobExecutor.java   |    39 -
 .../cloud/async/AsyncJobExecutorContext.java    |    54 -
 .../async/AsyncJobExecutorContextImpl.java      |   146 -
 server/src/com/cloud/async/AsyncJobMBean.java   |    37 -
 .../src/com/cloud/async/AsyncJobMBeanImpl.java  |   144 -
 server/src/com/cloud/async/AsyncJobManager.java |    52 -
 .../com/cloud/async/AsyncJobManagerImpl.java    |   893 -
 server/src/com/cloud/async/AsyncJobResult.java  |    28 +-
 server/src/com/cloud/async/AsyncJobVO.java      |   403 -
 .../com/cloud/async/BaseAsyncJobExecutor.java   |    69 -
 server/src/com/cloud/async/SyncQueueItemVO.java |   141 -
 .../src/com/cloud/async/SyncQueueManager.java   |    35 -
 .../com/cloud/async/SyncQueueManagerImpl.java   |   253 -
 server/src/com/cloud/async/SyncQueueVO.java     |   137 -
 server/src/com/cloud/async/dao/AsyncJobDao.java |    33 -
 .../com/cloud/async/dao/AsyncJobDaoImpl.java    |   150 -
 .../src/com/cloud/async/dao/SyncQueueDao.java   |    25 -
 .../com/cloud/async/dao/SyncQueueDaoImpl.java   |    81 -
 .../com/cloud/async/dao/SyncQueueItemDao.java   |    30 -
 .../cloud/async/dao/SyncQueueItemDaoImpl.java   |   163 -
 .../async/executor/ExtractJobResultObject.java  |   183 -
 .../com/cloud/capacity/CapacityManagerImpl.java |    66 +-
 .../cloud/cluster/ActiveFencingException.java   |    31 -
 .../com/cloud/cluster/ClusterFenceManager.java  |    23 -
 .../cloud/cluster/ClusterFenceManagerImpl.java  |    58 -
 .../src/com/cloud/cluster/ClusterManager.java   |    67 -
 .../com/cloud/cluster/ClusterManagerImpl.java   |  1517 --
 .../cloud/cluster/ClusterManagerListener.java   |    25 -
 .../com/cloud/cluster/ClusterManagerMBean.java  |    27 -
 .../cloud/cluster/ClusterManagerMBeanImpl.java  |    67 -
 .../cloud/cluster/ClusterManagerMessage.java    |    44 -
 .../cloud/cluster/ClusterNodeJoinEventArgs.java |    43 -
 .../cloud/cluster/ClusterNodeLeftEventArgs.java |    44 -
 .../src/com/cloud/cluster/ClusterService.java   |    25 -
 .../cloud/cluster/ClusterServiceAdapter.java    |    28 -
 .../com/cloud/cluster/ClusterServicePdu.java    |   112 -
 .../cloud/cluster/ClusterServiceRequestPdu.java |    54 -
 .../cluster/ClusterServiceServletAdapter.java   |   148 -
 .../cluster/ClusterServiceServletContainer.java |   179 -
 .../ClusterServiceServletHttpHandler.java       |   192 -
 .../cluster/ClusterServiceServletImpl.java      |   146 -
 .../cloud/cluster/DummyClusterManagerImpl.java  |   179 -
 .../com/cloud/cluster/LockMasterListener.java   |    49 -
 .../cloud/cluster/RemoteMethodConstants.java    |    23 -
 server/src/com/cloud/configuration/Config.java  |    25 +-
 .../configuration/ConfigurationManager.java     |    42 +-
 .../configuration/ConfigurationManagerImpl.java |   189 +-
 .../AgentBasedConsoleProxyManager.java          |     3 +-
 .../com/cloud/consoleproxy/AgentHookBase.java   |     4 +-
 .../ConsoleProxyBalanceAllocator.java           |    55 +-
 .../consoleproxy/ConsoleProxyManagerImpl.java   |    83 +-
 .../consoleproxy/StaticConsoleProxyManager.java |     3 +-
 server/src/com/cloud/dao/EntityManagerImpl.java |   150 -
 .../com/cloud/dc/dao/DedicatedResourceDao.java  |     6 +
 .../cloud/dc/dao/DedicatedResourceDaoImpl.java  |    42 +-
 .../deploy/DeploymentPlanningManagerImpl.java   |    76 +-
 .../src/com/cloud/deploy/FirstFitPlanner.java   |     3 +-
 .../src/com/cloud/event/ActionEventUtils.java   |     4 +
 .../ha/HighAvailabilityManagerExtImpl.java      |     3 +-
 .../cloud/ha/HighAvailabilityManagerImpl.java   |    14 +-
 .../hypervisor/CloudZonesStartupProcessor.java  |     3 +-
 .../cloud/hypervisor/HypervisorGuruBase.java    |     9 +-
 .../kvm/discoverer/LibvirtServerDiscoverer.java |     3 +-
 .../metadata/ResourceMetaDataManagerImpl.java   |     4 +-
 .../network/ExternalDeviceUsageManagerImpl.java |     3 +-
 .../ExternalFirewallDeviceManagerImpl.java      |     5 +-
 .../network/ExternalIpAddressAllocator.java     |     3 +-
 .../ExternalLoadBalancerDeviceManagerImpl.java  |    40 +-
 .../ExternalNetworkDeviceManagerImpl.java       |     3 +-
 .../src/com/cloud/network/IpAddressManager.java |   181 +
 .../com/cloud/network/IpAddressManagerImpl.java |  1919 +++
 .../cloud/network/Ipv6AddressManagerImpl.java   |     3 +-
 .../src/com/cloud/network/NetworkManager.java   |   389 -
 .../com/cloud/network/NetworkManagerImpl.java   |  2657 +--
 .../src/com/cloud/network/NetworkModelImpl.java |   101 +-
 .../com/cloud/network/NetworkServiceImpl.java   |   438 +-
 .../cloud/network/NetworkUsageManagerImpl.java  |     2 +-
 .../com/cloud/network/SshKeysDistriMonitor.java |     3 +-
 .../cloud/network/as/AutoScaleManagerImpl.java  |    31 +-
 .../element/CloudZonesNetworkElement.java       |     5 +-
 .../network/element/VirtualRouterElement.java   |    21 +-
 .../element/VpcVirtualRouterElement.java        |     2 -
 .../network/firewall/FirewallManagerImpl.java   |    60 +-
 .../cloud/network/guru/ControlNetworkGuru.java  |    15 +-
 .../cloud/network/guru/DirectNetworkGuru.java   |    20 +-
 .../network/guru/DirectPodBasedNetworkGuru.java |     9 +-
 .../network/guru/ExternalGuestNetworkGuru.java  |    28 +-
 .../cloud/network/guru/GuestNetworkGuru.java    |    45 +-
 .../cloud/network/guru/PrivateNetworkGuru.java  |    24 +-
 .../cloud/network/guru/PublicNetworkGuru.java   |    13 +-
 .../network/lb/LBHealthCheckManagerImpl.java    |     3 +-
 .../lb/LoadBalancingRulesManagerImpl.java       |    78 +-
 .../VirtualNetworkApplianceManagerImpl.java     |   116 +-
 .../VpcVirtualNetworkApplianceManagerImpl.java  |    75 +-
 .../cloud/network/rules/RulesManagerImpl.java   |   101 +-
 .../security/SecurityGroupManagerImpl.java      |    44 +-
 .../network/vpc/NetworkACLManagerImpl.java      |    29 +-
 .../network/vpc/PrivateGatewayProfile.java      |     2 +-
 .../com/cloud/network/vpc/VpcManagerImpl.java   |   163 +-
 .../network/vpn/RemoteAccessVpnManagerImpl.java |     2 +-
 .../network/vpn/Site2SiteVpnManagerImpl.java    |     2 +-
 .../com/cloud/projects/ProjectManagerImpl.java  |     2 +-
 .../src/com/cloud/resource/DiscovererBase.java  |     3 +-
 .../src/com/cloud/resource/ResourceManager.java |     5 +-
 .../com/cloud/resource/ResourceManagerImpl.java |   274 +-
 .../resourcelimit/ResourceLimitManagerImpl.java |     4 +-
 .../com/cloud/server/ConfigurationServer.java   |     3 +-
 .../cloud/server/ConfigurationServerImpl.java   |    22 +-
 .../com/cloud/server/LockMasterListener.java    |    51 +
 .../com/cloud/server/ManagementServerImpl.java  |   385 +-
 server/src/com/cloud/server/StatsCollector.java |     4 +-
 .../com/cloud/servlet/ConsoleProxyServlet.java  |     2 +-
 .../cloud/servlet/RegisterCompleteServlet.java  |     5 +-
 .../src/com/cloud/storage/StorageManager.java   |     8 +-
 .../com/cloud/storage/StorageManagerImpl.java   |   189 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java |  1738 ++
 server/src/com/cloud/storage/VolumeManager.java |   117 -
 .../com/cloud/storage/VolumeManagerImpl.java    |  2853 ----
 .../storage/download/DownloadMonitorImpl.java   |    23 +-
 server/src/com/cloud/storage/s3/S3Manager.java  |    67 -
 .../src/com/cloud/storage/s3/S3ManagerImpl.java |   613 -
 .../secondary/SecondaryStorageManagerImpl.java  |   199 +-
 .../storage/snapshot/SnapshotManagerImpl.java   |    74 +-
 .../storage/snapshot/SnapshotSchedulerImpl.java |    36 +-
 .../cloud/storage/upload/UploadListener.java    |    42 +-
 .../com/cloud/storage/upload/UploadMonitor.java |     4 +-
 .../cloud/storage/upload/UploadMonitorImpl.java |    25 +-
 .../template/HypervisorTemplateAdapter.java     |   221 +-
 server/src/com/cloud/template/S3SyncTask.java   |    94 -
 .../com/cloud/template/TemplateAdapterBase.java |   470 +-
 .../com/cloud/template/TemplateManagerImpl.java |   229 +-
 .../src/com/cloud/usage/UsageServiceImpl.java   |     2 +-
 .../src/com/cloud/user/AccountManagerImpl.java  |    16 +-
 .../vm/ClusteredVirtualMachineManagerImpl.java  |    64 -
 server/src/com/cloud/vm/UserVmManagerImpl.java  |   218 +-
 server/src/com/cloud/vm/VirtualMachineGuru.java |    62 -
 .../src/com/cloud/vm/VirtualMachineManager.java |   189 -
 .../com/cloud/vm/VirtualMachineManagerImpl.java |  3349 ----
 .../com/cloud/vm/VirtualMachineProfileImpl.java |     3 +-
 .../vm/snapshot/VMSnapshotManagerImpl.java      |    57 +-
 .../lb/ApplicationLoadBalancerManagerImpl.java  |    27 +-
 .../GlobalLoadBalancingRulesServiceImpl.java    |    11 +-
 .../com/cloud/agent/MockAgentManagerImpl.java   |   189 -
 .../configuration/ConfigurationManagerTest.java |     6 +-
 .../test/com/cloud/keystore/KeystoreTest.java   |     4 +-
 .../cloud/network/CreatePrivateNetworkTest.java |   192 +
 .../network/UpdatePhysicalNetworkTest.java      |     2 +-
 .../network/firewall/FirewallManagerTest.java   |    22 +-
 .../SecurityGroupManagerTestConfiguration.java  |     3 +-
 .../cloud/resource/MockResourceManagerImpl.java |    16 +-
 .../vm/DeploymentPlanningManagerImplTest.java   |     6 +-
 server/test/com/cloud/vm/UserVmManagerTest.java |    32 +-
 .../cloud/vm/VirtualMachineManagerImplTest.java |   472 -
 .../vm/snapshot/VMSnapshotManagerTest.java      |     4 +-
 .../cloud/vpc/MockConfigurationManagerImpl.java |   116 +-
 .../com/cloud/vpc/MockNetworkManagerImpl.java   |   329 +-
 .../com/cloud/vpc/NetworkACLManagerTest.java    |     8 +
 server/test/com/cloud/vpc/VpcTest.java          |     2 +-
 .../com/cloud/vpc/VpcTestConfiguration.java     |     3 +-
 .../cloud/vpc/dao/MockConfigurationDaoImpl.java |     5 +-
 .../cloudstack/lb/ChildTestConfiguration.java   |    14 +-
 .../networkoffering/ChildTestConfiguration.java |    16 +-
 .../CreateNetworkOfferingTest.java              |     4 +-
 .../privategw/AclOnPrivateGwTest.java           |     6 +-
 ...GlobalLoadBalancingRulesServiceImplTest.java |     2 +-
 services/console-proxy/plugin/pom.xml           |     4 +-
 services/console-proxy/pom.xml                  |     6 +-
 services/console-proxy/server/js/ajaxkeys.js    |     5 +-
 services/console-proxy/server/js/ajaxviewer.js  |     7 +
 services/console-proxy/server/pom.xml           |    13 +-
 services/pom.xml                                |     2 +-
 services/secondary-storage/pom.xml              |     8 +-
 .../LocalNfsSecondaryStorageResource.java       |     4 +-
 .../resource/NfsSecondaryStorageResource.java   |   341 +-
 .../resource/SecondaryStorageDiscoverer.java    |     3 +-
 setup/bindir/cloud-set-guest-sshkey.in          |    49 +-
 setup/db/db/schema-302to303.sql                 |   196 +
 setup/db/db/schema-304to305-cleanup.sql         |    22 +
 setup/db/db/schema-304to305.sql                 |   389 +
 setup/db/db/schema-305to306-cleanup.sql         |    26 +
 setup/db/db/schema-305to306.sql                 |    96 +
 setup/db/db/schema-306to307.sql                 |    22 +
 setup/db/db/schema-307to410-cleanup.sql         |    43 +
 setup/db/db/schema-307to410.sql                 |  1587 ++
 setup/db/db/schema-40to410.sql                  |     3 +-
 setup/db/db/schema-410to420.sql                 |   318 +-
 setup/db/db/schema-420to430-cleanup.sql         |    22 +
 setup/db/db/schema-420to430.sql                 |   279 +
 setup/db/templates.sql                          |    89 +-
 .../component/cpu_limits/__init__.py            |    16 +
 .../component/cpu_limits/test_cpu_limits.py     |   745 +
 .../component/cpu_limits/test_domain_limits.py  |   764 +
 .../component/cpu_limits/test_maximum_limits.py |   377 +
 .../component/cpu_limits/test_project_limits.py |   347 +
 .../component/maint/test_redundant_router.py    |  1589 ++
 ...test_redundant_router_deployment_planning.py |  1012 ++
 .../test_redundant_router_network_rules.py      |  1427 ++
 test/integration/component/test_accounts.py     |   139 +-
 .../component/test_affinity_groups.py           |   719 +-
 test/integration/component/test_asa1000v_fw.py  |     2 +
 test/integration/component/test_blocker_bugs.py |   164 +-
 .../component/test_custom_hostname.py           |   492 +-
 .../component/test_egress_fw_rules.py           |   952 ++
 .../component/test_explicit_dedication.py       |     4 +
 .../component/test_implicit_planner.py          |    44 +-
 .../component/test_netscaler_configs.py         |    84 +-
 test/integration/component/test_netscaler_lb.py |   340 +-
 .../component/test_netscaler_lb_algo.py         |   345 +-
 .../component/test_netscaler_lb_sticky.py       |    49 +-
 .../component/test_netscaler_nw_off.py          |   680 +-
 .../component/test_network_offering.py          |   941 +-
 .../component/test_project_resources.py         |     5 +-
 .../integration/component/test_project_usage.py |     5 +-
 test/integration/component/test_projects.py     |     2 +-
 .../component/test_redundant_router.py          |  1579 --
 ...test_redundant_router_deployment_planning.py |  1015 --
 .../test_redundant_router_network_rules.py      |  1425 --
 .../component/test_redundant_router_services.py |     1 +
 test/integration/component/test_routers.py      |   143 +-
 .../component/test_security_groups.py           |     3 +-
 .../component/test_shared_networks.py           |   252 +-
 test/integration/component/test_snapshot_gc.py  |   271 +-
 .../component/test_snapshot_limits.py           |   179 +-
 test/integration/component/test_snapshots.py    |   348 +-
 test/integration/component/test_stopped_vm.py   |   217 +-
 .../component/test_storage_motion.py            |    15 +-
 test/integration/component/test_tags.py         |    13 +-
 test/integration/component/test_templates.py    |    76 +-
 test/integration/component/test_usage.py        |    38 +-
 .../component/test_vm_passwdenabled.py          |    58 +-
 test/integration/component/test_volumes.py      |   249 +-
 test/integration/component/test_vpc.py          |     3 +-
 test/integration/component/test_vpc_network.py  |    42 +-
 .../component/test_vpc_network_lbrules.py       |   137 +-
 .../component/test_vpc_network_pfrules.py       |    16 +-
 .../component/test_vpc_network_staticnatrule.py |    46 +-
 .../integration/component/test_vpc_offerings.py |    67 +-
 test/integration/component/test_vpc_routers.py  |   265 +-
 .../component/test_vpc_vm_life_cycle.py         |   325 +-
 .../component/test_vpc_vms_deployment.py        |   108 +-
 test/integration/component/test_vpn_users.py    |    53 +-
 .../smoke/test_deploy_vm_with_userdata.py       |     3 +-
 test/integration/smoke/test_guest_vlan_range.py |    12 +-
 test/integration/smoke/test_internal_lb.py      |     2 +-
 test/integration/smoke/test_loadbalance.py      |     2 +-
 .../smoke/test_multipleips_per_nic.py           |   181 +
 test/integration/smoke/test_network.py          |    50 +-
 test/integration/smoke/test_network_acl.py      |     2 +-
 test/integration/smoke/test_nic.py              |    13 +-
 .../smoke/test_non_contigiousvlan.py            |     7 +-
 .../integration/smoke/test_portable_publicip.py |    14 +-
 test/integration/smoke/test_routers.py          |    66 +-
 test/integration/smoke/test_vm_life_cycle.py    |    33 +-
 test/integration/smoke/test_volumes.py          |    10 +-
 test/pom.xml                                    |     2 +-
 tools/apidoc/gen_toc.py                         |     9 +-
 tools/apidoc/generatetoc_header.xsl             |     2 +-
 tools/apidoc/pom.xml                            |     4 +-
 tools/appliance/definitions/builtin/base.sh     |    14 +
 tools/appliance/definitions/builtin/cleanup.sh  |    21 +
 .../appliance/definitions/builtin/definition.rb |    33 +
 .../definitions/builtin/install-xs-tools.sh     |    10 +
 tools/appliance/definitions/builtin/ks.cfg      |    35 +
 .../definitions/builtin/postinstall.sh          |    54 +
 tools/appliance/definitions/builtin/zerodisk.sh |     3 +
 tools/build/build_asf.sh                        |    14 +-
 tools/build/setnextversion.sh                   |     4 +-
 tools/cli/README                                |     1 +
 tools/cli/cloudmonkey/__init__.py               |    23 -
 tools/cli/cloudmonkey/cachemaker.py             |   181 -
 tools/cli/cloudmonkey/cloudmonkey.py            |   538 -
 tools/cli/cloudmonkey/config.py                 |   122 -
 tools/cli/cloudmonkey/printer.py                |   120 -
 tools/cli/cloudmonkey/requester.py              |   165 -
 tools/cli/pom.xml                               |    73 -
 tools/cli/setup.py                              |    68 -
 tools/devcloud-kvm/pom.xml                      |     2 +-
 tools/devcloud/pom.xml                          |     2 +-
 tools/marvin/marvin/cloudstackTestCase.py       |     4 +-
 tools/marvin/marvin/cloudstackTestClient.py     |     8 +-
 tools/marvin/marvin/codegenerator.py            |    18 +-
 tools/marvin/marvin/deployDataCenter.py         |    27 +-
 tools/marvin/marvin/integration/lib/base.py     |   242 +-
 tools/marvin/marvin/integration/lib/common.py   |   116 +-
 tools/marvin/marvin/integration/lib/utils.py    |   148 +-
 tools/marvin/marvin/marvinPlugin.py             |    23 +-
 tools/marvin/marvin/remoteSSHClient.py          |    23 +-
 tools/marvin/pom.xml                            |     2 +-
 tools/ngui/README.md                            |    17 +
 tools/ngui/api.py                               |    37 +
 tools/ngui/app.py                               |    38 +
 tools/ngui/config.py                            |    21 +
 tools/ngui/precache.py                          |    19 +
 tools/ngui/requester.py                         |   153 +
 .../bootstrap/css/bootstrap-responsive.css      |  1109 ++
 .../bootstrap/css/bootstrap-responsive.min.css  |     9 +
 tools/ngui/static/bootstrap/css/bootstrap.css   |  6315 +++++++
 .../ngui/static/bootstrap/css/bootstrap.min.css |   874 +
 .../img/glyphicons-halflings-white.png          |   Bin 0 -> 8777 bytes
 .../bootstrap/img/glyphicons-halflings.png      |   Bin 0 -> 12799 bytes
 tools/ngui/static/bootstrap/js/bootstrap.js     |  2291 +++
 tools/ngui/static/bootstrap/js/bootstrap.min.js |     7 +
 tools/ngui/static/css/app.css                   |    45 +
 tools/ngui/static/images/ajax-inverse.gif       |   Bin 0 -> 6488 bytes
 tools/ngui/static/images/ajax-loader.gif        |   Bin 0 -> 3208 bytes
 tools/ngui/static/js/app/accounts/accounts.js   |   102 +
 .../static/js/app/accounts/accounts.tpl.html    |    36 +
 tools/ngui/static/js/app/app.js                 |    77 +
 tools/ngui/static/js/app/dashboard/dashboard.js |    17 +
 tools/ngui/static/js/app/domains/domains.js     |    37 +
 tools/ngui/static/js/app/events/events.js       |    37 +
 .../js/app/globalsettings/globalsettings.js     |    38 +
 .../app/globalsettings/globalsettings.tpl.html  |    37 +
 .../js/app/infrastructure/infrastructure.js     |    17 +
 .../js/app/instances/instance-details.tpl.html  |    24 +
 tools/ngui/static/js/app/instances/instances.js |    54 +
 .../static/js/app/instances/instances.tpl.html  |    54 +
 tools/ngui/static/js/app/networks/networks.js   |    37 +
 tools/ngui/static/js/app/projects/projects.js   |    37 +
 .../js/app/serviceofferings/serviceofferings.js |    37 +
 tools/ngui/static/js/app/storage/storage.js     |   153 +
 .../ngui/static/js/app/storage/storage.tpl.html |    51 +
 .../js/app/storage/upload-volume.tpl.html       |    18 +
 tools/ngui/static/js/app/templates/templates.js |    37 +
 tools/ngui/static/js/common/dictionary.js       |    68 +
 .../ngui/static/js/common/directives/confirm.js |    43 +
 .../js/common/directives/edit-in-place.js       |    49 +
 .../js/common/directives/edit-in-place.tpl.html |    26 +
 tools/ngui/static/js/common/directives/label.js |    42 +
 .../static/js/common/directives/modal-form.js   |    70 +
 .../js/common/directives/modal-form.tpl.html    |    42 +
 .../ngui/static/js/common/resources/accounts.js |    41 +
 .../js/common/resources/configurations.js       |    44 +
 .../static/js/common/resources/diskofferings.js |    33 +
 .../ngui/static/js/common/resources/domains.js  |    33 +
 tools/ngui/static/js/common/resources/events.js |    33 +
 .../ngui/static/js/common/resources/networks.js |    33 +
 .../ngui/static/js/common/resources/projects.js |    33 +
 .../js/common/resources/serviceofferings.js     |    33 +
 .../static/js/common/resources/snapshots.js     |    33 +
 .../static/js/common/resources/templates.js     |    33 +
 tools/ngui/static/js/common/resources/users.js  |    40 +
 .../js/common/resources/virtualmachines.js      |    75 +
 .../ngui/static/js/common/resources/volumes.js  |    33 +
 tools/ngui/static/js/common/resources/zones.js  |    33 +
 .../static/js/common/services/breadcrumbs.js    |    32 +
 .../js/common/services/helperfunctions.js       |    39 +
 .../static/js/common/services/notifications.js  |    34 +
 .../ngui/static/js/common/services/requester.js |    46 +
 tools/ngui/static/js/lib/angular-ui.min.js      |     2 +
 tools/ngui/static/js/lib/angular.js             | 14847 +++++++++++++++++
 tools/ngui/static/js/lib/jquery-1.7.2.js        |  9404 +++++++++++
 tools/ngui/templates/index.html                 |   142 +
 tools/pom.xml                                   |     3 +-
 tools/whisker/LICENSE                           |     7 +
 tools/whisker/descriptor-for-packaging.xml      |    11 +
 tools/whisker/descriptor.xml                    |    13 +-
 ui/css/cloudstack3.css                          |    44 +-
 ui/dictionary.jsp                               |    12 +
 ui/index.jsp                                    |    18 +-
 ui/modules/infrastructure/infrastructure.css    |    19 +
 ui/modules/vnmcAsa1000v/vnmcAsa1000v.css        |    19 +
 .../vnmcNetworkProvider/vnmcNetworkProvider.css |    19 +
 .../vnmcNetworkProvider/vnmcNetworkProvider.js  |    32 +-
 ui/scripts/accounts.js                          |     8 +
 ui/scripts/affinity.js                          |    11 +
 ui/scripts/autoscaler.js                        |     2 +-
 ui/scripts/cloudStack.js                        |    92 +-
 ui/scripts/configuration.js                     |    34 +-
 ui/scripts/docs.js                              |    53 +-
 ui/scripts/events.js                            |   165 +-
 ui/scripts/globalSettings.js                    |     2 +-
 ui/scripts/instanceWizard.js                    |    24 +-
 ui/scripts/instances.js                         |    27 +-
 ui/scripts/network.js                           |   789 +-
 ui/scripts/plugins.js                           |    30 +
 ui/scripts/regions.js                           |     3 +-
 ui/scripts/sharedFunctions.js                   |    11 +-
 ui/scripts/storage.js                           |    20 +-
 ui/scripts/system.js                            |  1864 +--
 ui/scripts/templates.js                         |   147 +-
 ui/scripts/ui-custom/autoscaler.js              |     3 +
 ui/scripts/ui-custom/instanceWizard.js          |    24 +-
 ui/scripts/ui-custom/zoneChart.js               |     7 +-
 ui/scripts/ui-custom/zoneWizard.js              |    57 +-
 ui/scripts/ui/dialog.js                         |    87 +-
 ui/scripts/ui/utils.js                          |     3 +-
 ui/scripts/ui/widgets/detailView.js             |     4 +-
 ui/scripts/ui/widgets/listView.js               |     8 +-
 ui/scripts/ui/widgets/multiEdit.js              |    11 +-
 ui/scripts/vm_snapshots.js                      |     2 +-
 ui/scripts/vpc.js                               |   120 +-
 ui/scripts/zoneWizard.js                        |   377 +-
 usage/pom.xml                                   |    77 +-
 .../com/cloud/usage/UsageAlertManagerImpl.java  |     3 +-
 usage/src/com/cloud/usage/UsageManagerImpl.java |    89 +-
 .../cloud/usage/parser/NetworkUsageParser.java  |     7 +-
 .../usage/parser/VMSnapshotUsageParser.java     |   153 +
 .../cloud/usage/parser/VmDiskUsageParser.java   |     6 +-
 .../usage/UsageManagerTestConfiguration.java    |     3 +-
 utils/pom.xml                                   |    56 +-
 utils/src/com/cloud/utils/AnnotationHelper.java |    57 -
 utils/src/com/cloud/utils/ProcessUtil.java      |    22 +-
 utils/src/com/cloud/utils/ReflectUtil.java      |    88 +-
 utils/src/com/cloud/utils/StringUtils.java      |    21 +-
 utils/src/com/cloud/utils/UriUtils.java         |    27 +-
 .../utils/crypt/EncryptionSecretKeyChanger.java |   427 -
 utils/src/com/cloud/utils/db/Attribute.java     |   253 -
 .../com/cloud/utils/db/ConnectionConcierge.java |   223 -
 .../utils/db/ConnectionConciergeMBean.java      |    30 -
 utils/src/com/cloud/utils/db/DB.java            |    59 -
 utils/src/com/cloud/utils/db/DbUtil.java        |   342 -
 utils/src/com/cloud/utils/db/EcInfo.java        |   106 -
 utils/src/com/cloud/utils/db/Encrypt.java       |    32 -
 utils/src/com/cloud/utils/db/EntityManager.java |    33 -
 utils/src/com/cloud/utils/db/Filter.java        |   115 -
 utils/src/com/cloud/utils/db/GenericDao.java    |   284 -
 .../src/com/cloud/utils/db/GenericDaoBase.java  |  1890 ---
 .../cloud/utils/db/GenericSearchBuilder.java    |   548 -
 utils/src/com/cloud/utils/db/GlobalLock.java    |   244 -
 utils/src/com/cloud/utils/db/GroupBy.java       |   108 -
 utils/src/com/cloud/utils/db/JoinBuilder.java   |    79 -
 utils/src/com/cloud/utils/db/JoinType.java      |    32 -
 utils/src/com/cloud/utils/db/Merovingian2.java  |   461 -
 .../com/cloud/utils/db/MerovingianMBean.java    |    32 -
 utils/src/com/cloud/utils/db/ScriptRunner.java  |   233 -
 utils/src/com/cloud/utils/db/SearchBuilder.java |    64 -
 .../src/com/cloud/utils/db/SearchCriteria.java  |   364 -
 .../src/com/cloud/utils/db/SearchCriteria2.java |   213 -
 .../cloud/utils/db/SearchCriteriaService.java   |    29 -
 .../src/com/cloud/utils/db/SequenceFetcher.java |   171 -
 utils/src/com/cloud/utils/db/SqlGenerator.java  |   669 -
 utils/src/com/cloud/utils/db/StateMachine.java  |    30 -
 utils/src/com/cloud/utils/db/Transaction.java   |  1174 --
 .../cloud/utils/db/TransactionAttachment.java   |    34 -
 .../utils/db/TransactionContextBuilder.java     |    65 -
 .../com/cloud/utils/db/TransactionMBean.java    |    33 -
 .../cloud/utils/db/TransactionMBeanImpl.java    |   113 -
 utils/src/com/cloud/utils/db/UpdateBuilder.java |   147 -
 utils/src/com/cloud/utils/db/UpdateFilter.java  |    29 -
 .../cloud/utils/storage/encoding/Decoder.java   |     2 +-
 .../com/cloud/utils/xmlobject/XmlObject.java    |    11 +-
 .../apache/cloudstack/config/ConfigDepot.java   |    25 -
 .../org/apache/cloudstack/config/ConfigKey.java |    98 -
 .../apache/cloudstack/config/ConfigValue.java   |    76 -
 .../apache/cloudstack/config/Configuration.java |    33 -
 utils/test/com/cloud/utils/ProcessUtilTest.java |    73 +
 utils/test/com/cloud/utils/ReflectUtilTest.java |    91 +
 utils/test/com/cloud/utils/ScriptTest.java      |   100 +
 .../com/cloud/utils/db/DbAnnotatedBase.java     |    44 -
 .../cloud/utils/db/DbAnnotatedBaseDerived.java  |    27 -
 utils/test/com/cloud/utils/db/DbTestDao.java    |    66 -
 utils/test/com/cloud/utils/db/DbTestUtils.java  |    90 -
 utils/test/com/cloud/utils/db/DbTestVO.java     |    56 -
 .../test/com/cloud/utils/db/DummyComponent.java |    27 -
 .../cloud/utils/db/ElementCollectionTest.java   |    72 -
 .../test/com/cloud/utils/db/GlobalLockTest.java |    83 -
 .../com/cloud/utils/db/Merovingian2Test.java    |    77 -
 .../utils/db/TransactionContextBuilderTest.java |    63 -
 .../com/cloud/utils/db/TransactionTest.java     |   214 -
 .../utils/log/CglibThrowableRendererTest.java   |   104 -
 .../cloudstack/test/utils/SpringUtils.java      |   113 -
 .../com/cloud/utils/QualifierTestContext.xml    |     3 +-
 .../utils/db/transactionContextBuilderTest.xml  |     3 +-
 vmware-base/pom.xml                             |    11 +-
 .../cloud/hypervisor/vmware/mo/ClusterMO.java   |     2 +-
 .../hypervisor/vmware/mo/DatacenterMO.java      |     2 +-
 .../com/cloud/hypervisor/vmware/mo/HostMO.java  |     2 +-
 .../vmware/mo/HypervisorHostHelper.java         |    81 +-
 .../hypervisor/vmware/mo/PerfManagerMO.java     |     2 +-
 .../hypervisor/vmware/mo/VirtualMachineMO.java  |    10 +-
 1374 files changed, 115868 insertions(+), 60092 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bdba0dde/api/src/com/cloud/configuration/ConfigurationService.java
----------------------------------------------------------------------
diff --cc api/src/com/cloud/configuration/ConfigurationService.java
index cc6e47f,9e5fa82..d3dc90c
--- a/api/src/com/cloud/configuration/ConfigurationService.java
+++ b/api/src/com/cloud/configuration/ConfigurationService.java
@@@ -20,12 -20,9 +20,7 @@@ import java.util.List
  
  import javax.naming.NamingException;
  
- import com.cloud.exception.InvalidParameterValueException;
- import com.cloud.exception.InsufficientCapacityException;
- import com.cloud.exception.ConcurrentOperationException;
- import com.cloud.exception.ResourceUnavailableException;
- import com.cloud.exception.ResourceAllocationException;
  import org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd;
 -import org.apache.cloudstack.api.command.admin.ldap.LDAPConfigCmd;
 -import org.apache.cloudstack.api.command.admin.ldap.LDAPRemoveCmd;
  import org.apache.cloudstack.api.command.admin.network.CreateNetworkOfferingCmd;
  import org.apache.cloudstack.api.command.admin.network.DeleteNetworkOfferingCmd;
  import org.apache.cloudstack.api.command.admin.network.UpdateNetworkOfferingCmd;
@@@ -260,22 -259,14 +257,8 @@@ public interface ConfigurationService 
  
      List<? extends NetworkOffering> listNetworkOfferings(TrafficType trafficType, boolean systemOnly);
  
-     DataCenter getZone(long id);
- 
-     ServiceOffering getServiceOffering(long serviceOfferingId);
- 
      Long getDefaultPageSize();
  
-     Integer getServiceOfferingNetworkRate(long serviceOfferingId, Long dataCenterId);
- 
-     DiskOffering getDiskOffering(long diskOfferingId);
- 
-     /**
-      * @param offering
-      * @return
-      */
-     boolean isOfferingForVpc(NetworkOffering offering);
- 
 -    boolean updateLDAP(LDAPConfigCmd cmd) throws NamingException;
 -
 -	boolean removeLDAP(LDAPRemoveCmd cmd);
 -
 -    LDAPConfigCmd listLDAPConfig(LDAPConfigCmd cmd);
 -
      PortableIpRange createPortableIpRange(CreatePortableIpRangeCmd cmd) throws ConcurrentOperationException;
  
      boolean deletePortableIpRange(DeletePortableIpRangeCmd cmd);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bdba0dde/api/src/org/apache/cloudstack/api/ApiConstants.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bdba0dde/api/src/org/apache/cloudstack/api/ResponseGenerator.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bdba0dde/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bdba0dde/client/tomcatconf/applicationContext.xml.in
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bdba0dde/client/tomcatconf/commands.properties.in
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bdba0dde/client/tomcatconf/componentContext.xml.in
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bdba0dde/client/tomcatconf/nonossComponentContext.xml.in
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bdba0dde/client/tomcatconf/simulatorComponentContext.xml.in
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bdba0dde/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/ApiRateLimitServiceImpl.java
----------------------------------------------------------------------


Mime
View raw message