cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From muralire...@apache.org
Subject [49/50] [abbrv] git commit: refs/heads/gslb-wip - Merge branch 'master' into gslb-wip
Date Mon, 18 Mar 2013 10:14:47 GMT
Merge branch 'master' into gslb-wip

Conflicts:
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/Config.java
	setup/db/create-schema.sql


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

Branch: refs/heads/gslb-wip
Commit: fea98fa66b2c6bd4415178efcd3aa4a322dfb211
Parents: 11a7546 603b5ad
Author: Murali Reddy <murali.reddy@citrix.com>
Authored: Mon Mar 11 14:28:26 2013 +0530
Committer: Murali Reddy <murali.reddy@citrix.com>
Committed: Mon Mar 11 14:28:26 2013 +0530

----------------------------------------------------------------------
 INSTALL.md                                         |   31 +-
 LICENSE                                            |  210 +-
 NOTICE                                             |   49 +-
 agent/conf/agent.properties                        |    2 +-
 agent/pom.xml                                      |   26 +-
 agent/src/com/cloud/agent/AgentShell.java          |    4 +
 .../consoleproxy/ConsoleProxyResource.java         |   25 +-
 agent/test/com/cloud/agent/TestAgentShell.java     |    2 +-
 api/pom.xml                                        |    2 +-
 .../cloud/agent/api/CreateVMSnapshotAnswer.java    |   62 +
 .../cloud/agent/api/CreateVMSnapshotCommand.java   |   42 +
 .../agent/api/CreateVolumeFromSnapshotCommand.java |    1 +
 .../api/CreateVolumeFromVMSnapshotAnswer.java      |   54 +
 .../api/CreateVolumeFromVMSnapshotCommand.java     |   88 +
 .../cloud/agent/api/DeleteVMSnapshotAnswer.java    |   49 +
 .../cloud/agent/api/DeleteVMSnapshotCommand.java   |   28 +
 .../cloud/agent/api/RevertToVMSnapshotAnswer.java  |   63 +
 .../cloud/agent/api/RevertToVMSnapshotCommand.java |   29 +
 api/src/com/cloud/agent/api/ScaleVmAnswer.java     |   28 +
 api/src/com/cloud/agent/api/ScaleVmCommand.java    |  113 +
 .../com/cloud/agent/api/VMSnapshotBaseCommand.java |   74 +
 api/src/com/cloud/agent/api/VMSnapshotTO.java      |   90 +
 .../cloud/agent/api/routing/DhcpEntryCommand.java  |   10 +
 .../com/cloud/agent/api/to/VirtualMachineTO.java   |   36 +
 api/src/com/cloud/agent/api/to/VolumeTO.java       |    4 +
 api/src/com/cloud/alert/Alert.java                 |    1 +
 .../cloud/configuration/ConfigurationService.java  |    2 +
 api/src/com/cloud/configuration/Resource.java      |    4 +-
 api/src/com/cloud/dao/EntityManager.java           |   10 +
 api/src/com/cloud/dc/DataCenter.java               |    4 +
 api/src/com/cloud/event/Event.java                 |    1 +
 api/src/com/cloud/event/EventTypes.java            |    5 +
 .../cloud/exception/PermissionDeniedException.java |    4 +
 .../com/cloud/exception/RequestLimitException.java |    4 +-
 .../cloud/hypervisor/HypervisorCapabilities.java   |    6 +
 api/src/com/cloud/network/IpAddress.java           |    3 +
 api/src/com/cloud/network/Network.java             |   16 +-
 api/src/com/cloud/network/NetworkModel.java        |    9 +-
 api/src/com/cloud/network/NetworkProfile.java      |    7 +
 api/src/com/cloud/network/NetworkService.java      |   19 +-
 api/src/com/cloud/network/NetworkUsageService.java |   37 +
 api/src/com/cloud/network/TrafficLabel.java        |   36 +
 api/src/com/cloud/network/rules/RulesService.java  |    5 +-
 api/src/com/cloud/network/vpc/VpcService.java      |    4 +-
 api/src/com/cloud/offering/ServiceOffering.java    |    5 +
 api/src/com/cloud/resource/ResourceService.java    |    2 +-
 api/src/com/cloud/server/ManagementService.java    |   38 +-
 api/src/com/cloud/server/ResourceTag.java          |    3 +-
 api/src/com/cloud/storage/Snapshot.java            |   20 +-
 api/src/com/cloud/storage/StoragePool.java         |    9 +-
 api/src/com/cloud/storage/StoragePoolStatus.java   |    9 +-
 api/src/com/cloud/storage/StorageService.java      |   53 -
 api/src/com/cloud/storage/Volume.java              |   17 +-
 api/src/com/cloud/storage/VolumeApiService.java    |   81 +
 api/src/com/cloud/template/TemplateService.java    |   10 +
 api/src/com/cloud/user/AccountService.java         |    4 +-
 api/src/com/cloud/user/DomainService.java          |    2 +-
 api/src/com/cloud/vm/Nic.java                      |    1 +
 api/src/com/cloud/vm/NicProfile.java               |   18 +
 api/src/com/cloud/vm/NicSecondaryIp.java           |   36 +
 api/src/com/cloud/vm/UserVmService.java            |   41 -
 api/src/com/cloud/vm/VirtualMachine.java           |    6 +-
 api/src/com/cloud/vm/VirtualMachineProfile.java    |    6 +
 api/src/com/cloud/vm/snapshot/VMSnapshot.java      |  110 +
 .../com/cloud/vm/snapshot/VMSnapshotService.java   |   48 +
 api/src/org/apache/cloudstack/acl/APIChecker.java  |    3 +-
 api/src/org/apache/cloudstack/api/ACL.java         |    4 +
 .../org/apache/cloudstack/api/ApiConstants.java    |   30 +-
 .../apache/cloudstack/api/ApiConstants.java.orig   |  468 ++
 .../org/apache/cloudstack/api/ApiErrorCode.java    |    1 -
 api/src/org/apache/cloudstack/api/BaseCmd.java     |    9 +-
 .../apache/cloudstack/api/ResponseGenerator.java   |   96 +
 .../apache/cloudstack/api/ServerApiException.java  |   11 +-
 .../command/admin/account/CreateAccountCmd.java    |   28 +-
 .../command/admin/account/DeleteAccountCmd.java    |   11 +-
 .../command/admin/account/DisableAccountCmd.java   |   17 +-
 .../command/admin/account/EnableAccountCmd.java    |   11 +-
 .../command/admin/account/UpdateAccountCmd.java    |   11 +-
 .../api/command/admin/cluster/AddClusterCmd.java   |   55 +
 .../command/admin/cluster/UpdateClusterCmd.java    |   27 +-
 .../api/command/admin/domain/CreateDomainCmd.java  |   16 +-
 .../api/command/admin/domain/DeleteDomainCmd.java  |    9 +-
 .../api/command/admin/domain/UpdateDomainCmd.java  |   11 +-
 .../api/command/admin/ldap/LDAPConfigCmd.java      |   61 +-
 .../admin/offering/CreateServiceOfferingCmd.java   |   11 +-
 .../command/admin/resource/ArchiveAlertsCmd.java   |  100 +
 .../command/admin/resource/DeleteAlertsCmd.java    |   99 +
 .../api/command/admin/router/UpgradeRouterCmd.java |    4 +-
 .../admin/storage/CreateStoragePoolCmd.java        |   21 +-
 .../command/admin/systemvm/UpgradeSystemVMCmd.java |    4 +-
 .../command/admin/usage/AddTrafficMonitorCmd.java  |  107 +
 .../admin/usage/DeleteTrafficMonitorCmd.java       |   84 +
 .../admin/usage/GenerateUsageRecordsCmd.java       |   89 +
 .../command/admin/usage/GetUsageRecordsCmd.java    |  126 +
 .../admin/usage/ListTrafficMonitorsCmd.java        |   84 +
 .../api/command/admin/usage/ListUsageTypesCmd.java |   51 +
 .../api/command/admin/user/CreateUserCmd.java      |   16 +-
 .../api/command/admin/user/DeleteUserCmd.java      |    9 +-
 .../api/command/admin/user/DisableUserCmd.java     |   11 +-
 .../api/command/admin/user/EnableUserCmd.java      |   11 +-
 .../api/command/admin/user/UpdateUserCmd.java      |   11 +-
 .../command/admin/vlan/CreateVlanIpRangeCmd.java   |   45 +-
 .../command/admin/vpc/CreateVPCOfferingCmd.java    |   31 +-
 .../api/command/admin/zone/CreateZoneCmd.java      |   14 +
 .../api/command/admin/zone/UpdateZoneCmd.java      |   14 +
 .../autoscale/CreateAutoScaleVmProfileCmd.java     |    4 +-
 .../command/user/config/ListCapabilitiesCmd.java   |    6 +
 .../api/command/user/event/ArchiveEventsCmd.java   |  105 +
 .../api/command/user/event/DeleteEventsCmd.java    |  105 +
 .../user/firewall/CreateFirewallRuleCmd.java       |    2 +-
 .../user/firewall/CreatePortForwardingRuleCmd.java |   19 +-
 .../api/command/user/iso/RegisterIsoCmd.java       |    8 +
 .../api/command/user/nat/EnableStaticNatCmd.java   |   12 +-
 .../api/command/user/network/CreateNetworkCmd.java |    4 -
 .../api/command/user/network/UpdateNetworkCmd.java |   11 +-
 .../user/resource/UpdateResourceCountCmd.java      |    9 +-
 .../user/resource/UpdateResourceLimitCmd.java      |    8 +-
 .../command/user/template/CreateTemplateCmd.java   |    4 +-
 .../command/user/template/RegisterTemplateCmd.java |   10 +-
 .../api/command/user/vm/AddIpToVmNicCmd.java       |  176 +
 .../api/command/user/vm/DeployVMCmd.java           |   15 +-
 .../api/command/user/vm/ListNicsCmd.java           |  133 +
 .../api/command/user/vm/RemoveIpFromVmNicCmd.java  |  123 +
 .../api/command/user/vm/RestoreVMCmd.java          |   10 +-
 .../user/vmsnapshot/CreateVMSnapshotCmd.java       |  125 +
 .../user/vmsnapshot/DeleteVMSnapshotCmd.java       |   85 +
 .../command/user/vmsnapshot/ListVMSnapshotCmd.java |   89 +
 .../user/vmsnapshot/RevertToSnapshotCmd.java       |   92 +
 .../api/command/user/volume/AttachVolumeCmd.java   |    2 +-
 .../api/command/user/volume/CreateVolumeCmd.java   |    4 +-
 .../api/command/user/volume/DeleteVolumeCmd.java   |    2 +-
 .../api/command/user/volume/DetachVolumeCmd.java   |    2 +-
 .../api/command/user/volume/MigrateVolumeCmd.java  |    2 +-
 .../api/command/user/volume/ResizeVolumeCmd.java   |    2 +-
 .../api/command/user/volume/UploadVolumeCmd.java   |   10 +-
 .../user/vpn/CreateVpnCustomerGatewayCmd.java      |    2 +-
 .../api/command/user/zone/ListZonesByCmd.java      |    7 +
 .../cloudstack/api/response/AccountResponse.java   |   48 +-
 .../api/response/AddIpToVmNicResponse.java         |   85 +
 .../api/response/CapabilitiesResponse.java         |   15 +
 .../cloudstack/api/response/ClusterResponse.java   |   20 +
 .../api/response/DomainRouterResponse.java         |   22 +
 .../cloudstack/api/response/IPAddressResponse.java |    8 +
 .../api/response/LDAPConfigResponse.java           |    2 +-
 .../cloudstack/api/response/NetworkResponse.java   |   16 +-
 .../cloudstack/api/response/NicResponse.java       |   12 +-
 .../api/response/NicSecondaryIpResponse.java       |   85 +
 .../api/response/ResourceCountResponse.java        |    2 +-
 .../api/response/ResourceLimitResponse.java        |    2 +-
 .../api/response/VMSnapshotResponse.java           |  220 +
 .../cloudstack/api/response/ZoneResponse.java      |   22 +
 .../org/apache/cloudstack/query/QueryService.java  |    1 -
 api/src/org/apache/cloudstack/usage/Usage.java     |   69 +
 .../org/apache/cloudstack/usage/UsageService.java  |   64 +
 .../org/apache/cloudstack/usage/UsageTypes.java    |   58 +
 .../api/agent/test/BackupSnapshotCommandTest.java  |    6 +-
 .../api/agent/test/SnapshotCommandTest.java        |   12 +-
 .../api/command/test/AddIpToVmNicTest.java         |  132 +
 .../cloudstack/api/command/test/UsageCmdTest.java  |   69 +
 .../agent/api/test/ResizeVolumeCommandTest.java    |    6 +-
 awsapi/pom.xml                                     |    4 +-
 .../bridge/persist/dao/CloudStackUserDaoImpl.java  |    2 +
 .../com/cloud/bridge/service/EC2RestServlet.java   |  260 +-
 .../cloud/bridge/service/EC2SoapServiceImpl.java   |  110 +-
 .../service/core/ec2/EC2AvailabilityZone.java      |   55 +
 .../core/ec2/EC2AvailabilityZonesFilterSet.java    |   21 +-
 .../ec2/EC2DescribeAvailabilityZonesResponse.java  |   36 +-
 .../cloud/bridge/service/core/ec2/EC2Engine.java   |  378 +-
 .../bridge/service/core/ec2/EC2GroupFilterSet.java |   22 +-
 .../service/core/ec2/EC2ImageLaunchPermission.java |   53 +
 .../cloud/bridge/service/core/ec2/EC2Instance.java |   12 +-
 .../service/core/ec2/EC2InstanceFilterSet.java     |   10 +-
 .../service/core/ec2/EC2ModifyImageAttribute.java  |   39 +-
 .../bridge/service/core/ec2/EC2StopInstances.java  |    9 +
 .../cloud/bridge/service/core/ec2/EC2Volume.java   |   16 +
 .../service/core/ec2/EC2VolumeFilterSet.java       |    5 +-
 awsapi/src/com/cloud/stack/CloudStackClient.java   |    3 +-
 build.xml                                          |   49 -
 build/.gitignore                                   |   18 -
 build/build-aws-api.properties                     |   28 -
 build/build-aws-api.xml                            |  478 --
 build/build-cloud-plugins.xml                      |  328 --
 build/build-cloud.properties                       |   26 -
 build/build-cloud.xml                              |  595 --
 build/build-common.xml                             |  100 -
 build/build-devcloud.xml                           |   98 -
 build/build-docs.xml                               |   82 -
 build/build-marvin.xml                             |   71 -
 build/build-tests.xml                              |  319 -
 build/build-usage.xml                              |   69 -
 build/cloud.properties                             |   29 -
 build/developer.xml                                |  431 --
 build/overview.html                                |   35 -
 build/package.xml                                  |  305 -
 build/release-notes                                |  328 --
 .../WEB-INF/classes/resources/messages.properties  |   33 +
 .../classes/resources/messages_fr_FR.properties    | 2439 ++++----
 .../classes/resources/messages_ja.properties       |    9 +-
 .../classes/resources/messages_ko_KR.properties    | 1514 +++++
 .../classes/resources/messages_pt_BR.properties    |    7 +
 .../classes/resources/messages_ru_RU.properties    |    9 +
 .../classes/resources/messages_zh_CN.properties    |    7 +
 client/WEB-INF/web.xml                             |    8 +
 client/bindir/cloud-setup-management.in            |    2 +-
 client/pom.xml                                     |   69 +-
 client/tomcatconf/applicationContext.xml.in        |    7 +-
 client/tomcatconf/commands.properties.in           |   19 +-
 client/tomcatconf/componentContext.xml.in          |   91 +-
 client/tomcatconf/components.xml.in                |    5 +-
 client/tomcatconf/log4j-cloud.xml.in               |    2 +-
 client/tomcatconf/nonossComponentContext.xml.in    |   77 +-
 client/tomcatconf/tomcat6-nonssl.conf.in           |    2 +-
 client/tomcatconf/tomcat6-ssl.conf.in              |    2 +-
 client/vmops.log.2013-01-09.gz                     |  Bin 1248433 -> 0 bytes
 client/vmops.log.2013-01-18.gz                     |  Bin 4674726 -> 0 bytes
 cloud.spec                                         |  647 ---
 console-proxy/bindir/cloud-setup-console-proxy.in  |  220 -
 console-proxy/certs/localhost.crt                  |   22 -
 console-proxy/certs/localhost.key                  |   27 -
 console-proxy/certs/realhostip.crt                 |   31 -
 console-proxy/certs/realhostip.csr                 |   15 -
 console-proxy/certs/realhostip.key                 |   24 -
 console-proxy/certs/realhostip.keystore            |  Bin 8690 -> 0 bytes
 console-proxy/conf.dom0/agent.properties.in        |   46 -
 console-proxy/conf.dom0/consoleproxy.properties.in |   23 -
 console-proxy/conf.dom0/log4j-cloud.xml.in         |  101 -
 console-proxy/conf/agent.properties                |   19 -
 console-proxy/conf/consoleproxy.properties         |   23 -
 console-proxy/conf/log4j-cloud.xml                 |  102 -
 console-proxy/css/ajaxviewer.css                   |  144 -
 console-proxy/css/logger.css                       |  139 -
 .../SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in  |   98 -
 .../SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in  |   98 -
 .../SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in  |   98 -
 .../SYSCONFDIR/init.d/cloud-console-proxy.in       |  112 -
 console-proxy/images/back.gif                      |  Bin 149 -> 0 bytes
 console-proxy/images/bright-green.png              |  Bin 3903 -> 0 bytes
 console-proxy/images/cad.gif                       |  Bin 918 -> 0 bytes
 console-proxy/images/cannotconnect.jpg             |  Bin 1810 -> 0 bytes
 console-proxy/images/clr_button.gif                |  Bin 1274 -> 0 bytes
 console-proxy/images/clr_button_hover.gif          |  Bin 437 -> 0 bytes
 console-proxy/images/dot.cur                       |  Bin 326 -> 0 bytes
 console-proxy/images/gray-green.png                |  Bin 3833 -> 0 bytes
 console-proxy/images/grid_headerbg.gif             |  Bin 196 -> 0 bytes
 console-proxy/images/left.png                      |  Bin 3024 -> 0 bytes
 console-proxy/images/minimize_button.gif           |  Bin 634 -> 0 bytes
 console-proxy/images/minimize_button_hover.gif     |  Bin 227 -> 0 bytes
 console-proxy/images/notready.jpg                  |  Bin 1827 -> 0 bytes
 console-proxy/images/play_button.gif               |  Bin 657 -> 0 bytes
 console-proxy/images/play_button_hover.gif         |  Bin 243 -> 0 bytes
 console-proxy/images/right.png                     |  Bin 3131 -> 0 bytes
 console-proxy/images/right2.png                    |  Bin 3156 -> 0 bytes
 console-proxy/images/shrink_button.gif             |  Bin 655 -> 0 bytes
 console-proxy/images/shrink_button_hover.gif       |  Bin 243 -> 0 bytes
 console-proxy/images/stop_button.gif               |  Bin 649 -> 0 bytes
 console-proxy/images/stop_button_hover.gif         |  Bin 231 -> 0 bytes
 console-proxy/images/winlog.png                    |  Bin 2629 -> 0 bytes
 console-proxy/js/ajaxkeys.js                       |   77 -
 console-proxy/js/ajaxviewer.js                     | 1444 -----
 console-proxy/js/cloud.logger.js                   |  338 --
 console-proxy/js/handler.js                        |   72 -
 console-proxy/js/jquery.js                         |   19 -
 console-proxy/libexec/console-proxy-runner.in      |   90 -
 console-proxy/pom.xml                              |  246 -
 console-proxy/scripts/_run.sh                      |   63 -
 console-proxy/scripts/config_auth.sh               |   69 -
 console-proxy/scripts/config_ssl.sh                |  174 -
 console-proxy/scripts/ipfirewall.sh                |   50 -
 console-proxy/scripts/run-proxy.sh                 |   48 -
 console-proxy/scripts/run.bat                      |   18 -
 console-proxy/scripts/run.sh                       |   45 -
 console-proxy/scripts/ssvm-check.sh                |  136 -
 .../com/cloud/consoleproxy/AjaxFIFOImageCache.java |   83 -
 .../consoleproxy/AuthenticationException.java      |   33 -
 .../src/com/cloud/consoleproxy/ConsoleProxy.java   |  499 --
 .../consoleproxy/ConsoleProxyAjaxHandler.java      |  406 --
 .../consoleproxy/ConsoleProxyAjaxImageHandler.java |  159 -
 .../ConsoleProxyAuthenticationResult.java          |   81 -
 .../ConsoleProxyBaseServerFactoryImpl.java         |   48 -
 .../com/cloud/consoleproxy/ConsoleProxyClient.java |   69 -
 .../cloud/consoleproxy/ConsoleProxyClientBase.java |  457 --
 .../consoleproxy/ConsoleProxyClientListener.java   |   25 -
 .../consoleproxy/ConsoleProxyClientParam.java      |  110 -
 .../ConsoleProxyClientStatsCollector.java          |   88 -
 .../cloud/consoleproxy/ConsoleProxyCmdHandler.java |   70 -
 .../cloud/consoleproxy/ConsoleProxyGCThread.java   |  109 -
 .../ConsoleProxyHttpHandlerHelper.java             |   74 -
 .../consoleproxy/ConsoleProxyLoggerFactory.java    |   89 -
 .../cloud/consoleproxy/ConsoleProxyMonitor.java    |  153 -
 .../ConsoleProxyPasswordBasedEncryptor.java        |  142 -
 .../consoleproxy/ConsoleProxyResourceHandler.java  |  181 -
 .../ConsoleProxySecureServerFactoryImpl.java       |  145 -
 .../consoleproxy/ConsoleProxyServerFactory.java    |   29 -
 .../consoleproxy/ConsoleProxyThumbnailHandler.java |  212 -
 .../cloud/consoleproxy/ConsoleProxyVncClient.java  |  235 -
 .../src/com/cloud/consoleproxy/InputEventType.java |   58 -
 .../cloud/consoleproxy/util/ITileScanListener.java |   25 -
 .../com/cloud/consoleproxy/util/ImageHelper.java   |   32 -
 .../src/com/cloud/consoleproxy/util/Logger.java    |  223 -
 .../com/cloud/consoleproxy/util/LoggerFactory.java |   21 -
 .../src/com/cloud/consoleproxy/util/RawHTTP.java   |  249 -
 .../src/com/cloud/consoleproxy/util/Region.java    |   90 -
 .../cloud/consoleproxy/util/RegionClassifier.java  |   58 -
 .../src/com/cloud/consoleproxy/util/TileInfo.java  |   55 -
 .../com/cloud/consoleproxy/util/TileTracker.java   |  269 -
 .../consoleproxy/vnc/BufferedImageCanvas.java      |  150 -
 .../cloud/consoleproxy/vnc/FrameBufferCanvas.java  |   30 -
 .../vnc/FrameBufferUpdateListener.java             |   26 -
 .../vnc/PaintNotificationListener.java             |   27 -
 .../com/cloud/consoleproxy/vnc/RfbConstants.java   |   82 -
 .../src/com/cloud/consoleproxy/vnc/VncClient.java  |  451 --
 .../consoleproxy/vnc/VncClientPacketSender.java    |  258 -
 .../consoleproxy/vnc/VncScreenDescription.java     |   89 -
 .../consoleproxy/vnc/VncServerPacketReceiver.java  |  123 -
 .../vnc/packet/client/ClientPacket.java            |   26 -
 .../client/FramebufferUpdateRequestPacket.java     |   53 -
 .../vnc/packet/client/KeyboardEventPacket.java     |   42 -
 .../vnc/packet/client/MouseEventPacket.java        |   43 -
 .../vnc/packet/client/SetEncodingsPacket.java      |   45 -
 .../vnc/packet/client/SetPixelFormatPacket.java    |   75 -
 .../vnc/packet/server/AbstractRect.java            |   53 -
 .../consoleproxy/vnc/packet/server/CopyRect.java   |   39 -
 .../server/FrameBufferSizeChangeRequest.java       |   39 -
 .../vnc/packet/server/FramebufferUpdatePacket.java |  102 -
 .../consoleproxy/vnc/packet/server/RawRect.java    |   75 -
 .../cloud/consoleproxy/vnc/packet/server/Rect.java |   33 -
 .../vnc/packet/server/ServerCutText.java           |   49 -
 console-proxy/systemvm-descriptor.xml              |  113 -
 console-proxy/ui/viewer-bad-sid.ftl                |   29 -
 console-proxy/ui/viewer-connect-failed.ftl         |   29 -
 console-proxy/ui/viewer-update.ftl                 |   24 -
 console-proxy/ui/viewer.ftl                        |   60 -
 console-proxy/vm-script/vmops                      |  119 -
 core/pom.xml                                       |    8 +-
 .../virtualnetwork/VirtualRoutingResource.java     |   52 +-
 core/src/com/cloud/alert/AlertVO.java              |   38 +-
 core/src/com/cloud/event/EventVO.java              |  167 +-
 core/src/com/cloud/event/dao/EventDao.java         |    5 +
 core/src/com/cloud/event/dao/EventDaoImpl.java     |   71 +-
 .../cloud/hypervisor/HypervisorCapabilitiesVO.java |   12 +
 core/src/com/cloud/resource/DiskPreparer.java      |   42 -
 core/src/com/cloud/resource/NetworkPreparer.java   |   29 -
 .../storage/PrimaryStorageHeadResource.java        |   52 -
 core/src/com/cloud/storage/DiskOfferingVO.java     |    4 +
 core/src/com/cloud/storage/SnapshotVO.java         |   15 +-
 .../src/com/cloud/storage/StoragePoolDetailVO.java |   81 -
 .../com/cloud/storage/StoragePoolDiscoverer.java   |    2 +
 core/src/com/cloud/storage/StoragePoolVO.java      |  346 --
 core/src/com/cloud/storage/VMTemplateHostVO.java   |   41 +-
 .../com/cloud/storage/VMTemplateStoragePoolVO.java |   43 +-
 core/src/com/cloud/storage/VMTemplateVO.java       |   70 +-
 core/src/com/cloud/storage/VolumeHostVO.java       |   41 +-
 core/src/com/cloud/storage/VolumeVO.java           |    8 +-
 .../cloud/storage/template/RawImageProcessor.java  |    1 +
 core/src/com/cloud/vm/UserVmCloneSettingVO.java    |   50 +
 core/src/com/cloud/vm/VirtualEnvironment.java      |   46 -
 core/src/com/cloud/vm/VirtualNetwork.java          |   72 -
 core/src/com/cloud/vm/snapshot/VMSnapshotVO.java   |  224 +
 debian/README                                      |    6 -
 debian/changelog                                   |    6 +
 debian/cloud-agent-deps.install                    |   18 -
 debian/cloud-agent-libs.install                    |   19 -
 debian/cloud-agent.config                          |   17 -
 debian/cloud-agent.install                         |   25 -
 debian/cloud-agent.postinst                        |   34 -
 debian/cloud-cli.config                            |   17 -
 debian/cloud-cli.install                           |   21 -
 debian/cloud-client-ui.install                     |   19 -
 debian/cloud-client.config                         |   17 -
 debian/cloud-client.install                        |   58 -
 debian/cloud-client.postinst                       |   49 -
 debian/cloud-core.install                          |   19 -
 debian/cloud-deps.install                          |   34 -
 debian/cloud-management.config                     |   17 -
 debian/cloud-python.install                        |   18 -
 debian/cloud-scripts.install                       |   27 -
 debian/cloud-server.install                        |   32 -
 debian/cloud-setup.install                         |   25 -
 debian/cloud-system-iso.install                    |   18 -
 debian/cloud-usage.install                         |   23 -
 debian/cloud-usage.postinst                        |   47 -
 debian/cloud-utils.install                         |   22 -
 debian/cloudstack-agent.install                    |   26 +
 debian/cloudstack-agent.postinst                   |   40 +
 debian/cloudstack-awsapi.install                   |   18 +
 debian/cloudstack-cli.install                      |   16 +
 debian/cloudstack-common.install                   |   31 +
 debian/cloudstack-docs.install                     |   16 +
 debian/cloudstack-management.install               |   31 +
 debian/cloudstack-management.postinst              |   26 +
 debian/cloudstack-usage.install                    |   21 +
 debian/control                                     |  133 +-
 debian/rules                                       |  138 +-
 deps/XenServerJava/pom.xml                         |    2 +-
 deps/install-non-oss.sh                            |   15 +-
 developer/developer-prefill.sql                    |   20 +-
 developer/pom.xml                                  |  129 +-
 docs/.tx/config                                    | 1268 +++-
 docs/en-US/Developers_Guide.xml                    |    3 +-
 docs/en-US/accessing-vms.xml                       |    4 +-
 docs/en-US/add-clusters-ovm.xml                    |    6 +-
 docs/en-US/add-load-balancer-rule.xml              |   30 +-
 docs/en-US/add-remove-nic.xml                      |  127 +
 docs/en-US/added-API-commands-4-1.xml              |   69 +
 docs/en-US/added-error-codes.xml                   |    2 +-
 docs/en-US/advanced-zone-guest-ip-addresses.xml    |   12 +-
 docs/en-US/aws-ec2-configuration.xml               |    5 +-
 docs/en-US/aws-ec2-user-setup.xml                  |    4 +-
 docs/en-US/build-deb.xml                           |    2 +-
 docs/en-US/build-rpm.xml                           |  146 +-
 docs/en-US/building-documentation.xml              |   40 +
 docs/en-US/building-marvin.xml                     |    4 +-
 docs/en-US/building-translation.xml                |   75 +
 ...change-console-proxy-ssl-certificate-domain.xml |    4 +-
 .../change-network-offering-on-guest-network.xml   |    4 +-
 docs/en-US/changed-apicommands-4.1.xml             |  106 +
 docs/en-US/citrix-xenserver-installation.xml       |    8 +-
 docs/en-US/cloudmonkey.xml                         |  224 +
 docs/en-US/console-proxy.xml                       |  160 +-
 docs/en-US/create-bare-metal-template.xml          |    1 -
 docs/en-US/creating-network-offerings.xml          |  346 +-
 docs/en-US/creating-vms.xml                        |    2 +-
 docs/en-US/dedicated-ha-hosts.xml                  |    2 +-
 docs/en-US/deployment-architecture-overview.xml    |    3 +-
 docs/en-US/devcloud-usage-mode.xml                 |    4 +-
 docs/en-US/egress-firewall-rule.xml                |   98 +
 docs/en-US/event-framework.xml                     |  110 +
 docs/en-US/events.xml                              |   18 +-
 .../external-firewalls-and-load-balancers.xml      |    2 +-
 docs/en-US/firewall-rules.xml                      |  119 +-
 docs/en-US/getting-release.xml                     |   40 +-
 docs/en-US/globally-configured-limits.xml          |    2 +-
 docs/en-US/guest-traffic.xml                       |    9 +-
 docs/en-US/host-add.xml                            |    1 +
 docs/en-US/hypervisor-host-install-libvirt.xml     |   12 +-
 docs/en-US/images/egress-firewall-rule.png         |  Bin 0 -> 10413 bytes
 docs/en-US/images/resize-volume-icon.png           |  Bin 0 -> 857 bytes
 docs/en-US/images/resize-volume.png                |  Bin 0 -> 11995 bytes
 docs/en-US/installing-publican.xml                 |   46 +
 docs/en-US/ip-forwarding-firewalling.xml           |   44 +-
 docs/en-US/load-balancer-rules.xml                 |   22 +-
 docs/en-US/management-server-install-client.xml    |   28 +-
 .../management-server-install-db-external.xml      |    7 +-
 docs/en-US/management-server-install-db-local.xml  |   60 +-
 .../en-US/management-server-install-multi-node.xml |    4 +-
 .../en-US/management-server-install-nfs-shares.xml |    2 +-
 docs/en-US/management-server-install-systemvm.xml  |    2 +
 docs/en-US/network-offerings.xml                   |    2 +-
 docs/en-US/networks.xml                            |    4 +-
 docs/en-US/nfs-shares-on-management-server.xml     |    4 +-
 docs/en-US/ongoing-config-of-ext-firewalls-lb.xml  |   34 -
 .../ongoing-config-of-external-firewalls-lb.xml    |   46 +
 ...guration-of-external-firewalls-loadbalancer.xml |   46 -
 docs/en-US/persistent-network.xml                  |  100 +
 docs/en-US/plugin-niciranvp-devicemanagement.xml   |    4 +-
 docs/en-US/plugin-niciranvp-features.xml           |    8 +-
 docs/en-US/plugin-niciranvp-preparations.xml       |    6 +-
 docs/en-US/plugin-niciranvp-uuidreferences.xml     |    6 +-
 docs/en-US/prepare-system-vm-template.xml          |   29 +-
 docs/en-US/reserved-ip-addresses-non-csvms.xml     |  163 +
 docs/en-US/reset-ssh-key-dev.xml                   |   27 +
 docs/en-US/resizing-volumes.xml                    |   92 +-
 docs/en-US/security-groups.xml                     |    1 -
 docs/en-US/shared-networks.xml                     |    3 +-
 docs/en-US/site-to-site-vpn.xml                    |    3 +
 docs/en-US/source-prereqs.xml                      |   13 +-
 docs/en-US/source.xml                              |   18 +-
 .../en-US/sticky-session-policies-for-lb-rules.xml |   21 +-
 docs/en-US/tools.xml                               |    1 +
 docs/en-US/translating-documentation.xml           |   38 +
 ...pgrade-virtual-router-with-service-offering.xml |    5 +-
 docs/en-US/upload-existing-volume-to-vm.xml        |    6 +-
 docs/en-US/using-vpn-with-mac.xml                  |   15 +-
 docs/en-US/using-vpn-with-windows.xml              |   10 +-
 docs/en-US/verifying-source.xml                    |    4 +-
 docs/en-US/vlan-provisioning.xml                   |   23 +-
 docs/en-US/vmx-settings-dev.xml                    |   40 +
 docs/en-US/whats-new.xml                           |   72 +-
 docs/en-US/working-with-documentation.xml          |   32 +
 docs/en-US/working-with-snapshots.xml              |    4 +
 docs/en-US/working-with-system-vm.xml              |   56 +-
 docs/en-US/working-with-usage-data.xml             |    1 +
 docs/en-US/writing-new-documentation.xml           |  100 +
 docs/en-US/zone-add.xml                            |    2 +-
 docs/pot/Admin_Guide.pot                           |   40 +
 docs/pot/Author_Group.pot                          |   35 +
 docs/pot/Book_Info.pot                             |   45 +
 docs/pot/Book_Info_Release_Notes_4-0.pot           |   45 +
 docs/pot/CloudStack_Nicira_NVP_Guide.pot           |   40 +
 docs/pot/Common_Content/Legal_Notice.pot           |   50 +
 docs/pot/Developers_Guide.pot                      |   40 +
 docs/pot/Installation_Guide.pot                    |   40 +
 docs/pot/LDAPserver-for-user-authentication.pot    |   60 +
 docs/pot/Preface.pot                               |   30 +
 docs/pot/Release_Notes.pot                         | 4478 +++++++++++++++
 docs/pot/Revision_History.pot                      |   45 +
 docs/pot/Revision_History_Install_Guide.pot        |   65 +
 docs/pot/SSL-keystore-path-and-password.pot        |   35 +
 docs/pot/VPN-user-usage-record-format.pot          |   80 +
 docs/pot/about-clusters.pot                        |   60 +
 docs/pot/about-hosts.pot                           |  100 +
 docs/pot/about-password-encryption.pot             |   85 +
 docs/pot/about-physical-networks.pot               |   70 +
 docs/pot/about-pods.pot                            |   50 +
 docs/pot/about-primary-storage.pot                 |   60 +
 docs/pot/about-secondary-storage.pot               |   60 +
 docs/pot/about-security-groups.pot                 |   60 +
 docs/pot/about-virtual-networks.pot                |   35 +
 docs/pot/about-working-with-vms.pot                |   75 +
 docs/pot/about-zones.pot                           |  100 +
 docs/pot/accept-membership-invite.pot              |   65 +
 docs/pot/accessing-vms.pot                         |   75 +
 docs/pot/accounts-users-domains.pot                |  100 +
 docs/pot/accounts.pot                              |   30 +
 docs/pot/acquire-new-ip-address.pot                |   60 +
 docs/pot/acquire-new-ip-for-vpc.pot                |  115 +
 docs/pot/add-additional-guest-network.pot          |   80 +
 docs/pot/add-clusters-kvm-xenserver.pot            |   75 +
 docs/pot/add-clusters-ovm.pot                      |   85 +
 docs/pot/add-clusters-vsphere.pot                  |  125 +
 docs/pot/add-gateway-vpc.pot                       |  145 +
 docs/pot/add-ingress-egress-rules.pot              |  125 +
 docs/pot/add-iso.pot                               |  215 +
 docs/pot/add-load-balancer-rule.pot                |  110 +
 docs/pot/add-loadbalancer-rule-vpc.pot             |  180 +
 docs/pot/add-members-to-projects.pot               |   45 +
 docs/pot/add-more-clusters.pot                     |   35 +
 docs/pot/add-password-management-to-templates.pot  |   50 +
 docs/pot/add-portforward-rule-vpc.pot              |  155 +
 docs/pot/add-primary-storage.pot                   |  145 +
 docs/pot/add-projects-members-from-ui.pot          |   65 +
 docs/pot/add-secondary-storage.pot                 |   60 +
 docs/pot/add-security-group.pot                    |   75 +
 docs/pot/add-tier.pot                              |  125 +
 docs/pot/add-vm-to-tier.pot                        |   75 +
 docs/pot/add-vpc.pot                               |   85 +
 docs/pot/added-API-commands-4-0.pot                |  259 +
 docs/pot/added-API-commands.pot                    |  375 ++
 docs/pot/added-error-codes.pot                     |  330 ++
 .../adding-IP-addresses-for-the-public-network.pot |   85 +
 docs/pot/additional-installation-options.pot       |   35 +
 docs/pot/admin-alerts.pot                          |   60 +
 docs/pot/admin-guide.pot                           |   30 +
 docs/pot/adv-zone-topology-req.pot                 |   35 +
 docs/pot/advanced-zone-configuration.pot           |  345 ++
 docs/pot/advanced-zone-guest-ip-addresses.pot      |   35 +
 docs/pot/advanced-zone-network-traffic-types.pot   |   60 +
 ...dvanced-zone-physical-network-configuration.pot |   35 +
 docs/pot/advanced-zone-public-ip-addresses.pot     |   35 +
 docs/pot/alerts.pot                                |  165 +
 docs/pot/allocators.pot                            |   35 +
 docs/pot/api-calls.pot                             |   30 +
 docs/pot/api-overview.pot                          |   50 +
 docs/pot/api-reference.pot                         |   40 +
 docs/pot/asynchronous-commands-example.pot         |  166 +
 docs/pot/asynchronous-commands.pot                 |   55 +
 docs/pot/attach-iso-to-vm.pot                      |   55 +
 docs/pot/attaching-volume.pot                      |   65 +
 docs/pot/automatic-snapshot-creation-retention.pot |   45 +
 docs/pot/autoscale.pot                             |  270 +
 docs/pot/aws-api-examples.pot                      |  166 +
 docs/pot/aws-ec2-configuration.pot                 |  153 +
 docs/pot/aws-ec2-introduction.pot                  |   65 +
 docs/pot/aws-ec2-requirements.pot                  |   45 +
 docs/pot/aws-ec2-supported-commands.pot            |  665 +++
 docs/pot/aws-ec2-timeouts.pot                      |   80 +
 docs/pot/aws-ec2-user-setup.pot                    |  141 +
 docs/pot/aws-interface-compatibility.pot           |   30 +
 docs/pot/basic-adv-networking.pot                  |  195 +
 docs/pot/basic-zone-configuration.pot              |  360 ++
 docs/pot/basic-zone-guest-ip-addresses.pot         |   35 +
 docs/pot/basic-zone-network-traffic-types.pot      |   65 +
 .../basic-zone-physical-network-configuration.pot  |   35 +
 docs/pot/best-practices-for-vms.pot                |   35 +
 docs/pot/best-practices-primary-storage.pot        |   40 +
 docs/pot/best-practices-secondary-storage.pot      |   45 +
 docs/pot/best-practices-templates.pot              |   35 +
 docs/pot/best-practices-virtual-router.pot         |   40 +
 docs/pot/build-deb.pot                             |  175 +
 docs/pot/build-rpm.pot                             |  111 +
 docs/pot/building-devcloud.pot                     |   50 +
 docs/pot/building-marvin.pot                       |   91 +
 docs/pot/building-prerequisites.pot                |  116 +
 docs/pot/building-with-maven-deploy.pot            |   65 +
 docs/pot/building-with-maven-steps.pot             |   55 +
 docs/pot/building-with-maven.pot                   |   30 +
 docs/pot/castor-with-cs.pot                        |  123 +
 ...change-console-proxy-ssl-certificate-domain.pot |  120 +
 docs/pot/change-database-config.pot                |   35 +
 docs/pot/change-database-password.pot              |  126 +
 docs/pot/change-host-password.pot                  |   75 +
 .../change-network-offering-on-guest-network.pot   |   75 +
 docs/pot/change-to-behavior-of-list-commands.pot   |  170 +
 docs/pot/changed-apicommands-4-0.pot               |  575 ++
 docs/pot/changing-root-password.pot                |   80 +
 docs/pot/changing-secondary-storage-ip.pot         |   62 +
 docs/pot/changing-secondary-storage-servers.pot    |   60 +
 docs/pot/changing-service-offering-for-vm.pot      |   70 +
 docs/pot/changing-vm-name-os-group.pot             |   90 +
 docs/pot/choosing-a-deployment-architecture.pot    |   35 +
 docs/pot/cisco3750-hardware.pot                    |   76 +
 docs/pot/cisco3750-layer2.pot                      |   66 +
 docs/pot/citrix-xenserver-installation.pot         | 1195 ++++
 docs/pot/cloud-infrastructure-concepts.pot         |   30 +
 docs/pot/cloud-infrastructure-overview.pot         |   75 +
 docs/pot/cloudstack-api.pot                        |   50 +
 docs/pot/cloudstack.pot                            |   40 +
 docs/pot/cluster-add.pot                           |   35 +
 docs/pot/compatibility-matrix.pot                  |  115 +
 docs/pot/compute-disk-service-offerings.pot        |   95 +
 docs/pot/concepts.pot                              |   30 +
 docs/pot/configure-acl.pot                         |  165 +
 .../configure-guest-traffic-in-advanced-zone.pot   |   95 +
 docs/pot/configure-package-repository.pot          |  131 +
 ...onfigure-public-traffic-in-an-advanced-zone.pot |   35 +
 docs/pot/configure-snmp-rhel.pot                   |  143 +
 docs/pot/configure-usage-server.pot                |  230 +
 docs/pot/configure-virtual-router.pot              |   60 +
 docs/pot/configure-vpc.pot                         |   30 +
 docs/pot/configure-vpn.pot                         |  105 +
 docs/pot/configure-xenserver-dom0-memory.pot       |   35 +
 docs/pot/configuring-projects.pot                  |   35 +
 docs/pot/console-proxy.pot                         |   70 +
 docs/pot/convert-hyperv-vm-to-template.pot         |  170 +
 docs/pot/create-bare-metal-template.pot            |  110 +
 docs/pot/create-new-projects.pot                   |   70 +
 docs/pot/create-template-from-existing-vm.pot      |  105 +
 docs/pot/create-template-from-snapshot.pot         |   35 +
 docs/pot/create-templates-overview.pot             |   60 +
 docs/pot/create-vpn-connection-vpc.pot             |  160 +
 docs/pot/create-vpn-customer-gateway.pot           |  180 +
 docs/pot/create-vpn-gateway-for-vpc.pot            |  130 +
 docs/pot/create-vr-network-offering.pot            |  140 +
 docs/pot/create-windows-template.pot               |   75 +
 docs/pot/creating-compute-offerings.pot            |  125 +
 docs/pot/creating-disk-offerings.pot               |   95 +
 docs/pot/creating-network-offerings.pot            |  225 +
 docs/pot/creating-new-volumes.pot                  |   80 +
 docs/pot/creating-system-service-offerings.pot     |  130 +
 docs/pot/creating-vms.pot                          |   95 +
 docs/pot/customizing-dns.pot                       |   85 +
 docs/pot/database-replication.pot                  |  254 +
 docs/pot/dates-in-usage-record.pot                 |   50 +
 docs/pot/dedicated-ha-hosts.pot                    |   55 +
 docs/pot/default-account-resource-limit.pot        |   60 +
 docs/pot/default-template.pot                      |   79 +
 docs/pot/delete-reset-vpn.pot                      |  130 +
 docs/pot/delete-templates.pot                      |   40 +
 docs/pot/deleting-vms.pot                          |   60 +
 docs/pot/dell62xx-hardware.pot                     |   82 +
 docs/pot/dell62xx-layer2.pot                       |   75 +
 docs/pot/deployment-architecture-overview.pot      |   45 +
 docs/pot/detach-move-volumes.pot                   |   65 +
 docs/pot/devcloud-usage-mode.pot                   |   75 +
 docs/pot/devcloud.pot                              |   55 +
 docs/pot/developer-getting-started.pot             |   60 +
 docs/pot/developer-introduction.pot                |   30 +
 docs/pot/disable-enable-zones-pods-clusters.pot    |   85 +
 docs/pot/disk-volume-usage-record-format.pot       |  105 +
 docs/pot/dns-dhcp.pot                              |   35 +
 docs/pot/domains.pot                               |   35 +
 docs/pot/enable-disable-static-nat-vpc.pot         |  135 +
 docs/pot/enable-disable-static-nat.pot             |   75 +
 docs/pot/enable-security-groups.pot                |   35 +
 docs/pot/enabling-api-call-expiration.pot          |   70 +
 docs/pot/enabling-port-8096.pot                    |   55 +
 docs/pot/end-user-ui-overview.pot                  |   35 +
 docs/pot/error-handling.pot                        |   40 +
 docs/pot/event-log-queries.pot                     |   65 +
 docs/pot/event-types.pot                           |  575 ++
 docs/pot/events-log.pot                            |   35 +
 docs/pot/events.pot                                |   30 +
 docs/pot/example-LDAP-configuration-commands.pot   |   82 +
 .../pot/example-response-from-listUsageRecords.pot |   64 +
 docs/pot/export-template.pot                       |   35 +
 docs/pot/external-firewalls-and-load-balancers.pot |   35 +
 docs/pot/external-fw-topology-req.pot              |   35 +
 docs/pot/external-guest-firewall-integration.pot   |  251 +
 docs/pot/external-guest-lb-integration.pot         |  155 +
 docs/pot/extracting-source.pot                     |   50 +
 docs/pot/feature-overview.pot                      |  100 +
 docs/pot/firewall-rules.pot                        |  105 +
 docs/pot/first_ms_node_install.pot                 |   64 +
 docs/pot/generic-firewall-provisions.pot           |   50 +
 docs/pot/getting-release.pot                       |   60 +
 docs/pot/global-config.pot                         |   70 +
 docs/pot/globally-configured-limits.pot            |  175 +
 docs/pot/guest-ip-ranges.pot                       |   35 +
 docs/pot/guest-network.pot                         |   40 +
 docs/pot/guest-nw-usage-with-traffic-sentinel.pot  |   90 +
 docs/pot/guest-traffic.pot                         |   50 +
 docs/pot/ha-enabled-vm.pot                         |   40 +
 docs/pot/ha-for-hosts.pot                          |   40 +
 docs/pot/ha-management-server.pot                  |   45 +
 docs/pot/hardware-config-eg.pot                    |   35 +
 docs/pot/hardware-firewall.pot                     |   35 +
 docs/pot/host-add-vsphere.pot                      |   35 +
 docs/pot/host-add-xenserver-kvm-ovm.pot            |  210 +
 docs/pot/host-add.pot                              |   60 +
 docs/pot/host-allocation.pot                       |   50 +
 docs/pot/hypervisor-host-install-agent.pot         |   65 +
 docs/pot/hypervisor-host-install-finish.pot        |   35 +
 docs/pot/hypervisor-host-install-firewall.pot      |  160 +
 docs/pot/hypervisor-host-install-libvirt.pot       |  140 +
 ...hypervisor-host-install-network-openvswitch.pot |  263 +
 docs/pot/hypervisor-host-install-network.pot       |  313 +
 docs/pot/hypervisor-host-install-overview.pot      |   70 +
 docs/pot/hypervisor-host-install-prepare-os.pot    |  105 +
 .../hypervisor-host-install-security-policies.pot  |  145 +
 docs/pot/hypervisor-installation.pot               |   30 +
 docs/pot/hypervisor-kvm-install-flow.pot           |   30 +
 docs/pot/hypervisor-kvm-requirements.pot           |  115 +
 docs/pot/hypervisor-support-for-primarystorage.pot |  155 +
 docs/pot/import-ami.pot                            |  270 +
 docs/pot/increase-management-server-max-memory.pot |   70 +
 docs/pot/incremental-snapshots-backup.pot          |   70 +
 ...l-setup-of-external-firewalls-loadbalancers.pot |   65 +
 docs/pot/initialize-and-test.pot                   |  100 +
 docs/pot/install-usage-server.pot                  |  106 +
 docs/pot/installation-complete.pot                 |   50 +
 docs/pot/installation-steps-overview.pot           |  110 +
 docs/pot/installation.pot                          |   30 +
 docs/pot/installation_steps_overview.pot           |  135 +
 docs/pot/inter-vlan-routing.pot                    |  120 +
 docs/pot/introduction.pot                          |   30 +
 docs/pot/ip-forwarding-firewalling.pot             |   45 +
 docs/pot/ip-load-balancing.pot                     |   55 +
 docs/pot/ipaddress-usage-record-format.pot         |   95 +
 docs/pot/isolated-networks.pot                     |   50 +
 docs/pot/job-status.pot                            |   50 +
 docs/pot/kvm-topology-req.pot                      |   35 +
 docs/pot/large_scale_redundant_setup.pot           |   70 +
 docs/pot/layer2-switch.pot                         |   55 +
 .../lb-policy-pfwd-rule-usage-record-format.pot    |   80 +
 docs/pot/linux-installation.pot                    |  101 +
 docs/pot/load-balancer-rules.pot                   |   40 +
 docs/pot/log-in-root-admin.pot                     |   85 +
 docs/pot/log-in.pot                                |   90 +
 docs/pot/long-running-job-events.pot               |   65 +
 docs/pot/maintain-hypervisors-on-hosts.pot         |   45 +
 docs/pot/maintenance-mode-for-primary-storage.pot  |   35 +
 docs/pot/making-api-request.pot                    |  105 +
 docs/pot/manage-cloud.pot                          |   30 +
 docs/pot/management-server-install-client.pot      |   95 +
 docs/pot/management-server-install-complete.pot    |   50 +
 docs/pot/management-server-install-db-external.pot |  219 +
 docs/pot/management-server-install-db-local.pot    |  198 +
 docs/pot/management-server-install-db.pot          |   40 +
 docs/pot/management-server-install-flow.pot        |   30 +
 docs/pot/management-server-install-multi-node.pot  |  110 +
 docs/pot/management-server-install-nfs-shares.pot  |   70 +
 docs/pot/management-server-install-overview.pot    |   95 +
 docs/pot/management-server-install-prepare-os.pot  |  105 +
 docs/pot/management-server-install-systemvm.pot    |  111 +
 docs/pot/management-server-lb.pot                  |  105 +
 docs/pot/management-server-overview.pot            |   85 +
 docs/pot/manual-live-migration.pot                 |   95 +
 docs/pot/marvin.pot                                |   45 +
 docs/pot/max-result-page-returned.pot              |   60 +
 .../migrate-datadisk-volume-new-storage-pool.pot   |   55 +
 ...grate-vm-rootvolume-volume-new-storage-pool.pot |   65 +
 docs/pot/minimum-system-requirements.pot           |  150 +
 docs/pot/modify-delete-service-offerings.pot       |   40 +
 docs/pot/multi_node_management_server.pot          |   55 +
 docs/pot/multi_node_overview.pot                   |   75 +
 docs/pot/multi_site_deployment.pot                 |   65 +
 docs/pot/multiple-system-vm-vmware.pot             |   35 +
 docs/pot/network-offering-usage-record-format.pot  |   90 +
 docs/pot/network-offerings.pot                     |  115 +
 docs/pot/network-rate.pot                          |  195 +
 docs/pot/network-service-providers.pot             |   60 +
 docs/pot/network-setup.pot                         |   35 +
 docs/pot/network-usage-record-format.pot           |   85 +
 docs/pot/networking-in-a-pod.pot                   |   60 +
 docs/pot/networking-in-a-zone.pot                  |   45 +
 docs/pot/networking-overview.pot                   |   50 +
 docs/pot/networking_overview.pot                   |   50 +
 docs/pot/networks-for-users-overview.pot           |   60 +
 docs/pot/networks.pot                              |   35 +
 docs/pot/nfs-shares-on-management-server.pot       |  240 +
 docs/pot/nfs-shares-on-separate-server.pot         |  108 +
 docs/pot/offerings.pot                             |   35 +
 .../ongoing-config-of-external-firewalls-lb.pot    |   55 +
 .../over-provisioning-service-offering-limits.pot  |   50 +
 docs/pot/ovm-install.pot                           |   35 +
 docs/pot/ovm-requirements.pot                      |   35 +
 docs/pot/per-domain-limits.pot                     |   60 +
 docs/pot/performance-monitoring.pot                |   35 +
 .../physical-network-configuration-settings.pot    |   70 +
 docs/pot/plugin-niciranvp-about.pot                |   30 +
 docs/pot/plugin-niciranvp-devicemanagement.pot     |   85 +
 docs/pot/plugin-niciranvp-features.pot             |   55 +
 docs/pot/plugin-niciranvp-guide.pot                |   30 +
 docs/pot/plugin-niciranvp-introduction.pot         |   35 +
 docs/pot/plugin-niciranvp-preparations.pot         |   75 +
 docs/pot/plugin-niciranvp-provider.pot             |   65 +
 docs/pot/plugin-niciranvp-revisions.pot            |   45 +
 docs/pot/plugin-niciranvp-tables.pot               |   90 +
 docs/pot/plugin-niciranvp-troubleshooting.pot      |   30 +
 docs/pot/plugin-niciranvp-ui.pot                   |   35 +
 docs/pot/plugin-niciranvp-usage.pot                |   30 +
 docs/pot/plugin-niciranvp-uuidreferences.pot       |   50 +
 docs/pot/pod-add.pot                               |   85 +
 docs/pot/port-forwarding.pot                       |  115 +
 docs/pot/prepare-system-vm-template.pot            |  116 +
 docs/pot/primary-storage-add.pot                   |  190 +
 docs/pot/primary-storage-outage-and-data-loss.pot  |   35 +
 docs/pot/primary-storage.pot                       |   40 +
 docs/pot/private-public-template.pot               |   45 +
 docs/pot/projects-overview.pot                     |   50 +
 docs/pot/projects.pot                              |   30 +
 docs/pot/provisioning-auth-api.pot                 |   40 +
 docs/pot/provisioning-steps-overview.pot           |   85 +
 docs/pot/provisioning-steps.pot                    |   35 +
 docs/pot/query-filter.pot                          |  115 +
 docs/pot/re-install-hosts.pot                      |   35 +
 docs/pot/release-ip-address.pot                    |   60 +
 docs/pot/release-ip-for-vpc.pot                    |  115 +
 docs/pot/remove-member-from-project.pot            |   75 +
 docs/pot/remove-tier.pot                           |   75 +
 docs/pot/remove-vpc.pot                            |   75 +
 docs/pot/removed-API-commands.pot                  |   40 +
 docs/pot/removing-hosts.pot                        |   35 +
 docs/pot/removing-vsphere-hosts.pot                |   35 +
 docs/pot/removing-xenserver-kvm-hosts.pot          |   60 +
 docs/pot/requirements-templates.pot                |   40 +
 docs/pot/resizing-volumes.pot                      |   70 +
 docs/pot/response-formats.pot                      |   79 +
 docs/pot/responses.pot                             |   30 +
 docs/pot/roles.pot                                 |   50 +
 docs/pot/root-admin-ui-overview.pot                |   35 +
 ...untime-allocation-virtual-network-resources.pot |   35 +
 docs/pot/runtime-behavior-of-primary-storage.pot   |   45 +
 docs/pot/runtime-internal-comm-req.pot             |   45 +
 ...cheduled-maintenance-maintenance-mode-hosts.pot |   35 +
 docs/pot/search-base.pot                           |   65 +
 docs/pot/search-user-bind-dn.pot                   |   65 +
 docs/pot/secondary-storage-add.pot                 |   95 +
 .../pot/secondary-storage-outage-and-data-loss.pot |   40 +
 docs/pot/secondary-storage-vm.pot                  |   50 +
 docs/pot/secondary-storage.pot                     |   40 +
 docs/pot/security-groups.pot                       |   30 +
 docs/pot/security-req.pot                          |   35 +
 docs/pot/send-projects-membership-invitation.pot   |   85 +
 docs/pot/separate_storage_network.pot              |   35 +
 docs/pot/service-offerings.pot                     |   50 +
 docs/pot/set-database-buffer-pool-size.pot         |   70 +
 docs/pot/set-global-project-resource-limits.pot    |  110 +
 docs/pot/set-monitor-total-vm-limits-per-host.pot  |   35 +
 docs/pot/set-per-project-resource-limits.pot       |   75 +
 docs/pot/set-projects-creator-permissions.pot      |   75 +
 docs/pot/set-resource-limits-for-projects.pot      |   35 +
 docs/pot/set-up-invitations.pot                    |  160 +
 docs/pot/set-up-network-for-users.pot              |   30 +
 docs/pot/set-usage-limit.pot                       |   60 +
 docs/pot/set-zone-vlan-run-vm-max.pot              |  115 +
 docs/pot/shared-networks.pot                       |   60 +
 docs/pot/signing-api-requests.pot                  |  140 +
 docs/pot/site-to-site-vpn.pot                      |   85 +
 docs/pot/small_scale_deployment.pot                |   55 +
 docs/pot/snapshot-restore.pot                      |   35 +
 docs/pot/source-build.pot                          |   85 +
 docs/pot/source-prereqs.pot                        |   60 +
 docs/pot/source.pot                                |   45 +
 docs/pot/ssl.pot                                   |   40 +
 docs/pot/standard-events.pot                       |   65 +
 docs/pot/static-nat.pot                            |   35 +
 docs/pot/sticky-session-policies-for-lb-rules.pot  |   45 +
 docs/pot/stop-restart-management-server.pot        |   65 +
 docs/pot/stopped-vm.pot                            |   60 +
 docs/pot/stopping-and-starting-vms.pot             |   35 +
 docs/pot/storage-nw-topology-req.pot               |   35 +
 docs/pot/storage-overview.pot                      |   40 +
 docs/pot/storage-tags.pot                          |   40 +
 docs/pot/storage.pot                               |   30 +
 docs/pot/suspend-project.pot                       |   80 +
 docs/pot/sys-offering-sysvm.pot                    |  130 +
 docs/pot/sys-reliability-and-ha.pot                |   30 +
 docs/pot/sysprep-for-windows-server-2003R2.pot     |  160 +
 docs/pot/sysprep-windows-server-2008R2.pot         |  147 +
 docs/pot/system-reserved-ip-addresses.pot          |   95 +
 docs/pot/system-service-offerings.pot              |   40 +
 docs/pot/system-vm-template.pot                    |   70 +
 docs/pot/tagging-resources.pot                     |  140 +
 .../template-iso-snapshot-usage-record-format.pot  |   95 +
 docs/pot/templates.pot                             |   30 +
 docs/pot/time-zones.pot                            |  330 ++
 docs/pot/tools.pot                                 |   30 +
 docs/pot/topology-req.pot                          |   30 +
 docs/pot/troubleshooting-alerts.pot                |   68 +
 docs/pot/troubleshooting-lb-rules-fails.pot        |   60 +
 ...troubleshooting-recover-lost-virtual-router.pot |   85 +
 docs/pot/troubleshooting-unable-to-deploy-vms.pot  |   60 +
 docs/pot/troubleshooting-unable-to-power-on-vm.pot |   80 +
 .../troubleshooting-working-with-server-logs.pot   |   76 +
 docs/pot/troubleshooting.pot                       |   30 +
 .../troublesht-dataloss-on-exp-primary-storage.pot |   80 +
 .../troublesht-mtn-mode-not-working-on-vCenter.pot |   70 +
 docs/pot/tuning.pot                                |   35 +
 docs/pot/ui.pot                                    |   30 +
 ...pgrade-virtual-router-with-service-offering.pot |   50 +
 docs/pot/upload-existing-volume-to-vm.pot          |  150 +
 docs/pot/upload-template.pot                       |  130 +
 docs/pot/usage-record-format.pot                   |   30 +
 docs/pot/usage-types.pot                           |  245 +
 docs/pot/use-project-view.pot                      |   60 +
 docs/pot/user-data-and-meta-data.pot               |  100 +
 docs/pot/user-services-overview.pot                |   70 +
 docs/pot/using-multiple-guest-networks.pot         |   50 +
 docs/pot/using-netscaler-load-balancers.pot        |  110 +
 docs/pot/using-sshkeys.pot                         |  238 +
 docs/pot/using-swift-for-secondary-storage.pot     |   40 +
 docs/pot/using-vpn-with-mac.pot                    |   35 +
 docs/pot/using-vpn-with-windows.pot                |   95 +
 docs/pot/vcenter-maintenance-mode.pot              |   80 +
 docs/pot/verifying-source.pot                      |  115 +
 docs/pot/virtual-machine-usage-record-format.pot   |  110 +
 docs/pot/virtual-machines.pot                      |   30 +
 docs/pot/virtual-router.pot                        |   40 +
 docs/pot/vlan-allocation-eg.pot                    |  130 +
 docs/pot/vlan-provisioning.pot                     |   45 +
 docs/pot/vm-lifecycle.pot                          |   75 +
 docs/pot/vm-storage-migration.pot                  |   50 +
 docs/pot/vmware-install.pot                        |  618 ++
 docs/pot/vmware-requirements.pot                   |  210 +
 docs/pot/vmware-topology-req.pot                   |   45 +
 docs/pot/volume-deletion-garbage-collection.pot    |   60 +
 docs/pot/volume-status.pot                         |   40 +
 docs/pot/vpc.pot                                   |  240 +
 docs/pot/vpn.pot                                   |   50 +
 docs/pot/whatis.pot                                |   50 +
 docs/pot/whats-in-this-adminguide.pot              |   35 +
 docs/pot/whats-new.pot                             |   45 +
 docs/pot/who-should-read-installation.pot          |   35 +
 docs/pot/windows-installation.pot                  |   35 +
 docs/pot/work-with-usage.pot                       |   45 +
 docs/pot/working-with-hosts.pot                    |   40 +
 docs/pot/working-with-iso.pot                      |   50 +
 docs/pot/working-with-snapshots.pot                |   55 +
 docs/pot/working-with-system-vm.pot                |   35 +
 docs/pot/working-with-templates.pot                |   45 +
 docs/pot/working-with-usage-data.pot               |   45 +
 docs/pot/working-with-volumes.pot                  |   45 +
 docs/pot/xenserver-maintenance-mode.pot            |   85 +
 docs/pot/xenserver-topology-req.pot                |   35 +
 docs/pot/zone-add.pot                              |  155 +
 docs/publican-cloudstack/defaults.cfg              |    2 +-
 docs/publican-cloudstack/en-US/Legal_Notice.xml    |    9 +
 .../en-US/images/title_logo.svg                    |   32 +-
 docs/publican-cloudstack/publican-cloudstack.spec  |    6 +-
 docs/settx.sh                                      |   23 +
 engine/api/pom.xml                                 |    4 +-
 .../cloud/entity/api/VirtualMachineEntity.java     |    4 +-
 .../engine/subsystem/api/storage/ClusterScope.java |   14 +-
 .../subsystem/api/storage/CopyCommandResult.java   |   10 +-
 .../engine/subsystem/api/storage/DataObject.java   |    1 +
 .../subsystem/api/storage/DataObjectInStore.java   |   27 +
 .../engine/subsystem/api/storage/DataStore.java    |    3 +
 .../subsystem/api/storage/DataStoreDriver.java     |    1 +
 .../subsystem/api/storage/DataStoreLifeCycle.java  |   14 +-
 .../subsystem/api/storage/DataStoreManager.java    |   31 +
 .../subsystem/api/storage/DataStoreProvider.java   |   30 +
 .../api/storage/DataStoreProviderManager.java      |   31 +
 .../subsystem/api/storage/DataStoreStatus.java     |   23 +
 .../engine/subsystem/api/storage/HostScope.java    |    6 +-
 .../api/storage/HypervisorHostListener.java        |   24 +
 .../subsystem/api/storage/ImageDataFactory.java    |   26 +
 .../engine/subsystem/api/storage/ImageService.java |   29 +
 .../api/storage/ObjectInDataStoreStateMachine.java |   56 +
 .../api/storage/PrimaryDataStoreDriver.java        |   26 +
 .../api/storage/PrimaryDataStoreInfo.java          |   14 +-
 .../engine/subsystem/api/storage/Scope.java        |    2 +-
 .../subsystem/api/storage/SnapshotDataFactory.java |   26 +
 .../engine/subsystem/api/storage/SnapshotInfo.java |   28 +
 .../subsystem/api/storage/SnapshotStrategy.java    |   27 +
 .../api/storage/StoragePoolAllocator.java          |   45 +
 .../subsystem/api/storage/TemplateEvent.java       |   26 +
 .../engine/subsystem/api/storage/TemplateInfo.java |   22 +
 .../subsystem/api/storage/TemplateState.java       |   27 +
 .../subsystem/api/storage/VolumeDataFactory.java   |   26 +
 .../engine/subsystem/api/storage/VolumeInfo.java   |    9 +-
 .../subsystem/api/storage/VolumeService.java       |   80 +
 .../engine/subsystem/api/storage/ZoneScope.java    |    6 +-
 .../storage/datastore/db/DataStoreProviderDao.java |   25 +
 .../datastore/db/DataStoreProviderDaoImpl.java     |   38 +
 .../storage/datastore/db/DataStoreProviderVO.java  |   60 +
 .../storage/datastore/db/PrimaryDataStoreDao.java  |  112 +
 .../datastore/db/PrimaryDataStoreDaoImpl.java      |  430 ++
 .../datastore/db/PrimaryDataStoreDetailVO.java     |   79 +
 .../datastore/db/PrimaryDataStoreDetailsDao.java   |   27 +
 .../db/PrimaryDataStoreDetailsDaoImpl.java         |   71 +
 .../storage/datastore/db/StoragePoolDetailVO.java  |   81 +
 .../datastore/db/StoragePoolDetailsDao.java        |   28 +
 .../storage/datastore/db/StoragePoolVO.java        |  311 +
 engine/components-api/pom.xml                      |    2 +-
 engine/compute/pom.xml                             |    2 +-
 engine/network/pom.xml                             |    2 +-
 engine/orchestration/pom.xml                       |    2 +-
 .../engine/cloud/entity/api/VMEntityManager.java   |    5 +-
 .../cloud/entity/api/VMEntityManagerImpl.java      |   30 +-
 .../entity/api/VirtualMachineEntityFactory.java    |    3 +-
 .../cloud/entity/api/VirtualMachineEntityImpl.java |   15 +-
 .../cloud/entity/api/db/dao/VMEntityDaoImpl.java   |    8 +-
 .../entity/api/db/dao/VMReservationDaoImpl.java    |    2 +-
 .../entity/api/db/EngineDataCenterVO.java          |   28 +-
 .../platform/orchestration/CloudOrchestrator.java  |   32 +-
 .../engine/provisioning/test/ProvisioningTest.java |    2 +-
 engine/pom.xml                                     |    2 +-
 engine/schema/pom.xml                              |    2 +-
 engine/service/pom.xml                             |    4 +-
 engine/storage/backup/pom.xml                      |    2 +-
 .../cloudstack/storage/backup/BackupService.java   |    2 +-
 engine/storage/image/pom.xml                       |    2 +-
 .../storage/image/ImageDataFactoryImpl.java        |   56 +-
 .../cloudstack/storage/image/ImageServiceImpl.java |   95 +-
 .../storage/image/downloader/ImageDownloader.java  |    2 +-
 .../driver/AncientImageDataStoreDriverImpl.java    |  250 +
 .../driver/DefaultImageDataStoreDriverImpl.java    |   13 +-
 .../storage/image/manager/ImageDataManager.java    |    8 +-
 .../image/manager/ImageDataManagerImpl.java        |   12 +-
 .../image/manager/ImageDataStoreManagerImpl.java   |   38 +-
 .../image/store/AncientImageDataStoreProvider.java |   92 +
 .../image/store/DefaultImageDataStoreImpl.java     |  145 +
 .../image/store/DefaultImageDataStoreProvider.java |    2 -
 .../storage/image/store/HttpDataStoreImpl.java     |  144 -
 .../storage/image/store/TemplateObject.java        |   84 +-
 .../lifecycle/DefaultImageDataStoreLifeCycle.java  |   23 +-
 engine/storage/imagemotion/pom.xml                 |    2 +-
 .../image/motion/DefaultImageMotionStrategy.java   |   15 +-
 .../image/motion/ImageMotionServiceImpl.java       |   12 +-
 engine/storage/integration-test/pom.xml            |   25 +-
 .../storage/allocator/StorageAllocatorTest.java    |  439 ++
 .../StorageAllocatorTestConfiguration.java         |   73 +
 .../storage/test/ChildTestConfiguration.java       |  236 +-
 .../storage/test/DirectAgentManagerSimpleImpl.java |    6 +
 .../cloudstack/storage/test/DirectAgentTest.java   |    2 +-
 .../storage/test/MockStorageMotionStrategy.java    |   42 +
 .../cloudstack/storage/test/TestConfiguration.java |    8 -
 .../cloudstack/storage/test/volumeServiceTest.java |   67 +-
 .../test/resource/StorageAllocatorTestContext.xml  |   45 +
 .../integration-test/test/resource/component.xml   |  201 +
 .../test/resource/storageContext.xml               |   49 +-
 engine/storage/pom.xml                             |    2 +-
 engine/storage/snapshot/pom.xml                    |   10 +-
 .../storage/snapshot/SnapshotDataFactoryImpl.java  |   53 +-
 .../storage/snapshot/SnapshotObject.java           |  163 +-
 .../storage/snapshot/SnapshotServiceImpl.java      |    7 +
 .../snapshot/SnapshotStateMachineManager.java      |   26 +
 .../snapshot/SnapshotStateMachineManagerImpl.java  |   54 +
 .../snapshot/strategy/AncientSnasphotStrategy.java |  608 ++
 .../snapshot/strategy/HypervisorBasedSnapshot.java |   44 -
 .../snapshot/strategy/StorageBasedSnapshot.java    |   42 -
 .../test/resource/SnapshotManagerTestContext.xml   |   42 +
 .../snapshot/test/src/SnapshotDataFactoryTest.java |   50 +
 .../storage/HypervsiorHostEndPointRpcServer.java   |   10 +-
 .../allocator/AbstractStoragePoolAllocator.java    |  192 +
 .../ClusterScopeStoragePoolAllocator.java          |  105 +
 .../GarbageCollectingStoragePoolAllocator.java     |   91 +
 .../allocator/LocalStoragePoolAllocator.java       |  126 +
 .../allocator/UseLocalForRootAllocator.java        |   61 +
 .../allocator/ZoneWideStoragePoolAllocator.java    |   80 +
 .../storage/datastore/DataObjectManagerImpl.java   |   76 +-
 .../storage/datastore/DataStoreManager.java        |   29 -
 .../storage/datastore/DataStoreManagerImpl.java    |   20 +
 .../storage/datastore/DataStoreStatus.java         |   23 -
 .../datastore/ObjectInDataStoreManager.java        |   18 +-
 .../datastore/ObjectInDataStoreManagerImpl.java    |  185 +-
 .../storage/datastore/PrimaryDataStore.java        |   25 +-
 .../datastore/PrimaryDataStoreEntityImpl.java      |   23 +-
 .../datastore/PrimaryDataStoreProviderManager.java |    5 +-
 .../storage/datastore/VolumeDataFactory.java       |   26 -
 .../storage/datastore/db/DataStoreProviderDao.java |   25 -
 .../datastore/db/DataStoreProviderDaoImpl.java     |   38 -
 .../storage/datastore/db/DataStoreProviderVO.java  |   60 -
 .../storage/datastore/db/PrimaryDataStoreDao.java  |  116 -
 .../datastore/db/PrimaryDataStoreDaoImpl.java      |  360 --
 .../datastore/db/PrimaryDataStoreDetailVO.java     |   79 -
 .../datastore/db/PrimaryDataStoreDetailsDao.java   |   28 -
 .../db/PrimaryDataStoreDetailsDaoImpl.java         |   71 -
 .../storage/datastore/db/PrimaryDataStoreVO.java   |  267 -
 .../datastore/provider/DataStoreProvider.java      |   32 -
 .../provider/DataStoreProviderManager.java         |   30 -
 .../provider/DataStoreProviderManagerImpl.java     |   30 +-
 .../datastore/provider/ImageDataStoreProvider.java |    2 +
 .../provider/PrimaryDataStoreProvider.java         |    2 +
 .../storage/db/ObjectInDataStoreDao.java           |    6 +-
 .../storage/db/ObjectInDataStoreDaoImpl.java       |   13 +-
 .../cloudstack/storage/db/ObjectInDataStoreVO.java |   39 +-
 .../cloudstack/storage/image/ImageDataFactory.java |   25 -
 .../cloudstack/storage/image/ImageService.java     |   28 -
 .../storage/image/TemplateEntityImpl.java          |    1 +
 .../cloudstack/storage/image/TemplateEvent.java    |   26 -
 .../cloudstack/storage/image/TemplateInfo.java     |   27 -
 .../cloudstack/storage/image/TemplateState.java    |   27 -
 .../storage/image/datastore/ImageDataStore.java    |    4 +-
 .../image/datastore/ImageDataStoreHelper.java      |   16 +-
 .../image/datastore/ImageDataStoreManager.java     |    5 +
 .../cloudstack/storage/image/db/ImageDataDao.java  |   85 -
 .../storage/image/db/ImageDataDaoImpl.java         |  975 ----
 .../cloudstack/storage/image/db/ImageDataVO.java   |  450 --
 .../storage/image/motion/ImageMotionService.java   |    2 +-
 .../storage/motion/AncientDataMotionStrategy.java  |  725 +++
 .../storage/snapshot/SnapshotDataFactory.java      |   25 -
 .../storage/snapshot/SnapshotEntityImpl.java       |   13 +-
 .../cloudstack/storage/snapshot/SnapshotInfo.java  |   26 -
 .../storage/snapshot/SnapshotService.java          |    1 +
 .../storage/snapshot/SnapshotStrategy.java         |   23 -
 .../cloudstack/storage/to/PrimaryDataStoreTO.java  |    4 +-
 .../apache/cloudstack/storage/to/TemplateTO.java   |    2 +-
 .../volume/ObjectInDataStoreStateMachine.java      |   54 -
 .../storage/volume/PrimaryDataStoreDriver.java     |   29 -
 .../volume/TemplateOnPrimaryDataStoreInfo.java     |    2 +-
 .../cloudstack/storage/volume/VolumeService.java   |   91 -
 .../volume/datastore/PrimaryDataStoreHelper.java   |   28 +-
 .../volume/db/TemplatePrimaryDataStoreDao.java     |    2 +-
 .../volume/db/TemplatePrimaryDataStoreDaoImpl.java |    6 +-
 .../volume/db/TemplatePrimaryDataStoreVO.java      |    4 +-
 .../storage/volume/db/VolumeDao2Impl.java          |    5 +-
 engine/storage/volume/pom.xml                      |    2 +-
 .../storage/datastore/DefaultPrimaryDataStore.java |  193 +-
 .../driver/AncientPrimaryDataStoreDriverImpl.java  |  362 ++
 .../driver/DefaultPrimaryDataStoreDriverImpl.java  |   25 +-
 .../AncientPrimaryDataStoreLifeCycleImpl.java      |  963 ++++
 .../DefaultPrimaryDataStoreLifeCycleImpl.java      |   31 +-
 ...DefaultPrimaryDataStoreProviderManagerImpl.java |   36 +-
 .../storage/datastore/manager/data model.ucls      |   38 +-
 .../AncientPrimaryDataStoreProviderImpl.java       |   78 +
 .../datastore/provider/DefaultHostListener.java    |   90 +
 .../DefaultPrimaryDatastoreProviderImpl.java       |    6 +-
 .../storage/volume/TemplateInstallStrategy.java    |    2 +-
 .../volume/TemplateInstallStrategyImpl.java        |   33 +-
 .../storage/volume/VolumeDataFactoryImpl.java      |   42 +-
 .../storage/volume/VolumeEntityImpl.java           |   13 +-
 .../cloudstack/storage/volume/VolumeManager.java   |   45 -
 .../storage/volume/VolumeManagerImpl.java          |  112 -
 .../cloudstack/storage/volume/VolumeObject.java    |  206 +-
 .../storage/volume/VolumeServiceImpl.java          |  463 ++-
 framework/api/pom.xml                              |   42 +
 .../framework/async/AsyncCallFuture.java           |   84 +
 .../framework/async/AsyncCompletionCallback.java   |   23 +
 framework/events/pom.xml                           |    4 +-
 .../cloudstack/framework/events/EventBus.java      |    4 +-
 framework/ipc/pom.xml                              |    7 +-
 .../framework/async/AsyncCallFuture.java           |   84 -
 .../framework/async/AsyncCompletionCallback.java   |   23 -
 framework/jobs/pom.xml                             |    2 +-
 framework/pom.xml                                  |    5 +-
 framework/rest/pom.xml                             |  114 +-
 packaging/centos63/cloud-agent.rc                  |  102 +-
 packaging/centos63/cloud-management.rc             |    8 +-
 packaging/centos63/cloud-management.sysconfig      |    2 +-
 packaging/centos63/cloud-usage.rc                  |   12 +-
 packaging/centos63/cloud.spec                      |  404 +-
 packaging/centos63/package.sh                      |   12 +-
 packaging/centos63/replace.properties              |   33 +-
 packaging/debian/init/cloud-agent                  |  171 +
 packaging/debian/init/cloud-management             |  244 +
 packaging/debian/init/cloud-usage                  |  131 +
 packaging/debian/replace.properties                |   32 +-
 parent/pom.xml                                     |   86 -
 patches/pom.xml                                    |    2 +-
 .../debian/config/etc/init.d/cloud-early-config    |  105 +-
 .../systemvm/debian/config/etc/logrotate.d/dnsmasq |    2 +-
 .../debian/config/opt/cloud/bin/vpc_guestnw.sh     |   12 +
 .../debian/config/opt/cloud/bin/vpc_ipassoc.sh     |   12 +
 patches/systemvm/debian/config/root/edithosts.sh   |   31 +-
 patches/systemvm/debian/config/root/func.sh        |   13 +-
 .../root/redundant_router/arping_gateways.sh.templ |    4 +-
 .../config/root/redundant_router/backup.sh.templ   |    1 +
 plugins/acl/static-role-based/pom.xml              |    2 +-
 plugins/api/discovery/pom.xml                      |    2 +-
 .../discovery/ApiDiscoveryServiceImpl.java         |   22 +-
 .../cloudstack/discovery/ApiDiscoveryTest.java     |   20 +-
 plugins/api/rate-limit/pom.xml                     |    2 +-
 .../command/admin/ratelimit/ResetApiLimitCmd.java  |    9 +
 .../api/command/user/ratelimit/GetApiLimitCmd.java |   11 +
 .../cloudstack/ratelimit/ApiRateLimitService.java  |    3 +-
 .../ratelimit/ApiRateLimitServiceImpl.java         |   42 +-
 .../cloudstack/ratelimit/EhcacheLimitStore.java    |    1 -
 .../apache/cloudstack/ratelimit/LimitStore.java    |    1 -
 .../apache/cloudstack/ratelimit/StoreEntry.java    |    1 -
 .../cloudstack/ratelimit/StoreEntryImpl.java       |    1 -
 .../cloudstack/ratelimit/ApiRateLimitTest.java     |   33 +
 .../cloudstack/ratelimit/integration/APITest.java  |    2 -
 .../ratelimit/integration/LoginResponse.java       |    2 -
 .../integration/RateLimitIntegrationTest.java      |    3 -
 .../user-concentrated-pod/pom.xml                  |    2 +-
 .../deployment-planners/user-dispersing/pom.xml    |    2 +-
 plugins/event-bus/rabbitmq/pom.xml                 |    2 +-
 .../cloudstack/mom/rabbitmq/RabbitMQEventBus.java  |  111 +-
 plugins/file-systems/netapp/pom.xml                |    2 +-
 .../netapp/src/com/cloud/netapp/NetappManager.java |    3 +-
 .../src/com/cloud/netapp/NetappManagerImpl.java    |   22 +-
 plugins/host-allocators/random/pom.xml             |    2 +-
 plugins/hypervisors/baremetal/pom.xml              |    2 +-
 .../cloud/baremetal/database/BaremetalCmdbDao.java |   25 -
 .../baremetal/database/BaremetalCmdbDaoImpl.java   |   32 -
 .../cloud/baremetal/database/BaremetalCmdbVO.java  |  104 -
 .../baremetal/manager/AddBaremetalHostCmd.java     |    9 +-
 .../baremetal/manager/BareMetalDiscoverer.java     |    8 +
 .../cloud/baremetal/manager/BareMetalPlanner.java  |  170 +
 .../manager/BareMetalTemplateAdapter.java          |    5 +
 .../cloud/baremetal/manager/BaremetalManager.java  |    3 +-
 .../baremetal/manager/BaremetalManagerImpl.java    |    9 +
 .../manager/BaremetalPlannerSelector.java          |   39 +
 .../networkservice/AddBaremetalDhcpCmd.java        |    9 +-
 .../AddBaremetalKickStartPxeCmd.java               |    3 +-
 .../networkservice/AddBaremetalPxeCmd.java         |    8 +-
 .../AddBaremetalPxePingServerCmd.java              |    2 +
 .../networkservice/BareMetalPingServiceImpl.java   |    6 +
 .../networkservice/BaremetalDhcpManagerImpl.java   |    5 +-
 .../networkservice/BaremetalDhcpResponse.java      |    4 +
 .../BaremetalKickStartPxeResource.java             |   11 +-
 .../BaremetalKickStartServiceImpl.java             |   38 +-
 .../networkservice/BaremetalPxeElement.java        |    6 +-
 .../BaremetalPxeKickStartResponse.java             |    5 +-
 .../networkservice/BaremetalPxeManagerImpl.java    |   22 +-
 .../networkservice/BaremetalPxePingResponse.java   |    4 +-
 .../networkservice/BaremetalPxeService.java        |    2 +
 .../networkservice/BaremetalUserdataElement.java   |    8 +-
 .../networkservice/ListBaremetalDhcpCmd.java       |    3 +-
 .../ListBaremetalPxePingServersCmd.java            |    3 +-
 .../PrepareKickstartPxeServerCommand.java          |   31 +-
 plugins/hypervisors/kvm/pom.xml                    |   67 +-
 .../cloud/hypervisor/kvm/resource/KVMHABase.java   |    6 +-
 .../kvm/resource/LibvirtComputingResource.java     |  553 +-
 .../hypervisor/kvm/resource/LibvirtVMDef.java      |   33 +
 .../hypervisor/kvm/resource/LibvirtXMLParser.java  |    8 +-
 .../kvm/resource/LibvirtComputingResourceTest.java |  184 +
 .../kvm/resource/LibvirtVifDriverTest.java         |  226 +
 plugins/hypervisors/ovm/pom.xml                    |    2 +-
 plugins/hypervisors/simulator/pom.xml              |    2 +-
 .../cloud/agent/manager/MockAgentManagerImpl.java  |    2 +
 .../agent/manager/MockStorageManagerImpl.java      |    2 +
 .../com/cloud/agent/manager/MockVmManagerImpl.java |   63 +-
 .../cloud/agent/manager/SimulatorManagerImpl.java  |   76 +-
 .../com/cloud/resource/AgentRoutingResource.java   |    6 +-
 .../com/cloud/resource/SimulatorDiscoverer.java    |    2 +-
 .../resource/SimulatorSecondaryDiscoverer.java     |    2 +
 .../server/ManagementServerSimulatorImpl.java      |    2 +-
 .../src/com/cloud/simulator/SimulatorGuru.java     |    7 +-
 .../simulator/dao/MockConfigurationDaoImpl.java    |   13 +-
 .../com/cloud/simulator/dao/MockHostDaoImpl.java   |    6 +-
 .../cloud/simulator/dao/MockSecStorageDaoImpl.java |    6 +-
 .../simulator/dao/MockSecurityRulesDaoImpl.java    |   14 +-
 .../simulator/dao/MockStoragePoolDaoImpl.java      |    6 +-
 .../src/com/cloud/simulator/dao/MockVMDaoImpl.java |   17 +-
 .../com/cloud/simulator/dao/MockVolumeDaoImpl.java |    9 +-
 plugins/hypervisors/ucs/pom.xml                    |   29 +-
 .../src/com/cloud/ucs/database/UcsBladeDao.java    |   17 +
 .../com/cloud/ucs/database/UcsBladeDaoImpl.java    |   21 +-
 .../ucs/src/com/cloud/ucs/database/UcsBladeVO.java |   39 +-
 .../src/com/cloud/ucs/database/UcsManagerDao.java  |   17 +
 .../com/cloud/ucs/database/UcsManagerDaoImpl.java  |   21 +-
 .../src/com/cloud/ucs/database/UcsManagerVO.java   |   24 +-
 .../com/cloud/ucs/manager/AddUcsManagerCmd.java    |   30 +-
 .../cloud/ucs/manager/AddUcsManagerResponse.java   |   53 -
 .../ucs/manager/AssociateUcsProfileToBladeCmd.java |   30 +-
 ...sociateUcsProfileToBladesInClusterResponse.java |    6 -
 .../src/com/cloud/ucs/manager/ListUcsBladeCmd.java |   87 +
 .../com/cloud/ucs/manager/ListUcsManagerCmd.java   |   32 +-
 .../cloud/ucs/manager/ListUcsManagerResponse.java  |   42 -
 .../com/cloud/ucs/manager/ListUcsProfileCmd.java   |   28 +-
 .../cloud/ucs/manager/ListUcsProfileResponse.java  |   20 -
 .../src/com/cloud/ucs/manager/StringTemplate.java  |   17 +
 .../com/cloud/ucs/manager/UcsBladeResponse.java    |   84 +
 .../ucs/src/com/cloud/ucs/manager/UcsCommands.java |   19 +-
 .../src/com/cloud/ucs/manager/UcsHttpClient.java   |   24 +-
 .../ucs/src/com/cloud/ucs/manager/UcsManager.java  |   30 +-
 .../src/com/cloud/ucs/manager/UcsManagerImpl.java  |  158 +-
 .../com/cloud/ucs/manager/UcsManagerResponse.java  |   73 +
 .../com/cloud/ucs/manager/UcsProfileResponse.java  |   37 +
 .../src/com/cloud/ucs/structure/ComputeBlade.java  |   19 +-
 .../src/com/cloud/ucs/structure/UcsProfile.java    |   21 +-
 plugins/hypervisors/vmware/pom.xml                 |   14 +-
 .../src/com/cloud/hypervisor/guru/VMwareGuru.java  |   12 +
 .../hypervisor/vmware/VmwareServerDiscoverer.java  |  350 +-
 .../hypervisor/vmware/manager/VmwareManager.java   |   14 +-
 .../vmware/manager/VmwareManagerImpl.java          |  273 +-
 .../vmware/manager/VmwareStorageManager.java       |   16 +-
 .../vmware/manager/VmwareStorageManagerImpl.java   |  526 ++-
 .../vmware/resource/VmwareContextFactory.java      |   41 +-
 .../hypervisor/vmware/resource/VmwareResource.java |  603 ++-
 .../src/com/cloud/network/VmwareTrafficLabel.java  |  118 +
 .../VmwareSecondaryStorageContextFactory.java      |   31 +-
 .../VmwareSecondaryStorageResourceHandler.java     |   18 +-
 plugins/hypervisors/xen/pom.xml                    |    2 +-
 .../xen/discoverer/XcpServerDiscoverer.java        |   13 +-
 .../xen/resource/CitrixResourceBase.java           |  373 ++-
 .../hypervisor/xen/resource/XcpServerResource.java |   16 +-
 .../xen/resource/XenServer56FP1Resource.java       |    6 +-
 .../xen/resource/XenServerStorageResource.java     |    5 +
 plugins/network-elements/bigswitch-vns/pom.xml     |    2 +-
 .../api/commands/AddBigSwitchVnsDeviceCmd.java     |    2 +-
 .../api/commands/DeleteBigSwitchVnsDeviceCmd.java  |    2 +-
 .../api/commands/ListBigSwitchVnsDevicesCmd.java   |    2 +-
 .../cloud/network/element/BigSwitchVnsElement.java |    2 +
 plugins/network-elements/dns-notifier/pom.xml      |    2 +-
 .../dns-notifier/resources/components-example.xml  |    2 +-
 .../network-elements/elastic-loadbalancer/pom.xml  |    2 +-
 plugins/network-elements/f5/pom.xml                |    2 +-
 plugins/network-elements/juniper-srx/pom.xml       |    2 +-
 plugins/network-elements/netscaler/pom.xml         |    2 +-
 plugins/network-elements/nicira-nvp/pom.xml        |    2 +-
 .../network/guru/NiciraNvpGuestNetworkGuru.java    |    7 +-
 .../guru/NiciraNvpGuestNetworkGuruTest.java        |    4 +-
 plugins/network-elements/ovs/pom.xml               |    2 +-
 plugins/parent/pom.xml                             |   42 -
 plugins/pom.xml                                    |    2 +-
 plugins/storage-allocators/random/pom.xml          |   12 +-
 .../allocator/RandomStoragePoolAllocator.java      |   90 -
 .../allocator/RandomStoragePoolAllocator.java      |   78 +
 plugins/storage/image/s3/pom.xml                   |    2 +-
 plugins/storage/volume/solidfire/pom.xml           |    2 +-
 .../driver/SolidfirePrimaryDataStoreDriver.java    |   24 +-
 .../apache/cloudstack/storage/test/VolumeTest.java |    4 +-
 plugins/user-authenticators/ldap/pom.xml           |    2 +-
 .../cloud/server/auth/LDAPUserAuthenticator.java   |    9 +-
 plugins/user-authenticators/md5/pom.xml            |    2 +-
 plugins/user-authenticators/plain-text/pom.xml     |    2 +-
 .../server/auth/PlainTextUserAuthenticator.java    |    3 -
 plugins/user-authenticators/sha256salted/pom.xml   |    2 +-
 pom.xml                                            |  154 +-
 python/lib/cloudutils/serviceConfig.py             |   22 +-
 python/lib/cloudutils/serviceConfigServer.py       |   45 +-
 python/lib/cloudutils/utilities.py                 |    9 +-
 scripts/network/domr/dhcp_entry.sh                 |    6 +-
 scripts/network/ping/baremetal_user_data.py        |  104 +
 scripts/network/ping/prepare_kickstart_bootfile.py |   78 +
 .../ping/prepare_kickstart_kernel_initrd.py        |   75 +
 scripts/storage/qcow2/resizevolume.sh              |    2 +-
 scripts/storage/secondary/cloud-install-sys-tmplt  |   16 +-
 scripts/vm/hypervisor/kvm/patchviasocket.pl        |   58 +
 scripts/vm/hypervisor/kvm/rundomrpre.sh            |  147 -
 scripts/vm/hypervisor/kvm/setup_agent.sh           |   12 +-
 scripts/vm/hypervisor/xenserver/vmops              |    1 +
 scripts/vm/hypervisor/xenserver/vmopsSnapshot      |   29 +-
 scripts/vm/hypervisor/xenserver/xenheartbeat.sh    |   53 +-
 scripts/vm/network/security_group.py               |   10 +-
 server/conf/migration-components.xml               |    1 +
 server/pom.xml                                     |   68 +-
 server/src/com/cloud/agent/AgentManager.java       |    2 +
 .../com/cloud/agent/manager/AgentManagerImpl.java  |   29 +-
 .../src/com/cloud/agent/manager/AgentMonitor.java  |   41 +-
 .../cloud/agent/manager/AgentMonitorService.java   |   28 +
 .../manager/allocator/impl/FirstFitAllocator.java  |   16 +-
 .../allocator/impl/RecreateHostAllocator.java      |    4 +-
 server/src/com/cloud/alert/AlertManagerImpl.java   |    6 +-
 server/src/com/cloud/alert/dao/AlertDao.java       |    7 +
 server/src/com/cloud/alert/dao/AlertDaoImpl.java   |   85 +
 server/src/com/cloud/api/ApiDBUtils.java           |   65 +-
 server/src/com/cloud/api/ApiDispatcher.java        |   34 +-
 server/src/com/cloud/api/ApiResponseHelper.java    |  467 ++-
 server/src/com/cloud/api/ApiServer.java            |  115 +-
 server/src/com/cloud/api/ApiServerService.java     |   37 +
 server/src/com/cloud/api/ApiServlet.java           |    4 +-
 .../cloud/api/commands/AddTrafficMonitorCmd.java   |  109 -
 .../api/commands/DeleteTrafficMonitorCmd.java      |   86 -
 .../api/commands/GenerateUsageRecordsCmd.java      |   91 -
 .../com/cloud/api/commands/GetUsageRecordsCmd.java |  370 --
 .../cloud/api/commands/ListTrafficMonitorsCmd.java |   86 -
 .../com/cloud/api/commands/ListUsageTypesCmd.java  |   53 -
 .../src/com/cloud/api/query/QueryManagerImpl.java  |   20 +-
 .../com/cloud/api/query/ViewResponseHelper.java    |    1 -
 .../cloud/api/query/dao/AccountJoinDaoImpl.java    |   18 +
 .../cloud/api/query/dao/DataCenterJoinDaoImpl.java |    2 +
 .../api/query/dao/DomainRouterJoinDaoImpl.java     |   34 +-
 .../api/query/dao/UserAccountJoinDaoImpl.java      |    9 +-
 .../com/cloud/api/query/dao/UserVmJoinDaoImpl.java |   16 +-
 .../src/com/cloud/api/query/vo/AccountJoinVO.java  |   54 +-
 .../cloud/api/query/vo/ControlledViewEntity.java   |    1 -
 .../com/cloud/api/query/vo/DataCenterJoinVO.java   |   22 +
 .../com/cloud/api/query/vo/DomainRouterJoinVO.java |   71 +
 server/src/com/cloud/api/query/vo/EventJoinVO.java |    9 +
 server/src/com/cloud/api/query/vo/HostJoinVO.java  |    1 -
 .../com/cloud/api/query/vo/StoragePoolJoinVO.java  |    1 -
 .../src/com/cloud/api/query/vo/UserVmJoinVO.java   |   47 +
 .../com/cloud/baremetal/BareMetalDiscoverer.java   |  245 -
 server/src/com/cloud/baremetal/BareMetalGuru.java  |   59 -
 .../cloud/baremetal/BareMetalPingServiceImpl.java  |  199 -
 .../cloud/baremetal/BareMetalPxeServiceBase.java   |   56 -
 .../com/cloud/baremetal/BareMetalResourceBase.java |  630 --
 .../cloud/baremetal/BareMetalTemplateAdapter.java  |   42 +-
 .../com/cloud/baremetal/BareMetalVmManager.java    |   22 -
 .../cloud/baremetal/BareMetalVmManagerImpl.java    |  551 --
 .../com/cloud/baremetal/DhcpServerResponse.java    |   35 -
 server/src/com/cloud/baremetal/DhcpdResource.java  |  133 -
 .../src/com/cloud/baremetal/DnsmasqResource.java   |  123 -
 .../cloud/baremetal/ExternalDhcpEntryListener.java |   44 -
 .../com/cloud/baremetal/ExternalDhcpManager.java   |   54 -
 .../cloud/baremetal/ExternalDhcpManagerImpl.java   |  250 -
 .../cloud/baremetal/ExternalDhcpResourceBase.java  |  198 -
 .../src/com/cloud/baremetal/HttpCallException.java |   28 -
 .../com/cloud/baremetal/PingPxeServerResource.java |  196 -
 .../src/com/cloud/baremetal/PxeServerManager.java  |   54 -
 .../com/cloud/baremetal/PxeServerManagerImpl.java  |  145 -
 .../src/com/cloud/baremetal/PxeServerProfile.java  |   90 -
 .../com/cloud/baremetal/PxeServerResourceBase.java |  185 -
 .../src/com/cloud/baremetal/PxeServerResponse.java |   35 -
 .../src/com/cloud/baremetal/PxeServerService.java  |   35 -
 server/src/com/cloud/capacity/CapacityManager.java |    7 +-
 .../com/cloud/capacity/CapacityManagerImpl.java    |  144 +-
 .../cloud/capacity/ComputeCapacityListener.java    |    5 +-
 server/src/com/cloud/capacity/dao/CapacityDao.java |   14 +-
 .../com/cloud/capacity/dao/CapacityDaoImpl.java    |  267 +-
 .../src/com/cloud/cluster/ClusterManagerImpl.java  |    5 +-
 .../agentlb/dao/HostTransferMapDaoImpl.java        |   50 +-
 server/src/com/cloud/configuration/Config.java     |   52 +-
 .../cloud/configuration/ConfigurationManager.java  |    7 +-
 .../configuration/ConfigurationManagerImpl.java    |  172 +-
 .../configuration/dao/ConfigurationDaoImpl.java    |    9 -
 .../configuration/dao/ResourceCountDaoImpl.java    |    9 +-
 .../consoleproxy/ConsoleProxyManagerImpl.java      |   20 +-
 server/src/com/cloud/dao/EntityManagerImpl.java    |    7 +-
 server/src/com/cloud/dc/DataCenterVO.java          |   30 +-
 server/src/com/cloud/dc/dao/DataCenterDaoImpl.java |   10 +-
 .../com/cloud/dc/dao/DataCenterIpAddressDao.java   |    6 +
 .../dc/dao/DataCenterLinkLocalIpAddressDao.java    |   32 +
 .../dao/DataCenterLinkLocalIpAddressDaoImpl.java   |    2 +-
 server/src/com/cloud/dc/dao/DataCenterVnetDao.java |   38 +
 .../com/cloud/dc/dao/DataCenterVnetDaoImpl.java    |    2 +-
 server/src/com/cloud/dc/dao/PodVlanDao.java        |   30 +
 server/src/com/cloud/dc/dao/PodVlanDaoImpl.java    |    2 +-
 .../deploy/AbstractDeployPlannerSelector.java      |   74 +
 server/src/com/cloud/deploy/BareMetalPlanner.java  |  163 -
 .../com/cloud/deploy/DeployPlannerSelector.java    |   24 +
 server/src/com/cloud/deploy/FirstFitPlanner.java   |   99 +-
 .../cloud/deploy/HypervisorVmPlannerSelector.java  |   33 +
 server/src/com/cloud/event/ActionEventUtils.java   |   19 +-
 server/src/com/cloud/event/AlertGenerator.java     |   21 +-
 server/src/com/cloud/event/UsageEventUtils.java    |   21 +-
 .../com/cloud/ha/HighAvailabilityManagerImpl.java  |    6 +-
 server/src/com/cloud/ha/RecreatableFencer.java     |    8 +-
 server/src/com/cloud/host/dao/HostDaoImpl.java     |    7 +-
 .../com/cloud/hypervisor/HypervisorGuruBase.java   |    8 +-
 .../hypervisor/dao/HypervisorCapabilitiesDao.java  |    2 +
 .../dao/HypervisorCapabilitiesDaoImpl.java         |   87 +-
 .../kvm/discoverer/KvmServerDiscoverer.java        |    2 +-
 .../com/cloud/migration/ServiceOffering21VO.java   |    5 +
 .../ExternalLoadBalancerDeviceManagerImpl.java     |   12 +-
 .../ExternalLoadBalancerUsageManagerImpl.java      |  263 +-
 .../network/ExternalNetworkDeviceManagerImpl.java  |   84 +-
 .../com/cloud/network/Ipv6AddressManagerImpl.java  |   79 +-
 server/src/com/cloud/network/NetworkManager.java   |   12 +
 .../src/com/cloud/network/NetworkManagerImpl.java  |  147 +-
 server/src/com/cloud/network/NetworkModelImpl.java |  164 +-
 .../src/com/cloud/network/NetworkServiceImpl.java  |  375 +-
 .../com/cloud/network/NetworkStateListener.java    |   13 +-
 .../src/com/cloud/network/NetworkUsageManager.java |   14 -
 .../com/cloud/network/NetworkUsageManagerImpl.java |   20 +-
 server/src/com/cloud/network/addr/PublicIp.java    |   38 +-
 .../cloud/network/dao/FirewallRulesDaoImpl.java    |    5 +-
 server/src/com/cloud/network/dao/IPAddressDao.java |    7 +-
 .../com/cloud/network/dao/IPAddressDaoImpl.java    |   23 +-
 server/src/com/cloud/network/dao/IPAddressVO.java  |   16 +-
 .../com/cloud/network/dao/LoadBalancerDaoImpl.java |    2 +-
 .../com/cloud/network/dao/NetworkAccountDao.java   |   22 +
 .../cloud/network/dao/NetworkAccountDaoImpl.java   |    2 +-
 .../src/com/cloud/network/dao/NetworkDaoImpl.java  |   20 +-
 server/src/com/cloud/network/dao/NetworkOpDao.java |   26 +
 .../com/cloud/network/dao/NetworkOpDaoImpl.java    |    2 +-
 server/src/com/cloud/network/dao/NetworkVO.java    |   21 +-
 .../cloud/network/dao/PhysicalNetworkDaoImpl.java  |    2 +-
 .../com/cloud/network/dao/RouterNetworkDao.java    |   26 +
 .../cloud/network/dao/RouterNetworkDaoImpl.java    |    2 +-
 .../network/dao/Site2SiteVpnConnectionDaoImpl.java |    4 +-
 .../network/dao/Site2SiteVpnGatewayDaoImpl.java    |    2 +-
 .../com/cloud/network/dao/UserIpv6AddressDao.java  |    2 +
 .../cloud/network/dao/UserIpv6AddressDaoImpl.java  |    8 +
 .../cloud/network/element/BareMetalElement.java    |  128 -
 .../cloud/network/element/ExternalDhcpElement.java |  152 -
 .../network/element/VpcVirtualRouterElement.java   |    4 +-
 .../network/firewall/FirewallManagerImpl.java      |   21 +
 .../com/cloud/network/guru/DirectNetworkGuru.java  |    2 +
 .../com/cloud/network/guru/GuestNetworkGuru.java   |    9 +-
 .../network/lb/LoadBalancingRulesManager.java      |   10 +-
 .../network/lb/LoadBalancingRulesManagerImpl.java  |    5 +
 .../router/VirtualNetworkApplianceManagerImpl.java |   52 +-
 .../VpcVirtualNetworkApplianceManagerImpl.java     |   39 +-
 .../com/cloud/network/rules/RulesManagerImpl.java  |  122 +-
 .../network/rules/dao/PortForwardingRulesDao.java  |    2 +
 .../rules/dao/PortForwardingRulesDaoImpl.java      |   11 +-
 .../network/security/dao/SecurityGroupDaoImpl.java |    3 +-
 server/src/com/cloud/network/vpc/VpcManager.java   |    3 +-
 .../src/com/cloud/network/vpc/VpcManagerImpl.java  |  209 +-
 .../src/com/cloud/network/vpc/VpcServiceMapVO.java |   90 +
 .../cloud/network/vpc/dao/StaticRouteDaoImpl.java  |    3 +-
 server/src/com/cloud/network/vpc/dao/VpcDao.java   |    5 +
 .../src/com/cloud/network/vpc/dao/VpcDaoImpl.java  |   32 +-
 .../cloud/network/vpc/dao/VpcServiceMapDao.java    |   40 +
 .../network/vpc/dao/VpcServiceMapDaoImpl.java      |  115 +
 .../src/com/cloud/projects/ProjectManagerImpl.java |    3 +-
 .../src/com/cloud/projects/dao/ProjectDaoImpl.java |    3 +-
 server/src/com/cloud/resource/DiscovererBase.java  |    1 +
 server/src/com/cloud/resource/ResourceManager.java |    1 +
 .../com/cloud/resource/ResourceManagerImpl.java    |  172 +-
 .../resourcelimit/ResourceLimitManagerImpl.java    |   71 +-
 .../com/cloud/server/ConfigurationServerImpl.java  |   83 +-
 server/src/com/cloud/server/ManagementServer.java  |    3 +-
 .../src/com/cloud/server/ManagementServerExt.java  |   63 -
 .../com/cloud/server/ManagementServerExtImpl.java  |  254 -
 .../src/com/cloud/server/ManagementServerImpl.java |  562 ++-
 server/src/com/cloud/server/StatsCollector.java    |   11 +-
 .../server/auth/DefaultUserAuthenticator.java      |    3 -
 .../src/com/cloud/service/ServiceOfferingVO.java   |   30 +-
 .../src/com/cloud/servlet/CloudStartupServlet.java |   17 +-
 .../cloud/storage/LocalStoragePoolListener.java    |   70 +-
 server/src/com/cloud/storage/OCFS2ManagerImpl.java |    5 +-
 .../com/cloud/storage/RegisterVolumePayload.java   |   43 +
 .../src/com/cloud/storage/ResizeVolumePayload.java |   31 +
 server/src/com/cloud/storage/StorageManager.java   |  173 +-
 .../src/com/cloud/storage/StorageManagerImpl.java  | 4249 ++++-----------
 server/src/com/cloud/storage/TemplateProfile.java  |   10 +-
 server/src/com/cloud/storage/VolumeManager.java    |   99 +
 .../src/com/cloud/storage/VolumeManagerImpl.java   | 2452 ++++++++
 .../allocator/AbstractStoragePoolAllocator.java    |  207 -
 .../allocator/FirstFitStoragePoolAllocator.java    |  174 -
 .../GarbageCollectingStoragePoolAllocator.java     |  105 -
 .../allocator/LocalStoragePoolAllocator.java       |  287 -
 .../storage/allocator/StoragePoolAllocator.java    |   53 -
 .../allocator/UseLocalForRootAllocator.java        |   83 -
 .../com/cloud/storage/dao/LaunchPermissionDao.java |    1 +
 server/src/com/cloud/storage/dao/SnapshotDao.java  |    2 +-
 .../src/com/cloud/storage/dao/SnapshotDaoImpl.java |   16 +-
 .../src/com/cloud/storage/dao/StoragePoolDao.java  |  106 -
 .../com/cloud/storage/dao/StoragePoolDaoImpl.java  |  377 --
 .../cloud/storage/dao/StoragePoolDetailsDao.java   |   28 -
 .../storage/dao/StoragePoolDetailsDaoImpl.java     |    3 +-
 .../src/com/cloud/storage/dao/VMTemplateDao.java   |    6 +-
 .../com/cloud/storage/dao/VMTemplateDaoImpl.java   |   59 +-
 .../com/cloud/storage/dao/VMTemplateHostDao.java   |    8 +-
 .../cloud/storage/dao/VMTemplateHostDaoImpl.java   |   58 +-
 .../com/cloud/storage/dao/VMTemplatePoolDao.java   |    7 +-
 .../cloud/storage/dao/VMTemplatePoolDaoImpl.java   |   49 +
 .../src/com/cloud/storage/dao/VolumeDaoImpl.java   |    7 +-
 .../src/com/cloud/storage/dao/VolumeHostDao.java   |    6 +-
 .../com/cloud/storage/dao/VolumeHostDaoImpl.java   |   56 +-
 .../cloud/storage/download/DownloadListener.java   |   10 +-
 .../cloud/storage/download/DownloadMonitor.java    |    1 +
 .../storage/download/DownloadMonitorImpl.java      |  103 +-
 .../storage/listener/SnapshotStateListener.java    |   34 +-
 .../cloud/storage/listener/StoragePoolMonitor.java |   18 +-
 .../storage/listener/VolumeStateListener.java      |   15 +-
 .../resource/DummySecondaryStorageResource.java    |    2 +-
 server/src/com/cloud/storage/s3/S3Manager.java     |    1 +
 server/src/com/cloud/storage/s3/S3ManagerImpl.java |    2 +-
 .../secondary/SecondaryStorageManagerImpl.java     |    2 +-
 .../cloud/storage/snapshot/SnapshotManager.java    |   98 +-
 .../storage/snapshot/SnapshotManagerImpl.java      |  763 +--
 .../com/cloud/storage/upload/UploadMonitor.java    |    1 +
 .../com/cloud/tags/TaggedResourceManagerImpl.java  |    4 +
 .../com/cloud/tags/dao/ResourceTagsDaoImpl.java    |    1 +
 .../cloud/template/HyervisorTemplateAdapter.java   |  303 -
 .../cloud/template/HypervisorTemplateAdapter.java  |  339 ++
 server/src/com/cloud/template/TemplateAdapter.java |    3 +-
 .../com/cloud/template/TemplateAdapterBase.java    |   45 +-
 server/src/com/cloud/template/TemplateManager.java |   28 +-
 .../com/cloud/template/TemplateManagerImpl.java    |  762 +++-
 server/src/com/cloud/upgrade/DatabaseCreator.java  |   21 +-
 .../com/cloud/upgrade/DatabaseUpgradeChecker.java  |   55 +-
 .../src/com/cloud/upgrade/dao/Upgrade2214to30.java |   11 +
 .../src/com/cloud/upgrade/dao/Upgrade40to41.java   |  139 +-
 .../src/com/cloud/upgrade/dao/Upgrade410to420.java |  161 +
 .../src/com/cloud/upgrade/dao/VersionDaoImpl.java  |    2 +-
 server/src/com/cloud/usage/UsageServiceImpl.java   |  261 +
 server/src/com/cloud/usage/UsageTypes.java         |   58 -
 server/src/com/cloud/usage/UsageVO.java            |   23 +-
 server/src/com/cloud/user/AccountManagerImpl.java  |   96 +-
 server/src/com/cloud/user/DomainManager.java       |    2 +-
 server/src/com/cloud/user/DomainManagerImpl.java   |   37 +-
 .../com/cloud/user/dao/UserStatisticsDaoImpl.java  |   18 +-
 server/src/com/cloud/vm/NicVO.java                 |   11 +
 server/src/com/cloud/vm/UserVmManager.java         |   13 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java     | 1542 +----
 server/src/com/cloud/vm/UserVmStateListener.java   |   17 +-
 server/src/com/cloud/vm/VirtualMachineManager.java |    1 +
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |  165 +-
 .../com/cloud/vm/VirtualMachineProfileImpl.java    |   29 +-
 .../src/com/cloud/vm/dao/DomainRouterDaoImpl.java  |   12 +-
 server/src/com/cloud/vm/dao/NicDao.java            |    2 +
 server/src/com/cloud/vm/dao/NicDaoImpl.java        |   12 +-
 server/src/com/cloud/vm/dao/NicSecondaryIpDao.java |   53 +
 .../com/cloud/vm/dao/NicSecondaryIpDaoImpl.java    |  138 +
 server/src/com/cloud/vm/dao/NicSecondaryIpVO.java  |  160 +
 .../dao/RandomlyIncreasingVMInstanceDaoImpl.java   |   36 -
 .../com/cloud/vm/dao/UserVmCloneSettingDao.java    |   37 +
 .../cloud/vm/dao/UserVmCloneSettingDaoImpl.java    |   74 +
 server/src/com/cloud/vm/dao/UserVmDao.java         |    2 +
 server/src/com/cloud/vm/dao/UserVmDaoImpl.java     |   42 +-
 server/src/com/cloud/vm/dao/UserVmDetailsDao.java  |    3 -
 server/src/com/cloud/vm/dao/VMInstanceDao.java     |    3 +-
 server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java |   14 +-
 .../com/cloud/vm/snapshot/VMSnapshotManager.java   |   47 +
 .../cloud/vm/snapshot/VMSnapshotManagerImpl.java   |  836 +++
 server/src/com/cloud/vm/snapshot/VMSnapshotVO.java |  224 +
 .../com/cloud/vm/snapshot/dao/VMSnapshotDao.java   |   39 +
 .../cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java   |  161 +
 .../apache/cloudstack/region/RegionManager.java    |  194 +-
 .../cloudstack/region/RegionManagerImpl.java       | 1066 ++---
 .../cloudstack/region/RegionServiceImpl.java       |  272 +-
 .../apache/cloudstack/region/RegionsApiUtil.java   |  478 +-
 .../cloudstack/region/dao/RegionSyncDao.java       |   24 -
 .../cloudstack/region/dao/RegionSyncDaoImpl.java   |   35 -
 .../test/com/cloud/agent/MockAgentManagerImpl.java |    6 +
 .../com/cloud/alert/AlertControlsUnitTest.java     |   83 +
 server/test/com/cloud/api/APITest.java             |    2 -
 server/test/com/cloud/api/ListPerfTest.java        |    2 -
 server/test/com/cloud/api/LoginResponse.java       |    2 -
 .../com/cloud/capacity/CapacityManagerTest.java    |   78 +
 .../com/cloud/event/EventControlsUnitTest.java     |   84 +
 .../com/cloud/network/MockNetworkManagerImpl.java  |   49 +-
 .../com/cloud/network/MockNetworkModelImpl.java    |   24 +-
 .../com/cloud/network/MockRulesManagerImpl.java    |   19 +-
 .../cloud/resource/MockResourceManagerImpl.java    |   13 +-
 .../ResourceLimitManagerImplTest.java              |   92 +
 .../com/cloud/storage/dao/StoragePoolDaoTest.java  |    3 +-
 .../dao/StoragePoolDaoTestConfiguration.java       |    3 +-
 server/test/com/cloud/upgrade/DbUpgrade22Test.java |    2 +
 .../com/cloud/user/MockAccountManagerImpl.java     |   47 +-
 .../test/com/cloud/user/MockDomainManagerImpl.java |   38 +-
 .../test/com/cloud/vm/MockUserVmManagerImpl.java   |   50 +-
 server/test/com/cloud/vm/UserVmManagerTest.java    |  182 +
 .../vm/dao/UserVmCloneSettingDaoImplTest.java      |   62 +
 .../UserVmCloneSettingDaoTestConfiguration.java    |   52 +
 .../cloud/vm/snapshot/VMSnapshotManagerTest.java   |  186 +
 .../cloud/vpc/MockConfigurationManagerImpl.java    |   13 +-
 .../test/com/cloud/vpc/MockNetworkManagerImpl.java |   79 +-
 .../test/com/cloud/vpc/MockNetworkModelImpl.java   |   23 +-
 .../cloud/vpc/MockResourceLimitManagerImpl.java    |   17 +-
 server/test/com/cloud/vpc/MockVpcManagerImpl.java  |   24 +-
 server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java  |   13 +-
 .../test/resources/CloneSettingDaoTestContext.xml  |   42 +
 services/console-proxy/plugin/pom.xml              |   35 +
 services/console-proxy/pom.xml                     |   37 +
 .../server/bindir/cloud-setup-console-proxy.in     |  220 +
 services/console-proxy/server/certs/localhost.crt  |   22 +
 services/console-proxy/server/certs/localhost.key  |   27 +
 services/console-proxy/server/certs/realhostip.crt |   31 +
 services/console-proxy/server/certs/realhostip.csr |   15 +
 services/console-proxy/server/certs/realhostip.key |   24 +
 .../console-proxy/server/certs/realhostip.keystore |  Bin 0 -> 8690 bytes
 .../server/conf.dom0/agent.properties.in           |   46 +
 .../server/conf.dom0/consoleproxy.properties.in    |   23 +
 .../server/conf.dom0/log4j-cloud.xml.in            |  101 +
 .../console-proxy/server/conf/agent.properties     |   19 +
 .../server/conf/consoleproxy.properties            |   23 +
 services/console-proxy/server/conf/log4j-cloud.xml |  102 +
 services/console-proxy/server/css/ajaxviewer.css   |  144 +
 services/console-proxy/server/css/logger.css       |  139 +
 .../SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in  |   98 +
 .../SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in  |   98 +
 .../SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in  |   98 +
 .../SYSCONFDIR/init.d/cloud-console-proxy.in       |  112 +
 services/console-proxy/server/images/back.gif      |  Bin 0 -> 149 bytes
 .../console-proxy/server/images/bright-green.png   |  Bin 0 -> 3903 bytes
 services/console-proxy/server/images/cad.gif       |  Bin 0 -> 918 bytes
 .../console-proxy/server/images/cannotconnect.jpg  |  Bin 0 -> 1810 bytes
 .../console-proxy/server/images/clr_button.gif     |  Bin 0 -> 1274 bytes
 .../server/images/clr_button_hover.gif             |  Bin 0 -> 437 bytes
 services/console-proxy/server/images/dot.cur       |  Bin 0 -> 326 bytes
 .../console-proxy/server/images/gray-green.png     |  Bin 0 -> 3833 bytes
 .../console-proxy/server/images/grid_headerbg.gif  |  Bin 0 -> 196 bytes
 services/console-proxy/server/images/left.png      |  Bin 0 -> 3024 bytes
 .../server/images/minimize_button.gif              |  Bin 0 -> 634 bytes
 .../server/images/minimize_button_hover.gif        |  Bin 0 -> 227 bytes
 services/console-proxy/server/images/notready.jpg  |  Bin 0 -> 1827 bytes
 .../console-proxy/server/images/play_button.gif    |  Bin 0 -> 657 bytes
 .../server/images/play_button_hover.gif            |  Bin 0 -> 243 bytes
 services/console-proxy/server/images/right.png     |  Bin 0 -> 3131 bytes
 services/console-proxy/server/images/right2.png    |  Bin 0 -> 3156 bytes
 .../console-proxy/server/images/shrink_button.gif  |  Bin 0 -> 655 bytes
 .../server/images/shrink_button_hover.gif          |  Bin 0 -> 243 bytes
 .../console-proxy/server/images/stop_button.gif    |  Bin 0 -> 649 bytes
 .../server/images/stop_button_hover.gif            |  Bin 0 -> 231 bytes
 services/console-proxy/server/images/winlog.png    |  Bin 0 -> 2629 bytes
 services/console-proxy/server/js/ajaxkeys.js       |   77 +
 services/console-proxy/server/js/ajaxviewer.js     | 1444 +++++
 services/console-proxy/server/js/cloud.logger.js   |  338 ++
 services/console-proxy/server/js/handler.js        |   72 +
 services/console-proxy/server/js/jquery.js         |   19 +
 .../server/libexec/console-proxy-runner.in         |   90 +
 services/console-proxy/server/pom.xml              |  247 +
 services/console-proxy/server/scripts/_run.sh      |   63 +
 .../console-proxy/server/scripts/config_auth.sh    |   69 +
 .../console-proxy/server/scripts/config_ssl.sh     |  174 +
 .../console-proxy/server/scripts/ipfirewall.sh     |   50 +
 services/console-proxy/server/scripts/run-proxy.sh |   48 +
 services/console-proxy/server/scripts/run.bat      |   18 +
 services/console-proxy/server/scripts/run.sh       |   45 +
 .../console-proxy/server/scripts/ssvm-check.sh     |  136 +
 .../com/cloud/consoleproxy/AjaxFIFOImageCache.java |   83 +
 .../consoleproxy/AuthenticationException.java      |   33 +
 .../src/com/cloud/consoleproxy/ConsoleProxy.java   |  508 ++
 .../consoleproxy/ConsoleProxyAjaxHandler.java      |  406 ++
 .../consoleproxy/ConsoleProxyAjaxImageHandler.java |  159 +
 .../ConsoleProxyAuthenticationResult.java          |   81 +
 .../ConsoleProxyBaseServerFactoryImpl.java         |   48 +
 .../com/cloud/consoleproxy/ConsoleProxyClient.java |   69 +
 .../cloud/consoleproxy/ConsoleProxyClientBase.java |  457 ++
 .../consoleproxy/ConsoleProxyClientListener.java   |   25 +
 .../consoleproxy/ConsoleProxyClientParam.java      |  110 +
 .../ConsoleProxyClientStatsCollector.java          |   88 +
 .../cloud/consoleproxy/ConsoleProxyCmdHandler.java |   70 +
 .../cloud/consoleproxy/ConsoleProxyGCThread.java   |  109 +
 .../ConsoleProxyHttpHandlerHelper.java             |   79 +
 .../consoleproxy/ConsoleProxyLoggerFactory.java    |   89 +
 .../cloud/consoleproxy/ConsoleProxyMonitor.java    |  153 +
 .../ConsoleProxyPasswordBasedEncryptor.java        |  142 +
 .../consoleproxy/ConsoleProxyResourceHandler.java  |  181 +
 .../ConsoleProxySecureServerFactoryImpl.java       |  145 +
 .../consoleproxy/ConsoleProxyServerFactory.java    |   29 +
 .../consoleproxy/ConsoleProxyThumbnailHandler.java |  212 +
 .../cloud/consoleproxy/ConsoleProxyVncClient.java  |  235 +
 .../src/com/cloud/consoleproxy/InputEventType.java |   58 +
 .../cloud/consoleproxy/util/ITileScanListener.java |   25 +
 .../com/cloud/consoleproxy/util/ImageHelper.java   |   32 +
 .../src/com/cloud/consoleproxy/util/Logger.java    |  223 +
 .../com/cloud/consoleproxy/util/LoggerFactory.java |   21 +
 .../src/com/cloud/consoleproxy/util/RawHTTP.java   |  249 +
 .../src/com/cloud/consoleproxy/util/Region.java    |   90 +
 .../cloud/consoleproxy/util/RegionClassifier.java  |   58 +
 .../src/com/cloud/consoleproxy/util/TileInfo.java  |   55 +
 .../com/cloud/consoleproxy/util/TileTracker.java   |  269 +
 .../consoleproxy/vnc/BufferedImageCanvas.java      |  150 +
 .../cloud/consoleproxy/vnc/FrameBufferCanvas.java  |   30 +
 .../vnc/FrameBufferUpdateListener.java             |   26 +
 .../vnc/PaintNotificationListener.java             |   27 +
 .../com/cloud/consoleproxy/vnc/RfbConstants.java   |   82 +
 .../src/com/cloud/consoleproxy/vnc/VncClient.java  |  451 ++
 .../consoleproxy/vnc/VncClientPacketSender.java    |  258 +
 .../consoleproxy/vnc/VncScreenDescription.java     |   89 +
 .../consoleproxy/vnc/VncServerPacketReceiver.java  |  123 +
 .../vnc/packet/client/ClientPacket.java            |   26 +
 .../client/FramebufferUpdateRequestPacket.java     |   53 +
 .../vnc/packet/client/KeyboardEventPacket.java     |   42 +
 .../vnc/packet/client/MouseEventPacket.java        |   43 +
 .../vnc/packet/client/SetEncodingsPacket.java      |   45 +
 .../vnc/packet/client/SetPixelFormatPacket.java    |   75 +
 .../vnc/packet/server/AbstractRect.java            |   53 +
 .../consoleproxy/vnc/packet/server/CopyRect.java   |   39 +
 .../server/FrameBufferSizeChangeRequest.java       |   39 +
 .../vnc/packet/server/FramebufferUpdatePacket.java |  102 +
 .../consoleproxy/vnc/packet/server/RawRect.java    |   75 +
 .../cloud/consoleproxy/vnc/packet/server/Rect.java |   33 +
 .../vnc/packet/server/ServerCutText.java           |   49 +
 .../console-proxy/server/systemvm-descriptor.xml   |  113 +
 .../console-proxy/server/ui/viewer-bad-sid.ftl     |   29 +
 .../server/ui/viewer-connect-failed.ftl            |   29 +
 services/console-proxy/server/ui/viewer-update.ftl |   24 +
 services/console-proxy/server/ui/viewer.ftl        |   60 +
 services/console-proxy/server/vm-script/vmops      |  119 +
 services/pom.xml                                   |   36 +
 setup/bindir/cloud-setup-databases.in              |   11 +-
 setup/db/4.1-new-db-schema.sql                     |  140 -
 setup/db/create-schema-view.sql                    | 1136 ----
 setup/db/create-schema.sql                         |  256 +-
 setup/db/db/schema-40to410-cleanup.sql             |   21 +
 setup/db/db/schema-40to410.sql                     |  451 ++-
 setup/db/db/schema-410to420-cleanup.sql            |   21 +
 setup/db/db/schema-410to420.sql                    |  187 +
 setup/db/deploy-db-dev.sh                          |   11 -
 setup/db/deploy-db-simulator.sh                    |   11 -
 setup/db/server-setup.xml                          |    2 +-
 setup/db/templates.sql                             |    9 +-
 test/integration/component/test_accounts.py        |    5 +-
 .../component/test_allocation_states.py            |    5 +-
 test/integration/component/test_blocker_bugs.py    |   14 +-
 test/integration/component/test_egress_rules.py    |   24 +-
 test/integration/component/test_eip_elb.py         |    6 +-
 .../integration/component/test_network_offering.py |   10 +-
 test/integration/component/test_project_configs.py |    4 +-
 test/integration/component/test_project_limits.py  |    8 +-
 .../component/test_project_resources.py            |   16 +-
 test/integration/component/test_project_usage.py   |   22 +-
 test/integration/component/test_projects.py        |    4 +-
 test/integration/component/test_resource_limits.py |   10 +-
 test/integration/component/test_routers.py         |   10 +-
 test/integration/component/test_security_groups.py |   16 +-
 test/integration/component/test_templates.py       |    8 +-
 test/integration/component/test_usage.py           |   22 +-
 test/integration/component/test_volumes.py         |   14 +-
 test/integration/smoke/test_vm_life_cycle.py       |    6 -
 test/pom.xml                                       |    2 +-
 test/selenium/ReadMe.txt                           |   52 +
 test/selenium/lib/Global_Locators.py               |  224 +
 test/selenium/lib/initialize.py                    |   31 +
 test/selenium/smoke/Login_and_Accounts.py          |  253 +
 test/selenium/smoke/Service_Offering.py            |  426 ++
 test/selenium/smoke/TemplatesAndISO.py             |  244 +
 test/selenium/smoke/VM_lifeCycle.py                |  613 ++
 test/selenium/smoke/main.py                        |  145 +
 tools/apidoc/gen_toc.py                            |    3 +
 tools/apidoc/generateadmincommands.xsl             |   10 +-
 tools/apidoc/generatedomainadmincommands.xsl       |    2 +-
 tools/apidoc/generatetoc_header.xsl                |    2 +-
 tools/apidoc/generateusercommands.xsl              |    2 +-
 tools/apidoc/pom.xml                               |   18 +-
 tools/appliance/.rvmrc                             |   24 +
 tools/appliance/Gemfile                            |   20 +
 tools/appliance/README.md                          |   67 +
 tools/appliance/build.sh                           |   88 +
 .../appliance/definitions/systemvmtemplate/base.sh |   27 +
 .../definitions/systemvmtemplate/cleanup.sh        |   21 +
 .../definitions/systemvmtemplate/definition.rb     |   45 +
 .../definitions/systemvmtemplate/postinstall.sh    |  220 +
 .../definitions/systemvmtemplate/preseed.cfg       |  357 ++
 .../definitions/systemvmtemplate/zerodisk.sh       |   15 +
 tools/cli/cloudmonkey/cachemaker.py                |   87 +-
 tools/cli/cloudmonkey/cloudmonkey.py               |  222 +-
 tools/cli/cloudmonkey/config.py                    |   13 +-
 tools/cli/cloudmonkey/printer.py                   |   19 +-
 tools/cli/pom.xml                                  |   42 +-
 tools/devcloud-kvm/pom.xml                         |    8 +-
 tools/devcloud/pom.xml                             |   12 +-
 .../src/deps/boxes/basebox-build/definition.rb     |   17 -
 .../src/deps/boxes/basebox-build/preseed.cfg       |   17 -
 tools/git/prepare-commit-msg                       |   23 +-
 tools/marvin/marvin/codegenerator.py               |   31 +-
 tools/marvin/marvin/deployDataCenter.py            |    8 +-
 tools/marvin/pom.xml                               |   68 +-
 tools/pom.xml                                      |   44 +
 tools/whisker/LICENSE                              |  247 +-
 tools/whisker/NOTICE                               |    8 +
 tools/whisker/descriptor-for-packaging.xml         |   55 +
 tools/whisker/descriptor.xml                       |   43 +-
 ui/css/cloudstack3.css                             |  354 ++-
 ui/dictionary.jsp                                  |   29 +-
 ui/images/bg-what-is-cloudstack.png                |  Bin 32240 -> 36116 bytes
 ui/images/logo-login-oss.png                       |  Bin 2534 -> 4567 bytes
 ui/images/logo.png                                 |  Bin 3778 -> 3886 bytes
 ui/images/sample-wizard/step1.png                  |  Bin 52950 -> 0 bytes
 ui/images/sample-wizard/step2.png                  |  Bin 42277 -> 0 bytes
 ui/images/sample-wizard/step3.png                  |  Bin 44303 -> 0 bytes
 ui/images/sample-wizard/step4.png                  |  Bin 37188 -> 0 bytes
 ui/images/sample-wizard/step5.png                  |  Bin 41363 -> 0 bytes
 ui/images/sample-wizard/step6.png                  |  Bin 39897 -> 0 bytes
 ui/images/screens/Dashboard.jpg                    |  Bin 69188 -> 0 bytes
 ui/images/screens/Dashboard2.jpg                   |  Bin 150035 -> 0 bytes
 ui/images/screens/Events-Details.jpg               |  Bin 35278 -> 0 bytes
 ui/images/screens/Events.jpg                       |  Bin 37224 -> 0 bytes
 ui/images/screens/MultiEdit.jpg                    |  Bin 14080 -> 0 bytes
 ui/images/screens/Network-Details.jpg              |  Bin 40540 -> 0 bytes
 ui/images/screens/Network.jpg                      |  Bin 39980 -> 0 bytes
 ui/images/screens/ProjectDashboard.png             |  Bin 97769 -> 0 bytes
 ui/images/screens/Projects-Details.jpg             |  Bin 63045 -> 0 bytes
 ui/images/screens/Projects.jpg                     |  Bin 37662 -> 0 bytes
 ui/images/screens/Storage-Details.jpg              |  Bin 37152 -> 0 bytes
 ui/images/screens/Storage.jpg                      |  Bin 39991 -> 0 bytes
 ui/images/screens/Templates-Details.jpg            |  Bin 37459 -> 0 bytes
 ui/images/screens/Templates.jpg                    |  Bin 41406 -> 0 bytes
 ui/images/screens/ZoneWizard-AddCluster.jpg        |  Bin 13883 -> 0 bytes
 ui/images/screens/ZoneWizard-AddHost.jpg           |  Bin 21496 -> 0 bytes
 ui/images/screens/ZoneWizard-AddPrimaryStorage.jpg |  Bin 19489 -> 0 bytes
 .../screens/ZoneWizard-AddSecondaryStorage.jpg     |  Bin 11123 -> 0 bytes
 ui/images/screens/ZoneWizard-SetupGuestTraffic.jpg |  Bin 15217 -> 0 bytes
 ui/images/screens/ZoneWizard-StorageTraffic.jpg    |  Bin 41681 -> 0 bytes
 ui/images/sprites.png                              |  Bin 180485 -> 188552 bytes
 ui/index.jsp                                       |   14 +-
 ui/lib/require.js                                  | 1993 +++++++
 ui/plugins/plugins.js                              |   21 +
 ui/plugins/testPlugin/config.js                    |   25 +
 ui/plugins/testPlugin/icon.png                     |  Bin 0 -> 7943 bytes
 ui/plugins/testPlugin/testPlugin.css               |   20 +
 ui/plugins/testPlugin/testPlugin.js                |   30 +
 ui/scripts/accounts.js                             |   32 +-
 ui/scripts/autoscaler.js                           |   22 +-
 ui/scripts/cloudStack.js                           |   38 +-
 ui/scripts/configuration.js                        |   13 +
 ui/scripts/docs.js                                 |   42 +
 ui/scripts/globalSettings.js                       |  130 +
 ui/scripts/installWizard.js                        |    5 +-
 ui/scripts/instanceWizard.js                       |   24 +-
 ui/scripts/instances.js                            |  178 +-
 ui/scripts/network.js                              |   20 +-
 ui/scripts/plugins.js                              |   76 +
 ui/scripts/regions.js                              |  170 +
 ui/scripts/sharedFunctions.js                      |    1 +
 ui/scripts/storage.js                              |  115 +
 ui/scripts/system.js                               |  571 ++-
 ui/scripts/ui-custom/dashboard.js                  |    8 +-
 ui/scripts/ui-custom/installWizard.js              |    4 +-
 ui/scripts/ui-custom/physicalResources.js          |    2 +-
 ui/scripts/ui-custom/plugins.js                    |  109 +
 ui/scripts/ui-custom/regions.js                    |  123 +
 ui/scripts/ui-custom/zoneWizard.js                 |   13 +-
 ui/scripts/ui/core.js                              |   15 +-
 ui/scripts/ui/utils.js                             |    6 +-
 ui/scripts/ui/widgets/detailView.js                |   91 +-
 ui/scripts/ui/widgets/multiEdit.js                 |    8 +-
 ui/scripts/ui/widgets/notifications.js             |    4 +-
 ui/scripts/vm_snapshots.js                         |  196 +
 ui/scripts/vpc.js                                  |    7 +
 ui/scripts/zoneWizard.js                           |  367 ++-
 usage/conf/usage-components.xml.in                 |   80 -
 usage/conf/usageApplicationContext.xml.in          |   53 -
 usage/pom.xml                                      |   93 +-
 usage/resources/usageApplicationContext.xml        |   54 +
 usage/src/com/cloud/usage/UsageManagerImpl.java    |    5 +-
 usage/src/com/cloud/usage/UsageServer.java         |    8 +-
 .../cloud/usage/UsageServerComponentConfig.java    |  180 -
 .../cloud/usage/parser/IPAddressUsageParser.java   |    2 +-
 .../usage/parser/LoadBalancerUsageParser.java      |    2 +-
 .../usage/parser/NetworkOfferingUsageParser.java   |    5 +-
 .../com/cloud/usage/parser/NetworkUsageParser.java |    4 +-
 .../usage/parser/PortForwardingUsageParser.java    |    7 +-
 .../usage/parser/SecurityGroupUsageParser.java     |    5 +-
 .../com/cloud/usage/parser/StorageUsageParser.java |    5 +-
 .../cloud/usage/parser/VMInstanceUsageParser.java  |   11 +-
 .../com/cloud/usage/parser/VPNUserUsageParser.java |    5 +-
 .../com/cloud/usage/parser/VolumeUsageParser.java  |    5 +-
 usage/test/com/cloud/usage/UsageManagerTest.java   |   97 +
 .../cloud/usage/UsageManagerTestConfiguration.java |   94 +
 usage/test/resources/UsageManagerTestContext.xml   |   42 +
 usage/test/resources/db.properties                 |   70 +
 utils/pom.xml                                      |    7 +-
 utils/src/com/cloud/utils/PropertiesUtil.java      |    8 +-
 utils/src/com/cloud/utils/StringUtils.java         |    5 +
 .../src/com/cloud/utils/component/AdapterBase.java |    2 +-
 .../cloud/utils/component/ComponentContext.java    |   71 +-
 .../utils/crypt/EncryptionSecretKeyChecker.java    |   15 +-
 utils/src/com/cloud/utils/db/GenericDao.java       |    2 +
 utils/src/com/cloud/utils/db/GenericDaoBase.java   |   46 +-
 utils/src/com/cloud/utils/db/QueryBuilder.java     |   20 +-
 utils/src/com/cloud/utils/db/Transaction.java      |   14 +-
 .../cloud/utils/db/TransactionContextBuilder.java  |   23 +-
 utils/src/com/cloud/utils/net/NetUtils.java        |   90 +-
 utils/src/com/cloud/utils/script/Script.java       |    6 +
 utils/src/com/cloud/utils/xmlobject/XmlObject.java |   21 +-
 .../com/cloud/utils/xmlobject/XmlObjectParser.java |   16 +
 utils/test/com/cloud/utils/db/TransactionTest.java |   12 +-
 .../utils/log/CglibThrowableRendererTest.java      |    6 +-
 utils/test/com/cloud/utils/net/NetUtilsTest.java   |   31 +-
 .../com/cloud/utils/xmlobject/TestXmlObject.java   |   16 +
 .../com/cloud/utils/xmlobject/TestXmlObject2.java  |   16 +
 vmware-base/pom.xml                                |   14 +-
 .../src/com/cloud/hypervisor/vmware/mo/BaseMO.java |   74 +-
 .../com/cloud/hypervisor/vmware/mo/ClusterMO.java  |  318 +-
 .../vmware/mo/CustomFieldsManagerMO.java           |   32 +-
 .../cloud/hypervisor/vmware/mo/DatacenterMO.java   |  332 +-
 .../cloud/hypervisor/vmware/mo/DatastoreMO.java    |  186 +-
 .../vmware/mo/DistributedVirtualSwitchMO.java      |   49 +
 .../vmware/mo/HostDatastoreBrowserMO.java          |   58 +-
 .../vmware/mo/HostDatastoreSystemMO.java           |   92 +-
 .../hypervisor/vmware/mo/HostFirewallSystemMO.java |   14 +-
 .../src/com/cloud/hypervisor/vmware/mo/HostMO.java |  492 +-
 .../cloud/hypervisor/vmware/mo/HttpNfcLeaseMO.java |  109 +-
 .../hypervisor/vmware/mo/HypervisorHostHelper.java |  459 +-
 .../com/cloud/hypervisor/vmware/mo/NetworkMO.java  |   15 +-
 .../cloud/hypervisor/vmware/mo/PerfManagerMO.java  |   85 +-
 .../src/com/cloud/hypervisor/vmware/mo/TaskMO.java |   24 +-
 .../hypervisor/vmware/mo/VirtualDiskManagerMO.java |  126 +-
 .../hypervisor/vmware/mo/VirtualMachineMO.java     | 1288 +++--
 .../hypervisor/vmware/mo/VirtualSwitchType.java    |   35 +-
 .../cloud/hypervisor/vmware/util/VmwareClient.java |  580 ++
 .../hypervisor/vmware/util/VmwareContext.java      |  364 +-
 .../vmware/util/VmwareGuestOsMapper.java           |  282 +-
 .../cloud/hypervisor/vmware/util/VmwareHelper.java |  280 +-
 .../vmware/mo/TestVmwareContextFactory.java        |   14 +-
 .../cloud/hypervisor/vmware/mo/TestVmwareMO.java   |    1 -
 vmware-base/test/com/cloud/vmware/TestVMWare.java  |  240 +-
 waf                                                |  Bin 92487 -> 0 bytes
 waf.bat                                            |   44 -
 wscript                                            |  782 ---
 wscript_build                                      |  457 --
 wscript_configure                                  |  408 --
 1965 files changed, 111428 insertions(+), 49043 deletions(-)
----------------------------------------------------------------------



Mime
View raw message