cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kelv...@apache.org
Subject [6/50] [abbrv] git commit: refs/heads/javelin - Merge branch 'master' into regions
Date Fri, 01 Feb 2013 19:38:12 GMT
Merge branch 'master' into regions

Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/ResponseGenerator.java
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/user/UserVO.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/user/AccountManagerImpl.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/89779cce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/89779cce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/89779cce

Branch: refs/heads/javelin
Commit: 89779cceb84566f554943e0be6307b4e6734e96e
Parents: 4fcf64d 18a09c9
Author: Kishan Kavala <kishan@cloud.com>
Authored: Wed Oct 3 14:09:01 2012 +0530
Committer: Kishan Kavala <kishan@cloud.com>
Committed: Wed Oct 3 14:09:01 2012 +0530

----------------------------------------------------------------------
 .gitignore                                         |   34 +-
 DISCLAIMER                                         |    7 +
 INSTALL.md                                         |  143 +
 INSTALL.txt                                        |   70 -
 KEYS                                               |  288 +
 LICENSE                                            | 4264 ++++++
 NOTICE                                             |  674 +
 README.html                                        |   11 -
 README.md                                          |  138 +-
 agent-simulator/.classpath                         |   23 -
 agent-simulator/.project                           |   17 -
 agent-simulator/db/create-schema-simulator.sql     |   85 -
 agent-simulator/scripts/__old__/deletePod.sh       |   26 -
 .../scripts/__old__/deleteServiceOffering.sh       |   25 -
 agent-simulator/scripts/__old__/deleteVlan.sh      |   26 -
 .../scripts/__old__/deployVirtualMachine.sh        |   26 -
 agent-simulator/scripts/__old__/listRouters.sh     |   22 -
 .../scripts/__old__/listVirtualMachine.sh          |   22 -
 .../scripts/__old__/queryAsyncJobResult.sh         |   53 -
 agent-simulator/scripts/__old__/run.sh             |   25 -
 agent-simulator/scripts/__old__/setupDirectPods.sh |   31 -
 agent-simulator/scripts/__old__/setupHosts.sh      |   23 -
 .../scripts/__old__/setupPodAndNetwork.sh          |   39 -
 .../scripts/__old__/setupServiceOffering.sh        |   24 -
 agent-simulator/scripts/__old__/setupVlan.sh       |   26 -
 .../scripts/__old__/simulator_advanced.sh          |   55 -
 agent-simulator/scripts/__old__/simulator_basic.sh |   53 -
 agent-simulator/scripts/__old__/startRouter.sh     |   26 -
 agent-simulator/scripts/__old__/testQuery.sh       |   22 -
 agent-simulator/scripts/addHostStats.py            |   52 -
 agent-simulator/scripts/addHosts.png               |  Bin 44302 -> 0 bytes
 .../scripts/guava/__old__/1000routers.sh           |   37 -
 .../scripts/guava/__old__/createAdminAccount.sh    |   24 -
 .../scripts/guava/__old__/createStoragePool.sh     |   20 -
 .../scripts/guava/__old__/createUserAccount.sh     |   24 -
 .../scripts/guava/__old__/deleteAccount.sh         |   25 -
 agent-simulator/scripts/guava/__old__/deletePod.sh |   26 -
 .../scripts/guava/__old__/deleteServiceOffering.sh |   25 -
 .../scripts/guava/__old__/deleteVlan.sh            |   26 -
 .../scripts/guava/__old__/deployVirtualMachine.sh  |   27 -
 .../scripts/guava/__old__/destroyVirtualMachine.sh |   25 -
 .../scripts/guava/__old__/listCapacity.sh          |   22 -
 .../scripts/guava/__old__/listEvents.sh            |   22 -
 agent-simulator/scripts/guava/__old__/listHosts.sh |   22 -
 .../scripts/guava/__old__/listRouters.sh           |   22 -
 .../scripts/guava/__old__/listTemplates.sh         |   22 -
 .../scripts/guava/__old__/listVirtualMachine.sh    |   22 -
 agent-simulator/scripts/guava/__old__/load.sh      |   31 -
 .../scripts/guava/__old__/networkShutDown.sh       |   24 -
 .../scripts/guava/__old__/networkStart.sh          |   24 -
 .../scripts/guava/__old__/reconnectStats.sh        |   28 -
 agent-simulator/scripts/guava/__old__/setup.sh     |   44 -
 .../scripts/guava/__old__/setupDirectPods.sh       |   31 -
 .../scripts/guava/__old__/setupHosts.sh            |   23 -
 .../scripts/guava/__old__/setupPodAndNetwork.sh    |   39 -
 .../scripts/guava/__old__/setupServiceOffering.sh  |   24 -
 agent-simulator/scripts/guava/__old__/setupVlan.sh |   26 -
 .../scripts/guava/__old__/startRouter.sh           |   26 -
 .../scripts/guava/__old__/startVirtualMachine.sh   |   26 -
 .../scripts/guava/__old__/stopVirtualMachine.sh    |   26 -
 agent-simulator/scripts/guava/__old__/stress.sh    |   55 -
 agent-simulator/scripts/guava/__old__/stress2.sh   |  127 -
 agent-simulator/scripts/guava/setup.py             |  147 -
 .../scripts/guava/tests/testProvision.py           |  139 -
 agent-simulator/scripts/kumquat/setup.py           |  194 -
 .../scripts/kumquat/tests/testProvision.py         |  259 -
 agent-simulator/scripts/run.bat                    |    2 -
 .../scripts/zucchini/__old__/deletePod.sh          |   26 -
 .../zucchini/__old__/deleteServiceOffering.sh      |   25 -
 .../scripts/zucchini/__old__/deleteVlan.sh         |   26 -
 .../scripts/zucchini/__old__/deployBulk-sg.sh      |  206 -
 .../scripts/zucchini/__old__/deployBulk.sh         |  159 -
 .../zucchini/__old__/deployVirtualMachine.sh       |   26 -
 .../scripts/zucchini/__old__/destroySystemVm.sh    |   52 -
 .../zucchini/__old__/destroyVirtualMachine.sh      |   25 -
 .../scripts/zucchini/__old__/listCapacity.sh       |   22 -
 .../scripts/zucchini/__old__/listEvents.sh         |   22 -
 .../scripts/zucchini/__old__/listHosts.sh          |   22 -
 .../scripts/zucchini/__old__/listRouters.sh        |   22 -
 .../scripts/zucchini/__old__/listTemplates.sh      |   22 -
 .../scripts/zucchini/__old__/listVirtualMachine.sh |   22 -
 .../scripts/zucchini/__old__/monitor.sh            |   36 -
 .../scripts/zucchini/__old__/newsetup.sh           |  228 -
 .../scripts/zucchini/__old__/reconnectStats.sh     |   28 -
 agent-simulator/scripts/zucchini/__old__/setup.sh  |   90 -
 .../scripts/zucchini/__old__/setupDirectPods.sh    |   31 -
 .../scripts/zucchini/__old__/setupHosts.sh         |   23 -
 .../scripts/zucchini/__old__/setupPodAndNetwork.sh |   39 -
 .../zucchini/__old__/setupServiceOffering.sh       |   24 -
 .../scripts/zucchini/__old__/setupVlan.sh          |   26 -
 .../scripts/zucchini/__old__/setup_sg.sh           |  252 -
 agent-simulator/scripts/zucchini/__old__/small.sh  |  158 -
 .../scripts/zucchini/__old__/so_setup.sh           |   21 -
 .../scripts/zucchini/__old__/startRouter.sh        |   26 -
 .../zucchini/__old__/startVirtualMachine.sh        |   26 -
 .../scripts/zucchini/__old__/stopRouter.sh         |   49 -
 .../scripts/zucchini/__old__/stopVirtualMachine.sh |   49 -
 .../scripts/zucchini/__old__/zucchini219.sh        |  119 -
 agent-simulator/scripts/zucchini/setup.py          |  217 -
 .../scripts/zucchini/tests/testListVm.py           |   53 -
 .../scripts/zucchini/tests/testProvision.py        |  184 -
 .../scripts/zucchini/zucchini.configuration.sql    |   41 -
 .../com/cloud/agent/manager/MockAgentManager.java  |   40 +-
 .../cloud/agent/manager/MockAgentManagerImpl.java  |  702 +-
 .../agent/manager/MockStorageManagerImpl.java      | 1835 ++-
 .../src/com/cloud/agent/manager/MockVmManager.java |   23 +-
 .../com/cloud/agent/manager/MockVmManagerImpl.java |  372 +-
 .../cloud/agent/manager/SimulatorManagerImpl.java  |  139 +-
 .../com/cloud/resource/AgentRoutingResource.java   |    9 +-
 .../com/cloud/resource/SimulatorDiscoverer.java    |    6 +-
 .../cloud/simulator/SimulatorRuntimeException.java |   41 +
 .../tomcatconf/commands-simulator.properties.in    |   18 +
 .../tomcatconf/components-simulator.xml.in         |   18 +
 agent/.classpath                                   |   12 -
 agent/.project                                     |   23 -
 agent/bindir/cloud-setup-agent.in                  |   32 +-
 agent/bindir/mycloud-setup-agent                   |  153 -
 agent/conf/agent.properties                        |   41 +-
 agent/conf/dummy.agent.properties                  |   17 -
 agent/conf/environment.properties.in               |    1 +
 agent/conf/log4j-cloud.xml.in                      |   18 +
 .../centos/SYSCONFDIR/rc.d/init.d/cloud-agent.in   |   35 +-
 .../fedora/SYSCONFDIR/rc.d/init.d/cloud-agent.in   |   35 +-
 .../opensuse/sles/SYSCONFDIR/init.d/cloud-agent.in |   49 +-
 .../rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in     |   35 +-
 agent/distro/sles/SYSCONFDIR/init.d/cloud-agent.in |   49 +-
 .../distro/ubuntu/SYSCONFDIR/init.d/cloud-agent.in |  183 +-
 .../ubuntu/SYSCONFDIR/init/cloud-cleanup.conf      |   32 -
 agent/doc/README-iscsi.txt                         |  230 -
 agent/doc/README.txt                               |  194 -
 agent/libexec/agent-runner.in                      |   88 -
 agent/pom.xml                                      |   65 +
 agent/scripts/run.sh                               |    2 +-
 agent/src/com/cloud/agent/Agent.java               |   30 +-
 agent/src/com/cloud/agent/AgentShell.java          |   41 +-
 agent/src/com/cloud/agent/VmmAgentShell.java       |  526 +
 .../resource/computing/FakeComputingResource.java  |  645 -
 .../agent/resource/computing/KVMGuestOsMapper.java |  169 -
 .../cloud/agent/resource/computing/KVMHABase.java  |  220 -
 .../agent/resource/computing/KVMHAChecker.java     |   85 -
 .../agent/resource/computing/KVMHAMonitor.java     |  119 -
 .../resource/computing/LibvirtCapXMLParser.java    |  194 -
 .../computing/LibvirtComputingResource.java        | 4087 ------
 .../resource/computing/LibvirtConnection.java      |   48 -
 .../resource/computing/LibvirtDomainXMLParser.java |  253 -
 .../resource/computing/LibvirtNetworkDef.java      |  193 -
 .../resource/computing/LibvirtStoragePoolDef.java  |   90 -
 .../computing/LibvirtStoragePoolXMLParser.java     |  109 -
 .../computing/LibvirtStorageVolumeDef.java         |   91 -
 .../computing/LibvirtStorageVolumeXMLParser.java   |  104 -
 .../agent/resource/computing/LibvirtVMDef.java     |  902 --
 .../agent/resource/computing/LibvirtXMLParser.java |   72 -
 .../ConsoleProxyAuthenticationResult.java          |  128 +-
 .../com/cloud/agent/storage/KVMPhysicalDisk.java   |   82 -
 .../com/cloud/agent/storage/KVMStoragePool.java    |   55 -
 .../cloud/agent/storage/KVMStoragePoolManager.java |  104 -
 .../com/cloud/agent/storage/KVMVirtualDisk.java    |   21 -
 .../cloud/agent/storage/LibvirtStorageAdaptor.java |  703 -
 .../cloud/agent/storage/LibvirtStoragePool.java    |  158 -
 .../com/cloud/agent/storage/StorageAdaptor.java    |   70 -
 .../com/cloud/agent/vmdata/JettyVmDataServer.java  |  370 -
 api/.classpath                                     |    8 -
 api/.project                                       |   17 -
 api/pom.xml                                        |   44 +
 .../agent/api/CheckS2SVpnConnectionsAnswer.java    |   71 +
 .../agent/api/CheckS2SVpnConnectionsCommand.java   |   39 +
 .../com/cloud/agent/api/GetHostStatsAnswer.java    |    4 -
 api/src/com/cloud/agent/api/HostStatsEntry.java    |    4 -
 .../cloud/agent/api/ModifyStoragePoolAnswer.java   |    4 -
 .../com/cloud/agent/api/NetworkUsageCommand.java   |   44 +-
 api/src/com/cloud/agent/api/PlugNicAnswer.java     |   25 +
 api/src/com/cloud/agent/api/PlugNicCommand.java    |   46 +
 .../agent/api/PrepareForMigrationCommand.java      |   11 +-
 api/src/com/cloud/agent/api/RebootAnswer.java      |   33 +-
 api/src/com/cloud/agent/api/RebootCommand.java     |    4 -
 .../cloud/agent/api/SetupGuestNetworkAnswer.java   |   25 +
 .../cloud/agent/api/SetupGuestNetworkCommand.java  |   72 +
 api/src/com/cloud/agent/api/StartupAnswer.java     |    4 -
 api/src/com/cloud/agent/api/StopAnswer.java        |    8 +-
 api/src/com/cloud/agent/api/StopCommand.java       |   10 -
 api/src/com/cloud/agent/api/UnPlugNicAnswer.java   |   25 +
 api/src/com/cloud/agent/api/UnPlugNicCommand.java  |   45 +
 api/src/com/cloud/agent/api/VmStatsEntry.java      |    4 -
 .../com/cloud/agent/api/routing/IpAssocAnswer.java |    6 +-
 .../cloud/agent/api/routing/IpAssocCommand.java    |    5 -
 .../cloud/agent/api/routing/IpAssocVpcCommand.java |   29 +
 .../api/routing/LoadBalancerConfigCommand.java     |   17 +-
 .../agent/api/routing/NetworkElementCommand.java   |    1 +
 .../agent/api/routing/SetFirewallRulesCommand.java |    2 -
 .../agent/api/routing/SetNetworkACLAnswer.java     |   36 +
 .../agent/api/routing/SetNetworkACLCommand.java    |   97 +
 .../routing/SetPortForwardingRulesVpcCommand.java  |   30 +
 .../agent/api/routing/SetSourceNatAnswer.java      |   27 +
 .../agent/api/routing/SetSourceNatCommand.java     |   42 +
 .../api/routing/SetStaticNatRulesCommand.java      |    7 +-
 .../agent/api/routing/SetStaticRouteAnswer.java    |   36 +
 .../agent/api/routing/SetStaticRouteCommand.java   |   62 +
 .../agent/api/routing/Site2SiteVpnCfgCommand.java  |  154 +
 .../cloud/agent/api/storage/DownloadCommand.java   |    4 -
 .../agent/api/storage/DownloadProgressCommand.java |    4 -
 api/src/com/cloud/agent/api/to/IpAddressTO.java    |   10 +-
 api/src/com/cloud/agent/api/to/NetworkACLTO.java   |  125 +
 api/src/com/cloud/agent/api/to/NetworkTO.java      |    1 -
 api/src/com/cloud/agent/api/to/NicTO.java          |   11 +
 api/src/com/cloud/agent/api/to/StorageFilerTO.java |    6 +
 .../com/cloud/agent/api/to/VirtualMachineTO.java   |   11 +
 api/src/com/cloud/alert/Alert.java                 |    4 -
 api/src/com/cloud/api/ApiConstants.java            |   22 +
 api/src/com/cloud/api/BaseAsyncCmd.java            |    2 +
 api/src/com/cloud/api/BaseCmd.java                 |   29 +-
 .../com/cloud/api/BaseListDomainResourcesCmd.java  |    9 +-
 .../api/BaseListProjectAndAccountResourcesCmd.java |    2 +-
 .../com/cloud/api/BaseListTaggedResourcesCmd.java  |   48 +
 api/src/com/cloud/api/Implementation.java          |    4 +-
 api/src/com/cloud/api/ResponseGenerator.java       |   52 +-
 api/src/com/cloud/api/commands/.gitignore          |   17 +
 api/src/com/cloud/api/commands/AddVpnUserCmd.java  |    2 +-
 .../com/cloud/api/commands/AssociateIPAddrCmd.java |   95 +-
 .../cloud/api/commands/CreateDiskOfferingCmd.java  |   11 +-
 .../cloud/api/commands/CreateFirewallRuleCmd.java  |   22 +-
 .../api/commands/CreateIpForwardingRuleCmd.java    |    7 +-
 .../api/commands/CreateLoadBalancerRuleCmd.java    |   36 +-
 .../cloud/api/commands/CreateNetworkACLCmd.java    |  328 +
 .../com/cloud/api/commands/CreateNetworkCmd.java   |   27 +-
 .../api/commands/CreatePortForwardingRuleCmd.java  |  126 +-
 .../api/commands/CreatePrivateGatewayCmd.java      |  182 +
 .../api/commands/CreatePrivateNetworkCmd.java      |  199 +
 .../api/commands/CreateRemoteAccessVpnCmd.java     |   17 +-
 .../cloud/api/commands/CreateStaticRouteCmd.java   |  149 +
 api/src/com/cloud/api/commands/CreateTagsCmd.java  |   10 +-
 api/src/com/cloud/api/commands/CreateVPCCmd.java   |  189 +
 .../cloud/api/commands/CreateVPCOfferingCmd.java   |  120 +
 .../commands/CreateVirtualRouterElementCmd.java    |    3 +-
 .../cloud/api/commands/CreateVpnConnectionCmd.java |  147 +
 .../api/commands/CreateVpnCustomerGatewayCmd.java  |  170 +
 .../cloud/api/commands/CreateVpnGatewayCmd.java    |  108 +
 api/src/com/cloud/api/commands/CreateZoneCmd.java  |   13 +-
 .../cloud/api/commands/DeleteNetworkACLCmd.java    |  121 +
 .../api/commands/DeletePrivateGatewayCmd.java      |  114 +
 .../cloud/api/commands/DeleteStaticRouteCmd.java   |  124 +
 api/src/com/cloud/api/commands/DeleteTagsCmd.java  |   12 +-
 api/src/com/cloud/api/commands/DeleteVPCCmd.java   |  107 +
 .../cloud/api/commands/DeleteVPCOfferingCmd.java   |   92 +
 .../cloud/api/commands/DeleteVpnConnectionCmd.java |  104 +
 .../api/commands/DeleteVpnCustomerGatewayCmd.java  |   97 +
 .../cloud/api/commands/DeleteVpnGatewayCmd.java    |   98 +
 api/src/com/cloud/api/commands/DeployVMCmd.java    |   14 +-
 .../cloud/api/commands/DisassociateIPAddrCmd.java  |    7 +-
 .../com/cloud/api/commands/EnableStaticNatCmd.java |   32 +-
 api/src/com/cloud/api/commands/GetUserCmd.java     |   76 +
 .../cloud/api/commands/ListFirewallRulesCmd.java   |    6 +-
 api/src/com/cloud/api/commands/ListIsosCmd.java    |    4 +-
 .../api/commands/ListLoadBalancerRulesCmd.java     |    5 +-
 .../com/cloud/api/commands/ListNetworkACLsCmd.java |   94 +
 .../api/commands/ListNetworkOfferingsCmd.java      |    8 +
 .../com/cloud/api/commands/ListNetworksCmd.java    |   24 +-
 .../api/commands/ListPortForwardingRulesCmd.java   |   14 +-
 .../cloud/api/commands/ListPrivateGatewaysCmd.java |  106 +
 .../com/cloud/api/commands/ListProjectsCmd.java    |   31 +-
 .../api/commands/ListPublicIpAddressesCmd.java     |   13 +-
 api/src/com/cloud/api/commands/ListRoutersCmd.java |   16 +-
 .../cloud/api/commands/ListSecurityGroupsCmd.java  |   30 +-
 .../com/cloud/api/commands/ListSnapshotsCmd.java   |   13 +-
 .../cloud/api/commands/ListStaticRoutesCmd.java    |   85 +
 api/src/com/cloud/api/commands/ListTagsCmd.java    |   10 +-
 .../com/cloud/api/commands/ListTemplatesCmd.java   |    4 +-
 api/src/com/cloud/api/commands/ListVMsCmd.java     |   28 +-
 .../cloud/api/commands/ListVPCOfferingsCmd.java    |  116 +
 api/src/com/cloud/api/commands/ListVPCsCmd.java    |  159 +
 api/src/com/cloud/api/commands/ListVolumesCmd.java |   13 +-
 .../cloud/api/commands/ListVpnConnectionsCmd.java  |   92 +
 .../api/commands/ListVpnCustomerGatewaysCmd.java   |   84 +
 .../com/cloud/api/commands/ListVpnGatewaysCmd.java |   91 +
 .../api/commands/MarkDefaultZoneForAccountCmd.java |    2 +-
 .../com/cloud/api/commands/RemoveVpnUserCmd.java   |    2 +-
 .../cloud/api/commands/ResetVpnConnectionCmd.java  |  120 +
 api/src/com/cloud/api/commands/RestartVPCCmd.java  |  110 +
 .../com/cloud/api/commands/UpdateNetworkCmd.java   |   19 +-
 .../api/commands/UpdateNetworkOfferingCmd.java     |    3 +-
 .../api/commands/UpdatePhysicalNetworkCmd.java     |   12 +-
 .../commands/UpdateStorageNetworkIpRangeCmd.java   |    3 +-
 api/src/com/cloud/api/commands/UpdateVPCCmd.java   |  109 +
 .../cloud/api/commands/UpdateVPCOfferingCmd.java   |  111 +
 .../api/commands/UpdateVpnCustomerGatewayCmd.java  |  170 +
 api/src/com/cloud/api/commands/UpdateZoneCmd.java  |   10 +-
 .../com/cloud/api/response/AccountResponse.java    |   12 +-
 .../com/cloud/api/response/AsyncJobResponse.java   |    8 +-
 .../cloud/api/response/DiskOfferingResponse.java   |   10 +
 .../cloud/api/response/DomainRouterResponse.java   |   18 +-
 .../com/cloud/api/response/ExceptionResponse.java  |   43 +-
 .../com/cloud/api/response/FirewallResponse.java   |   17 +-
 .../cloud/api/response/FirewallRuleResponse.java   |   11 +-
 .../com/cloud/api/response/IPAddressResponse.java  |   27 +-
 .../cloud/api/response/LoadBalancerResponse.java   |   11 +-
 .../com/cloud/api/response/NetworkACLResponse.java |   98 +
 .../api/response/NetworkOfferingResponse.java      |    7 +
 .../com/cloud/api/response/NetworkResponse.java    |   16 +-
 api/src/com/cloud/api/response/NicResponse.java    |    7 +
 .../cloud/api/response/PrivateGatewayResponse.java |  140 +
 .../com/cloud/api/response/ProjectResponse.java    |   11 +-
 .../cloud/api/response/ResourceTagResponse.java    |    4 -
 .../cloud/api/response/SecurityGroupResponse.java  |    9 +-
 .../response/Site2SiteCustomerGatewayResponse.java |  152 +
 .../response/Site2SiteVpnConnectionResponse.java   |  173 +
 .../api/response/Site2SiteVpnGatewayResponse.java  |   96 +
 .../com/cloud/api/response/SnapshotResponse.java   |   10 +-
 .../cloud/api/response/StaticRouteResponse.java    |  113 +
 .../com/cloud/api/response/TemplateResponse.java   |    8 +
 api/src/com/cloud/api/response/UserVmResponse.java |   16 +-
 api/src/com/cloud/api/response/VolumeResponse.java |   12 +-
 .../cloud/api/response/VpcOfferingResponse.java    |   78 +
 api/src/com/cloud/api/response/VpcResponse.java    |  170 +
 api/src/com/cloud/api/response/ZoneResponse.java   |    7 +
 api/src/com/cloud/async/AsyncJob.java              |    4 +-
 api/src/com/cloud/capacity/Capacity.java           |    4 -
 .../cloud/configuration/ConfigurationService.java  |    7 +-
 api/src/com/cloud/configuration/Resource.java      |    3 +-
 api/src/com/cloud/dc/DataCenter.java               |    1 +
 api/src/com/cloud/deploy/DeploymentPlanner.java    |    8 +
 api/src/com/cloud/event/EventTypes.java            |   27 +
 .../exception/InvalidParameterValueException.java  |    4 -
 .../cloud/exception/ManagementServerException.java |    4 -
 .../cloud/exception/PermissionDeniedException.java |    4 -
 .../cloud/exception/ResourceInUseException.java    |    4 -
 api/src/com/cloud/host/Host.java                   |    3 +-
 api/src/com/cloud/host/HostStats.java              |    4 -
 .../cloud/hypervisor/HypervisorCapabilities.java   |    5 +-
 api/src/com/cloud/hypervisor/HypervisorGuru.java   |    8 +
 api/src/com/cloud/network/IpAddress.java           |   10 +
 api/src/com/cloud/network/Network.java             |   22 +-
 api/src/com/cloud/network/NetworkProfile.java      |    7 +
 api/src/com/cloud/network/NetworkService.java      |   79 +-
 api/src/com/cloud/network/Networks.java            |    1 +
 api/src/com/cloud/network/PhysicalNetwork.java     |    3 +-
 .../network/PhysicalNetworkServiceProvider.java    |    2 +
 .../cloud/network/Site2SiteCustomerGateway.java    |   35 +
 .../com/cloud/network/Site2SiteVpnConnection.java  |   36 +
 api/src/com/cloud/network/Site2SiteVpnGateway.java |   28 +
 .../network/VirtualNetworkApplianceService.java    |    7 +-
 .../com/cloud/network/VirtualRouterProvider.java   |    3 +-
 .../network/VpcVirtualNetworkApplianceService.java |   49 +
 .../network/element/ConnectivityProvider.java      |   21 +
 .../network/element/NetworkACLServiceProvider.java |   35 +
 .../com/cloud/network/element/NetworkElement.java  |   19 +-
 .../element/Site2SiteVpnServiceProvider.java       |   27 +
 .../network/element/UserDataServiceProvider.java   |    1 -
 .../element/VirtualRouterElementService.java       |    3 +-
 api/src/com/cloud/network/element/VpcProvider.java |   55 +
 .../cloud/network/firewall/NetworkACLService.java  |   48 +
 .../com/cloud/network/lb/LoadBalancingRule.java    |    7 +-
 .../com/cloud/network/router/VirtualRouter.java    |    5 +-
 api/src/com/cloud/network/rules/FirewallRule.java  |   13 +-
 api/src/com/cloud/network/rules/RulesService.java  |    2 +-
 api/src/com/cloud/network/rules/StaticNatRule.java |    2 +-
 .../com/cloud/network/security/SecurityRule.java   |    4 -
 api/src/com/cloud/network/vpc/PrivateGateway.java  |   21 +
 api/src/com/cloud/network/vpc/PrivateIp.java       |   48 +
 api/src/com/cloud/network/vpc/StaticRoute.java     |   55 +
 .../com/cloud/network/vpc/StaticRouteProfile.java  |   98 +
 api/src/com/cloud/network/vpc/Vpc.java             |   52 +
 api/src/com/cloud/network/vpc/VpcGateway.java      |   81 +
 api/src/com/cloud/network/vpc/VpcOffering.java     |   46 +
 api/src/com/cloud/network/vpc/VpcService.java      |  248 +
 .../cloud/network/vpn/RemoteAccessVpnService.java  |    5 +-
 .../com/cloud/network/vpn/Site2SiteVpnService.java |   53 +
 api/src/com/cloud/offering/NetworkOffering.java    |    6 +-
 api/src/com/cloud/projects/ProjectService.java     |    4 +-
 api/src/com/cloud/server/ResourceTag.java          |   11 +-
 .../com/cloud/server/TaggedResourceService.java    |    7 +-
 api/src/com/cloud/storage/GuestOsCategory.java     |    6 +-
 api/src/com/cloud/storage/Storage.java             |    2 +
 api/src/com/cloud/storage/StoragePool.java         |   10 +-
 api/src/com/cloud/storage/StorageService.java      |    9 +-
 .../storage/VMTemplateStorageResourceAssoc.java    |    4 -
 api/src/com/cloud/storage/Volume.java              |    7 +-
 api/src/com/cloud/user/AccountService.java         |    2 +
 api/src/com/cloud/vm/Nic.java                      |    3 +-
 api/src/com/cloud/vm/NicProfile.java               |   14 +-
 api/src/com/cloud/vm/UserVmService.java            |    1 -
 api/src/com/cloud/vm/VirtualMachine.java           |    2 +
 api/src/com/cloud/vm/VirtualMachineProfile.java    |    7 +-
 awsapi-setup/db/mysql/init_db.bat                  |   17 +
 awsapi-setup/setup/cloudstack-aws-api-register     |    2 +-
 awsapi/.classpath                                  |   67 -
 awsapi/.project                                    |   23 -
 awsapi/.pydevproject                               |   18 +
 awsapi/LICENSE.txt                                 |  203 -
 awsapi/NOTICE.txt                                  |   26 -
 awsapi/axis2.war                                   |  Bin 18714716 -> 0 bytes
 awsapi/conf/CloudStack.cfg.xml                     |   40 -
 awsapi/conf/cloud-bridge.properties                |   33 +-
 awsapi/conf/ec2-service.properties                 |   19 +-
 awsapi/conf/hibernate.cfg.xml                      |   33 -
 awsapi/deploy-cloud-bridge.sh                      |  136 -
 awsapi/docs/AmazonEC2/EC2-API-tool-setup.txt       |   48 -
 .../docs/AmazonEC2/EC2-implementation-guide.html   |  146 -
 .../docs/AmazonEC2/EC2-local-deploy-using-ant.html |   74 -
 awsapi/docs/AmazonEC2/EC2-users-guide.html         |  257 -
 awsapi/docs/AmazonEC2/wsdl2java-command-line.txt   |    2 -
 awsapi/docs/AmazonS3/S3-users-guide.html           |  102 -
 awsapi/docs/AmazonS3/notes.txt                     |   10 -
 awsapi/docs/AmazonS3/wsdl2java-command-line.txt    |   47 -
 awsapi/install.sh                                  |   33 -
 awsapi/modules/.gitignore                          |   54 +
 awsapi/modules/axis2-adb-1.6.2.jar                 |  Bin 688884 -> 0 bytes
 awsapi/modules/axis2-adb-codegen-1.6.2.jar         |  Bin 180677 -> 0 bytes
 awsapi/modules/axis2-ant-plugin-1.6.2.jar          |  Bin 18284 -> 0 bytes
 awsapi/modules/axis2-clustering-1.6.2.jar          |  Bin 107281 -> 0 bytes
 awsapi/modules/axis2-codegen-1.6.2.jar             |  Bin 254405 -> 0 bytes
 awsapi/modules/axis2-corba-1.6.2.jar               |  Bin 147181 -> 0 bytes
 awsapi/modules/axis2-fastinfoset-1.6.2.jar         |  Bin 16437 -> 0 bytes
 awsapi/modules/axis2-java2wsdl-1.6.2.jar           |  Bin 27749 -> 0 bytes
 awsapi/modules/axis2-jaxbri-1.6.2.jar              |  Bin 28700 -> 0 bytes
 awsapi/modules/axis2-jaxws-1.6.2.jar               |  Bin 743899 -> 0 bytes
 awsapi/modules/axis2-jibx-1.6.2.jar                |  Bin 35742 -> 0 bytes
 awsapi/modules/axis2-json-1.6.2.jar                |  Bin 19191 -> 0 bytes
 awsapi/modules/axis2-kernel-1.6.2.jar              |  Bin 1045467 -> 0 bytes
 awsapi/modules/axis2-metadata-1.6.2.jar            |  Bin 432494 -> 0 bytes
 awsapi/modules/axis2-mtompolicy-1.6.2.jar          |  Bin 13946 -> 0 bytes
 awsapi/modules/axis2-saaj-1.6.2.jar                |  Bin 90445 -> 0 bytes
 awsapi/modules/axis2-soapmonitor-servlet-1.6.2.jar |  Bin 33756 -> 0 bytes
 awsapi/modules/axis2-spring-1.6.2.jar              |  Bin 11466 -> 0 bytes
 awsapi/modules/axis2-transport-http-1.6.2.jar      |  Bin 152926 -> 0 bytes
 awsapi/modules/axis2-transport-local-1.6.2.jar     |  Bin 16117 -> 0 bytes
 awsapi/modules/axis2-xmlbeans-1.6.2.jar            |  Bin 27446 -> 0 bytes
 awsapi/modules/rahas-1.5.mar                       |  Bin 3039 -> 0 bytes
 awsapi/modules/rampart-1.5.mar                     |  Bin 2947 -> 0 bytes
 awsapi/packages/config/debian/changelog            |   12 -
 awsapi/packages/config/debian/cloud-bridge.install |    4 -
 .../packages/config/debian/cloud-bridge.postinst   |   23 -
 awsapi/packages/config/debian/control              |   13 -
 awsapi/packages/config/debian/rules                |  119 -
 awsapi/packages/config/rpm/cloudbridge.spec        |   81 -
 awsapi/pom.xml                                     |  386 +
 awsapi/release-notes.html                          |  123 -
 awsapi/release-notes.txt                           |   23 -
 awsapi/resource/AmazonEC2/AmazonEC2.wsdl           | 4916 -------
 awsapi/resource/AmazonEC2/crypto.properties        |   30 +-
 awsapi/resource/AmazonEC2/services.xml             |   16 +
 awsapi/resource/Axis2/axis2.xml                    | 1122 +-
 awsapi/scripts/run.bat                             |   19 +-
 .../bridge/auth/ec2/AuthenticationHandler.java     |   21 +-
 awsapi/src/com/cloud/bridge/auth/ec2/module.xml    |   18 +
 .../bridge/auth/s3/AuthenticationHandler.java      |   10 +-
 awsapi/src/com/cloud/bridge/auth/s3/module.xml     |   18 +
 .../com/cloud/bridge/io/FileRangeDataSource.java   |    3 -
 .../com/cloud/bridge/io/FileRangeInputStream.java  |    3 -
 .../bridge/io/MTOMAwareResultStreamWriter.java     |    1 -
 .../com/cloud/bridge/io/S3CAStorBucketAdapter.java |  479 +
 .../cloud/bridge/io/S3FileSystemBucketAdapter.java |    3 -
 .../bridge/lifecycle/ServiceEngineLifecycle.java   |    5 +-
 .../src/com/cloud/bridge/model/BucketPolicyVO.java |   75 +
 .../cloud/bridge/model/CloudStackAccountVO.java    |   50 +
 .../bridge/model/CloudStackConfigurationVO.java    |   46 +
 .../bridge/model/CloudStackServiceOfferingVO.java  |   67 +
 awsapi/src/com/cloud/bridge/model/MHost.hbm.xml    |   37 -
 awsapi/src/com/cloud/bridge/model/MHost.java       |  114 -
 .../src/com/cloud/bridge/model/MHostMount.hbm.xml  |   28 -
 awsapi/src/com/cloud/bridge/model/MHostMount.java  |   95 -
 .../src/com/cloud/bridge/model/MHostMountVO.java   |  136 +
 awsapi/src/com/cloud/bridge/model/MHostVO.java     |  137 +
 .../com/cloud/bridge/model/MultiPartPartsVO.java   |  124 +
 .../com/cloud/bridge/model/MultiPartUploadsVO.java |  110 +
 .../com/cloud/bridge/model/MultipartMetaVO.java    |   75 +
 .../com/cloud/bridge/model/OfferingBundleVO.java   |   62 +
 awsapi/src/com/cloud/bridge/model/SAcl.hbm.xml     |   36 -
 awsapi/src/com/cloud/bridge/model/SAcl.java        |  107 +-
 awsapi/src/com/cloud/bridge/model/SAclVO.java      |  254 +
 awsapi/src/com/cloud/bridge/model/SBucket.hbm.xml  |   38 -
 awsapi/src/com/cloud/bridge/model/SBucket.java     |   12 +-
 awsapi/src/com/cloud/bridge/model/SBucketVO.java   |  169 +
 awsapi/src/com/cloud/bridge/model/SHost.hbm.xml    |   42 -
 awsapi/src/com/cloud/bridge/model/SHost.java       |   23 +-
 awsapi/src/com/cloud/bridge/model/SHostVO.java     |  152 +
 awsapi/src/com/cloud/bridge/model/SMeta.hbm.xml    |   23 -
 awsapi/src/com/cloud/bridge/model/SMeta.java       |   97 -
 awsapi/src/com/cloud/bridge/model/SMetaVO.java     |  112 +
 awsapi/src/com/cloud/bridge/model/SObject.hbm.xml  |   41 -
 awsapi/src/com/cloud/bridge/model/SObject.java     |  209 -
 .../src/com/cloud/bridge/model/SObjectItem.hbm.xml |   44 -
 awsapi/src/com/cloud/bridge/model/SObjectItem.java |  152 -
 .../src/com/cloud/bridge/model/SObjectItemVO.java  |  191 +
 awsapi/src/com/cloud/bridge/model/SObjectVO.java   |  242 +
 .../com/cloud/bridge/model/UserCredentials.hbm.xml |   20 -
 .../com/cloud/bridge/model/UserCredentials.java    |   95 -
 .../com/cloud/bridge/model/UserCredentialsVO.java  |  117 +
 awsapi/src/com/cloud/bridge/persist/EntityDao.java |  119 -
 .../cloud/bridge/persist/GMTDateTimeUserType.java  |  103 -
 .../com/cloud/bridge/persist/PersistContext.java   |  360 -
 .../com/cloud/bridge/persist/PersistException.java |   39 -
 .../cloud/bridge/persist/dao/BucketPolicyDao.java  |  141 +-
 .../bridge/persist/dao/BucketPolicyDaoImpl.java    |   72 +
 .../bridge/persist/dao/CloudStackAccountDao.java   |   20 +-
 .../persist/dao/CloudStackAccountDaoImpl.java      |   55 +
 .../persist/dao/CloudStackConfigurationDao.java    |   25 +-
 .../dao/CloudStackConfigurationDaoImpl.java        |   66 +
 .../persist/dao/CloudStackSvcOfferingDao.java      |   23 +-
 .../persist/dao/CloudStackSvcOfferingDaoImpl.java  |   75 +
 .../src/com/cloud/bridge/persist/dao/MHostDao.java |   21 +-
 .../com/cloud/bridge/persist/dao/MHostDaoImpl.java |   61 +
 .../cloud/bridge/persist/dao/MHostMountDao.java    |   20 +-
 .../bridge/persist/dao/MHostMountDaoImpl.java      |   48 +
 .../bridge/persist/dao/MultiPartPartsDao.java      |   34 +
 .../bridge/persist/dao/MultiPartPartsDaoImpl.java  |  117 +
 .../bridge/persist/dao/MultiPartUploadsDao.java    |   37 +
 .../persist/dao/MultiPartUploadsDaoImpl.java       |  124 +
 .../cloud/bridge/persist/dao/MultipartLoadDao.java |  428 +-
 .../cloud/bridge/persist/dao/MultipartMetaDao.java |   28 +
 .../bridge/persist/dao/MultipartMetaDaoImpl.java   |   50 +
 .../com/cloud/bridge/persist/dao/OfferingDao.java  |  151 +-
 .../cloud/bridge/persist/dao/OfferingDaoImpl.java  |  135 +
 .../src/com/cloud/bridge/persist/dao/SAclDao.java  |   62 +-
 .../com/cloud/bridge/persist/dao/SAclDaoImpl.java  |  127 +
 .../com/cloud/bridge/persist/dao/SBucketDao.java   |   24 +-
 .../cloud/bridge/persist/dao/SBucketDaoImpl.java   |   72 +
 .../src/com/cloud/bridge/persist/dao/SHostDao.java |   26 +-
 .../com/cloud/bridge/persist/dao/SHostDaoImpl.java |   67 +
 .../src/com/cloud/bridge/persist/dao/SMetaDao.java |   41 +-
 .../com/cloud/bridge/persist/dao/SMetaDaoImpl.java |   88 +
 .../com/cloud/bridge/persist/dao/SObjectDao.java   |   64 +-
 .../cloud/bridge/persist/dao/SObjectDaoImpl.java   |  119 +
 .../cloud/bridge/persist/dao/SObjectItemDao.java   |   23 +-
 .../bridge/persist/dao/SObjectItemDaoImpl.java     |   71 +
 .../bridge/persist/dao/UserCredentialsDao.java     |  151 +-
 .../bridge/persist/dao/UserCredentialsDaoImpl.java |   73 +
 .../com/cloud/bridge/service/EC2MainServlet.java   |   22 +-
 .../com/cloud/bridge/service/EC2RestServlet.java   |   69 +-
 .../cloud/bridge/service/EC2SoapServiceImpl.java   |  439 +-
 .../com/cloud/bridge/service/S3RestServlet.java    |   49 +-
 .../service/controller/s3/S3BucketAction.java      |  873 +-
 .../service/controller/s3/S3ObjectAction.java      |   21 +-
 .../s3/S3SerializableServiceImplementation.java    |    2 +-
 .../service/controller/s3/ServiceProvider.java     |  177 +-
 .../service/controller/s3/ServletAction.java       |    3 -
 .../service/core/ec2/EC2AddressFilterSet.java      |    4 -
 .../service/core/ec2/EC2DescribeInstances.java     |    9 +
 .../service/core/ec2/EC2DescribeKeyPairs.java      |    4 -
 .../core/ec2/EC2DescribeKeyPairsResponse.java      |    4 -
 .../service/core/ec2/EC2DescribeSnapshots.java     |    9 +
 .../bridge/service/core/ec2/EC2DescribeTags.java   |   34 +
 .../service/core/ec2/EC2DescribeTagsResponse.java  |   37 +
 .../service/core/ec2/EC2DescribeVolumes.java       |    9 +
 .../cloud/bridge/service/core/ec2/EC2Engine.java   |  262 +-
 .../cloud/bridge/service/core/ec2/EC2Image.java    |   15 +-
 .../cloud/bridge/service/core/ec2/EC2Instance.java |   22 +-
 .../service/core/ec2/EC2InstanceFilterSet.java     |   45 +-
 .../service/core/ec2/EC2KeyPairFilterSet.java      |    4 -
 .../bridge/service/core/ec2/EC2RegisterImage.java  |   24 +-
 .../bridge/service/core/ec2/EC2ResourceTag.java    |   64 +
 .../cloud/bridge/service/core/ec2/EC2Snapshot.java |   12 +
 .../service/core/ec2/EC2SnapshotFilterSet.java     |   45 +-
 .../bridge/service/core/ec2/EC2TagKeyValue.java    |   44 +
 .../bridge/service/core/ec2/EC2TagTypeId.java      |   47 +
 .../com/cloud/bridge/service/core/ec2/EC2Tags.java |   44 +
 .../bridge/service/core/ec2/EC2TagsFilterSet.java  |  107 +
 .../cloud/bridge/service/core/ec2/EC2Volume.java   |   15 +-
 .../service/core/ec2/EC2VolumeFilterSet.java       |   43 +-
 .../service/core/s3/S3AccessControlList.java       |    1 -
 .../service/core/s3/S3AccessControlPolicy.java     |    3 -
 .../bridge/service/core/s3/S3CanonicalUser.java    |    3 -
 .../service/core/s3/S3CopyObjectRequest.java       |    1 +
 .../com/cloud/bridge/service/core/s3/S3Engine.java |  818 +-
 .../com/cloud/bridge/service/core/s3/S3Grant.java  |    5 +-
 .../service/core/s3/S3PutObjectInlineRequest.java  |    3 -
 .../service/core/s3/S3PutObjectInlineResponse.java |    3 -
 .../bridge/service/core/s3/S3PutObjectRequest.java |    3 -
 .../service/core/s3/S3PutObjectResponse.java       |    3 -
 .../cloud/bridge/service/core/s3/S3Request.java    |    3 -
 .../service/exception/EC2ServiceException.java     |    1 +
 .../com/cloud/bridge/util/CloudSessionFactory.java |  106 -
 .../bridge/util/CloudStackSessionFactory.java      |  110 -
 .../bridge/util/ISO8601SimpleDateTimeFormat.java   |    1 -
 awsapi/src/com/cloud/bridge/util/QueryHelper.java  |   85 -
 awsapi/src/com/cloud/bridge/util/XFlatten.java     |    3 -
 awsapi/src/com/cloud/stack/CloudStackApi.java      |   98 +-
 .../src/com/cloud/stack/models/ApiConstants.java   |   11 +
 .../cloud/stack/models/CloudStackAccount.hbm.xml   |   16 -
 .../stack/models/CloudStackConfiguration.hbm.xml   |   19 -
 .../com/cloud/stack/models/CloudStackKeyPair.java  |    4 -
 .../cloud/stack/models/CloudStackResourceTag.java  |   50 +
 .../stack/models/CloudStackServiceOffering.hbm.xml |   16 -
 .../com/cloud/stack/models/CloudStackSnapshot.java |    9 +
 .../com/cloud/stack/models/CloudStackTemplate.java |   10 +
 .../com/cloud/stack/models/CloudStackUserVm.java   |   18 +
 .../com/cloud/stack/models/CloudStackVolume.java   |   10 +
 .../test/com/cloud/gate/util/Xml2JavaTestData.xml  |   18 +
 awsapi/test/html/certSubmit.html                   |   56 +-
 awsapi/test/html/testRestURL.txt                   |   69 +-
 awsapi/waf                                         |  Bin 92487 -> 0 bytes
 awsapi/web/web.xml                                 |  290 +-
 awsapi/wscript                                     |  250 -
 awsapi/wscript_build                               |   45 -
 awsapi/wscript_configure                           |   96 -
 awsapi/wsdl/AmazonEC2.wsdl                         | 4536 ------
 awsapi/wsdl/AmazonS3.xsd                           |  607 -
 awsapi/wsdl/cloud-AmazonEC2.wsdl                   | 4668 ------
 awsapi/wsdl/cloud-AmazonS3.wsdl                    |  370 -
 build.xml                                          |   18 +-
 build/.gitignore                                   |   17 +
 build/.project                                     |   11 -
 build/build-aws-api.properties                     |   17 +
 build/build-aws-api.xml                            |   90 +-
 build/build-cloud-plugins.xml                      |   28 +-
 build/build-cloud.properties                       |   18 +
 build/build-cloud.xml                              |   50 +-
 build/build-devcloud.xml                           |   28 +-
 build/build-marvin.xml                             |   16 +-
 build/build-tests.xml                              |   31 +-
 build/build-usage.xml                              |   27 +-
 build/cloud.properties                             |   21 +-
 build/deploy/branding/default/images/favicon.ico   |  Bin 1406 -> 0 bytes
 .../deploy/branding/default/images/header_logo.gif |  Bin 5319 -> 0 bytes
 .../deploy/branding/godaddy/images/header_logo.gif |  Bin 3047 -> 0 bytes
 .../deploy/branding/nframe/images/header_logo.gif  |  Bin 2774 -> 0 bytes
 .../deploy/branding/superb/images/header_logo.gif  |  Bin 2837 -> 0 bytes
 build/deploy/db/deploy-db.sh                       |  126 -
 build/deploy/db/log4j.properties                   |    7 -
 build/deploy/deploy-agent.sh                       |  232 -
 build/deploy/deploy-console-proxy.sh               |   90 -
 build/deploy/deploy-server.sh                      |  121 -
 build/deploy/deploy-simulator.sh                   |  200 -
 build/deploy/install-storage-server.sh             |  149 -
 build/deploy/install.sh                            |  155 -
 .../agent/storagehdpatch/etc/default/init          |   38 -
 .../agent/storagehdpatch/etc/inet/ntp.conf         |    6 -
 .../agent/storagehdpatch/etc/nsswitch.conf         |   70 -
 .../agent/storagehdpatch/etc/ssh/sshd_config       |  154 -
 .../production/agent/storagehdpatch/etc/system     |  101 -
 .../storagehdpatch/etc/vmops/disks.properties      |    6 -
 .../storagehdpatch/etc/vmops/network.properties    |   34 -
 .../agent/storagehdpatch/lib/svc/method/vmops      |  121 -
 .../agent/storagehdpatch/usr/sbin/vsetup           |   59 -
 .../var/svc/manifest/application/cloud.xml         |   60 -
 .../consoleproxy/conf/consoleproxy.properties      |    6 -
 build/deploy/production/db/server-setup-dev.xml    |  550 -
 build/deploy/production/db/templates-dev.sql       |   26 -
 .../production/premium/conf/log4j-cloud_usage.xml  |   85 -
 .../premium/conf/log4j-cloud_usage.xml.template    |   85 -
 .../production/premium/conf/usage-components.xml   |   67 -
 .../production/server/conf/agent-update.properties |    1 -
 .../production/server/conf/cloud-localhost.pk12    |  Bin 1597 -> 0 bytes
 build/deploy/production/server/conf/ehcache.xml    |  544 -
 .../deploy/production/server/conf/log4j-cloud.xml  |  107 -
 .../server/conf/log4j-cloud.xml.template           |  107 -
 build/deploy/production/server/conf/server.xml     |  149 -
 build/developer.xml                                |   76 +-
 build/overview.html                                |   19 +-
 build/package.xml                                  |   89 +-
 build/replace.properties                           |   29 +
 build/simulator.properties                         |   28 +
 client/.classpath                                  |   10 -
 client/.project                                    |   23 -
 .../WEB-INF/classes/resources/messages.properties  |  125 +-
 .../classes/resources/messages_es.properties       |  866 --
 .../classes/resources/messages_ja.properties       |  141 +-
 .../classes/resources/messages_zh_CN.properties    | 2929 ++--
 client/WEB-INF/web.xml                             |    6 -
 client/bindir/cloud-setup-management.in            |   17 +
 client/bindir/cloud-update-xenserver-licenses.in   |   17 +
 client/cloudstack-ui.launch                        |   32 +
 .../SYSCONFDIR/rc.d/init.d/cloud-management.in     |   16 +
 .../SYSCONFDIR/sysconfig/cloud-management.in       |   17 +
 .../SYSCONFDIR/rc.d/init.d/cloud-management.in     |   16 +
 .../SYSCONFDIR/sysconfig/cloud-management.in       |   17 +
 .../opensuse/SYSCONFDIR/init.d/cloud-management.in |   27 +-
 .../SYSCONFDIR/sysconfig/cloud-management.in       |   17 +
 .../SYSCONFDIR/rc.d/init.d/cloud-management.in     |   16 +
 .../rhel/SYSCONFDIR/sysconfig/cloud-management.in  |   17 +
 .../sles/SYSCONFDIR/init.d/cloud-management.in     |   27 +-
 .../sles/SYSCONFDIR/sysconfig/cloud-management.in  |   17 +
 .../ubuntu/SYSCONFDIR/init.d/cloud-management.in   |   29 +-
 client/pom.xml                                     |  298 +
 .../cisconexusvsm_commands.properties.in           |   17 +
 client/tomcatconf/classpath.conf.in                |   16 +
 client/tomcatconf/commands-ext.properties.in       |   39 +-
 client/tomcatconf/commands.properties.in           |   67 +
 client/tomcatconf/components-cloudzones.xml.in     |   18 +
 client/tomcatconf/components.xml.in                |   74 +-
 client/tomcatconf/db-enc.properties.in             |   71 +
 client/tomcatconf/db.properties.in                 |   29 +
 client/tomcatconf/ehcache.xml.in                   |   18 +
 client/tomcatconf/environment.properties.in        |   19 +-
 client/tomcatconf/f5bigip_commands.properties.in   |   17 +
 .../tomcatconf/junipersrx_commands.properties.in   |   17 +
 client/tomcatconf/log4j-cloud.xml.in               |   18 +
 client/tomcatconf/netapp_commands.properties.in    |   33 +
 .../netscalerloadbalancer_commands.properties.in   |   17 +
 .../tomcatconf/nicira-nvp_commands.properties.in   |   29 +
 client/tomcatconf/server-nonssl.xml                |   91 +-
 client/tomcatconf/server-ssl.xml.in                |  110 +-
 client/tomcatconf/server.xml.in                    |   91 +-
 client/tomcatconf/simulator.properties.in          |   19 +-
 client/tomcatconf/tomcat6-nonssl.conf.in           |   17 +
 client/tomcatconf/tomcat6-ssl.conf.in              |   16 +
 .../virtualrouter_commands.properties.in           |   17 +
 cloud-cli/cloudapis/__init__.py                    |    1 -
 cloud-cli/cloudapis/cloud.py                       |   64 +-
 cloud-cli/cloudtool/__init__.py                    |    1 -
 cloud-cli/cloudtool/utils.py                       |    1 -
 cloud.spec                                         |  208 +-
 configure-info.in                                  |   17 +
 console-proxy/.classpath                           |    7 -
 console-proxy/.project                             |   23 -
 console-proxy/certs/realhostip.csr                 |   30 +-
 console-proxy/conf.dom0/agent.properties.in        |   92 +-
 console-proxy/conf.dom0/consoleproxy.properties.in |   29 +-
 console-proxy/conf.dom0/log4j-cloud.xml.in         |   18 +
 console-proxy/conf/agent.properties                |   21 +-
 console-proxy/conf/consoleproxy.properties         |   29 +-
 console-proxy/conf/log4j-cloud.xml                 |   18 +
 console-proxy/css/ajaxviewer.css                   |  288 +-
 console-proxy/js/ajaxviewer.js                     | 1764 ++--
 console-proxy/js/handler.js                        |  106 +-
 console-proxy/pom.xml                              |  203 +
 console-proxy/scripts/run.bat                      |   19 +-
 .../com/cloud/consoleproxy/AjaxFIFOImageCache.java |  127 +-
 .../consoleproxy/AuthenticationException.java      |   32 +-
 .../src/com/cloud/consoleproxy/ConsoleProxy.java   |  959 +-
 .../consoleproxy/ConsoleProxyAjaxHandler.java      |  752 +-
 .../consoleproxy/ConsoleProxyAjaxImageHandler.java |  239 +-
 .../ConsoleProxyAuthenticationResult.java          |  130 +-
 .../ConsoleProxyBaseServerFactoryImpl.java         |   50 +-
 .../com/cloud/consoleproxy/ConsoleProxyClient.java |  107 +-
 .../cloud/consoleproxy/ConsoleProxyClientBase.java |  876 +-
 .../consoleproxy/ConsoleProxyClientListener.java   |   18 +-
 .../consoleproxy/ConsoleProxyClientParam.java      |  189 +-
 .../ConsoleProxyClientStatsCollector.java          |  145 +-
 .../cloud/consoleproxy/ConsoleProxyCmdHandler.java |  106 +-
 .../cloud/consoleproxy/ConsoleProxyGCThread.java   |  184 +-
 .../ConsoleProxyHttpHandlerHelper.java             |  116 +-
 .../consoleproxy/ConsoleProxyLoggerFactory.java    |  140 +-
 .../cloud/consoleproxy/ConsoleProxyMonitor.java    |  226 +-
 .../ConsoleProxyPasswordBasedEncryptor.java        |  253 +-
 .../consoleproxy/ConsoleProxyResourceHandler.java  |  328 +-
 .../ConsoleProxySecureServerFactoryImpl.java       |  214 +-
 .../consoleproxy/ConsoleProxyServerFactory.java    |   14 +-
 .../consoleproxy/ConsoleProxyThumbnailHandler.java |  386 +-
 .../cloud/consoleproxy/ConsoleProxyVncClient.java  |  429 +-
 .../src/com/cloud/consoleproxy/InputEventType.java |   84 +-
 .../cloud/consoleproxy/util/ITileScanListener.java |   18 +-
 .../com/cloud/consoleproxy/util/ImageHelper.java   |   32 +-
 .../src/com/cloud/consoleproxy/util/Logger.java    |  414 +-
 .../com/cloud/consoleproxy/util/LoggerFactory.java |   10 +-
 .../src/com/cloud/consoleproxy/util/RawHTTP.java   |  466 +-
 .../src/com/cloud/consoleproxy/util/Region.java    |  148 +-
 .../cloud/consoleproxy/util/RegionClassifier.java  |   84 +-
 .../src/com/cloud/consoleproxy/util/TileInfo.java  |   78 +-
 .../com/cloud/consoleproxy/util/TileTracker.java   |  506 +-
 .../consoleproxy/vnc/BufferedImageCanvas.java      |  212 +-
 .../cloud/consoleproxy/vnc/FrameBufferCanvas.java  |   26 +-
 .../vnc/FrameBufferUpdateListener.java             |   10 +-
 .../vnc/PaintNotificationListener.java             |   10 +-
 .../com/cloud/consoleproxy/vnc/RfbConstants.java   |  117 +-
 .../src/com/cloud/consoleproxy/vnc/VncClient.java  |  747 +-
 .../consoleproxy/vnc/VncClientPacketSender.java    |  380 +-
 .../consoleproxy/vnc/VncScreenDescription.java     |  129 +-
 .../consoleproxy/vnc/VncServerPacketReceiver.java  |  176 +-
 .../vnc/packet/client/ClientPacket.java            |    2 +-
 .../client/FramebufferUpdateRequestPacket.java     |   43 +-
 .../vnc/packet/client/KeyboardEventPacket.java     |   30 +-
 .../vnc/packet/client/MouseEventPacket.java        |   32 +-
 .../vnc/packet/client/SetEncodingsPacket.java      |   37 +-
 .../vnc/packet/client/SetPixelFormatPacket.java    |   82 +-
 .../vnc/packet/server/AbstractRect.java            |   62 +-
 .../consoleproxy/vnc/packet/server/CopyRect.java   |   20 +-
 .../server/FrameBufferSizeChangeRequest.java       |   22 +-
 .../vnc/packet/server/FramebufferUpdatePacket.java |  133 +-
 .../consoleproxy/vnc/packet/server/RawRect.java    |   67 +-
 .../cloud/consoleproxy/vnc/packet/server/Rect.java |   15 +-
 .../vnc/packet/server/ServerCutText.java           |   32 +-
 console-proxy/systemvm-descriptor.xml              |  112 +
 console-proxy/ui/viewer-bad-sid.ftl                |   58 +-
 console-proxy/ui/viewer-connect-failed.ftl         |   58 +-
 console-proxy/ui/viewer-update.ftl                 |   30 +-
 console-proxy/ui/viewer.ftl                        |  118 +-
 core/.classpath                                    |   12 -
 core/.project                                      |   17 -
 core/pom.xml                                       |   52 +
 .../virtualnetwork/VirtualRoutingResource.java     |  398 +-
 core/src/com/cloud/host/HostInfo.java              |    4 -
 .../cloud/hypervisor/HypervisorCapabilitiesVO.java |   12 +
 .../kvm/resource/KvmDummyResourceBase.java         |   89 -
 .../src/com/cloud/network/HAProxyConfigurator.java |   24 +-
 .../cloud/network/LoadBalancerConfigurator.java    |    4 -
 core/src/com/cloud/network/VpnUserVO.java          |   94 +-
 .../com/cloud/network/resource/XTrustProvider.java |  114 -
 .../network/security/SecurityGroupRulesVO.java     |    9 +-
 .../com/cloud/storage/StoragePoolHostAssoc.java    |    4 -
 core/src/com/cloud/storage/StoragePoolHostVO.java  |    1 -
 core/src/com/cloud/storage/StoragePoolVO.java      |   26 +-
 core/src/com/cloud/storage/UploadVO.java           |    4 -
 core/src/com/cloud/storage/VMTemplateHostVO.java   |    1 -
 .../com/cloud/storage/VMTemplateStoragePoolVO.java |    1 -
 core/src/com/cloud/storage/VolumeHostVO.java       |    1 -
 .../resource/NfsSecondaryStorageResource.java      |   14 +-
 .../cloud/storage/template/DownloadManager.java    |    4 -
 .../storage/template/DownloadManagerImpl.java      |    4 -
 .../storage/template/HttpTemplateDownloader.java   |    1 -
 .../cloud/storage/template/TemplateConstants.java  |    4 -
 .../cloud/storage/template/TemplateDownloader.java |    5 -
 .../cloud/storage/template/TemplateUploader.java   |    1 -
 core/src/com/cloud/user/UserAccountVO.java         |   49 +-
 core/src/com/cloud/user/UserVO.java                |   41 +-
 core/src/com/cloud/vm/DomainRouterVO.java          |   46 +-
 core/src/com/cloud/vm/VMInstanceVO.java            |   18 +-
 .../vmware/mo/TestVmwareContextFactory.java        |   43 -
 .../cloud/hypervisor/vmware/mo/TestVmwareMO.java   |   40 -
 .../hypervisor/vmware/util/TestVmwareUtil.java     |  107 -
 core/test/com/cloud/vmware/TestVMWare.java         | 1140 --
 daemonize/COPYING                                  |   16 -
 daemonize/daemonize.c                              |  351 -
 debian/changelog                                   |   24 +
 debian/cloud-agent-deps.install                    |   21 +-
 debian/cloud-agent-libs.install                    |   18 +
 debian/cloud-agent-scripts.install                 |   10 -
 debian/cloud-agent-scripts.postinst                |   13 -
 debian/cloud-agent.config                          |   17 +
 debian/cloud-agent.install                         |   18 +-
 debian/cloud-agent.postinst                        |   18 +-
 debian/cloud-cli.config                            |   17 +
 debian/cloud-cli.install                           |   17 +
 debian/cloud-client-ui.install                     |   17 +
 debian/cloud-client.config                         |   17 +
 debian/cloud-client.install                        |   18 +-
 debian/cloud-client.postinst                       |   16 +
 debian/cloud-core.install                          |   17 +
 debian/cloud-daemonize.install                     |    2 -
 debian/cloud-deps.install                          |   64 +-
 debian/cloud-management.config                     |   17 +
 debian/cloud-python.install                        |   17 +
 debian/cloud-scripts.install                       |   27 +
 debian/cloud-scripts.postinst                      |   34 +
 debian/cloud-server.install                        |   28 +
 debian/cloud-setup.install                         |   17 +
 debian/cloud-system-iso.install                    |   19 +-
 debian/cloud-system-iso.postinst                   |   34 +
 debian/cloud-test.install                          |    6 -
 debian/cloud-usage.install                         |   18 +-
 debian/cloud-usage.postinst                        |   18 +-
 debian/cloud-utils.install                         |   17 +
 debian/control                                     |  103 +-
 debian/copyright                                   |   26 +-
 debian/rules                                       |   10 +-
 deps/.classpath                                    |   50 -
 deps/.project                                      |   17 -
 deps/XenServerJava/BSD                             |   26 +
 deps/XenServerJava/GPL-2                           |  339 -
 deps/XenServerJava/LICENSE.Apache-2.0.txt          |  402 +-
 deps/XenServerJava/LICENSE.txt                     |   53 +-
 deps/XenServerJava/README.txt                      |   94 +-
 .../com/xensource/xenapi/APIVersion.java           |   83 -
 deps/XenServerJava/com/xensource/xenapi/Auth.java  |   95 -
 deps/XenServerJava/com/xensource/xenapi/Blob.java  |  384 -
 deps/XenServerJava/com/xensource/xenapi/Bond.java  |  376 -
 .../com/xensource/xenapi/Connection.java           |  368 -
 .../com/xensource/xenapi/Console.java              |  397 -
 .../com/xensource/xenapi/Crashdump.java            |  336 -
 .../com/xensource/xenapi/DataSource.java           |  142 -
 deps/XenServerJava/com/xensource/xenapi/Event.java |  242 -
 deps/XenServerJava/com/xensource/xenapi/Host.java  | 2752 ----
 .../com/xensource/xenapi/HostCpu.java              |  514 -
 .../com/xensource/xenapi/HostCrashdump.java        |  395 -
 .../com/xensource/xenapi/HostMetrics.java          |  351 -
 .../com/xensource/xenapi/HostPatch.java            |  530 -
 .../com/xensource/xenapi/Marshalling.java          |   59 -
 .../com/xensource/xenapi/Message.java              |  298 -
 .../com/xensource/xenapi/Network.java              |  710 -
 deps/XenServerJava/com/xensource/xenapi/PBD.java   |  520 -
 deps/XenServerJava/com/xensource/xenapi/PIF.java   | 1214 --
 .../com/xensource/xenapi/PIFMetrics.java           |  511 -
 deps/XenServerJava/com/xensource/xenapi/Pool.java  | 2277 ---
 .../com/xensource/xenapi/PoolPatch.java            |  605 -
 deps/XenServerJava/com/xensource/xenapi/Role.java  |  342 -
 deps/XenServerJava/com/xensource/xenapi/SM.java    |  506 -
 deps/XenServerJava/com/xensource/xenapi/SR.java    | 1460 --
 .../XenServerJava/com/xensource/xenapi/Secret.java |  295 -
 .../com/xensource/xenapi/Session.java              |  653 -
 .../com/xensource/xenapi/Subject.java              |  374 -
 deps/XenServerJava/com/xensource/xenapi/Task.java  |  666 -
 .../XenServerJava/com/xensource/xenapi/Tunnel.java |  452 -
 deps/XenServerJava/com/xensource/xenapi/Types.java |11056 --------------
 deps/XenServerJava/com/xensource/xenapi/User.java  |  362 -
 deps/XenServerJava/com/xensource/xenapi/VBD.java   | 1139 --
 .../com/xensource/xenapi/VBDMetrics.java           |  327 -
 deps/XenServerJava/com/xensource/xenapi/VDI.java   | 1730 ---
 deps/XenServerJava/com/xensource/xenapi/VIF.java   |  825 --
 .../com/xensource/xenapi/VIFMetrics.java           |  327 -
 deps/XenServerJava/com/xensource/xenapi/VLAN.java  |  399 -
 deps/XenServerJava/com/xensource/xenapi/VM.java    | 4253 ------
 .../com/xensource/xenapi/VMGuestMetrics.java       |  465 -
 .../com/xensource/xenapi/VMMetrics.java            |  488 -
 deps/XenServerJava/com/xensource/xenapi/VMPP.java  | 1136 --
 deps/XenServerJava/com/xensource/xenapi/VTPM.java  |  268 -
 .../com/xensource/xenapi/XenAPIObject.java         |   18 -
 deps/XenServerJava/pom.xml                         |   42 +
 .../src/com/xensource/xenapi/APIVersion.java       |  100 +
 .../src/com/xensource/xenapi/Auth.java             |  112 +
 .../src/com/xensource/xenapi/Blob.java             |  401 +
 .../src/com/xensource/xenapi/Bond.java             |  393 +
 .../src/com/xensource/xenapi/Connection.java       |  385 +
 .../src/com/xensource/xenapi/Console.java          |  414 +
 .../src/com/xensource/xenapi/Crashdump.java        |  353 +
 .../src/com/xensource/xenapi/DataSource.java       |  159 +
 .../src/com/xensource/xenapi/Event.java            |  258 +
 .../src/com/xensource/xenapi/Host.java             | 2769 ++++
 .../src/com/xensource/xenapi/HostCpu.java          |  531 +
 .../src/com/xensource/xenapi/HostCrashdump.java    |  412 +
 .../src/com/xensource/xenapi/HostMetrics.java      |  368 +
 .../src/com/xensource/xenapi/HostPatch.java        |  547 +
 .../src/com/xensource/xenapi/Marshalling.java      |   76 +
 .../src/com/xensource/xenapi/Message.java          |  315 +
 .../src/com/xensource/xenapi/Network.java          |  727 +
 .../src/com/xensource/xenapi/PBD.java              |  537 +
 .../src/com/xensource/xenapi/PIF.java              | 1231 ++
 .../src/com/xensource/xenapi/PIFMetrics.java       |  528 +
 .../src/com/xensource/xenapi/Pool.java             | 2294 +++
 .../src/com/xensource/xenapi/PoolPatch.java        |  622 +
 .../src/com/xensource/xenapi/Role.java             |  359 +
 .../XenServerJava/src/com/xensource/xenapi/SM.java |  523 +
 .../XenServerJava/src/com/xensource/xenapi/SR.java | 1477 ++
 .../src/com/xensource/xenapi/Secret.java           |  312 +
 .../src/com/xensource/xenapi/Session.java          |  670 +
 .../src/com/xensource/xenapi/Subject.java          |  391 +
 .../src/com/xensource/xenapi/Task.java             |  683 +
 .../src/com/xensource/xenapi/Tunnel.java           |  469 +
 .../src/com/xensource/xenapi/Types.java            |11096 +++++++++++++++
 .../src/com/xensource/xenapi/User.java             |  379 +
 .../src/com/xensource/xenapi/VBD.java              | 1156 ++
 .../src/com/xensource/xenapi/VBDMetrics.java       |  344 +
 .../src/com/xensource/xenapi/VDI.java              | 1815 +++
 .../src/com/xensource/xenapi/VIF.java              |  842 ++
 .../src/com/xensource/xenapi/VIFMetrics.java       |  344 +
 .../src/com/xensource/xenapi/VLAN.java             |  416 +
 .../XenServerJava/src/com/xensource/xenapi/VM.java | 4270 ++++++
 .../src/com/xensource/xenapi/VMGuestMetrics.java   |  482 +
 .../src/com/xensource/xenapi/VMMetrics.java        |  505 +
 .../src/com/xensource/xenapi/VMPP.java             | 1153 ++
 .../src/com/xensource/xenapi/VTPM.java             |  285 +
 .../src/com/xensource/xenapi/XenAPIObject.java     |   35 +
 deps/awsapi-lib/XmlSchema-1.4.3.jar                |  Bin 143145 -> 0 bytes
 deps/awsapi-lib/antlr-2.7.6.jar                    |  Bin 443432 -> 0 bytes
 deps/awsapi-lib/apache-log4j-extras-1.0.jar        |  Bin 153863 -> 0 bytes
 deps/awsapi-lib/axiom-api-1.2.8.jar                |  Bin 245780 -> 0 bytes
 deps/awsapi-lib/axiom-impl-1.2.8.jar               |  Bin 131352 -> 0 bytes
 deps/awsapi-lib/axis2-1.5.1.jar                    |  Bin 2342330 -> 0 bytes
 deps/awsapi-lib/axis2-adb-1.5.1.jar                |  Bin 777098 -> 0 bytes
 deps/awsapi-lib/axis2-ant-plugin-1.5.1.jar         |  Bin 16740 -> 0 bytes
 deps/awsapi-lib/axis2-jaxbri-1.5.1.jar             |  Bin 25500 -> 0 bytes
 deps/awsapi-lib/axis2-jaxws-1.5.1.jar              |  Bin 643786 -> 0 bytes
 deps/awsapi-lib/axis2-jibx-1.5.1.jar               |  Bin 35407 -> 0 bytes
 deps/awsapi-lib/axis2-json-1.5.1.jar               |  Bin 16898 -> 0 bytes
 deps/awsapi-lib/axis2-kernel-1.5.1.jar             |  Bin 997666 -> 0 bytes
 deps/awsapi-lib/axis2-transport-http-1.5.1.jar     |  Bin 145208 -> 0 bytes
 deps/awsapi-lib/axis2-transport-local-1.5.1.jar    |  Bin 10840 -> 0 bytes
 deps/awsapi-lib/axis2.war                          |  Bin 21406456 -> 0 bytes
 deps/awsapi-lib/c3p0-0.9.1.2.jar                   |  Bin 610790 -> 0 bytes
 deps/awsapi-lib/cloud-gson.jar                     |  Bin 177245 -> 0 bytes
 deps/awsapi-lib/commons-codec-1.4.jar              |  Bin 58160 -> 0 bytes
 deps/awsapi-lib/commons-collections-3.1.jar        |  Bin 559366 -> 0 bytes
 deps/awsapi-lib/commons-fileupload-1.2.jar         |  Bin 53082 -> 0 bytes
 deps/awsapi-lib/commons-httpclient-3.1.jar         |  Bin 305001 -> 0 bytes
 deps/awsapi-lib/commons-io-1.4.jar                 |  Bin 109043 -> 0 bytes
 deps/awsapi-lib/commons-logging-1.1.1.jar          |  Bin 60686 -> 0 bytes
 deps/awsapi-lib/dom4j-1.6.1.jar                    |  Bin 313898 -> 0 bytes
 deps/awsapi-lib/hibernate3.jar                     |  Bin 3894821 -> 0 bytes
 deps/awsapi-lib/httpcore-4.0.jar                   |  Bin 172914 -> 0 bytes
 deps/awsapi-lib/javassist-3.9.0.GA.jar             |  Bin 597476 -> 0 bytes
 deps/awsapi-lib/jaxb-api-2.1.jar                   |  Bin 89967 -> 0 bytes
 deps/awsapi-lib/jaxb-impl-2.1.7.jar                |  Bin 854901 -> 0 bytes
 deps/awsapi-lib/jaxb-xjc-2.1.7.jar                 |  Bin 3126580 -> 0 bytes
 deps/awsapi-lib/jsch-0.1.42.jar                    |  Bin 185746 -> 0 bytes
 deps/awsapi-lib/json_simple-1.1.jar                |  Bin 16046 -> 0 bytes
 deps/awsapi-lib/jta-1.1.jar                        |  Bin 10899 -> 0 bytes
 deps/awsapi-lib/junit-4.8.1.jar                    |  Bin 237047 -> 0 bytes
 deps/awsapi-lib/log4j-1.2.15.jar                   |  Bin 391834 -> 0 bytes
 deps/awsapi-lib/mail-1.4.jar                       |  Bin 388826 -> 0 bytes
 deps/awsapi-lib/mysql-connector-java-5.1.7-bin.jar |  Bin 709922 -> 0 bytes
 deps/awsapi-lib/neethi-2.0.4.jar                   |  Bin 32900 -> 0 bytes
 deps/awsapi-lib/rampart-lib/bcprov-jdk16-145.jar   |  Bin 1719483 -> 0 bytes
 .../rampart-lib/commons-collections-3.1.jar        |  Bin 559366 -> 0 bytes
 .../rampart-lib/commons-collections-LICENSE.txt    |  202 -
 deps/awsapi-lib/rampart-lib/joda-time-1.5.2.jar    |  Bin 531326 -> 0 bytes
 deps/awsapi-lib/rampart-lib/joda-time-LICENSE.txt  |  202 -
 deps/awsapi-lib/rampart-lib/opensaml-1.1.jar       |  Bin 155714 -> 0 bytes
 deps/awsapi-lib/rampart-lib/opensaml-2.2.3.jar     |  Bin 1244822 -> 0 bytes
 deps/awsapi-lib/rampart-lib/opensaml-LICENSE.txt   |  202 -
 deps/awsapi-lib/rampart-lib/openws-1.2.2.jar       |  Bin 119232 -> 0 bytes
 deps/awsapi-lib/rampart-lib/openws-LICENSE.txt     |  202 -
 deps/awsapi-lib/rampart-lib/rampart-core-1.5.jar   |  Bin 147797 -> 0 bytes
 deps/awsapi-lib/rampart-lib/rampart-policy-1.5.jar |  Bin 150819 -> 0 bytes
 deps/awsapi-lib/rampart-lib/rampart-trust-1.5.jar  |  Bin 100039 -> 0 bytes
 deps/awsapi-lib/rampart-lib/slf4j-api-1.5.11.jar   |  Bin 23671 -> 0 bytes
 deps/awsapi-lib/rampart-lib/slf4j-api-LICENSE.txt  |   12 -
 deps/awsapi-lib/rampart-lib/slf4j-jdk14-1.5.11.jar |  Bin 8831 -> 0 bytes
 .../awsapi-lib/rampart-lib/slf4j-jdk14-LICENSE.txt |   12 -
 deps/awsapi-lib/rampart-lib/velocity-1.5.jar       |  Bin 392124 -> 0 bytes
 deps/awsapi-lib/rampart-lib/velocity-LICENSE.txt   |  202 -
 deps/awsapi-lib/rampart-lib/wss4j-1.5.8.jar        |  Bin 323799 -> 0 bytes
 deps/awsapi-lib/rampart-lib/wss4j-LICENSE.txt      |  202 -
 deps/awsapi-lib/rampart-lib/xmlsec-1.4.2.jar       |  Bin 444503 -> 0 bytes
 deps/awsapi-lib/rampart-lib/xmlsec-LICENSE.txt     |  202 -
 deps/awsapi-lib/rampart-lib/xmltooling-1.2.0.jar   |  Bin 575190 -> 0 bytes
 deps/awsapi-lib/rampart-lib/xmltooling-LICENSE.txt |  202 -
 deps/awsapi-lib/slf4j-api-1.5.11.jar               |  Bin 23671 -> 0 bytes
 deps/awsapi-lib/slf4j-jdk14-1.5.11.jar             |  Bin 8831 -> 0 bytes
 deps/awsapi-lib/woden-api-1.0M8.jar                |  Bin 145544 -> 0 bytes
 deps/awsapi-lib/woden-impl-dom-1.0M8.jar           |  Bin 222478 -> 0 bytes
 deps/awsapi-lib/xercesImpl.jar                     |  Bin 1212965 -> 0 bytes
 deps/awsapi-lib/xml-apis.jar                       |  Bin 195119 -> 0 bytes
 deps/cloud-axis.jar                                |  Bin 1599570 -> 0 bytes
 deps/cloud-backport-util-concurrent-3.0.jar        |  Bin 327810 -> 0 bytes
 deps/cloud-bcprov-jdk16-1.45.jar                   |  Bin 1719483 -> 0 bytes
 deps/cloud-cglib.jar                               |  Bin 332756 -> 0 bytes
 deps/cloud-commons-codec-1.5.jar                   |  Bin 73098 -> 0 bytes
 deps/cloud-commons-collections-3.2.1.jar           |  Bin 575389 -> 0 bytes
 deps/cloud-commons-configuration-1.8.jar           |  Bin 354491 -> 0 bytes
 deps/cloud-commons-dbcp-1.4.jar                    |  Bin 160519 -> 0 bytes
 deps/cloud-commons-discovery.jar                   |  Bin 71442 -> 0 bytes
 deps/cloud-commons-httpclient-3.1.jar              |  Bin 305001 -> 0 bytes
 deps/cloud-commons-lang-2.6.jar                    |  Bin 284220 -> 0 bytes
 deps/cloud-commons-logging-1.1.1.jar               |  Bin 60841 -> 0 bytes
 deps/cloud-commons-pool-1.5.6.jar                  |  Bin 100472 -> 0 bytes
 deps/cloud-ehcache.jar                             |  Bin 263854 -> 0 bytes
 deps/cloud-email.jar                               |  Bin 434812 -> 0 bytes
 deps/cloud-google-gson-1.7.1.jar                   |  Bin 173590 -> 0 bytes
 deps/cloud-httpcore-4.0.jar                        |  Bin 172914 -> 0 bytes
 deps/cloud-iControl.jar                            |  Bin 2284200 -> 0 bytes
 deps/cloud-jasypt-1.8.jar                          |  Bin 178961 -> 0 bytes
 deps/cloud-jnetpcap.jar                            |  Bin 540571 -> 0 bytes
 deps/cloud-jsch-0.1.42.jar                         |  Bin 185746 -> 0 bytes
 deps/cloud-jstl-1.2.jar                            |  Bin 414240 -> 0 bytes
 deps/cloud-junit.jar                               |  Bin 237047 -> 0 bytes
 deps/cloud-libvirt-0.4.5.jar                       |  Bin 68899 -> 0 bytes
 deps/cloud-log4j-extras.jar                        |  Bin 346729 -> 0 bytes
 deps/cloud-log4j.jar                               |  Bin 481534 -> 0 bytes
 deps/cloud-manageontap.jar                         |  Bin 55444 -> 0 bytes
 deps/cloud-mysql-connector-java-5.1.7-bin.jar      |  Bin 709922 -> 0 bytes
 deps/cloud-netscaler-sdx.jar                       |  Bin 138839 -> 0 bytes
 deps/cloud-netscaler.jar                           |  Bin 1881606 -> 0 bytes
 deps/cloud-servlet-api.jar                         |  Bin 83787 -> 0 bytes
 deps/cloud-trilead-ssh2-build213.jar               |  Bin 252914 -> 0 bytes
 deps/cloud-ws-commons-util-1.0.2.jar               |  Bin 34407 -> 0 bytes
 deps/cloud-wsdl4j-1.6.2.jar                        |  Bin 148429 -> 0 bytes
 deps/cloud-wsdl4j.jar                              |  Bin 126771 -> 0 bytes
 deps/cloud-xenserver-5.6.100-1.jar                 |  Bin 426631 -> 0 bytes
 deps/cloud-xmlrpc-client-3.1.3.jar                 |  Bin 58573 -> 0 bytes
 deps/cloud-xmlrpc-common-3.1.3.jar                 |  Bin 109131 -> 0 bytes
 deps/cloud-xstream-1.3.1.jar                       |  Bin 431406 -> 0 bytes
 deps/install-non-oss.sh                            |   25 +
 deps/jetty-6.1.26.jar                              |  Bin 539912 -> 0 bytes
 deps/jetty-util-6.1.26.jar                         |  Bin 177131 -> 0 bytes
 deps/pom.xml                                       |  201 +
 deps/vmware-apputils.jar                           |  Bin 40057 -> 0 bytes
 deps/vmware-lib-jaxrpc.jar                         |  Bin 31191 -> 0 bytes
 deps/vmware-vim.jar                                |  Bin 2645679 -> 0 bytes
 deps/vmware-vim25.jar                              |  Bin 5666804 -> 0 bytes
 developer/pom.xml                                  |  238 +
 docs/.tx/config                                    | 2139 +++
 docs/README.txt                                    |  301 +
 docs/en-US/Author_Group.xml                        |   32 +
 docs/en-US/Book_Info.xml                           |   47 +
 docs/en-US/Book_Info_Admin.xml                     |   46 +
 docs/en-US/Book_Info_Build_All.xml                 |   44 +
 docs/en-US/Common_Content/Legal_Notice.xml         |   21 +
 docs/en-US/LDAPserver-for-user-authentication.xml  |   40 +
 docs/en-US/Preface.xml                             |   31 +
 docs/en-US/Revision_History.xml                    |   45 +
 docs/en-US/SSL-keystore-path-and-password.xml      |   28 +
 docs/en-US/VPN-user-usage-record-format.xml        |   40 +
 docs/en-US/about-clusters.xml                      |   39 +
 docs/en-US/about-hosts.xml                         |   45 +
 docs/en-US/about-physical-networks.xml             |   44 +
 docs/en-US/about-pods.xml                          |   37 +
 docs/en-US/about-primary-storage.xml               |   35 +
 docs/en-US/about-secondary-storage.xml             |   35 +
 docs/en-US/about-virtual-networks.xml              |   31 +
 docs/en-US/about-working-with-vms.xml              |   39 +
 docs/en-US/about-zones.xml                         |   51 +
 docs/en-US/accept-membership-invite.xml            |   36 +
 docs/en-US/accessing-vms.xml                       |   41 +
 docs/en-US/accounts-users-domains.xml              |   54 +
 docs/en-US/accounts.xml                            |   30 +
 docs/en-US/acquire-new-ip-address.xml              |   36 +
 docs/en-US/add-additional-guest-network.xml        |   65 +
 docs/en-US/add-ingress-egress-rules.xml            |  131 +
 docs/en-US/add-iso.xml                             |  151 +
 docs/en-US/add-load-balancer-rule.xml              |   82 +
 docs/en-US/add-members-to-projects.xml             |   35 +
 docs/en-US/add-more-clusters.xml                   |   29 +
 .../en-US/add-password-management-to-templates.xml |   33 +
 docs/en-US/add-primary-storage.xml                 |  108 +
 docs/en-US/add-projects-members-from-ui.xml        |   37 +
 docs/en-US/add-secondary-storage.xml               |   48 +
 docs/en-US/add-security-group.xml                  |   49 +
 docs/en-US/added-API-commands.xml                  |  167 +
 docs/en-US/added-cloudPlatform-error-codes.xml     |  138 +
 .../adding-IP-addresses-for-the-public-network.xml |   45 +
 docs/en-US/admin-alerts.xml                        |   36 +
 docs/en-US/admin-guide.xml                         |   92 +
 docs/en-US/advanced-zone-configuration.xml         |  380 +
 docs/en-US/advanced-zone-guest-ip-addresses.xml    |   28 +
 docs/en-US/advanced-zone-network-traffic-types.xml |   35 +
 ...dvanced-zone-physical-network-configuration.xml |   29 +
 docs/en-US/advanced-zone-public-ip-addresses.xml   |   28 +
 docs/en-US/alerts.xml                              |   49 +
 docs/en-US/allocators.xml                          |   28 +
 docs/en-US/api-reference.xml                       |   26 +
 docs/en-US/appendix-a-time-zones.xml               |  143 +
 docs/en-US/asynchronous-commands-example.xml       |  106 +
 docs/en-US/asynchronous-commands.xml               |   38 +
 docs/en-US/attach-iso-to-vm.xml                    |   39 +
 docs/en-US/attaching-volume.xml                    |   43 +
 .../automatic-snapshot-creation-retention.xml      |   36 +
 docs/en-US/aws-ec2-configuration.xml               |   64 +
 docs/en-US/aws-ec2-introduction.xml                |   47 +
 docs/en-US/aws-ec2-requirements.xml                |   30 +
 docs/en-US/aws-ec2-supported-commands.xml          |  407 +
 docs/en-US/aws-ec2-user-setup.xml                  |   91 +
 docs/en-US/aws-interface-guide.xml                 |   32 +
 docs/en-US/basic-zone-configuration.xml            |  147 +
 docs/en-US/basic-zone-guest-ip-addresses.xml       |   28 +
 docs/en-US/basic-zone-network-traffic-types.xml    |   36 +
 .../basic-zone-physical-network-configuration.xml  |   29 +
 docs/en-US/best-practices-for-vms.xml              |   23 +
 docs/en-US/best-practices-primary-storage.xml      |   31 +
 docs/en-US/best-practices-secondary-storage.xml    |   32 +
 docs/en-US/best-practices-templates.xml            |   28 +
 docs/en-US/best-practices-virtual-router.xml       |   34 +
 ...change-console-proxy-ssl-certificate-domain.xml |   49 +
 docs/en-US/change-host-password.xml                |   39 +
 .../change-network-offering-on-guest-network.xml   |   44 +
 docs/en-US/change-to-behavior-of-list-commands.xml |   89 +
 docs/en-US/changing-root-password.xml              |   51 +
 docs/en-US/changing-secondary-storage-ip.xml       |   44 +
 docs/en-US/changing-secondary-storage-servers.xml  |   36 +
 docs/en-US/changing-secondary-storage-serversp.xml |   36 +
 docs/en-US/changing-service-offering-for-vm.xml    |   49 +
 docs/en-US/changing-vm-name-os-group.xml           |   54 +
 docs/en-US/choosing_a_deployment_architecture.xml  |   29 +
 docs/en-US/citrix-xenserver-installation.xml       |  489 +
 docs/en-US/cloud-infrastructure-concepts.xml       |   34 +
 docs/en-US/cloud-infrastructure-overview.xml       |   46 +
 docs/en-US/cloudplatform-api.xml                   |   31 +
 docs/en-US/cloudstack.ent                          |   22 +
 docs/en-US/cloudstack.xml                          |   53 +
 docs/en-US/cloudstack_admin.ent                    |    4 +
 docs/en-US/cloudstack_admin.xml                    |   51 +
 docs/en-US/cloudstack_developers.ent               |   22 +
 docs/en-US/cloudstack_developers.xml               |   52 +
 docs/en-US/cloudstack_installation.ent             |   22 +
 docs/en-US/cloudstack_installation.xml             |   50 +
 docs/en-US/cluster-add.xml                         |   28 +
 docs/en-US/compatibility-matrix.xml                |  116 +
 docs/en-US/compute-disk-service-offerings.xml      |   50 +
 docs/en-US/concepts.xml                            |   30 +
 .../configure-guest-traffic-in-advanced-zone.xml   |   79 +
 docs/en-US/configure-package-repository.xml        |   46 +
 ...onfigure-public-traffic-in-an-advanced-zone.xml |   25 +
 docs/en-US/configure-usage-server.xml              |  101 +
 docs/en-US/configure-virtual-router.xml            |   36 +
 docs/en-US/configure-vpn.xml                       |   52 +
 docs/en-US/configure-xenserver-dom-memory.xml      |   29 +
 docs/en-US/configure-xenserver-dom0-memory.xml     |   29 +
 docs/en-US/configuring-projects.xml                |   15 +
 docs/en-US/console-proxy.xml                       |   35 +
 docs/en-US/convert-hyperv-vm-to-template.xml       |   68 +
 docs/en-US/create-bare-metal-template.xml          |   46 +
 docs/en-US/create-new-projects.xml                 |   37 +
 docs/en-US/create-template-from-existing-vm.xml    |   49 +
 docs/en-US/create-template-from-snapshot.xml       |   29 +
 docs/en-US/create-templates-overview.xml           |   35 +
 docs/en-US/create-vpn-connection-vpc.xml           |  103 +
 docs/en-US/create-vpn-customer-gateway.xml         |  191 +
 docs/en-US/create-vpn-gateway-for-vpc.xml          |   80 +
 docs/en-US/create-windows-template.xml             |   38 +
 docs/en-US/creating-compute-offerings.xml          |   66 +
 docs/en-US/creating-disk-offerings.xml             |   44 +
 docs/en-US/creating-network-offerings.xml          |  117 +
 docs/en-US/creating-new-volumes.xml                |   41 +
 docs/en-US/creating-system-service-offerings.xml   |   53 +
 docs/en-US/creating-vms.xml                        |   49 +
 docs/en-US/customizing-dns.xml                     |   44 +
 docs/en-US/dates-in-usage-record.xml               |   26 +
 docs/en-US/dedicated-ha-hosts.xml                  |   34 +
 docs/en-US/default-account-resource-limit.xml      |   40 +
 docs/en-US/default-template.xml                    |   56 +
 docs/en-US/delete-templates.xml                    |   29 +
 docs/en-US/deleting-vms.xml                        |   41 +
 docs/en-US/deployment-architecture-overview.xml    |   44 +
 docs/en-US/detach-move-volumes.xml                 |   43 +
 docs/en-US/developer-getting-started.xml           |   38 +
 docs/en-US/developer-guide.xml                     |   38 +
 docs/en-US/developer-introduction.xml              |   30 +
 docs/en-US/developer_guide.xml                     |   39 +
 docs/en-US/disable-enable-zones-pods-clusters.xml  |   53 +
 docs/en-US/disk-volume-usage-record-format.xml     |   38 +
 docs/en-US/dns-dhcp.xml                            |   28 +
 docs/en-US/domains.xml                             |   28 +
 docs/en-US/enable-disable-static-nat.xml           |   44 +
 docs/en-US/enable-security-groups.xml              |   29 +
 docs/en-US/enabling-api-call-expiration.xml        |   40 +
 docs/en-US/enabling-port-8096.xml                  |   37 +
 docs/en-US/end-user-ui-overview.xml                |   28 +
 docs/en-US/error-handling.xml                      |   29 +
 docs/en-US/event-log-queries.xml                   |   37 +
 docs/en-US/event-types.xml                         |  220 +
 docs/en-US/events-log.xml                          |   28 +
 docs/en-US/events.xml                              |   31 +
 docs/en-US/example-LDAP-configuration-commands.xml |   47 +
 .../example-response-from-listUsageRecords.xml     |   56 +
 docs/en-US/export-template.xml                     |   29 +
 .../external-firewalls-and-load-balancers.xml      |   28 +
 docs/en-US/feature-overview.xml                    |   68 +
 docs/en-US/firewall-rules.xml                      |   56 +
 docs/en-US/first_ms_node_install.xml               |   58 +
 docs/en-US/globally-configured-limit.xml           |  100 +
 docs/en-US/globally-configured-limits.xml          |  100 +
 docs/en-US/guest-ip-ranges.xml                     |   28 +
 docs/en-US/guest-network.xml                       |   29 +
 docs/en-US/guest-traffic.xml                       |   38 +
 docs/en-US/ha-enabled-vm.xml                       |   29 +
 docs/en-US/ha-for-hosts.xml                        |   29 +
 docs/en-US/ha-management-server.xml                |   30 +
 docs/en-US/host-add.xml                            |   28 +
 docs/en-US/host-allocation.xml                     |   31 +
 docs/en-US/hypervisor-host-install-agent.xml       |   34 +
 docs/en-US/hypervisor-host-install-firewall.xml    |   59 +
 docs/en-US/hypervisor-host-install-flow.xml        |   34 +
 docs/en-US/hypervisor-host-install-libvirt.xml     |   66 +
 docs/en-US/hypervisor-host-install-network.xml     |  149 +
 docs/en-US/hypervisor-host-install-overview.xml    |   37 +
 docs/en-US/hypervisor-host-install-prepare-os.xml  |   53 +
 .../hypervisor-host-install-security-policies.xml  |   70 +
 .../hypervisor-support-for-primarystorage.xml      |  102 +
 docs/en-US/images/1000-foot-view.png               |  Bin 0 -> 222230 bytes
 docs/en-US/images/add-cluster.png                  |  Bin 0 -> 46302 bytes
 docs/en-US/images/add-gateway.png                  |  Bin 0 -> 16360 bytes
 docs/en-US/images/add-guest-network.png            |  Bin 0 -> 20547 bytes
 docs/en-US/images/add-new-gateway-vpc.png          |  Bin 0 -> 23184 bytes
 docs/en-US/images/add-tier.png                     |  Bin 0 -> 14891 bytes
 docs/en-US/images/add-vpc.png                      |  Bin 0 -> 16597 bytes
 docs/en-US/images/add-vpn-customer-gateway.png     |  Bin 0 -> 29851 bytes
 docs/en-US/images/attach-disk-icon.png             |  Bin 0 -> 1092 bytes
 docs/en-US/images/autoscale-config.png             |  Bin 0 -> 39379 bytes
 docs/en-US/images/basic-deployment.png             |  Bin 0 -> 5892 bytes
 docs/en-US/images/change-admin-password.png        |  Bin 0 -> 141860 bytes
 docs/en-US/images/change-password.png              |  Bin 0 -> 891 bytes
 docs/en-US/images/change-service-icon.png          |  Bin 0 -> 769 bytes
 docs/en-US/images/cluster-overview.png             |  Bin 0 -> 6973 bytes
 docs/en-US/images/console-icon.png                 |  Bin 0 -> 953 bytes
 docs/en-US/images/create-vpn-connection.png        |  Bin 0 -> 13613 bytes
 docs/en-US/images/delete-button.png                |  Bin 0 -> 735 bytes
 docs/en-US/images/destroy-instance.png             |  Bin 0 -> 815 bytes
 docs/en-US/images/detach-disk-icon.png             |  Bin 0 -> 953 bytes
 docs/en-US/images/edit-icon.png                    |  Bin 0 -> 940 bytes
 docs/en-US/images/enable-disable-autoscale.png     |  Bin 0 -> 913 bytes
 docs/en-US/images/enable-disable.png               |  Bin 0 -> 982 bytes
 docs/en-US/images/guest-traffic-setup.png          |  Bin 0 -> 34022 bytes
 docs/en-US/images/http-access.png                  |  Bin 0 -> 10214 bytes
 docs/en-US/images/icon.svg                         |   37 +
 docs/en-US/images/infrastructure-overview.png      |  Bin 0 -> 11852 bytes
 docs/en-US/images/installation-complete.png        |  Bin 0 -> 20814 bytes
 docs/en-US/images/iso-icon.png                     |  Bin 0 -> 991 bytes
 docs/en-US/images/migrate-instance.png             |  Bin 0 -> 837 bytes
 docs/en-US/images/multi-tier-app.png               |  Bin 0 -> 200956 bytes
 docs/en-US/images/network-acl.png                  |  Bin 0 -> 23333 bytes
 docs/en-US/images/network-setup-zone.png           |  Bin 0 -> 67410 bytes
 docs/en-US/images/network-singlepod.png            |  Bin 0 -> 18381 bytes
 docs/en-US/images/networking-in-a-pod.png          |  Bin 0 -> 16365 bytes
 docs/en-US/images/networking-in-a-zone.png         |  Bin 0 -> 88746 bytes
 docs/en-US/images/pod-overview.png                 |  Bin 0 -> 6036 bytes
 docs/en-US/images/provisioning-overview.png        |  Bin 0 -> 23622 bytes
 docs/en-US/images/release-ip-icon.png              |  Bin 0 -> 815 bytes
 docs/en-US/images/remove-tier.png                  |  Bin 0 -> 7457 bytes
 docs/en-US/images/restart-vpc.png                  |  Bin 0 -> 860 bytes
 docs/en-US/images/search-button.png                |  Bin 0 -> 1012 bytes
 docs/en-US/images/select-vm-staticnat-vpc.png      |  Bin 0 -> 17472 bytes
 docs/en-US/images/software-license.png             |  Bin 0 -> 124257 bytes
 docs/en-US/images/stop-instance-icon.png           |  Bin 0 -> 955 bytes
 docs/en-US/images/suspend-icon.png                 |  Bin 0 -> 982 bytes
 docs/en-US/images/sysmanager.png                   |  Bin 0 -> 114821 bytes
 docs/en-US/images/vm-lifecycle.png                 |  Bin 0 -> 20783 bytes
 docs/en-US/images/vpc-setting.png                  |  Bin 0 -> 5636 bytes
 docs/en-US/images/vpn-icon.png                     |  Bin 0 -> 1012 bytes
 docs/en-US/images/vsphere-client.png               |  Bin 0 -> 81246 bytes
 docs/en-US/images/zone-overview.png                |  Bin 0 -> 11852 bytes
 docs/en-US/import-ami.xml                          |  112 +
 .../increase-management-server-max-memory.xml      |   35 +
 docs/en-US/incremental-snapshots-backup.xml        |   51 +
 ...l-setup-of-external-firewalls-loadbalancers.xml |   38 +
 docs/en-US/initialize-and-test.xml                 |   53 +
 docs/en-US/installation-complete.xml               |   39 +
 docs/en-US/installation-steps-overview.xml         |   82 +
 docs/en-US/installation.xml                        |   33 +
 docs/en-US/installation_steps_overview.xml         |   84 +
 docs/en-US/introduction.xml                        |   30 +
 docs/en-US/ip-forwarding-firewalling.xml           |   30 +
 docs/en-US/ip-load-balancing.xml                   |   34 +
 docs/en-US/ipaddress-usage-record-format.xml       |   42 +
 docs/en-US/isolated-networks.xml                   |   33 +
 docs/en-US/job-status.xml                          |   34 +
 docs/en-US/large_scale_redundant_setup.xml         |   42 +
 docs/en-US/linux-installation.xml                  |   47 +
 docs/en-US/load-balancer-rules.xml                 |   29 +
 ...cy-port-forwarding-rule-usage-record-format.xml |   40 +
 docs/en-US/log-in-root-admin.xml                   |   46 +
 docs/en-US/log-in.xml                              |   48 +
 docs/en-US/long-running-job-events.xml             |   41 +
 docs/en-US/maintain-hypervisors-on-hosts.xml       |   30 +
 .../en-US/maintenance-mode-for-primary-storage.xml |   28 +
 docs/en-US/making-api-request.xml                  |   54 +
 docs/en-US/manage-cloud.xml                        |   31 +
 docs/en-US/management-server-install-client.xml    |   40 +
 docs/en-US/management-server-install-complete.xml  |   39 +
 .../management-server-install-db-external.xml      |  116 +
 docs/en-US/management-server-install-db-local.xml  |   76 +
 docs/en-US/management-server-install-db.xml        |   34 +
 docs/en-US/management-server-install-flow.xml      |   35 +
 .../en-US/management-server-install-multi-node.xml |   74 +
 .../en-US/management-server-install-nfs-shares.xml |   38 +
 docs/en-US/management-server-install-overview.xml  |   45 +
 .../en-US/management-server-install-prepare-os.xml |   54 +
 docs/en-US/management-server-install-systemvm.xml  |   56 +
 docs/en-US/management-server-overview.xml          |   58 +
 docs/en-US/manual-live-migration.xml               |   52 +
 docs/en-US/max-result-page-returned.xml            |   38 +
 .../migrate-datadisk-volume-new-storage-pool.xml   |   35 +
 ...grate-vm-rootvolume-volume-new-storage-pool.xml |   37 +
 docs/en-US/minimum-system-requirements.xml         |   90 +
 docs/en-US/modify-delete-service-offerings.xml     |   29 +
 docs/en-US/multi_node_management_server.xml        |   36 +
 docs/en-US/multi_node_overview.xml                 |   43 +
 docs/en-US/multi_site_deployment.xml               |   50 +
 docs/en-US/multiple-system-vm-vmware.xml           |   28 +
 .../en-US/network-offering-usage-record-format.xml |   43 +
 docs/en-US/network-offerings.xml                   |   47 +
 docs/en-US/network-service-providers.xml           |   35 +
 docs/en-US/network-usage-record-format.xml         |   40 +
 docs/en-US/networking-in-a-pod.xml                 |   41 +
 docs/en-US/networking-in-a-zone.xml                |   36 +
 docs/en-US/networking-overview.xml                 |   35 +
 docs/en-US/networking_overview.xml                 |   36 +
 docs/en-US/nfs-shares-on-management-server.xml     |  112 +
 docs/en-US/nfs-shares-on-separate-server.xml       |   52 +
 ...guration-of-external-firewalls-loadbalancer.xml |   34 +
 .../over-provisioning-service-offering-limits.xml  |   31 +
 docs/en-US/per-domain-limits.xml                   |   40 +
 docs/en-US/performance-monitoring.xml              |   29 +
 .../physical-network-configuration-settings.xml    |   37 +
 docs/en-US/pod-add.xml                             |   28 +
 docs/en-US/port-forwarding.xml                     |   49 +
 docs/en-US/prepare-system-vm-template.xml          |   57 +
 docs/en-US/primary-storage-add.xml                 |   74 +
 .../en-US/primary-storage-outage-and-data-loss.xml |   28 +
 docs/en-US/primary-storage.xml                     |   28 +
 docs/en-US/private-public-template.xml             |   30 +
 docs/en-US/projects-overview.xml                   |   31 +
 docs/en-US/projects.xml                            |   35 +
 docs/en-US/provisioning-auth-api.xml               |   29 +
 docs/en-US/provisioning-steps-overview.xml         |   46 +
 docs/en-US/provisioning-steps.xml                  |   36 +
 docs/en-US/query-filter.xml                        |   60 +
 docs/en-US/release-ip-address.xml                  |   41 +
 docs/en-US/release-notes-3.0.4.ent                 |   22 +
 docs/en-US/remove-member-from-project.xml          |   44 +
 docs/en-US/removed-API-commands.xml                |   32 +
 docs/en-US/removing-vsphere-hosts.xml              |   28 +
 docs/en-US/removing-xenserver-kvm-hosts.xml        |   33 +
 docs/en-US/requirements-templates.xml              |   31 +
 docs/en-US/resizing-volumes.xml                    |   38 +
 docs/en-US/response-formats.xml                    |   56 +
 docs/en-US/responses.xml                           |   30 +
 docs/en-US/roles.xml                               |   35 +
 docs/en-US/root-admin-ui-overview.xml              |   28 +
 ...untime-allocation-virtual-network-resources.xml |   28 +
 docs/en-US/runtime-behavior-of-primary-storage.xml |   30 +
 ...cheduled-maintenance-maintenance-mode-hosts.xml |   28 +
 docs/en-US/search-base.xml                         |   51 +
 docs/en-US/search-user-bind-dn.xml                 |   47 +
 docs/en-US/secondary-storage-add.xml               |   48 +
 .../secondary-storage-outage-and-data-loss.xml     |   29 +
 docs/en-US/secondary-storage-vm.xml                |   32 +
 docs/en-US/secondary-storage.xml                   |   29 +
 docs/en-US/security-groups.xml                     |   30 +
 docs/en-US/send-projects-membership-invitation.xml |   42 +
 docs/en-US/separate_storage_network.xml            |   24 +
 docs/en-US/service-offerings.xml                   |   31 +
 docs/en-US/set-database-buffer-pool-size.xml       |   36 +
 docs/en-US/set-global-project-resource-limits.xml  |   28 +
 .../en-US/set-monitor-total-vm-limits-per-host.xml |   29 +
 docs/en-US/set-per-project-resource-limits.xml     |   28 +
 docs/en-US/set-projects-creator-permissions.xml    |   47 +
 docs/en-US/set-resource-limits-for-projects.xml    |   30 +
 docs/en-US/set-up-invitations.xml                  |   87 +
 docs/en-US/set-up-network-for-users.xml            |   35 +
 docs/en-US/set-usage-limit.xml                     |   33 +
 docs/en-US/shared-networks.xml                     |   35 +
 docs/en-US/signing-api-requests.xml                |   60 +
 docs/en-US/site-to-site-vpn.xml                    |   62 +
 docs/en-US/small_scale_deployment.xml              |   37 +
 docs/en-US/snapshot-restore.xml                    |   28 +
 docs/en-US/standard-events.xml                     |   39 +
 docs/en-US/static-nat.xml                          |   28 +
 .../en-US/sticky-session-policies-for-lb-rules.xml |   30 +
 docs/en-US/stop-restart-management-server.xml      |   35 +
 docs/en-US/stopped-vm.xml                          |   35 +
 docs/en-US/stopping-and-starting-vms.xml           |   28 +
 docs/en-US/storage-tags.xml                        |   29 +
 docs/en-US/storage.xml                             |   30 +
 docs/en-US/suspend-project.xml                     |   52 +
 docs/en-US/sys-reliability-and-ha.xml              |   31 +
 docs/en-US/sysprep-for-windows-server-2003R2.xml   |   57 +
 docs/en-US/sysprep-windows-server-2008R2.xml       |   67 +
 docs/en-US/system-reserved-ip-addresses.xml        |   39 +
 docs/en-US/system-service-offerings.xml            |   29 +
 docs/en-US/system-vm-template.xml                  |   37 +
 .../template-iso-snapshot-usage-record-format.xml  |   42 +
 docs/en-US/templates.xml                           |   29 +
 docs/en-US/time-zones.xml                          |  137 +
 docs/en-US/troubleshooting-alerts.xml              |   57 +
 ...ooting-dataloss-on-exported-primary-storage.xml |   45 +
 docs/en-US/troubleshooting-lb-rules-fails.xml      |   39 +
 ...ing-maintenance-mode-not-working-on-vCenter.xml |   43 +
 ...troubleshooting-recover-lost-virtual-router.xml |   46 +
 .../en-US/troubleshooting-unable-to-deploy-vms.xml |   39 +
 .../troubleshooting-unable-to-power-on-vm.xml      |   45 +
 .../troubleshooting-working-with-server-logs.xml   |   41 +
 docs/en-US/troubleshooting.xml                     |   34 +
 docs/en-US/tuning.xml                              |   33 +
 docs/en-US/ui.xml                                  |   29 +
 ...pgrade-virtual-router-with-service-offering.xml |   33 +
 docs/en-US/upload-existing-volume-to-vm.xml        |   76 +
 docs/en-US/upload-template.xml                     |   53 +
 docs/en-US/usage-record-format.xml                 |   35 +
 docs/en-US/usage-types.xml                         |  109 +
 docs/en-US/use-project-view.xml                    |   38 +
 docs/en-US/user-data-and-meta-data.xml             |   45 +
 docs/en-US/user-services-overview.xml              |   39 +
 docs/en-US/using-multiple-guest-networks.xml       |   31 +
 docs/en-US/using-netscaler-load-balancers.xml      |   60 +
 docs/en-US/using-sshkeys.xml                       |   92 +
 docs/en-US/using-swift-for-secondary-storage.xml   |   29 +
 docs/en-US/using-vpn-with-mac.xml                  |   28 +
 docs/en-US/using-vpn-with-windows.xml              |   42 +
 docs/en-US/vcenter-maintenance-mode.xml            |   41 +
 docs/en-US/virtual-machine-usage-record-format.xml |   45 +
 docs/en-US/virtual-router.xml                      |   29 +
 docs/en-US/vlan-provisioning.xml                   |   30 +
 docs/en-US/vm-lifecycle.xml                        |   42 +
 docs/en-US/vm-storage-migration.xml                |   33 +
 docs/en-US/volume-deletion-garbage-collection.xml  |   35 +
 docs/en-US/volume-status.xml                       |   29 +
 docs/en-US/vpc.xml                                 |  183 +
 docs/en-US/vpn.xml                                 |   33 +
 docs/en-US/whatis.xml                              |   41 +
 docs/en-US/whats-in-this-adminguide.xml            |   28 +
 docs/en-US/whats-new.xml                           |   34 +
 docs/en-US/who-should-read-installation.xml        |   28 +
 docs/en-US/windows-installation.xml                |   28 +
 docs/en-US/work-with-usage.xml                     |   28 +
 docs/en-US/working-with-hosts.xml                  |   28 +
 docs/en-US/working-with-iso.xml                    |   33 +
 docs/en-US/working-with-snapshots.xml              |   32 +
 docs/en-US/working-with-system-vm.xml              |   28 +
 docs/en-US/working-with-templates.xml              |   44 +
 docs/en-US/working-with-usage-data.xml             |   34 +
 docs/en-US/working-with-volumes.xml                |   30 +
 docs/en-US/xenserver-maintenance-mode.xml          |   51 +
 docs/en-US/zone-add.xml                            |   77 +
 docs/images/AddHostVMware.png                      |  Bin 11345 -> 0 bytes
 docs/images/AddNetworkDialog.png                   |  Bin 13085 -> 0 bytes
 docs/images/AddTemplate.png                        |  Bin 16767 -> 0 bytes
 docs/images/AttachVolume.png                       |  Bin 23511 -> 0 bytes
 docs/images/AttachVolumeButton.png                 |  Bin 1141 -> 0 bytes
 docs/images/ChangePassword.png                     |  Bin 780 -> 0 bytes
 docs/images/CreateTemplate.png                     |  Bin 8325 -> 0 bytes
 docs/images/DeleteButton.png                       |  Bin 935 -> 0 bytes
 docs/images/DetachVolume.png                       |  Bin 20249 -> 0 bytes
 docs/images/EditButton.png                         |  Bin 1012 -> 0 bytes
 docs/images/EnableStaticNAT.png                    |  Bin 1019 -> 0 bytes
 docs/images/MigrateVM.png                          |  Bin 75071 -> 0 bytes
 docs/images/MigrateVM_2.png                        |  Bin 6183 -> 0 bytes
 docs/images/VMConsoleButton.png                    |  Bin 816 -> 0 bytes
 docs/images/logo_cloud.jpg                         |  Bin 70880 -> 0 bytes
 docs/publican-adminguide.cfg                       |   30 +
 docs/publican-all.cfg                              |   28 +
 docs/publican-cloudstack/README                    |    8 -
 docs/publican-cloudstack/defaults.cfg              |   21 +
 docs/publican-cloudstack/en-US/Feedback.xml        |   45 +-
 docs/publican-cloudstack/en-US/Legal_Notice.xml    |   19 +
 docs/publican-cloudstack/en-US/css/overrides.css   |   45 +-
 docs/publican-cloudstack/en-US/images/.directory   |    4 -
 docs/publican-cloudstack/en-US/images/1.svg        |   28 -
 docs/publican-cloudstack/en-US/images/10.svg       |   28 -
 docs/publican-cloudstack/en-US/images/11.svg       |   28 -
 docs/publican-cloudstack/en-US/images/12.svg       |   28 -
 docs/publican-cloudstack/en-US/images/13.svg       |   28 -
 docs/publican-cloudstack/en-US/images/14.svg       |   28 -
 docs/publican-cloudstack/en-US/images/15.svg       |   28 -
 docs/publican-cloudstack/en-US/images/16.svg       |   28 -
 docs/publican-cloudstack/en-US/images/17.svg       |   28 -
 docs/publican-cloudstack/en-US/images/18.svg       |   28 -
 docs/publican-cloudstack/en-US/images/19.svg       |   28 -
 docs/publican-cloudstack/en-US/images/2.svg        |   28 -
 docs/publican-cloudstack/en-US/images/20.svg       |   28 -
 docs/publican-cloudstack/en-US/images/21.svg       |   28 -
 docs/publican-cloudstack/en-US/images/22.svg       |   28 -
 docs/publican-cloudstack/en-US/images/23.svg       |   28 -
 docs/publican-cloudstack/en-US/images/24.svg       |   28 -
 docs/publican-cloudstack/en-US/images/25.svg       |   28 -
 docs/publican-cloudstack/en-US/images/26.svg       |   28 -
 docs/publican-cloudstack/en-US/images/27.svg       |   28 -
 docs/publican-cloudstack/en-US/images/28.svg       |   28 -
 docs/publican-cloudstack/en-US/images/29.svg       |   28 -
 docs/publican-cloudstack/en-US/images/3.svg        |   28 -
 docs/publican-cloudstack/en-US/images/4.svg        |   28 -
 docs/publican-cloudstack/en-US/images/5.svg        |   28 -
 docs/publican-cloudstack/en-US/images/6.svg        |   28 -
 docs/publican-cloudstack/en-US/images/7.svg        |   28 -
 docs/publican-cloudstack/en-US/images/8.svg        |   28 -
 docs/publican-cloudstack/en-US/images/9.svg        |   28 -
 docs/publican-cloudstack/en-US/images/dot.svg      |   21 -
 docs/publican-cloudstack/en-US/images/dot2.svg     |   21 -
 docs/publican-cloudstack/en-US/images/h1-bg.svg    |   21 -
 .../en-US/images/image_left.svg                    |  331 -
 .../en-US/images/image_right.svg                   |   21 -
 .../publican-cloudstack/en-US/images/important.svg |   30 -
 docs/publican-cloudstack/en-US/images/note.svg     |   28 -
 .../en-US/images/stock-go-back.svg                 |   21 -
 .../en-US/images/stock-go-forward.svg              |   21 -
 .../en-US/images/stock-go-up.svg                   |   21 -
 .../en-US/images/stock-home.svg                    |   21 -
 .../en-US/images/title_logo.svg                    |   19 +-
 docs/publican-cloudstack/en-US/images/warning.svg  |  130 -
 .../en-US/images/watermark-draft.svg               |   21 -
 docs/publican-cloudstack/gen_rpm.sh                |   22 +
 docs/publican-cloudstack/overrides.cfg             |   20 +
 docs/publican-cloudstack/publican-cloudstack.spec  |   31 +-
 docs/publican-cloudstack/publican.cfg              |   24 +
 docs/publican-devguide.cfg                         |   29 +
 docs/publican-install.cfg                          |   27 +
 docs/publican-installation.cfg                     |   29 +
 docs/publican-release-notes-4_0.cfg                |   27 +
 docs/publican-trial-install.cfg                    |   29 +
 docs/runbook/README                                |   19 -
 docs/runbook/en-US/Author_Group.xml                |    8 +-
 docs/runbook/en-US/Book_Info.xml                   |   40 +-
 docs/runbook/en-US/Chapter.xml                     |    2 +-
 docs/runbook/en-US/Environment.xml                 |   55 +-
 docs/runbook/en-US/Management.xml                  |   10 +-
 docs/runbook/en-US/Overview.xml                    |   20 +-
 docs/runbook/en-US/Preface.xml                     |   10 +-
 docs/runbook/en-US/Revision_History.xml            |   28 +-
 docs/runbook/en-US/Runbook.ent                     |   18 +
 docs/runbook/en-US/Runbook.xml                     |   10 +-
 docs/runbook/en-US/config.xml                      |   10 +-
 docs/runbook/en-US/images/icon.svg                 |   19 -
 docs/runbook/en-US/kvm.xml                         |    2 +-
 docs/runbook/publican.cfg                          |   22 +
 docs/runbook/zh-CN/Author_Group.po                 |   37 +
 docs/runbook/zh-CN/Book_Info.po                    |   54 +
 docs/runbook/zh-CN/Chapter.po                      |   65 +
 docs/runbook/zh-CN/Environment.po                  |  494 +
 docs/runbook/zh-CN/Management.po                   |  235 +
 docs/runbook/zh-CN/Overview.po                     |  130 +
 docs/runbook/zh-CN/Preface.po                      |   34 +
 docs/runbook/zh-CN/Revision_History.po             |   39 +
 docs/runbook/zh-CN/Runbook.po                      |   27 +
 docs/runbook/zh-CN/config.po                       |  280 +
 docs/runbook/zh-CN/kvm.po                          |  145 +
 patches/.classpath                                 |    6 -
 patches/.project                                   |   11 -
 patches/cloudpatch-descriptor.xml                  |   59 +
 patches/pom.xml                                    |   91 +
 patches/systemvm/debian/buildsystemvm.sh           |   19 +-
 patches/systemvm/debian/config/bin/vhd-util        |  Bin 294148 -> 0 bytes
 .../debian/config/etc/apache2/vhostexample.conf    |  238 +
 patches/systemvm/debian/config/etc/cloud-nic.rules |    2 +
 .../debian/config/etc/cron.daily/cloud-cleanup     |   16 +
 patches/systemvm/debian/config/etc/default/cloud   |   17 +
 .../debian/config/etc/default/cloud-passwd-srvr    |   17 +
 .../debian/config/etc/httpd/conf/httpd.conf        |  990 --
 patches/systemvm/debian/config/etc/init.d/cloud    |   16 +
 .../debian/config/etc/init.d/cloud-early-config    |  154 +-
 .../debian/config/etc/init.d/cloud-passwd-srvr     |   21 +-
 patches/systemvm/debian/config/etc/init.d/postinit |   17 +
 .../config/etc/iptables/iptables-consoleproxy      |   19 +-
 .../debian/config/etc/iptables/iptables-elbvm      |   17 +
 .../debian/config/etc/iptables/iptables-router     |   17 +
 .../debian/config/etc/iptables/iptables-secstorage |   20 +-
 .../debian/config/etc/iptables/iptables-vpcrouter  |   42 +
 .../debian/config/etc/iptables/rt_tables_init      |   29 +
 patches/systemvm/debian/config/etc/iptables/rules  |   17 +
 patches/systemvm/debian/config/etc/logrotate.conf  |   12 -
 .../systemvm/debian/config/etc/profile.d/cloud.sh  |   29 +-
 patches/systemvm/debian/config/etc/sysctl.conf     |    7 +
 patches/systemvm/debian/config/etc/vpcdnsmasq.conf |  465 +
 .../debian/config/opt/cloud/bin/checks2svpn.sh     |   46 +
 .../debian/config/opt/cloud/bin/cloud-nic.sh       |   80 +
 .../config/opt/cloud/bin/get_template_version.sh   |   28 +-
 .../debian/config/opt/cloud/bin/ipassoc.sh         |  402 +
 .../debian/config/opt/cloud/bin/ipsectunnel.sh     |  298 +
 .../debian/config/opt/cloud/bin/netusage.sh        |  155 +
 .../debian/config/opt/cloud/bin/passwd_server      |   37 +-
 .../debian/config/opt/cloud/bin/passwd_server_ip   |   32 +
 .../debian/config/opt/cloud/bin/patchsystemvm.sh   |   65 +-
 .../debian/config/opt/cloud/bin/serve_password.sh  |   42 +-
 .../debian/config/opt/cloud/bin/vpc_acl.sh         |  232 +
 .../debian/config/opt/cloud/bin/vpc_func.sh        |   68 +
 .../debian/config/opt/cloud/bin/vpc_guestnw.sh     |  235 +
 .../debian/config/opt/cloud/bin/vpc_ipassoc.sh     |  165 +
 .../config/opt/cloud/bin/vpc_loadbalancer.sh       |  201 +
 .../debian/config/opt/cloud/bin/vpc_netusage.sh    |  158 +
 .../debian/config/opt/cloud/bin/vpc_passwd_server  |   32 +
 .../config/opt/cloud/bin/vpc_portforwarding.sh     |  126 +
 .../config/opt/cloud/bin/vpc_privateGateway.sh     |   98 +
 .../debian/config/opt/cloud/bin/vpc_snat.sh        |  102 +
 .../debian/config/opt/cloud/bin/vpc_staticnat.sh   |  124 +
 .../debian/config/opt/cloud/bin/vpc_staticroute.sh |  134 +
 .../systemvm/debian/config/root/bumpup_priority.sh |   28 +-
 .../systemvm/debian/config/root/clearUsageRules.sh |   31 +-
 patches/systemvm/debian/config/root/edithosts.sh   |   29 +-
 patches/systemvm/debian/config/root/firewall.sh    |   45 +-
 .../systemvm/debian/config/root/firewall_rule.sh   |   28 +-
 patches/systemvm/debian/config/root/func.sh        |   28 +-
 patches/systemvm/debian/config/root/ipassoc.sh     |  400 -
 .../systemvm/debian/config/root/loadbalancer.sh    |   30 +-
 patches/systemvm/debian/config/root/netusage.sh    |  153 -
 patches/systemvm/debian/config/root/reconfigLB.sh  |   30 +-
 .../root/redundant_router/arping_gateways.sh.templ |   17 +
 .../config/root/redundant_router/backup.sh.templ   |   16 +
 .../config/root/redundant_router/check_bumpup.sh   |   28 +-
 .../root/redundant_router/check_heartbeat.sh.templ |   17 +
 .../root/redundant_router/checkrouter.sh.templ     |   17 +
 .../config/root/redundant_router/disable_pubip.sh  |   29 +-
 .../root/redundant_router/enable_pubip.sh.templ    |   27 +-
 .../config/root/redundant_router/fault.sh.templ    |   16 +
 .../root/redundant_router/heartbeat.sh.templ       |   16 +
 .../root/redundant_router/keepalived.conf.templ    |   39 +-
 .../config/root/redundant_router/master.sh.templ   |   16 +
 .../root/redundant_router/primary-backup.sh.templ  |   26 +-
 .../systemvm/debian/config/root/savepassword.sh    |   29 +-
 patches/systemvm/debian/config/root/userdata.py    |   31 +-
 patches/systemvm/debian/config/root/userdata.sh    |   30 +-
 .../iptables_1.4.8-3local1checksum1_i386.deb       |  Bin 340494 -> 0 bytes
 patches/systemvm/debian/systemvm.xml               |   16 +
 patches/systemvm/debian/vpn/etc/ipsec.conf         |   43 +-
 patches/systemvm/debian/vpn/etc/ipsec.conf.orig    |   48 -
 patches/systemvm/debian/vpn/etc/ipsec.secrets      |   10 -
 patches/systemvm/debian/vpn/etc/ipsec.secrets.orig |   11 -
 .../debian/vpn/etc/xl2tpd/xl2tpd.conf.orig         |   76 -
 .../debian/vpn/opt/cloud/bin/vpc_vpn_l2tp.sh       |  176 +
 .../systemvm/debian/vpn/opt/cloud/bin/vpn_l2tp.sh  |   30 +-
 .../debian/xe-guest-utilities_5.6.0-595_i386.deb   |  Bin 55452 -> 0 bytes
 patches/systemvm/debian/xe/xe-daemon               |   26 +-
 patches/systemvm/debian/xe/xe-linux-distribution   |   26 +-
 .../systemvm/debian/xe/xe-linux-distribution.init  |  106 -
 patches/systemvm/debian/xe/xe-update-guest-attrs   |   26 +-
 patches/systemvm/debian/xe/xen-vcpu-hotplug.rules  |    1 -
 patches/systemvm/debian/xt_CHECKSUM.ko             |  Bin 145696 -> 0 bytes
 .../user-concentrated-pod/.classpath               |   10 -
 .../user-concentrated-pod/.project                 |   17 -
 .../user-concentrated-pod/build.xml                |    2 +-
 .../user-concentrated-pod/pom.xml                  |   29 +
 .../cloud/deploy/UserConcentratedPodPlanner.java   |   28 +-
 .../deployment-planners/user-dispersing/.classpath |   10 -
 .../deployment-planners/user-dispersing/.project   |   17 -
 .../.settings/org.eclipse.jdt.core.prefs           |   12 -
 .../deployment-planners/user-dispersing/pom.xml    |   29 +
 .../com/cloud/deploy/UserDispersingPlanner.java    |   28 +-
 plugins/file-systems/netapp/.classpath             |   11 -
 plugins/file-systems/netapp/.project               |   17 -
 plugins/file-systems/netapp/pom.xml                |   36 +
 .../src/com/cloud/netapp/dao/VolumeDaoImpl.java    |    1 +
 plugins/host-allocators/random/.classpath          |   10 -
 plugins/host-allocators/random/.project            |   17 -
 plugins/host-allocators/random/pom.xml             |   29 +
 .../manager/allocator/impl/RandomAllocator.java    |   28 +-
 plugins/hypervisors/kvm/.pydevproject              |   25 +
 plugins/hypervisors/kvm/agent-descriptor.xml       |   68 +
 plugins/hypervisors/kvm/build.xml                  |  137 +
 plugins/hypervisors/kvm/pom.xml                    |   99 +
 .../hypervisor/kvm/resource/BridgeVifDriver.java   |  220 +
 .../hypervisor/kvm/resource/KVMGuestOsMapper.java  |  170 +
 .../cloud/hypervisor/kvm/resource/KVMHABase.java   |  189 +
 .../hypervisor/kvm/resource/KVMHAChecker.java      |   84 +
 .../hypervisor/kvm/resource/KVMHAMonitor.java      |  119 +
 .../kvm/resource/LibvirtCapXMLParser.java          |  136 +
 .../kvm/resource/LibvirtComputingResource.java     | 4348 ++++++
 .../hypervisor/kvm/resource/LibvirtConnection.java |   48 +
 .../kvm/resource/LibvirtDomainXMLParser.java       |  181 +
 .../hypervisor/kvm/resource/LibvirtNetworkDef.java |  172 +
 .../hypervisor/kvm/resource/LibvirtSecretDef.java  |  106 +
 .../kvm/resource/LibvirtStoragePoolDef.java        |  162 +
 .../kvm/resource/LibvirtStoragePoolXMLParser.java  |  108 +
 .../kvm/resource/LibvirtStorageVolumeDef.java      |   91 +
 .../resource/LibvirtStorageVolumeXMLParser.java    |   84 +
 .../hypervisor/kvm/resource/LibvirtVMDef.java      |  916 ++
 .../hypervisor/kvm/resource/LibvirtXMLParser.java  |   72 +
 .../cloud/hypervisor/kvm/resource/VifDriver.java   |   39 +
 .../hypervisor/kvm/resource/VifDriverBase.java     |   55 +
 .../hypervisor/kvm/storage/KVMPhysicalDisk.java    |   98 +
 .../hypervisor/kvm/storage/KVMStoragePool.java     |   65 +
 .../kvm/storage/KVMStoragePoolManager.java         |  117 +
 .../hypervisor/kvm/storage/KVMVirtualDisk.java     |   21 +
 .../kvm/storage/LibvirtStorageAdaptor.java         |  803 ++
 .../hypervisor/kvm/storage/LibvirtStoragePool.java |  212 +
 .../hypervisor/kvm/storage/StorageAdaptor.java     |   70 +
 .../hypervisor/kvm/resource/LibvirtVMDefTest.java  |   38 +
 plugins/hypervisors/ovm/.classpath                 |   15 -
 plugins/hypervisors/ovm/.project                   |   23 -
 plugins/hypervisors/ovm/pom.xml                    |   36 +
 ..._reposExceptionDueToWrongReturnValueCheck.patch |   13 -
 .../scripts/vm/hypervisor/ovm/OvmCommonModule.py   |    1 -
 .../ovm/scripts/vm/hypervisor/ovm/OvmDiskModule.py |    1 -
 .../OvmDontTouchOCFS2ClusterWhenAgentStart.patch   |   13 -
 .../vm/hypervisor/ovm/OvmHaHeartBeatModule.py      |    1 -
 .../scripts/vm/hypervisor/ovm/OvmLoggerModule.py   |    1 -
 .../scripts/vm/hypervisor/ovm/OvmObjectModule.py   |    1 -
 .../ovm/scripts/vm/hypervisor/ovm/OvmPatch.patch   |   23 -
 .../ovm/scripts/vm/hypervisor/ovm/OvmVifModule.py  |    1 -
 .../ovm/scripts/vm/hypervisor/ovm/OvmVmModule.py   |    1 -
 .../scripts/vm/hypervisor/ovm/OvmVolumeModule.py   |    1 -
 .../com/cloud/ovm/hypervisor/OvmResourceBase.java  |   10 +-
 plugins/hypervisors/vmware/.classpath              |   12 -
 plugins/hypervisors/vmware/.project                |   23 -
 plugins/hypervisors/vmware/pom.xml                 |   54 +
 .../cloud/api/commands/DeleteCiscoNexusVSMCmd.java |   33 +-
 .../api/commands/DisableCiscoNexusVSMCmd.java      |   33 +-
 .../cloud/api/commands/EnableCiscoNexusVSMCmd.java |   33 +-
 .../cloud/api/commands/ListCiscoNexusVSMsCmd.java  |   33 +-
 .../vmware/src/com/cloud/ha/VmwareFencer.java      |   28 +-
 .../src/com/cloud/ha/VmwareInvestigator.java       |   28 +-
 .../src/com/cloud/hypervisor/guru/VMwareGuru.java  |   28 +-
 .../cloud/hypervisor/vmware/VmwareCleanupMaid.java |   28 +-
 .../hypervisor/vmware/VmwareServerDiscoverer.java  |   28 +-
 .../vmware/manager/VmwareHostService.java          |   28 +-
 .../hypervisor/vmware/manager/VmwareManager.java   |   28 +-
 .../vmware/manager/VmwareManagerImpl.java          |   55 +-
 .../vmware/manager/VmwareStorageManager.java       |   28 +-
 .../vmware/manager/VmwareStorageManagerImpl.java   |   28 +-
 .../vmware/manager/VmwareStorageMount.java         |   28 +-
 .../vmware/resource/VmwareContextFactory.java      |   28 +-
 .../hypervisor/vmware/resource/VmwareResource.java |  885 +-
 .../network/CiscoNexusVSMDeviceManagerImpl.java    |   28 +-
 .../com/cloud/network/CiscoNexusVSMDeviceVO.java   |  180 +-
 .../cloud/network/dao/CiscoNexusVSMDeviceDao.java  |   28 +-
 .../network/dao/CiscoNexusVSMDeviceDaoImpl.java    |   30 +-
 .../network/element/CiscoNexusVSMElement.java      |   34 +-
 .../element/CiscoNexusVSMElementService.java       |   33 +-
 .../resource/PremiumSecondaryStorageResource.java  |   28 +-
 .../VmwareSecondaryStorageContextFactory.java      |   38 +-
 .../VmwareSecondaryStorageResourceHandler.java     |   28 +-
 plugins/hypervisors/xen/.classpath                 |   11 -
 plugins/hypervisors/xen/.project                   |   23 -
 plugins/hypervisors/xen/build.xml                  |    2 +-
 plugins/hypervisors/xen/pom.xml                    |   47 +
 .../xen/src/com/cloud/ha/XenServerFencer.java      |   28 +-
 .../src/com/cloud/hypervisor/XenServerGuru.java    |   28 +-
 .../xen/discoverer/XcpServerDiscoverer.java        |   37 +-
 .../hypervisor/xen/resource/CitrixHelper.java      |   28 +-
 .../xen/resource/CitrixResourceBase.java           |  781 +-
 .../hypervisor/xen/resource/XcpOssResource.java    |    6 +-
 .../hypervisor/xen/resource/XcpServerResource.java |   28 +-
 .../xen/resource/XenServer56FP1Resource.java       |   28 +-
 .../xen/resource/XenServer56Resource.java          |   94 +-
 .../xen/resource/XenServer56SP2Resource.java       |   28 +-
 .../xen/resource/XenServer600Resource.java         |   28 +-
 .../xen/resource/XenServer602Resource.java         |   28 +-
 .../xen/resource/XenServerConnectionPool.java      |   30 +-
 .../hypervisor/xen/resource/XenServerPoolVms.java  |   28 +-
 .../elastic-loadbalancer/.classpath                |   11 -
 .../network-elements/elastic-loadbalancer/.project |   17 -
 .../network-elements/elastic-loadbalancer/pom.xml  |   29 +
 .../element/ElasticLoadBalancerElement.java        |    2 +-
 .../network/lb/ElasticLoadBalancerManagerImpl.java |   80 +-
 plugins/network-elements/f5/.classpath             |   11 -
 plugins/network-elements/f5/.project               |   17 -
 plugins/network-elements/f5/pom.xml                |   41 +
 .../api/commands/AddExternalLoadBalancerCmd.java   |   31 +-
 .../cloud/api/commands/AddF5LoadBalancerCmd.java   |   31 +-
 .../api/commands/ConfigureF5LoadBalancerCmd.java   |   29 +-
 .../commands/DeleteExternalLoadBalancerCmd.java    |   29 +-
 .../api/commands/DeleteF5LoadBalancerCmd.java      |   29 +-
 .../api/commands/ListExternalLoadBalancersCmd.java |   29 +-
 .../commands/ListF5LoadBalancerNetworksCmd.java    |   29 +-
 .../cloud/api/commands/ListF5LoadBalancersCmd.java |   29 +-
 .../element/F5ExternalLoadBalancerElement.java     |   32 +-
 .../F5ExternalLoadBalancerElementService.java      |   28 +-
 .../cloud/network/resource/F5BigIpResource.java    |   32 +-
 plugins/network-elements/juniper-srx/.classpath    |   11 -
 plugins/network-elements/juniper-srx/.project      |   17 -
 plugins/network-elements/juniper-srx/pom.xml       |   41 +
 .../cloud/api/commands/AddExternalFirewallCmd.java |   28 +-
 .../com/cloud/api/commands/AddSrxFirewallCmd.java  |   28 +-
 .../api/commands/ConfigureSrxFirewallCmd.java      |   28 +-
 .../api/commands/DeleteExternalFirewallCmd.java    |   28 +-
 .../cloud/api/commands/DeleteSrxFirewallCmd.java   |   28 +-
 .../api/commands/ListExternalFirewallsCmd.java     |   28 +-
 .../api/commands/ListSrxFirewallNetworksCmd.java   |   28 +-
 .../cloud/api/commands/ListSrxFirewallsCmd.java    |   28 +-
 .../element/JuniperSRXExternalFirewallElement.java |   36 +-
 .../element/JuniperSRXFirewallElementService.java  |   28 +-
 .../cloud/network/resource/JuniperSrxResource.java |   30 +-
 .../network-elements/midokura-midonet/build.xml    |   17 +
 plugins/network-elements/midokura-midonet/pom.xml  |   30 +
 .../network/element/MidokuraMidonetElement.java    |  133 +
 .../guru/MidokuraMidonetGuestNetworkGuru.java      |   46 +
 plugins/network-elements/netscaler/.classpath      |   11 -
 plugins/network-elements/netscaler/.project        |   17 -
 plugins/network-elements/netscaler/pom.xml         |   41 +
 .../api/commands/AddNetscalerLoadBalancerCmd.java  |   17 +-
 .../ConfigureNetscalerLoadBalancerCmd.java         |   16 +-
 .../commands/DeleteNetscalerLoadBalancerCmd.java   |   17 +-
 .../ListNetscalerLoadBalancerNetworksCmd.java      |   16 +-
 .../commands/ListNetscalerLoadBalancersCmd.java    |   16 +-
 .../src/com/cloud/network/NetScalerPodVO.java      |   27 +-
 .../src/com/cloud/network/dao/NetScalerPodDao.java |   29 +-
 .../com/cloud/network/dao/NetScalerPodDaoImpl.java |   27 +-
 .../cloud/network/element/NetscalerElement.java    |   56 +-
 .../NetscalerLoadBalancerElementService.java       |   28 +-
 .../cloud/network/resource/NetscalerResource.java  |   30 +-
 .../nicira-nvp/README.NiciraIntegration            |   87 +
 plugins/network-elements/nicira-nvp/build.xml      |  129 +
 plugins/network-elements/nicira-nvp/pom.xml        |   29 +
 .../cloud/agent/api/CreateLogicalSwitchAnswer.java |   36 +
 .../agent/api/CreateLogicalSwitchCommand.java      |   54 +
 .../agent/api/CreateLogicalSwitchPortAnswer.java   |   36 +
 .../agent/api/CreateLogicalSwitchPortCommand.java  |   58 +
 .../cloud/agent/api/DeleteLogicalSwitchAnswer.java |   30 +
 .../agent/api/DeleteLogicalSwitchCommand.java      |   35 +
 .../agent/api/DeleteLogicalSwitchPortAnswer.java   |   30 +
 .../agent/api/DeleteLogicalSwitchPortCommand.java  |   41 +
 .../agent/api/FindLogicalSwitchPortAnswer.java     |   36 +
 .../agent/api/FindLogicalSwitchPortCommand.java    |   44 +
 .../cloud/agent/api/StartupNiciraNvpCommand.java   |   27 +
 .../agent/api/UpdateLogicalSwitchPortAnswer.java   |   36 +
 .../agent/api/UpdateLogicalSwitchPortCommand.java  |   65 +
 .../cloud/api/commands/AddNiciraNvpDeviceCmd.java  |  126 +
 .../api/commands/DeleteNiciraNvpDeviceCmd.java     |   92 +
 .../commands/ListNiciraNvpDeviceNetworksCmd.java   |  101 +
 .../api/commands/ListNiciraNvpDevicesCmd.java      |  106 +
 .../api/response/NiciraNvpDeviceResponse.java      |   53 +
 .../src/com/cloud/network/NiciraNvpDeviceVO.java   |   95 +
 .../com/cloud/network/NiciraNvpNicMappingVO.java   |   81 +
 .../src/com/cloud/network/dao/NiciraNvpDao.java    |   32 +
 .../com/cloud/network/dao/NiciraNvpDaoImpl.java    |   48 +
 .../cloud/network/dao/NiciraNvpNicMappingDao.java  |   29 +
 .../network/dao/NiciraNvpNicMappingDaoImpl.java    |   46 +
 .../cloud/network/element/NiciraNvpElement.java    |  543 +
 .../network/element/NiciraNvpElementService.java   |   44 +
 .../network/guru/NiciraNvpGuestNetworkGuru.java    |  273 +
 .../src/com/cloud/network/nicira/Attachment.java   |   38 +
 .../cloud/network/nicira/ControlClusterStatus.java |   82 +
 .../com/cloud/network/nicira/LogicalSwitch.java    |  115 +
 .../cloud/network/nicira/LogicalSwitchPort.java    |  134 +
 .../src/com/cloud/network/nicira/NiciraNvpApi.java |  454 +
 .../network/nicira/NiciraNvpApiException.java      |   36 +
 .../com/cloud/network/nicira/NiciraNvpList.java    |   41 +
 .../src/com/cloud/network/nicira/NiciraNvpTag.java |   63 +
 .../cloud/network/nicira/TransportZoneBinding.java |   63 +
 .../com/cloud/network/nicira/VifAttachment.java    |   59 +
 .../cloud/network/resource/NiciraNvpResource.java  |  357 +
 plugins/network-elements/ovs/.classpath            |   11 -
 plugins/network-elements/ovs/.project              |   17 -
 plugins/network-elements/ovs/pom.xml               |   29 +
 .../src/com/cloud/network/element/OvsElement.java  |   31 +-
 .../cloud/network/guru/OvsGuestNetworkGuru.java    |   56 +-
 .../com/cloud/network/ovs/GreTunnelException.java  |   28 +-
 .../cloud/network/ovs/OvsDestroyBridgeCommand.java |   18 +-
 .../cloud/network/ovs/OvsFetchInterfaceAnswer.java |   18 +-
 .../network/ovs/OvsFetchInterfaceCommand.java      |   17 -
 .../cloud/network/ovs/OvsSetupBridgeCommand.java   |   17 -
 .../com/cloud/network/ovs/OvsTunnelManager.java    |   28 +-
 .../cloud/network/ovs/OvsTunnelManagerImpl.java    |   28 +-
 .../network/ovs/dao/OvsTunnelInterfaceDao.java     |   33 +-
 .../network/ovs/dao/OvsTunnelInterfaceDaoImpl.java |   33 +-
 .../network/ovs/dao/OvsTunnelInterfaceVO.java      |   33 +-
 .../cloud/network/ovs/dao/OvsTunnelNetworkDao.java |   33 +-
 .../network/ovs/dao/OvsTunnelNetworkDaoImpl.java   |   33 +-
 .../cloud/network/ovs/dao/OvsTunnelNetworkVO.java  |   33 +-
 plugins/pom.xml                                    |  127 +
 plugins/storage-allocators/random/.classpath       |   10 -
 plugins/storage-allocators/random/.project         |   17 -
 plugins/storage-allocators/random/pom.xml          |   29 +
 .../allocator/RandomStoragePoolAllocator.java      |   17 +-
 plugins/user-authenticators/ldap/.classpath        |   10 -
 plugins/user-authenticators/ldap/.project          |   17 -
 plugins/user-authenticators/ldap/pom.xml           |   29 +
 .../cloud/server/auth/LDAPUserAuthenticator.java   |   17 +-
 plugins/user-authenticators/md5/.classpath         |   10 -
 plugins/user-authenticators/md5/.project           |   17 -
 plugins/user-authenticators/md5/pom.xml            |   29 +
 .../cloud/server/auth/MD5UserAuthenticator.java    |   28 +-
 plugins/user-authenticators/plain-text/.classpath  |   10 -
 plugins/user-authenticators/plain-text/.project    |   17 -
 plugins/user-authenticators/plain-text/pom.xml     |   29 +
 .../server/auth/PlainTextUserAuthenticator.java    |   17 +-
 pom.xml                                            |  344 +
 project_admin/process/committerVote.txt            |   96 -
 project_admin/readme.txt                           |    3 -
 project_admin/templates/committerAccept.txt        |   47 -
 project_admin/templates/committerAnnounce.txt      |   18 -
 project_admin/templates/committerCreate.txt        |   38 -
 project_admin/templates/committerDone.txt          |   45 -
 project_admin/templates/committerInvite.txt        |   38 -
 project_admin/templates/committerVote.txt          |   26 -
 project_admin/templates/committerVoteResults.txt   |   33 -
 python/bindir/cloud-external-ipallocator.py        |   26 +-
 .../bindir/cloud-grab-dependent-library-versions   |   20 +-
 python/bindir/cloud-setup-baremetal                |   28 +-
 .../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in    |   16 +
 .../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in    |   16 +
 .../SYSCONFDIR/init.d/cloud-ipallocator.in         |   17 +
 .../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in    |   16 +
 .../sles/SYSCONFDIR/init.d/cloud-ipallocator.in    |   17 +
 .../ubuntu/SYSCONFDIR/init.d/cloud-ipallocator.in  |   16 +
 python/incubation/cloud-web-ipallocator.py         |   26 +-
 python/lib/cloud_utils.py                          |   26 +-
 python/lib/cloudutils/__init__.py                  |   26 +-
 python/lib/cloudutils/cloudException.py            |   26 +-
 python/lib/cloudutils/configFileOps.py             |   26 +-
 python/lib/cloudutils/db.py                        |   26 +-
 python/lib/cloudutils/globalEnv.py                 |   26 +-
 python/lib/cloudutils/networkConfig.py             |   26 +-
 python/lib/cloudutils/serviceConfig.py             |  214 +-
 python/lib/cloudutils/serviceConfigServer.py       |   26 +-
 python/lib/cloudutils/syscfg.py                    |   28 +-
 python/lib/cloudutils/utilities.py                 |   28 +-
 scripts/.classpath                                 |    6 -
 scripts/.project                                   |   17 -
 scripts/.pydevproject                              |   18 +
 scripts/network/domr/getDomRVersion.sh             |   46 -
 scripts/network/domr/getRouterStatus.sh            |   46 -
 scripts/network/domr/ipassoc.sh                    |   54 -
 scripts/network/domr/l2tp_vpn.sh                   |   27 -
 scripts/network/domr/networkUsage.sh               |   54 -
 scripts/network/domr/router_proxy.sh               |   58 +
 scripts/network/domr/s2s_vpn.sh                    |   29 +
 scripts/network/juniper/access-profile-add.xml     |   18 +
 scripts/network/juniper/access-profile-getall.xml  |   18 +
 scripts/network/juniper/access-profile-getone.xml  |   18 +
 scripts/network/juniper/address-book-entry-add.xml |   20 +-
 .../network/juniper/address-book-entry-getall.xml  |   20 +-
 .../network/juniper/address-book-entry-getone.xml  |   20 +-
 scripts/network/juniper/address-pool-add.xml       |   18 +
 scripts/network/juniper/address-pool-getall.xml    |   18 +
 scripts/network/juniper/address-pool-getone.xml    |   18 +
 scripts/network/juniper/application-add.xml        |   20 +-
 scripts/network/juniper/application-getone.xml     |   20 +-
 scripts/network/juniper/close-configuration.xml    |   20 +-
 scripts/network/juniper/commit.xml                 |   20 +-
 scripts/network/juniper/dest-nat-pool-add.xml      |   20 +-
 scripts/network/juniper/dest-nat-pool-getall.xml   |   20 +-
 scripts/network/juniper/dest-nat-pool-getone.xml   |   20 +-
 scripts/network/juniper/dest-nat-rule-add.xml      |   20 +-
 scripts/network/juniper/dest-nat-rule-getall.xml   |   20 +-
 scripts/network/juniper/dest-nat-rule-getone.xml   |   18 +
 scripts/network/juniper/dynamic-vpn-client-add.xml |   18 +
 .../network/juniper/dynamic-vpn-client-getall.xml  |   18 +
 .../network/juniper/dynamic-vpn-client-getone.xml  |   18 +
 scripts/network/juniper/filter-getone.xml          |   18 +
 scripts/network/juniper/filter-term-getone.xml     |   18 +
 .../juniper/firewall-filter-bytes-getall.xml       |   18 +
 .../network/juniper/guest-vlan-filter-term-add.xml |   18 +
 scripts/network/juniper/ike-gateway-add.xml        |   18 +
 scripts/network/juniper/ike-gateway-getall.xml     |   20 +-
 scripts/network/juniper/ike-gateway-getone.xml     |   20 +-
 scripts/network/juniper/ike-policy-add.xml         |   20 +-
 scripts/network/juniper/ike-policy-getall.xml      |   20 +-
 scripts/network/juniper/ike-policy-getone.xml      |   20 +-
 scripts/network/juniper/ipsec-vpn-add.xml          |   18 +
 scripts/network/juniper/ipsec-vpn-getall.xml       |   18 +
 scripts/network/juniper/ipsec-vpn-getone.xml       |   18 +
 scripts/network/juniper/login.xml                  |   20 +-
 scripts/network/juniper/open-configuration.xml     |   20 +-
 scripts/network/juniper/private-interface-add.xml  |   18 +
 .../network/juniper/private-interface-getall.xml   |   20 +-
 .../network/juniper/private-interface-getone.xml   |   18 +
 .../juniper/private-interface-with-filters-add.xml |   18 +
 scripts/network/juniper/proxy-arp-add.xml          |   20 +-
 scripts/network/juniper/proxy-arp-getall.xml       |   20 +-
 scripts/network/juniper/proxy-arp-getone.xml       |   20 +-
 .../network/juniper/public-ip-filter-term-add.xml  |   18 +
 scripts/network/juniper/rollback.xml               |   20 +-
 scripts/network/juniper/security-policy-add.xml    |   18 +
 scripts/network/juniper/security-policy-getall.xml |   18 +
 scripts/network/juniper/security-policy-getone.xml |   18 +
 scripts/network/juniper/security-policy-group.xml  |   18 +
 scripts/network/juniper/security-policy-rename.xml |   18 +
 scripts/network/juniper/src-nat-pool-add.xml       |   20 +-
 scripts/network/juniper/src-nat-pool-getone.xml    |   20 +-
 scripts/network/juniper/src-nat-rule-add.xml       |   18 +
 scripts/network/juniper/src-nat-rule-getall.xml    |   18 +
 scripts/network/juniper/src-nat-rule-getone.xml    |   18 +
 scripts/network/juniper/static-nat-rule-add.xml    |   18 +
 scripts/network/juniper/static-nat-rule-getall.xml |   18 +
 scripts/network/juniper/static-nat-rule-getone.xml |   18 +
 scripts/network/juniper/test.xml                   |   18 +
 scripts/network/juniper/zone-interface-add.xml     |   18 +
 scripts/network/juniper/zone-interface-getone.xml  |   18 +
 scripts/storage/qcow2/managesnapshot.sh            |  136 +-
 scripts/storage/secondary/cloud-install-sys-tmplt  |   40 +-
 scripts/vm/hypervisor/kvm/kvmheartbeat.sh          |   12 +-
 scripts/vm/hypervisor/xenserver/setupxenserver.sh  |   14 +
 scripts/vm/hypervisor/xenserver/vhd-util           |  Bin 318977 -> 0 bytes
 scripts/vm/hypervisor/xenserver/vmops              |  179 +-
 scripts/vm/hypervisor/xenserver/xcpserver/patch    |    9 +-
 scripts/vm/hypervisor/xenserver/xenserver56/patch  |    6 +-
 .../vm/hypervisor/xenserver/xenserver56fp1/patch   |    6 +-
 scripts/vm/hypervisor/xenserver/xenserver60/patch  |    7 +-
 scripts/vm/network/security_group.py               |   74 +-
 scripts/vm/network/vnet/modifyvlan.sh              |   31 +-
 scripts/vm/systemvm/injectkeys.sh                  |    3 +-
 server/.classpath                                  |   14 -
 server/.project                                    |   17 -
 server/conf/log4j-cloud.xml.in                     |   18 +
 server/conf/migration-components.xml               |   17 +
 server/pom.xml                                     |   96 +
 server/scripts/vmops-fix-mysql-config              |   16 +
 server/src/com/cloud/agent/VmmAgentShell.java      |  526 -
 .../com/cloud/agent/manager/AgentManagerImpl.java  |    2 +-
 .../manager/allocator/impl/FirstFitAllocator.java  |   29 +-
 .../manager/allocator/impl/TestingAllocator.java   |    4 -
 server/src/com/cloud/api/ApiDBUtils.java           |   64 +-
 server/src/com/cloud/api/ApiResponseHelper.java    |  597 +-
 server/src/com/cloud/api/ApiServer.java            |   11 +-
 .../cloud/api/response/ApiResponseSerializer.java  |    2 +-
 .../src/com/cloud/async/AsyncJobManagerImpl.java   |   17 -
 .../com/cloud/baremetal/BareMetalResourceBase.java |    7 +-
 server/src/com/cloud/capacity/CapacityManager.java |    7 +
 .../com/cloud/capacity/CapacityManagerImpl.java    |   19 +
 .../cloud/capacity/StorageCapacityListener.java    |    7 -
 server/src/com/cloud/capacity/dao/CapacityDao.java |    3 +-
 .../com/cloud/capacity/dao/CapacityDaoImpl.java    |   54 +-
 .../src/com/cloud/cluster/ClusterManagerImpl.java  |    3 +-
 server/src/com/cloud/configuration/Config.java     |   31 +-
 .../cloud/configuration/ConfigurationManager.java  |   28 +-
 .../configuration/ConfigurationManagerImpl.java    |  185 +-
 .../configuration/DefaultComponentLibrary.java     |   30 +-
 .../AgentBasedConsoleProxyManager.java             |   30 +-
 .../consoleproxy/ConsoleProxyManagerImpl.java      |   69 +-
 server/src/com/cloud/dc/DataCenterVO.java          |   40 +-
 server/src/com/cloud/deploy/FirstFitPlanner.java   |  108 +-
 .../com/cloud/ha/HighAvailabilityManagerImpl.java  |    3 +-
 .../src/com/cloud/ha/UserVmDomRInvestigator.java   |    8 +-
 server/src/com/cloud/host/dao/HostDaoImpl.java     |    4 +-
 .../com/cloud/hypervisor/HypervisorGuruBase.java   |   20 +-
 .../hypervisor/dao/HypervisorCapabilitiesDao.java  |    5 +-
 .../dao/HypervisorCapabilitiesDaoImpl.java         |   41 +-
 .../kvm/discoverer/KvmDummyResourceBase.java       |   88 +
 .../kvm/discoverer/KvmServerDiscoverer.java        |    7 +-
 server/src/com/cloud/maint/Version.java            |    8 +
 .../com/cloud/migration/Db21to22MigrationUtil.java |    3 -
 .../network/ExternalFirewallDeviceManagerImpl.java |   14 +-
 .../ExternalLoadBalancerDeviceManagerImpl.java     |   14 +-
 .../ExternalLoadBalancerUsageManagerImpl.java      |    4 +-
 .../network/ExternalNetworkDeviceManager.java      |    4 +-
 server/src/com/cloud/network/IPAddressVO.java      |   19 +-
 server/src/com/cloud/network/NetworkManager.java   |  237 +-
 .../src/com/cloud/network/NetworkManagerImpl.java  | 2140 ++-
 server/src/com/cloud/network/NetworkVO.java        |   29 +-
 .../src/com/cloud/network/PhysicalNetworkVO.java   |    3 +-
 server/src/com/cloud/network/PortProfileVO.java    |   18 +-
 server/src/com/cloud/network/RouterNetworkVO.java  |   73 +
 .../cloud/network/Site2SiteCustomerGatewayVO.java  |  204 +
 .../cloud/network/Site2SiteVpnConnectionVO.java    |  140 +
 .../com/cloud/network/Site2SiteVpnGatewayVO.java   |  112 +
 .../com/cloud/network/SshKeysDistriMonitor.java    |    5 -
 server/src/com/cloud/network/addr/PublicIp.java    |   18 +-
 .../com/cloud/network/dao/FirewallRulesDao.java    |    5 +-
 .../cloud/network/dao/FirewallRulesDaoImpl.java    |   42 +-
 server/src/com/cloud/network/dao/IPAddressDao.java |    4 +-
 .../com/cloud/network/dao/IPAddressDaoImpl.java    |   34 +-
 .../com/cloud/network/dao/LoadBalancerDaoImpl.java |    2 +-
 server/src/com/cloud/network/dao/NetworkDao.java   |   16 +-
 .../src/com/cloud/network/dao/NetworkDaoImpl.java  |  109 +-
 .../dao/PhysicalNetworkServiceProviderVO.java      |   13 +
 .../cloud/network/dao/RouterNetworkDaoImpl.java    |   61 +
 .../network/dao/Site2SiteCustomerGatewayDao.java   |   28 +
 .../dao/Site2SiteCustomerGatewayDaoImpl.java       |   65 +
 .../network/dao/Site2SiteVpnConnectionDao.java     |   30 +
 .../network/dao/Site2SiteVpnConnectionDaoImpl.java |   93 +
 .../cloud/network/dao/Site2SiteVpnGatewayDao.java  |   24 +
 .../network/dao/Site2SiteVpnGatewayDaoImpl.java    |   49 +
 .../cloud/network/element/BareMetalElement.java    |    5 +-
 .../network/element/CloudZonesNetworkElement.java  |   30 +-
 .../cloud/network/element/ExternalDhcpElement.java |    3 +-
 .../network/element/SecurityGroupElement.java      |    3 +-
 .../network/element/VirtualRouterElement.java      |  297 +-
 .../network/element/VpcVirtualRouterElement.java   |  487 +
 .../network/firewall/FirewallManagerImpl.java      |  169 +-
 .../com/cloud/network/guru/ControlNetworkGuru.java |   15 +-
 .../network/guru/ExternalGuestNetworkGuru.java     |   30 +-
 .../com/cloud/network/guru/GuestNetworkGuru.java   |  176 +-
 .../cloud/network/guru/PodBasedNetworkGuru.java    |    4 +
 .../com/cloud/network/guru/PrivateNetworkGuru.java |  245 +
 .../com/cloud/network/guru/PublicNetworkGuru.java  |   12 +-
 .../network/lb/LoadBalancingRulesManagerImpl.java  |  133 +-
 .../router/VirtualNetworkApplianceManager.java     |   46 +-
 .../router/VirtualNetworkApplianceManagerImpl.java | 2086 ++--
 .../router/VpcVirtualNetworkApplianceManager.java  |  104 +
 .../VpcVirtualNetworkApplianceManagerImpl.java     | 1372 ++
 .../com/cloud/network/rules/FirewallManager.java   |   19 +-
 .../com/cloud/network/rules/FirewallRuleVO.java    |   35 +-
 .../cloud/network/rules/PortForwardingRuleVO.java  |    4 +-
 .../src/com/cloud/network/rules/RulesManager.java  |    9 +
 .../com/cloud/network/rules/RulesManagerImpl.java  |  448 +-
 .../com/cloud/network/rules/StaticNatRuleImpl.java |   11 +-
 .../rules/dao/PortForwardingRulesDaoImpl.java      |    5 +-
 .../network/security/SecurityGroupManagerImpl.java |   29 +
 .../network/security/dao/SecurityGroupDaoImpl.java |   54 +-
 .../security/dao/SecurityGroupWorkDaoImpl.java     |    2 +
 .../com/cloud/network/vpc/NetworkACLManager.java   |   40 +
 .../cloud/network/vpc/NetworkACLManagerImpl.java   |  454 +
 .../cloud/network/vpc/PrivateGatewayProfile.java   |  103 +
 .../com/cloud/network/vpc/PrivateIpAddress.java    |   76 +
 server/src/com/cloud/network/vpc/PrivateIpVO.java  |   93 +
 .../src/com/cloud/network/vpc/StaticRouteVO.java   |  140 +
 server/src/com/cloud/network/vpc/VpcGatewayVO.java |  195 +
 server/src/com/cloud/network/vpc/VpcManager.java   |  146 +
 .../src/com/cloud/network/vpc/VpcManagerImpl.java  | 1966 +++
 .../cloud/network/vpc/VpcOfferingServiceMapVO.java |   88 +
 .../src/com/cloud/network/vpc/VpcOfferingVO.java   |  151 +
 server/src/com/cloud/network/vpc/VpcVO.java        |  187 +
 .../com/cloud/network/vpc/dao/PrivateIpDao.java    |   75 +
 .../cloud/network/vpc/dao/PrivateIpDaoImpl.java    |  155 +
 .../com/cloud/network/vpc/dao/StaticRouteDao.java  |   35 +
 .../cloud/network/vpc/dao/StaticRouteDaoImpl.java  |  115 +
 server/src/com/cloud/network/vpc/dao/VpcDao.java   |   42 +
 .../src/com/cloud/network/vpc/dao/VpcDaoImpl.java  |  121 +
 .../com/cloud/network/vpc/dao/VpcGatewayDao.java   |   26 +
 .../cloud/network/vpc/dao/VpcGatewayDaoImpl.java   |   60 +
 .../com/cloud/network/vpc/dao/VpcOfferingDao.java  |   32 +
 .../cloud/network/vpc/dao/VpcOfferingDaoImpl.java  |   69 +
 .../network/vpc/dao/VpcOfferingServiceMapDao.java  |   41 +
 .../vpc/dao/VpcOfferingServiceMapDaoImpl.java      |  117 +
 .../network/vpn/RemoteAccessVpnManagerImpl.java    |   19 +-
 .../com/cloud/network/vpn/Site2SiteVpnManager.java |   31 +
 .../cloud/network/vpn/Site2SiteVpnManagerImpl.java |  784 +
 .../src/com/cloud/offerings/NetworkOfferingVO.java |    8 +-
 .../dao/NetworkOfferingServiceMapDao.java          |    9 +-
 .../dao/NetworkOfferingServiceMapDaoImpl.java      |   22 +-
 .../src/com/cloud/projects/ProjectManagerImpl.java |   36 +-
 server/src/com/cloud/projects/ProjectVO.java       |    3 +-
 .../src/com/cloud/projects/dao/ProjectDaoImpl.java |   11 +-
 .../com/cloud/resource/ResourceManagerImpl.java    |   34 +-
 .../resourcelimit/ResourceLimitManagerImpl.java    |    7 +
 .../com/cloud/server/ConfigurationServerImpl.java  |   93 +-
 server/src/com/cloud/server/Criteria.java          |    3 +
 .../src/com/cloud/server/ManagementServerImpl.java |  135 +-
 server/src/com/cloud/server/StatsCollector.java    |    3 +-
 .../server/auth/DefaultUserAuthenticator.java      |    2 -
 .../com/cloud/server/auth/UserAuthenticator.java   |    1 -
 .../src/com/cloud/servlet/ConsoleProxyServlet.java |  795 +-
 .../cloud/storage/LocalStoragePoolListener.java    |   10 +-
 server/src/com/cloud/storage/StorageManager.java   |    4 +-
 .../src/com/cloud/storage/StorageManagerImpl.java  |  306 +-
 .../allocator/AbstractStoragePoolAllocator.java    |   81 +-
 .../allocator/FirstFitStoragePoolAllocator.java    |   23 +-
 .../allocator/LocalStoragePoolAllocator.java       |   40 +-
 .../storage/allocator/StoragePoolAllocator.java    |    2 +-
 .../allocator/UseLocalForRootAllocator.java        |   17 +-
 server/src/com/cloud/storage/dao/SnapshotDao.java  |    1 +
 .../src/com/cloud/storage/dao/SnapshotDaoImpl.java |   26 +-
 .../src/com/cloud/storage/dao/VMTemplateDao.java   |   26 +-
 .../com/cloud/storage/dao/VMTemplateDaoImpl.java   |  184 +-
 .../src/com/cloud/storage/dao/VolumeDaoImpl.java   |   18 +
 .../cloud/storage/download/DownloadListener.java   |    1 -
 .../cloud/storage/download/DownloadMonitor.java    |    1 -
 .../storage/download/DownloadMonitorImpl.java      |    5 -
 .../com/cloud/storage/download/DownloadState.java  |    4 -
 .../cloud/storage/download/NotDownloadedState.java |    4 -
 .../cloud/storage/monitor/StorageHostMonitor.java  |    4 -
 .../secondary/SecondaryStorageManagerImpl.java     |   32 +-
 .../storage/snapshot/SnapshotManagerImpl.java      |  112 +-
 .../storage/snapshot/SnapshotSchedulerImpl.java    |    9 +-
 .../com/cloud/storage/upload/UploadMonitor.java    |    1 -
 .../cloud/storage/upload/UploadMonitorImpl.java    |   46 +-
 server/src/com/cloud/tags/ResourceTagVO.java       |   15 +-
 .../com/cloud/tags/TaggedResourceManagerImpl.java  |   77 +-
 server/src/com/cloud/tags/dao/ResourceTagDao.java  |   16 +-
 .../com/cloud/tags/dao/ResourceTagsDaoImpl.java    |   35 +-
 server/src/com/cloud/test/DatabaseConfig.java      |    7 +-
 server/src/com/cloud/test/IPRangeConfig.java       |    5 +-
 server/src/com/cloud/test/PodZoneConfig.java       |    5 +-
 .../cloud/upgrade/DatabaseIntegrityChecker.java    |    4 +
 .../com/cloud/upgrade/DatabaseUpgradeChecker.java  |   50 +-
 .../upgrade/PremiumDatabaseUpgradeChecker.java     |   42 +-
 .../src/com/cloud/upgrade/dao/Upgrade218to22.java  |    6 +-
 .../src/com/cloud/upgrade/dao/Upgrade2214to30.java |  329 +-
 .../src/com/cloud/upgrade/dao/Upgrade301to302.java |    3 -
 .../src/com/cloud/upgrade/dao/Upgrade302to303.java |   78 -
 .../src/com/cloud/upgrade/dao/Upgrade302to40.java  | 1033 ++
 .../src/com/cloud/upgrade/dao/Upgrade30xBase.java  |  314 +
 .../src/com/cloud/upgrade/dao/Upgrade40to41.java   |   83 +
 server/src/com/cloud/user/AccountDetailVO.java     |   17 +-
 server/src/com/cloud/user/AccountManagerImpl.java  |  140 +-
 server/src/com/cloud/user/dao/SSHKeyPairDao.java   |    2 +
 .../src/com/cloud/user/dao/SSHKeyPairDaoImpl.java  |    9 +-
 server/src/com/cloud/user/dao/UserAccountDao.java  |    1 +
 .../src/com/cloud/user/dao/UserAccountDaoImpl.java |   17 +
 server/src/com/cloud/user/dao/UserDaoImpl.java     |    5 -
 .../com/cloud/uuididentity/dao/IdentityDao.java    |    6 +-
 .../cloud/uuididentity/dao/IdentityDaoImpl.java    |    9 +-
 server/src/com/cloud/vm/UserVmManager.java         |    3 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java     |  697 +-
 server/src/com/cloud/vm/VirtualMachineGuru.java    |   45 +-
 server/src/com/cloud/vm/VirtualMachineManager.java |   42 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |  192 +-
 .../com/cloud/vm/VirtualMachineProfileImpl.java    |    5 +
 .../src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java  |    2 +-
 server/src/com/cloud/vm/dao/DomainRouterDao.java   |   46 +-
 .../src/com/cloud/vm/dao/DomainRouterDaoImpl.java  |  155 +-
 server/src/com/cloud/vm/dao/NicDao.java            |   19 +-
 server/src/com/cloud/vm/dao/NicDaoImpl.java        |   74 +-
 server/src/com/cloud/vm/dao/UserVmDao.java         |    1 +
 server/src/com/cloud/vm/dao/UserVmDaoImpl.java     | 1008 +-
 server/src/com/cloud/vm/dao/UserVmData.java        |    9 +
 .../src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java |    2 +-
 server/src/com/cloud/vm/dao/VMInstanceDao.java     |    8 +
 server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java |   56 +-
 server/test/async-job-component.xml                |   18 +
 .../cloud/agent/manager/ResourceManagerTest.java   |  364 -
 .../cloud/agent/manager/SearchCriteria2Test.java   |   99 -
 .../com/cloud/network/MockNetworkManagerImpl.java  |  453 +-
 .../com/cloud/network/dao/ElbVmMapDaoTest.java     |   61 -
 .../security/SecurityGroupManagerImpl2Test.java    |   21 +-
 .../com/cloud/projects/MockProjectManagerImpl.java |  232 +
 .../upgrade/AdvanceZone223To224UpgradeTest.java    |   15 +-
 .../com/cloud/user/MockAccountManagerImpl.java     |   17 +-
 .../test/com/cloud/user/MockDomainManagerImpl.java |  141 +
 .../test/com/cloud/vm/MockUserVmManagerImpl.java   |   32 +-
 .../cloud/vm/MockVirtualMachineManagerImpl.java    |   42 +-
 .../cloud/vpc/MockConfigurationManagerImpl.java    |  604 +
 .../test/com/cloud/vpc/MockNetworkManagerImpl.java | 1505 ++
 .../cloud/vpc/MockResourceLimitManagerImpl.java    |  154 +
 .../com/cloud/vpc/MockSite2SiteVpnManagerImpl.java |  257 +
 server/test/com/cloud/vpc/MockVpcManagerImpl.java  |  469 +
 server/test/com/cloud/vpc/VpcApiUnitTest.java      |  293 +
 .../cloud/vpc/dao/MockConfigurationDaoImpl.java    |  110 +
 .../test/com/cloud/vpc/dao/MockNetworkDaoImpl.java |  345 +
 .../cloud/vpc/dao/MockNetworkOfferingDaoImpl.java  |  152 +
 .../dao/MockNetworkOfferingServiceMapDaoImpl.java  |   39 +
 .../vpc/dao/MockNetworkServiceMapDaoImpl.java      |   98 +
 server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java  |  130 +
 .../com/cloud/vpc/dao/MockVpcOfferingDaoImpl.java  |   43 +
 .../vpc/dao/MockVpcOfferingServiceMapDaoImpl.java  |   73 +
 .../cloud/vpc/dao/MockVpcVirtualRouterElement.java |   30 +
 server/test/resources/cleanup.sql                  |   28 +-
 server/test/resources/fake.sql                     |   28 +-
 server/test/sync-queue-component.xml               |   18 +
 setup/.project                                     |   17 -
 setup/apidoc/build-apidoc.sh                       |   16 +-
 setup/apidoc/gen_toc.py                            |    5 +
 setup/apidoc/generateadmincommands.xsl             |   22 +-
 setup/apidoc/generatecommand.xsl                   |   19 +-
 setup/apidoc/generatecustomcommand.xsl             |   18 +
 setup/apidoc/generatedomainadmincommands.xsl       |   21 +-
 setup/apidoc/generategenericcommand.xsl            |   18 +
 setup/apidoc/generatetoc.xsl                       |   18 +
 setup/apidoc/generatetoc_footer.xsl                |   17 +-
 setup/apidoc/generatetoc_header.xsl                |   20 +-
 setup/apidoc/generateusercommands.xsl              |   21 +-
 setup/apidoc/includes/main.css                     |   19 +
 setup/bindir/cloud-setup-databases.in              |   13 +-
 setup/db/create-database-simulator.sql             |   29 +
 setup/db/create-index-fk.sql                       |    2 +
 setup/db/create-schema-simulator.sql               |   26 +-
 setup/db/create-schema.sql                         |  263 +-
 setup/db/db/schema-302to303.sql                    |  180 -
 setup/db/db/schema-302to40-cleanup.sql             |   22 +
 setup/db/db/schema-302to40.sql                     |  477 +
 setup/db/deploy-db-dev.sh                          |    4 +
 setup/db/deploy-db-simulator.sh                    |    4 +
 setup/db/server-setup.xml                          |   17 +
 setup/db/templates.sql                             |    6 +-
 test/.classpath                                    |   13 -
 test/.project                                      |   19 -
 test/conf/config.xml                               |   19 +-
 test/conf/deploy.properties                        |   17 +
 test/conf/deploy.xml                               |   18 +
 test/conf/log4j-stdout.properties                  |   19 +-
 test/conf/log4j.properties                         |   17 +
 test/conf/templates.sql                            |   30 +-
 test/conf/tool.properties                          |   19 +-
 test/integration/README                            |   10 +-
 test/integration/component/test_accounts.py        |  964 ++-
 .../component/test_allocation_states.py            |  274 +
 test/integration/component/test_blocker_bugs.py    |  160 +-
 test/integration/component/test_egress_rules.py    |   65 +-
 test/integration/component/test_eip_elb.py         |  347 +-
 .../component/test_high_availability.py            | 1093 --
 .../integration/component/test_network_offering.py |  198 +-
 test/integration/component/test_project_configs.py |  613 +-
 test/integration/component/test_project_limits.py  |  243 +-
 .../component/test_project_resources.py            |  158 +-
 test/integration/component/test_project_usage.py   |  181 +-
 test/integration/component/test_projects.py        |  599 +-
 test/integration/component/test_resource_limits.py |  343 +-
 test/integration/component/test_routers.py         |   47 +-
 test/integration/component/test_security_groups.py |  434 +-
 test/integration/component/test_snapshots.py       |  191 +-
 test/integration/component/test_templates.py       |   60 +-
 test/integration/component/test_usage.py           |  159 +-
 test/integration/component/test_volumes.py         |  199 +-
 test/integration/lib/base.py                       |  116 +-
 test/integration/lib/common.py                     |    4 +-
 test/integration/lib/utils.py                      |   14 +-
 test/integration/smoke/test_disk_offerings.py      |    4 +
 test/integration/smoke/test_hosts.py               |    2 +
 test/integration/smoke/test_iso.py                 |   15 +-
 test/integration/smoke/test_network.py             |   49 +-
 test/integration/smoke/test_primary_storage.py     |    2 +
 test/integration/smoke/test_routers.py             |   24 +-
 test/integration/smoke/test_secondary_storage.py   |   16 +-
 test/integration/smoke/test_service_offerings.py   |    6 +-
 test/integration/smoke/test_snapshots.py           |   23 +-
 test/integration/smoke/test_ssvm.py                |   15 +-
 test/integration/smoke/test_templates.py           |   17 +-
 test/integration/smoke/test_vm_life_cycle.py       |   66 +-
 test/integration/smoke/test_volumes.py             |   14 +-
 test/metadata/adapter.xml                          |   18 +
 .../delegatedAdmin/delegated_admin_cleanup.xml     |   20 +-
 .../delegatedAdmin/delegated_admin_createusers.xml |   20 +-
 .../delegated_admin_verify_part1.xml               |   20 +-
 .../delegated_admin_verify_part2.xml               |   20 +-
 .../pickuser_domainlevel1_domainlevel2.xml         |   20 +-
 ...ickuser_domainlevel1admin_domainlevel1admin.xml |   20 +-
 .../pickuser_domainlevel1admin_rootadmin.xml       |   20 +-
 .../pickuser_domainlevel2_child_domainlevel1.xml   |   20 +-
 ...pickuser_domainlevel2_nonchild_domainlevel1.xml |   20 +-
 .../pickuser_domainlevel2_rootadmin1.xml           |   20 +-
 .../pickuser_rootadmin1_rootadmin2.xml             |   20 +-
 .../pickuser_rootadmin_vs_domainlevel1admin.xml    |   20 +-
 test/metadata/func/commands                        |   19 +-
 test/metadata/func/directnw_regression.xml         |   20 +-
 test/metadata/func/error_events.properties         |   19 +-
 test/metadata/func/expunge.xml                     |   20 +-
 test/metadata/func/external_firewall.xml           |   20 +-
 test/metadata/func/flatnetwork.xml                 |   20 +-
 test/metadata/func/ha.xml                          |   20 +-
 test/metadata/func/iso.xml                         |   20 +-
 test/metadata/func/loadbalancers.xml               |   20 +-
 test/metadata/func/localstorage_volume_test.xml    |   20 +-
 test/metadata/func/mgmtvmsync.xml                  |   20 +-
 test/metadata/func/portforwarding.xml              |   20 +-
 test/metadata/func/private_templates.xml           |   20 +-
 test/metadata/func/regression.xml                  |   20 +-
 test/metadata/func/regression_events.properties    |   19 +-
 test/metadata/func/regression_new.xml              |   20 +-
 test/metadata/func/regression_test.xml             |   18 +
 test/metadata/func/regression_user.xml             |   20 +-
 test/metadata/func/regression_works.xml            |   18 +
 test/metadata/func/resource_limits.xml             |   20 +-
 test/metadata/func/roughflatstress.xml             |   20 +-
 test/metadata/func/roughregression.xml             |   18 +
 test/metadata/func/sanity.xml                      |   20 +-
 test/metadata/func/securitygroups.xml              |   20 +-
 test/metadata/func/sharedstorage_volume_test.xml   |   20 +-
 test/metadata/func/snapshot_iso.xml                |   20 +-
 test/metadata/func/snapshots.xml                   |   18 +
 test/metadata/func/snapshots_contd.xml             |   20 +-
 test/metadata/func/srxstresswithportfwd.xml        |   18 +
 test/metadata/func/static_nat.xml                  |   20 +-
 test/metadata/func/templatedwnldstress.xml         |   20 +-
 test/metadata/func/templates_sync.xml              |   18 +
 test/metadata/func/userapi.xml                     |   20 +-
 test/metadata/func/vmapi.xml                       |   20 +-
 test/metadata/func/vmsync.xml                      |   20 +-
 test/pom.xml                                       |   99 +
 test/scripts/run.bat                               |   19 +-
 test/scripts/usercloud.properties                  |   19 +-
 test/scripts/wget.exe                              |  Bin 162816 -> 0 bytes
 test/setup-test-data.sh                            |   94 +
 test/src/com/cloud/sample/Base64.java              | 1755 ---
 .../src/com/cloud/sample/UserCloudAPIExecutor.java |    7 +-
 .../cloud/test/stress/StressTestDirectAttach.java  | 2788 ++--
 .../com/cloud/test/stress/TestClientWithAPI.java   |   64 +-
 test/src/com/cloud/test/utils/UtilsForTest.java    |  392 +-
 tools/.classpath                                   |   35 -
 tools/.project                                     |   23 -
 tools/ant/apache-ant-1.7.1/LICENSE                 |  272 -
 tools/ant/apache-ant-1.7.1/bin/ant                 |  326 -
 tools/ant/apache-ant-1.7.1/bin/ant.bat             |  226 -
 tools/ant/apache-ant-1.7.1/bin/ant.cmd             |   93 -
 tools/ant/apache-ant-1.7.1/bin/antRun              |   24 -
 tools/ant/apache-ant-1.7.1/bin/antRun.bat          |   50 -
 tools/ant/apache-ant-1.7.1/bin/antRun.pl           |   66 -
 tools/ant/apache-ant-1.7.1/bin/antenv.cmd          |   98 -
 tools/ant/apache-ant-1.7.1/bin/complete-ant-cmd.pl |  114 -
 tools/ant/apache-ant-1.7.1/bin/envset.cmd          |  131 -
 tools/ant/apache-ant-1.7.1/bin/lcp.bat             |   31 -
 tools/ant/apache-ant-1.7.1/bin/runant.pl           |  153 -
 tools/ant/apache-ant-1.7.1/bin/runant.py           |   97 -
 tools/ant/apache-ant-1.7.1/bin/runrc.cmd           |   60 -
 tools/ant/apache-ant-1.7.1/etc/ant-bootstrap.jar   |  Bin 18877 -> 0 bytes
 tools/ant/apache-ant-1.7.1/lib/README              |   16 -
 tools/ant/apache-ant-1.7.1/lib/ant-antlr.jar       |  Bin 5752 -> 0 bytes
 tools/ant/apache-ant-1.7.1/lib/ant-apache-bcel.jar |  Bin 8611 -> 0 bytes
 tools/ant/apache-ant-1.7.1/lib/ant-apache-bsf.jar  |  Bin 3939 -> 0 bytes
 .../ant/apache-ant-1.7.1/lib/ant-apache-log4j.jar  |  Bin 3056 -> 0 bytes
 tools/ant/apache-ant-1.7.1/lib/ant-apache-oro.jar  |  Bin 39627 -> 0 bytes
 .../ant/apache-ant-1.7.1/lib/ant-apache-regexp.jar |  Bin 3762 -> 0 bytes
 .../apache-ant-1.7.1/lib/ant-apache-resolver.jar   |  Bin 4071 -> 0 bytes
 .../apache-ant-1.7.1/lib/ant-commons-logging.jar   |  Bin 3910 -> 0 bytes
 tools/ant/apache-ant-1.7.1/lib/ant-commons-net.jar |  Bin 47026 -> 0 bytes
 tools/ant/apache-ant-1.7.1/lib/ant-jai.jar         |  Bin 21348 -> 0 bytes
 tools/ant/apache-ant-1.7.1/lib/ant-javamail.jar    |  Bin 6998 -> 0 bytes
 tools/ant/apache-ant-1.7.1/lib/ant-jdepend.jar     |  Bin 8132 -> 0 bytes
 tools/ant/apache-ant-1.7.1/lib/ant-jmf.jar         |  Bin 6593 -> 0 bytes
 tools/ant/apache-ant-1.7.1/lib/ant-jsch.jar        |  Bin 30797 -> 0 bytes
 tools/ant/apache-ant-1.7.1/lib/ant-junit.jar       |  Bin 93518 -> 0 bytes
 tools/ant/apache-ant-1.7.1/lib/ant-launcher.jar    |  Bin 12143 -> 0 bytes
 tools/ant/apache-ant-1.7.1/lib/ant-netrexx.jar     |  Bin 9881 -> 0 bytes
 tools/ant/apache-ant-1.7.1/lib/ant-nodeps.jar      |  Bin 431580 -> 0 bytes
 tools/ant/apache-ant-1.7.1/lib/ant-starteam.jar    |  Bin 35355 -> 0 bytes
 tools/ant/apache-ant-1.7.1/lib/ant-stylebook.jar   |  Bin 2330 -> 0 bytes
 tools/ant/apache-ant-1.7.1/lib/ant-swing.jar       |  Bin 6738 -> 0 bytes
 tools/ant/apache-ant-1.7.1/lib/ant-testutil.jar    |  Bin 14941 -> 0 bytes
 tools/ant/apache-ant-1.7.1/lib/ant-trax.jar        |  Bin 6881 -> 0 bytes
 tools/ant/apache-ant-1.7.1/lib/ant-weblogic.jar    |  Bin 14205 -> 0 bytes
 tools/ant/apache-ant-1.7.1/lib/ant.jar             |  Bin 1323005 -> 0 bytes
 .../ant/apache-ant-1.7.1/lib/libraries.properties  |   62 -
 tools/ant/apache-ant-1.7.1/lib/xercesImpl.jar      |  Bin 1223877 -> 0 bytes
 tools/ant/apache-ant-1.7.1/lib/xml-apis.jar        |  Bin 194354 -> 0 bytes
 tools/build/addcopyright.py                        |  290 -
 tools/build/build_asf.sh                           |  113 +
 tools/build/build_docs.sh                          |   55 +
 tools/build/installer/debinstall_full.sh           |  163 +
 tools/build/installer/rpminstall_full.sh           |  177 +
 tools/devcloud/README                              |   56 +
 tools/devcloud/basebuild/Vagrantfile               |   51 +
 .../basebuild/puppet-devcloudinitial/Modulefile    |    8 +
 .../basebuild/puppet-devcloudinitial/files/grub    |   52 +
 .../puppet-devcloudinitial/files/interfaces        |   33 +
 .../puppet-devcloudinitial/files/network.conf      |    1 +
 .../puppet-devcloudinitial/files/xen-defaults      |   18 +
 .../basebuild/puppet-devcloudinitial/files/xend    |  188 +
 .../basebuild/puppet-devcloudinitial/init.pp       |   18 +
 .../puppet-devcloudinitial/manifests/init.pp       |  106 +
 tools/devcloud/build_vagrant_basebox.sh            |   99 +
 tools/devcloud/devcloud.cfg                        |   91 +
 tools/devcloud/devcloudbox/Vagrantfile             |   51 +
 .../devcloudbox/puppet-devcloud/Modulefile         |    8 +
 .../puppet-devcloud/files/builddevcloud.sh         |   28 +
 .../puppet-devcloud/files/configebtables.sh        |   21 +
 .../puppet-devcloud/files/configlocalstorage.sh    |   25 +
 .../devcloudbox/puppet-devcloud/files/configvnc.sh |   25 +
 .../devcloudbox/puppet-devcloud/files/exports      |   18 +
 .../puppet-devcloud/files/installmaven.sh          |   22 +
 .../puppet-devcloud/files/iptables.save            |   30 +
 .../puppet-devcloud/files/startdevcloud.sh         |   23 +
 .../puppet-devcloud/files/updatecode.sh            |   27 +
 tools/devcloud/devcloudbox/puppet-devcloud/init.pp |   18 +
 .../devcloudbox/puppet-devcloud/manifests/init.pp  |  348 +
 tools/devcloud/devcloudsetup.sh                    |  151 +
 tools/devcloud/veewee/README                       |    5 +
 tools/devcloud/veewee/definition.rb                |   56 +
 tools/devcloud/veewee/postinstall.sh               |   43 +
 tools/devcloud/veewee/preseed.cfg                  |  122 +
 tools/gcc/README                                   |  261 -
 tools/gcc/compiler.jar                             |  Bin 4212432 -> 0 bytes
 tools/gcc/gcc.sh                                   |   36 -
 tools/guest_password/cloud-set-guest-password      |  116 +
 tools/junit/junit-4.8.1.jar                        |  Bin 237047 -> 0 bytes
 tools/marvin/CHANGES.txt                           |   17 +
 tools/marvin/MANIFEST.in                           |   20 +-
 tools/marvin/README                                |   17 +-
 tools/marvin/docs/tutorial.txt                     |    1 -
 tools/marvin/marvin/NoseTestExecuteEngine.py       |  102 -
 tools/marvin/marvin/TestCaseExecuteEngine.py       |    6 +-
 tools/marvin/marvin/__init__.py                    |   19 +-
 tools/marvin/marvin/cloudstackConnection.py        |    3 +-
 tools/marvin/marvin/cloudstackTestCase.py          |    2 +-
 tools/marvin/marvin/configGenerator.py             |  297 +-
 tools/marvin/marvin/deployAndRun.py                |   33 +-
 tools/marvin/marvin/deployDataCenter.py            |  193 +-
 tools/marvin/marvin/marvinPlugin.py                |  118 +
 tools/marvin/marvin/pymysql/__init__.py            |  131 -
 tools/marvin/marvin/pymysql/charset.py             |  174 -
 tools/marvin/marvin/pymysql/connections.py         |  928 --
 tools/marvin/marvin/pymysql/constants/CLIENT.py    |   20 -
 tools/marvin/marvin/pymysql/constants/COMMAND.py   |   23 -
 tools/marvin/marvin/pymysql/constants/ER.py        |  472 -
 .../marvin/marvin/pymysql/constants/FIELD_TYPE.py  |   32 -
 tools/marvin/marvin/pymysql/constants/FLAG.py      |   15 -
 .../marvin/pymysql/constants/SERVER_STATUS.py      |   12 -
 tools/marvin/marvin/pymysql/converters.py          |  348 -
 tools/marvin/marvin/pymysql/cursors.py             |  297 -
 tools/marvin/marvin/pymysql/err.py                 |  147 -
 tools/marvin/marvin/pymysql/tests/__init__.py      |   13 -
 tools/marvin/marvin/pymysql/tests/base.py          |   20 -
 .../marvin/marvin/pymysql/tests/test_DictCursor.py |   56 -
 tools/marvin/marvin/pymysql/tests/test_basic.py    |  193 -
 tools/marvin/marvin/pymysql/tests/test_example.py  |   32 -
 tools/marvin/marvin/pymysql/tests/test_issues.py   |  268 -
 .../marvin/pymysql/tests/thirdparty/__init__.py    |    5 -
 .../tests/thirdparty/test_MySQLdb/__init__.py      |    7 -
 .../tests/thirdparty/test_MySQLdb/capabilities.py  |  292 -
 .../tests/thirdparty/test_MySQLdb/dbapi20.py       |  853 --
 .../test_MySQLdb/test_MySQLdb_capabilities.py      |  115 -
 .../test_MySQLdb/test_MySQLdb_dbapi20.py           |  205 -
 .../test_MySQLdb/test_MySQLdb_nonstandard.py       |   90 -
 tools/marvin/marvin/pymysql/times.py               |   16 -
 tools/marvin/marvin/pymysql/util.py                |   19 -
 tools/marvin/marvin/sandbox/README.txt             |   19 +-
 tools/marvin/marvin/sandbox/__init__.py            |   18 +
 tools/marvin/marvin/sandbox/advanced/__init__.py   |   18 +
 .../marvin/marvin/sandbox/advanced/advanced_env.py |   10 +
 .../marvin/sandbox/advanced/setup.properties       |   18 +
 .../sandbox/advanced/tests/test_scenarios.py       |  126 -
 tools/marvin/marvin/sandbox/basic/__init__.py      |   18 +
 tools/marvin/marvin/sandbox/basic/basic_env.py     |   11 +
 tools/marvin/marvin/sandbox/basic/setup.properties |   59 +
 .../marvin/sandbox/demo/simulator/__init__.py      |   18 +
 .../marvin/sandbox/demo/simulator/simulator.cfg    |  199 +
 .../sandbox/demo/simulator/simulator_setup.py      |   18 +-
 .../demo/simulator/simulatordemo.properties        |   37 +-
 .../sandbox/demo/simulator/testcase/__init__.py    |   18 +
 .../demo/simulator/testcase/libs/__init__.py       |   18 +
 tools/marvin/marvin/sandbox/run-marvin.sh          |   66 +
 tools/marvin/marvin/sandbox/testSetupSuccess.py    |   81 +
 tools/marvin/marvin/setup.py                       |   46 +
 tools/marvin/marvin/testSetupSuccess.py            |   81 +
 tools/marvin/setup.py                              |   10 +-
 tools/migration/10to21Upgrade.txt                  |   63 -
 tools/migration/XenAPI.py                          |  210 -
 tools/migration/paramiko/__init__.py               |  138 -
 tools/migration/paramiko/agent.py                  |  148 -
 tools/migration/paramiko/auth_handler.py           |  423 -
 tools/migration/paramiko/ber.py                    |  126 -
 tools/migration/paramiko/buffered_pipe.py          |  197 -
 tools/migration/paramiko/channel.py                | 1231 --
 tools/migration/paramiko/client.py                 |  483 -
 tools/migration/paramiko/common.py                 |  122 -
 tools/migration/paramiko/compress.py               |   36 -
 tools/migration/paramiko/config.py                 |  107 -
 tools/migration/paramiko/dsskey.py                 |  194 -
 tools/migration/paramiko/file.py                   |  453 -
 tools/migration/paramiko/hostkeys.py               |  313 -
 tools/migration/paramiko/kex_gex.py                |  241 -
 tools/migration/paramiko/kex_group1.py             |  133 -
 tools/migration/paramiko/logging22.py              |   63 -
 tools/migration/paramiko/message.py                |  298 -
 tools/migration/paramiko/packet.py                 |  485 -
 tools/migration/paramiko/pipe.py                   |  144 -
 tools/migration/paramiko/pkey.py                   |  377 -
 tools/migration/paramiko/primes.py                 |  148 -
 tools/migration/paramiko/resource.py               |   69 -
 tools/migration/paramiko/rng.py                    |  105 -
 tools/migration/paramiko/rng_posix.py              |   93 -
 tools/migration/paramiko/rng_win32.py              |  117 -
 tools/migration/paramiko/rsakey.py                 |  183 -
 tools/migration/paramiko/server.py                 |  629 -
 tools/migration/paramiko/sftp.py                   |  185 -
 tools/migration/paramiko/sftp_attr.py              |  220 -
 tools/migration/paramiko/sftp_client.py            |  723 -
 tools/migration/paramiko/sftp_file.py              |  473 -
 tools/migration/paramiko/sftp_handle.py            |  199 -
 tools/migration/paramiko/sftp_server.py            |  441 -
 tools/migration/paramiko/sftp_si.py                |  307 -
 tools/migration/paramiko/ssh_exception.py          |  112 -
 tools/migration/paramiko/transport.py              | 2096 ---
 tools/migration/paramiko/util.py                   |  299 -
 tools/migration/paramiko/win_pageant.py            |  143 -
 tools/migration/share_all_lus.sh                   |  235 -
 tools/migration/upgrade.properties                 |   85 -
 tools/migration/upgrade.py                         | 1608 ---
 tools/mockito/LICENSE                              |   21 -
 tools/mockito/NOTICE                               |   11 -
 tools/mockito/jars-info.txt                        |   11 -
 tools/mockito/javadoc/allclasses-frame.html        |  506 -
 tools/mockito/javadoc/allclasses-noframe.html      |  506 -
 tools/mockito/javadoc/constant-values.html         |  142 -
 tools/mockito/javadoc/deprecated-list.html         |  316 -
 tools/mockito/javadoc/help-doc.html                |  219 -
 tools/mockito/javadoc/index-all.html               | 3364 -----
 tools/mockito/javadoc/index.html                   |   39 -
 .../javadoc/org/mockito/AdditionalMatchers.html    | 2013 ---
 tools/mockito/javadoc/org/mockito/Answers.html     |  397 -
 .../javadoc/org/mockito/ArgumentCaptor.html        |  397 -
 .../javadoc/org/mockito/ArgumentMatcher.html       |  338 -
 .../mockito/BDDMockito.BDDMyOngoingStubbing.html   |  301 -
 .../mockito/BDDMockito.BDDOngoingStubbingImpl.html |  363 -
 .../javadoc/org/mockito/BDDMockito.BDDStubber.html |  306 -
 .../org/mockito/BDDMockito.BDDStubberImpl.html     |  368 -
 tools/mockito/javadoc/org/mockito/BDDMockito.html  |  487 -
 tools/mockito/javadoc/org/mockito/Captor.html      |  191 -
 tools/mockito/javadoc/org/mockito/InOrder.html     |  324 -
 tools/mockito/javadoc/org/mockito/InjectMocks.html |  211 -
 tools/mockito/javadoc/org/mockito/Matchers.html    | 1593 ---
 tools/mockito/javadoc/org/mockito/Mock.html        |  284 -
 .../mockito/javadoc/org/mockito/MockSettings.html  |  409 -
 tools/mockito/javadoc/org/mockito/Mockito.html     | 2469 ----
 .../org/mockito/MockitoAnnotations.Mock.html       |  182 -
 .../javadoc/org/mockito/MockitoAnnotations.html    |  313 -
 .../javadoc/org/mockito/MockitoDebugger.html       |  206 -
 .../mockito/javadoc/org/mockito/ReturnValues.html  |  224 -
 tools/mockito/javadoc/org/mockito/Spy.html         |  196 -
 .../org/mockito/class-use/AdditionalMatchers.html  |  140 -
 .../javadoc/org/mockito/class-use/Answers.html     |  185 -
 .../org/mockito/class-use/ArgumentCaptor.html      |  183 -
 .../org/mockito/class-use/ArgumentMatcher.html     |  389 -
 .../class-use/BDDMockito.BDDMyOngoingStubbing.html |  281 -
 .../BDDMockito.BDDOngoingStubbingImpl.html         |  140 -
 .../mockito/class-use/BDDMockito.BDDStubber.html   |  288 -
 .../class-use/BDDMockito.BDDStubberImpl.html       |  140 -
 .../javadoc/org/mockito/class-use/BDDMockito.html  |  140 -
 .../javadoc/org/mockito/class-use/Captor.html      |  140 -
 .../javadoc/org/mockito/class-use/InOrder.html     |  221 -
 .../javadoc/org/mockito/class-use/InjectMocks.html |  140 -
 .../javadoc/org/mockito/class-use/Matchers.html    |  184 -
 .../javadoc/org/mockito/class-use/Mock.html        |  140 -
 .../org/mockito/class-use/MockSettings.html        |  446 -
 .../javadoc/org/mockito/class-use/Mockito.html     |  176 -
 .../mockito/class-use/MockitoAnnotations.Mock.html |  140 -
 .../org/mockito/class-use/MockitoAnnotations.html  |  140 -
 .../org/mockito/class-use/MockitoDebugger.html     |  176 -
 .../org/mockito/class-use/ReturnValues.html        |  312 -
 .../mockito/javadoc/org/mockito/class-use/Spy.html |  140 -
 .../mockito/configuration/AnnotationEngine.html    |  248 -
 .../configuration/DefaultMockitoConfiguration.html |  352 -
 .../configuration/IMockitoConfiguration.html       |  332 -
 .../configuration/class-use/AnnotationEngine.html  |  245 -
 .../class-use/DefaultMockitoConfiguration.html     |  140 -
 .../class-use/IMockitoConfiguration.html           |  221 -
 .../org/mockito/configuration/package-frame.html   |   45 -
 .../org/mockito/configuration/package-summary.html |  187 -
 .../org/mockito/configuration/package-tree.html    |  155 -
 .../org/mockito/configuration/package-use.html     |  197 -
 .../org/mockito/exceptions/Discrepancy.html        |  311 -
 .../javadoc/org/mockito/exceptions/Pluralizer.html |  249 -
 .../mockito/exceptions/PrintableInvocation.html    |  231 -
 .../javadoc/org/mockito/exceptions/Reporter.html   | 1160 --
 .../exceptions/base/MockitoAssertionError.html     |  269 -
 .../mockito/exceptions/base/MockitoException.html  |  285 -
 .../base/class-use/MockitoAssertionError.html      |  224 -
 .../base/class-use/MockitoException.html           |  261 -
 .../org/mockito/exceptions/base/package-frame.html |   43 -
 .../mockito/exceptions/base/package-summary.html   |  183 -
 .../org/mockito/exceptions/base/package-tree.html  |  160 -
 .../org/mockito/exceptions/base/package-use.html   |  191 -
 .../mockito/exceptions/class-use/Discrepancy.html  |  217 -
 .../mockito/exceptions/class-use/Pluralizer.html   |  140 -
 .../exceptions/class-use/PrintableInvocation.html  |  387 -
 .../org/mockito/exceptions/class-use/Reporter.html |  140 -
 .../misusing/InvalidUseOfMatchersException.html    |  262 -
 .../misusing/MissingMethodInvocationException.html |  248 -
 .../misusing/MockitoConfigurationException.html    |  264 -
 .../exceptions/misusing/NotAMockException.html     |  248 -
 .../misusing/NullInsteadOfMockException.html       |  248 -
 .../misusing/UnfinishedStubbingException.html      |  248 -
 .../misusing/UnfinishedVerificationException.html  |  248 -
 .../misusing/WrongTypeOfReturnValue.html           |  248 -
 .../class-use/InvalidUseOfMatchersException.html   |  140 -
 .../MissingMethodInvocationException.html          |  140 -
 .../class-use/MockitoConfigurationException.html   |  140 -
 .../misusing/class-use/NotAMockException.html      |  140 -
 .../class-use/NullInsteadOfMockException.html      |  140 -
 .../class-use/UnfinishedStubbingException.html     |  140 -
 .../class-use/UnfinishedVerificationException.html |  140 -
 .../misusing/class-use/WrongTypeOfReturnValue.html |  140 -
 .../mockito/exceptions/misusing/package-frame.html |   46 -
 .../exceptions/misusing/package-summary.html       |  197 -
 .../mockito/exceptions/misusing/package-tree.html  |  158 -
 .../mockito/exceptions/misusing/package-use.html   |  140 -
 .../org/mockito/exceptions/package-frame.html      |   47 -
 .../org/mockito/exceptions/package-summary.html    |  191 -
 .../org/mockito/exceptions/package-tree.html       |  154 -
 .../org/mockito/exceptions/package-use.html        |  248 -
 .../verification/ArgumentsAreDifferent.html        |  279 -
 .../verification/NeverWantedButInvoked.html        |  248 -
 .../verification/NoInteractionsWanted.html         |  252 -
 .../verification/SmartNullPointerException.html    |  248 -
 .../verification/TooLittleActualInvocations.html   |  248 -
 .../verification/TooManyActualInvocations.html     |  248 -
 .../verification/VerificationInOrderFailure.html   |  248 -
 .../verification/WantedButNotInvoked.html          |  279 -
 .../class-use/ArgumentsAreDifferent.html           |  140 -
 .../class-use/NeverWantedButInvoked.html           |  140 -
 .../class-use/NoInteractionsWanted.html            |  140 -
 .../class-use/SmartNullPointerException.html       |  140 -
 .../class-use/TooLittleActualInvocations.html      |  140 -
 .../class-use/TooManyActualInvocations.html        |  140 -
 .../class-use/VerificationInOrderFailure.html      |  140 -
 .../class-use/WantedButNotInvoked.html             |  140 -
 .../verification/junit/ArgumentsAreDifferent.html  |  325 -
 .../exceptions/verification/junit/JUnitTool.html   |  272 -
 .../junit/class-use/ArgumentsAreDifferent.html     |  140 -
 .../verification/junit/class-use/JUnitTool.html    |  140 -
 .../verification/junit/package-frame.html          |   43 -
 .../verification/junit/package-summary.html        |  183 -
 .../verification/junit/package-tree.html           |  160 -
 .../exceptions/verification/junit/package-use.html |  140 -
 .../exceptions/verification/package-frame.html     |   55 -
 .../exceptions/verification/package-summary.html   |  207 -
 .../exceptions/verification/package-tree.html      |  164 -
 .../exceptions/verification/package-use.html       |  140 -
 .../javadoc/org/mockito/internal/InOrderImpl.html  |  436 -
 .../javadoc/org/mockito/internal/MockHandler.html  |  368 -
 .../org/mockito/internal/MockHandlerInterface.html |  263 -
 .../javadoc/org/mockito/internal/MockitoCore.html  |  528 -
 .../mockito/internal/MockitoInvocationHandler.html |  215 -
 .../mockito/internal/class-use/InOrderImpl.html    |  175 -
 .../mockito/internal/class-use/MockHandler.html    |  140 -
 .../internal/class-use/MockHandlerInterface.html   |  226 -
 .../mockito/internal/class-use/MockitoCore.html    |  140 -
 .../class-use/MockitoInvocationHandler.html        |  220 -
 .../internal/configuration/ClassPathLoader.html    |  250 -
 .../configuration/DefaultAnnotationEngine.html     |  292 -
 .../configuration/DefaultInjectionEngine.html      |  259 -
 .../configuration/GlobalConfiguration.html         |  369 -
 .../configuration/InjectingAnnotationEngine.html   |  318 -
 .../configuration/SpyAnnotationEngine.html         |  286 -
 .../configuration/class-use/ClassPathLoader.html   |  140 -
 .../class-use/DefaultAnnotationEngine.html         |  140 -
 .../class-use/DefaultInjectionEngine.html          |  140 -
 .../class-use/GlobalConfiguration.html             |  140 -
 .../class-use/InjectingAnnotationEngine.html       |  140 -
 .../class-use/SpyAnnotationEngine.html             |  140 -
 .../internal/configuration/package-frame.html      |   42 -
 .../internal/configuration/package-summary.html    |  191 -
 .../internal/configuration/package-tree.html       |  153 -
 .../internal/configuration/package-use.html        |  140 -
 .../creation/AbstractMockitoMethodProxy.html       |  272 -
 .../mockito/internal/creation/ClassNameFinder.html |  249 -
 .../internal/creation/DelegatingMethod.html        |  409 -
 .../creation/DelegatingMockitoMethodProxy.html     |  262 -
 .../internal/creation/MethodInterceptorFilter.html |  334 -
 .../internal/creation/MockSettingsImpl.html        |  565 -
 .../internal/creation/MockitoMethodProxy.html      |  230 -
 .../creation/SerializableMockitoMethodProxy.html   |  267 -
 .../internal/creation/cglib/CGLIBHacker.html       |  257 -
 .../creation/cglib/MockitoNamingPolicy.html        |  310 -
 .../creation/cglib/class-use/CGLIBHacker.html      |  140 -
 .../cglib/class-use/MockitoNamingPolicy.html       |  176 -
 .../internal/creation/cglib/package-frame.html     |   34 -
 .../internal/creation/cglib/package-summary.html   |  173 -
 .../internal/creation/cglib/package-tree.html      |  153 -
 .../internal/creation/cglib/package-use.html       |  166 -
 .../class-use/AbstractMockitoMethodProxy.html      |  184 -
 .../creation/class-use/ClassNameFinder.html        |  140 -
 .../creation/class-use/DelegatingMethod.html       |  140 -
 .../class-use/DelegatingMockitoMethodProxy.html    |  140 -
 .../class-use/MethodInterceptorFilter.html         |  140 -
 .../creation/class-use/MockSettingsImpl.html       |  263 -
 .../creation/class-use/MockitoMethodProxy.html     |  302 -
 .../class-use/SerializableMockitoMethodProxy.html  |  140 -
 ...er.ClassWithSuperclassToWorkAroundCglibBug.html |  224 -
 .../internal/creation/jmock/ClassImposterizer.html |  303 -
 .../creation/jmock/SearchingClassLoader.html       |  290 -
 .../internal/creation/jmock/SerializableNoOp.html  |  271 -
 ...er.ClassWithSuperclassToWorkAroundCglibBug.html |  140 -
 .../jmock/class-use/ClassImposterizer.html         |  176 -
 .../jmock/class-use/SearchingClassLoader.html      |  140 -
 .../creation/jmock/class-use/SerializableNoOp.html |  140 -
 .../internal/creation/jmock/package-frame.html     |   38 -
 .../internal/creation/jmock/package-summary.html   |  181 -
 .../internal/creation/jmock/package-tree.html      |  152 -
 .../internal/creation/jmock/package-use.html       |  166 -
 .../mockito/internal/creation/package-frame.html   |   55 -
 .../mockito/internal/creation/package-summary.html |  207 -
 .../mockito/internal/creation/package-tree.html    |  161 -
 .../org/mockito/internal/creation/package-use.html |  254 -
 .../internal/debugging/FindingsListener.html       |  246 -
 .../org/mockito/internal/debugging/Localized.html  |  268 -
 .../org/mockito/internal/debugging/Location.html   |  271 -
 .../internal/debugging/LoggingListener.html        |  347 -
 .../internal/debugging/MockitoDebuggerImpl.html    |  255 -
 .../internal/debugging/WarningsCollector.html      |  249 -
 .../mockito/internal/debugging/WarningsFinder.html |  251 -
 .../internal/debugging/WarningsPrinterImpl.html    |  288 -
 .../debugging/class-use/FindingsListener.html      |  192 -
 .../internal/debugging/class-use/Localized.html    |  140 -
 .../internal/debugging/class-use/Location.html     |  380 -
 .../debugging/class-use/LoggingListener.html       |  140 -
 .../debugging/class-use/MockitoDebuggerImpl.html   |  140 -
 .../debugging/class-use/WarningsCollector.html     |  140 -
 .../debugging/class-use/WarningsFinder.html        |  140 -
 .../debugging/class-use/WarningsPrinterImpl.html   |  140 -
 .../mockito/internal/debugging/package-frame.html  |   55 -
 .../internal/debugging/package-summary.html        |  207 -
 .../mockito/internal/debugging/package-tree.html   |  157 -
 .../mockito/internal/debugging/package-use.html    |  229 -
 .../ExceptionIncludingMockitoWarnings.html         |  240 -
 .../exceptions/VerificationAwareInvocation.html    |  221 -
 .../base/ConditionalStackTraceFilter.html          |  257 -
 .../internal/exceptions/base/StackTraceFilter.html |  287 -
 .../class-use/ConditionalStackTraceFilter.html     |  140 -
 .../base/class-use/StackTraceFilter.html           |  174 -
 .../internal/exceptions/base/package-frame.html    |   34 -
 .../internal/exceptions/base/package-summary.html  |  173 -
 .../internal/exceptions/base/package-tree.html     |  151 -
 .../internal/exceptions/base/package-use.html      |  166 -
 .../ExceptionIncludingMockitoWarnings.html         |  140 -
 .../class-use/VerificationAwareInvocation.html     |  235 -
 .../mockito/internal/exceptions/package-frame.html |   43 -
 .../internal/exceptions/package-summary.html       |  168 -
 .../mockito/internal/exceptions/package-tree.html  |  163 -
 .../mockito/internal/exceptions/package-use.html   |  204 -
 .../internal/exceptions/util/ScenarioPrinter.html  |  249 -
 .../exceptions/util/class-use/ScenarioPrinter.html |  140 -
 .../internal/exceptions/util/package-frame.html    |   32 -
 .../internal/exceptions/util/package-summary.html  |  154 -
 .../internal/exceptions/util/package-tree.html     |  149 -
 .../internal/exceptions/util/package-use.html      |  140 -
 .../internal/invocation/AllInvocationsFinder.html  |  252 -
 .../internal/invocation/ArgumentsComparator.html   |  272 -
 .../invocation/CapturesArgumensFromInvocation.html |  206 -
 .../mockito/internal/invocation/Invocation.html    |  825 --
 .../internal/invocation/InvocationMarker.html      |  295 -
 .../internal/invocation/InvocationMatcher.html     |  500 -
 .../internal/invocation/InvocationsFinder.html     |  444 -
 .../internal/invocation/MatchersBinder.html        |  259 -
 .../mockito/internal/invocation/MockitoMethod.html |  301 -
 .../internal/invocation/SerializableMethod.html    |  411 -
 .../org/mockito/internal/invocation/StubInfo.html  |  257 -
 .../internal/invocation/UnusedStubsFinder.html     |  251 -
 .../invocation/class-use/AllInvocationsFinder.html |  140 -
 .../invocation/class-use/ArgumentsComparator.html  |  140 -
 .../class-use/CapturesArgumensFromInvocation.html  |  241 -
 .../internal/invocation/class-use/Invocation.html  | 1074 --
 .../invocation/class-use/InvocationMarker.html     |  140 -
 .../invocation/class-use/InvocationMatcher.html    |  618 -
 .../invocation/class-use/InvocationsFinder.html    |  140 -
 .../invocation/class-use/MatchersBinder.html       |  140 -
 .../invocation/class-use/MockitoMethod.html        |  268 -
 .../invocation/class-use/SerializableMethod.html   |  140 -
 .../internal/invocation/class-use/StubInfo.html    |  192 -
 .../invocation/class-use/UnusedStubsFinder.html    |  140 -
 .../mockito/internal/invocation/package-frame.html |   63 -
 .../internal/invocation/package-summary.html       |  223 -
 .../mockito/internal/invocation/package-tree.html  |  159 -
 .../mockito/internal/invocation/package-use.html   |  435 -
 .../realmethod/CGLIBProxyRealMethod.html           |  284 -
 .../realmethod/FilteredCGLIBProxyRealMethod.html   |  298 -
 .../invocation/realmethod/HasCGLIBMethodProxy.html |  212 -
 .../internal/invocation/realmethod/RealMethod.html |  211 -
 .../realmethod/class-use/CGLIBProxyRealMethod.html |  140 -
 .../class-use/FilteredCGLIBProxyRealMethod.html    |  140 -
 .../realmethod/class-use/HasCGLIBMethodProxy.html  |  184 -
 .../realmethod/class-use/RealMethod.html           |  229 -
 .../invocation/realmethod/package-frame.html       |   47 -
 .../invocation/realmethod/package-summary.html     |  191 -
 .../invocation/realmethod/package-tree.html        |  158 -
 .../invocation/realmethod/package-use.html         |  191 -
 .../internal/listeners/CollectCreatedMocks.html    |  259 -
 .../listeners/MockingProgressListener.html         |  171 -
 .../internal/listeners/MockingStartedListener.html |  216 -
 .../listeners/class-use/CollectCreatedMocks.html   |  140 -
 .../class-use/MockingProgressListener.html         |  237 -
 .../class-use/MockingStartedListener.html          |  176 -
 .../mockito/internal/listeners/package-frame.html  |   45 -
 .../internal/listeners/package-summary.html        |  172 -
 .../mockito/internal/listeners/package-tree.html   |  157 -
 .../mockito/internal/listeners/package-use.html    |  191 -
 .../javadoc/org/mockito/internal/matchers/And.html |  297 -
 .../javadoc/org/mockito/internal/matchers/Any.html |  300 -
 .../org/mockito/internal/matchers/AnyVararg.html   |  320 -
 .../org/mockito/internal/matchers/ArrayEquals.html |  326 -
 .../internal/matchers/CapturesArguments.html       |  206 -
 .../internal/matchers/CapturingMatcher.html        |  363 -
 .../mockito/internal/matchers/CompareEqual.html    |  300 -
 .../org/mockito/internal/matchers/CompareTo.html   |  336 -
 .../org/mockito/internal/matchers/Contains.html    |  297 -
 .../matchers/ContainsExtraTypeInformation.html     |  234 -
 .../org/mockito/internal/matchers/EndsWith.html    |  297 -
 .../org/mockito/internal/matchers/Equality.html    |  251 -
 .../org/mockito/internal/matchers/Equals.html      |  432 -
 .../mockito/internal/matchers/EqualsWithDelta.html |  299 -
 .../org/mockito/internal/matchers/Find.html        |  297 -
 .../mockito/internal/matchers/GreaterOrEqual.html  |  300 -
 .../org/mockito/internal/matchers/GreaterThan.html |  300 -
 .../org/mockito/internal/matchers/InstanceOf.html  |  297 -
 .../org/mockito/internal/matchers/LessOrEqual.html |  300 -
 .../org/mockito/internal/matchers/LessThan.html    |  300 -
 .../internal/matchers/LocalizedMatcher.html        |  433 -
 .../internal/matchers/MatcherDecorator.html        |  212 -
 .../mockito/internal/matchers/MatchersPrinter.html |  272 -
 .../org/mockito/internal/matchers/Matches.html     |  297 -
 .../javadoc/org/mockito/internal/matchers/Not.html |  297 -
 .../org/mockito/internal/matchers/NotNull.html     |  300 -
 .../org/mockito/internal/matchers/Null.html        |  300 -
 .../javadoc/org/mockito/internal/matchers/Or.html  |  297 -
 .../org/mockito/internal/matchers/Same.html        |  297 -
 .../org/mockito/internal/matchers/StartsWith.html  |  297 -
 .../mockito/internal/matchers/VarargMatcher.html   |  171 -
 .../matchers/apachecommons/ReflectionEquals.html   |  299 -
 .../apachecommons/class-use/ReflectionEquals.html  |  140 -
 .../matchers/apachecommons/package-frame.html      |   32 -
 .../matchers/apachecommons/package-summary.html    |  169 -
 .../matchers/apachecommons/package-tree.html       |  155 -
 .../matchers/apachecommons/package-use.html        |  140 -
 .../mockito/internal/matchers/class-use/And.html   |  140 -
 .../mockito/internal/matchers/class-use/Any.html   |  176 -
 .../internal/matchers/class-use/AnyVararg.html     |  140 -
 .../internal/matchers/class-use/ArrayEquals.html   |  140 -
 .../matchers/class-use/CapturesArguments.html      |  184 -
 .../matchers/class-use/CapturingMatcher.html       |  140 -
 .../internal/matchers/class-use/CompareEqual.html  |  140 -
 .../internal/matchers/class-use/CompareTo.html     |  208 -
 .../internal/matchers/class-use/Contains.html      |  140 -
 .../class-use/ContainsExtraTypeInformation.html    |  192 -
 .../internal/matchers/class-use/EndsWith.html      |  140 -
 .../internal/matchers/class-use/Equality.html      |  140 -
 .../internal/matchers/class-use/Equals.html        |  176 -
 .../matchers/class-use/EqualsWithDelta.html        |  140 -
 .../mockito/internal/matchers/class-use/Find.html  |  140 -
 .../matchers/class-use/GreaterOrEqual.html         |  140 -
 .../internal/matchers/class-use/GreaterThan.html   |  140 -
 .../internal/matchers/class-use/InstanceOf.html    |  140 -
 .../internal/matchers/class-use/LessOrEqual.html   |  140 -
 .../internal/matchers/class-use/LessThan.html      |  140 -
 .../matchers/class-use/LocalizedMatcher.html       |  140 -
 .../matchers/class-use/MatcherDecorator.html       |  176 -
 .../matchers/class-use/MatchersPrinter.html        |  140 -
 .../internal/matchers/class-use/Matches.html       |  140 -
 .../mockito/internal/matchers/class-use/Not.html   |  140 -
 .../internal/matchers/class-use/NotNull.html       |  176 -
 .../mockito/internal/matchers/class-use/Null.html  |  176 -
 .../mockito/internal/matchers/class-use/Or.html    |  140 -
 .../mockito/internal/matchers/class-use/Same.html  |  140 -
 .../internal/matchers/class-use/StartsWith.html    |  140 -
 .../internal/matchers/class-use/VarargMatcher.html |  176 -
 .../mockito/internal/matchers/package-frame.html   |  101 -
 .../mockito/internal/matchers/package-summary.html |  299 -
 .../mockito/internal/matchers/package-tree.html    |  188 -
 .../org/mockito/internal/matchers/package-use.html |  214 -
 .../org/mockito/internal/package-frame.html        |   49 -
 .../org/mockito/internal/package-summary.html      |  195 -
 .../javadoc/org/mockito/internal/package-tree.html |  158 -
 .../javadoc/org/mockito/internal/package-use.html  |  229 -
 .../internal/progress/ArgumentMatcherStorage.html  |  320 -
 .../progress/ArgumentMatcherStorageImpl.html       |  387 -
 .../internal/progress/HandyReturnValues.html       |  441 -
 .../internal/progress/IOngoingStubbing.html        |  175 -
 .../mockito/internal/progress/MockingProgress.html |  423 -
 .../internal/progress/MockingProgressImpl.html     |  528 -
 .../mockito/internal/progress/SequenceNumber.html  |  249 -
 .../progress/ThreadSafeMockingProgress.html        |  530 -
 .../progress/class-use/ArgumentMatcherStorage.html |  238 -
 .../class-use/ArgumentMatcherStorageImpl.html      |  140 -
 .../progress/class-use/HandyReturnValues.html      |  232 -
 .../progress/class-use/IOngoingStubbing.html       |  335 -
 .../progress/class-use/MockingProgress.html        |  211 -
 .../progress/class-use/MockingProgressImpl.html    |  140 -
 .../progress/class-use/SequenceNumber.html         |  140 -
 .../class-use/ThreadSafeMockingProgress.html       |  140 -
 .../mockito/internal/progress/package-frame.html   |   55 -
 .../mockito/internal/progress/package-summary.html |  207 -
 .../mockito/internal/progress/package-tree.html    |  157 -
 .../org/mockito/internal/progress/package-use.html |  266 -
 .../mockito/internal/reporting/PrintSettings.html  |  325 -
 .../reporting/PrintingFriendlyInvocation.html      |  206 -
 .../mockito/internal/reporting/SmartPrinter.html   |  278 -
 .../reporting/class-use/PrintSettings.html         |  277 -
 .../class-use/PrintingFriendlyInvocation.html      |  242 -
 .../internal/reporting/class-use/SmartPrinter.html |  140 -
 .../mockito/internal/reporting/package-frame.html  |   45 -
 .../internal/reporting/package-summary.html        |  187 -
 .../mockito/internal/reporting/package-tree.html   |  154 -
 .../mockito/internal/reporting/package-use.html    |  235 -
 .../internal/runners/JUnit44RunnerImpl.html        |  307 -
 .../runners/JUnit45AndHigherRunnerImpl.html        |  307 -
 .../mockito/internal/runners/RunnerFactory.html    |  252 -
 .../org/mockito/internal/runners/RunnerImpl.html   |  248 -
 .../runners/class-use/JUnit44RunnerImpl.html       |  140 -
 .../class-use/JUnit45AndHigherRunnerImpl.html      |  140 -
 .../internal/runners/class-use/RunnerFactory.html  |  140 -
 .../internal/runners/class-use/RunnerImpl.html     |  230 -
 .../mockito/internal/runners/package-frame.html    |   47 -
 .../mockito/internal/runners/package-summary.html  |  191 -
 .../org/mockito/internal/runners/package-tree.html |  158 -
 .../org/mockito/internal/runners/package-use.html  |  185 -
 .../runners/util/FrameworkUsageValidator.html      |  265 -
 .../internal/runners/util/RunnerProvider.html      |  273 -
 .../internal/runners/util/TestMethodsFinder.html   |  249 -
 .../util/class-use/FrameworkUsageValidator.html    |  140 -
 .../runners/util/class-use/RunnerProvider.html     |  140 -
 .../runners/util/class-use/TestMethodsFinder.html  |  140 -
 .../internal/runners/util/package-frame.html       |   36 -
 .../internal/runners/util/package-summary.html     |  177 -
 .../internal/runners/util/package-tree.html        |  151 -
 .../mockito/internal/runners/util/package-use.html |  140 -
 .../mockito/internal/stubbing/BaseStubbing.html    |  474 -
 .../internal/stubbing/ConsecutiveStubbing.html     |  303 -
 .../internal/stubbing/InvocationContainer.html     |  225 -
 .../internal/stubbing/InvocationContainerImpl.html |  523 -
 .../internal/stubbing/OngoingStubbingImpl.html     |  322 -
 .../stubbing/StubbedInvocationMatcher.html         |  361 -
 .../org/mockito/internal/stubbing/StubberImpl.html |  412 -
 .../internal/stubbing/VoidMethodStubbableImpl.html |  385 -
 .../answers/AnswerReturnValuesAdapter.html         |  261 -
 .../stubbing/answers/AnswersValidator.html         |  251 -
 .../stubbing/answers/CallsRealMethods.html         |  282 -
 .../internal/stubbing/answers/ClonesArguments.html |  259 -
 .../internal/stubbing/answers/DoesNothing.html     |  261 -
 .../mockito/internal/stubbing/answers/Returns.html |  349 -
 .../internal/stubbing/answers/ThrowsException.html |  283 -
 .../class-use/AnswerReturnValuesAdapter.html       |  140 -
 .../answers/class-use/AnswersValidator.html        |  140 -
 .../answers/class-use/CallsRealMethods.html        |  140 -
 .../answers/class-use/ClonesArguments.html         |  140 -
 .../stubbing/answers/class-use/DoesNothing.html    |  140 -
 .../stubbing/answers/class-use/Returns.html        |  140 -
 .../answers/class-use/ThrowsException.html         |  140 -
 .../internal/stubbing/answers/package-frame.html   |   44 -
 .../internal/stubbing/answers/package-summary.html |  193 -
 .../internal/stubbing/answers/package-tree.html    |  155 -
 .../internal/stubbing/answers/package-use.html     |  140 -
 .../internal/stubbing/class-use/BaseStubbing.html  |  184 -
 .../stubbing/class-use/ConsecutiveStubbing.html    |  140 -
 .../stubbing/class-use/InvocationContainer.html    |  241 -
 .../class-use/InvocationContainerImpl.html         |  187 -
 .../stubbing/class-use/OngoingStubbingImpl.html    |  140 -
 .../class-use/StubbedInvocationMatcher.html        |  200 -
 .../internal/stubbing/class-use/StubberImpl.html   |  140 -
 .../class-use/VoidMethodStubbableImpl.html         |  140 -
 .../internal/stubbing/defaultanswers/Answers.html  |  397 -
 .../defaultanswers/GloballyConfiguredAnswer.html   |  267 -
 .../stubbing/defaultanswers/ReturnsDeepStubs.html  |  261 -
 .../defaultanswers/ReturnsEmptyValues.html         |  279 -
 .../stubbing/defaultanswers/ReturnsMocks.html      |  261 -
 .../defaultanswers/ReturnsMoreEmptyValues.html     |  292 -
 .../stubbing/defaultanswers/ReturnsSmartNulls.html |  280 -
 .../stubbing/defaultanswers/class-use/Answers.html |  185 -
 .../class-use/GloballyConfiguredAnswer.html        |  140 -
 .../defaultanswers/class-use/ReturnsDeepStubs.html |  140 -
 .../class-use/ReturnsEmptyValues.html              |  140 -
 .../defaultanswers/class-use/ReturnsMocks.html     |  140 -
 .../class-use/ReturnsMoreEmptyValues.html          |  140 -
 .../class-use/ReturnsSmartNulls.html               |  140 -
 .../stubbing/defaultanswers/package-frame.html     |   53 -
 .../stubbing/defaultanswers/package-summary.html   |  204 -
 .../stubbing/defaultanswers/package-tree.html      |  165 -
 .../stubbing/defaultanswers/package-use.html       |  170 -
 .../mockito/internal/stubbing/package-frame.html   |   55 -
 .../mockito/internal/stubbing/package-summary.html |  207 -
 .../mockito/internal/stubbing/package-tree.html    |  164 -
 .../org/mockito/internal/stubbing/package-use.html |  222 -
 .../org/mockito/internal/util/ArrayUtils.html      |  251 -
 .../internal/util/ConsoleMockitoLogger.html        |  258 -
 .../org/mockito/internal/util/Decamelizer.html     |  249 -
 .../org/mockito/internal/util/IdentitySet.html     |  268 -
 .../org/mockito/internal/util/ListUtil.Filter.html |  206 -
 .../org/mockito/internal/util/ListUtil.html        |  275 -
 .../internal/util/MockCreationValidator.html       |  310 -
 .../org/mockito/internal/util/MockName.html        |  281 -
 .../org/mockito/internal/util/MockUtil.html        |  362 -
 .../org/mockito/internal/util/MockitoLogger.html   |  206 -
 .../mockito/internal/util/ObjectMethodsGuru.html   |  323 -
 .../org/mockito/internal/util/Primitives.html      |  327 -
 .../org/mockito/internal/util/RemoveFirstLine.html |  250 -
 .../mockito/internal/util/SimpleMockitoLogger.html |  275 -
 .../org/mockito/internal/util/StringJoiner.html    |  249 -
 .../internal/util/class-use/ArrayUtils.html        |  140 -
 .../util/class-use/ConsoleMockitoLogger.html       |  176 -
 .../internal/util/class-use/Decamelizer.html       |  140 -
 .../internal/util/class-use/IdentitySet.html       |  140 -
 .../internal/util/class-use/ListUtil.Filter.html   |  184 -
 .../mockito/internal/util/class-use/ListUtil.html  |  140 -
 .../util/class-use/MockCreationValidator.html      |  174 -
 .../mockito/internal/util/class-use/MockName.html  |  205 -
 .../mockito/internal/util/class-use/MockUtil.html  |  140 -
 .../internal/util/class-use/MockitoLogger.html     |  244 -
 .../internal/util/class-use/ObjectMethodsGuru.html |  140 -
 .../internal/util/class-use/Primitives.html        |  140 -
 .../internal/util/class-use/RemoveFirstLine.html   |  140 -
 .../util/class-use/SimpleMockitoLogger.html        |  140 -
 .../internal/util/class-use/StringJoiner.html      |  140 -
 .../internal/util/junit/JUnitFailureHacker.html    |  251 -
 .../util/junit/class-use/JUnitFailureHacker.html   |  140 -
 .../mockito/internal/util/junit/package-frame.html |   32 -
 .../internal/util/junit/package-summary.html       |  154 -
 .../mockito/internal/util/junit/package-tree.html  |  149 -
 .../mockito/internal/util/junit/package-use.html   |  140 -
 .../org/mockito/internal/util/package-frame.html   |   69 -
 .../org/mockito/internal/util/package-summary.html |  235 -
 .../org/mockito/internal/util/package-tree.html    |  159 -
 .../org/mockito/internal/util/package-use.html     |  228 -
 .../util/reflection/AccessibilityChanger.html      |  272 -
 .../internal/util/reflection/FieldCopier.html      |  263 -
 .../internal/util/reflection/FieldReader.html      |  251 -
 .../internal/util/reflection/FieldSetter.html      |  251 -
 .../internal/util/reflection/GenericMaster.html    |  251 -
 .../internal/util/reflection/LenientCopyTool.html  |  286 -
 .../mockito/internal/util/reflection/Whitebox.html |  274 -
 .../reflection/class-use/AccessibilityChanger.html |  140 -
 .../util/reflection/class-use/FieldCopier.html     |  140 -
 .../util/reflection/class-use/FieldReader.html     |  140 -
 .../util/reflection/class-use/FieldSetter.html     |  140 -
 .../util/reflection/class-use/GenericMaster.html   |  140 -
 .../util/reflection/class-use/LenientCopyTool.html |  140 -
 .../util/reflection/class-use/Whitebox.html        |  140 -
 .../internal/util/reflection/package-frame.html    |   44 -
 .../internal/util/reflection/package-summary.html  |  193 -
 .../internal/util/reflection/package-tree.html     |  149 -
 .../internal/util/reflection/package-use.html      |  140 -
 .../org/mockito/internal/verification/AtLeast.html |  299 -
 .../org/mockito/internal/verification/AtMost.html  |  255 -
 .../internal/verification/InOrderContextImpl.html  |  277 -
 .../internal/verification/InOrderWrapper.html      |  257 -
 .../verification/MockAwareVerificationMode.html    |  279 -
 .../internal/verification/NoMoreInteractions.html  |  277 -
 .../org/mockito/internal/verification/Only.html    |  255 -
 .../verification/RegisteredInvocations.html        |  301 -
 .../org/mockito/internal/verification/Times.html   |  299 -
 .../verification/VerificationDataImpl.html         |  279 -
 .../verification/VerificationModeFactory.html      |  344 -
 .../verification/VerificationWithTimeoutImpl.html  |  310 -
 .../internal/verification/api/InOrderContext.html  |  225 -
 .../verification/api/VerificationData.html         |  225 -
 .../verification/api/VerificationDataInOrder.html  |  244 -
 .../api/VerificationDataInOrderImpl.html           |  303 -
 .../verification/api/VerificationInOrderMode.html  |  206 -
 .../verification/api/class-use/InOrderContext.html |  422 -
 .../api/class-use/VerificationData.html            |  285 -
 .../api/class-use/VerificationDataInOrder.html     |  237 -
 .../api/class-use/VerificationDataInOrderImpl.html |  140 -
 .../api/class-use/VerificationInOrderMode.html     |  207 -
 .../internal/verification/api/package-frame.html   |   49 -
 .../internal/verification/api/package-summary.html |  195 -
 .../internal/verification/api/package-tree.html    |  155 -
 .../internal/verification/api/package-use.html     |  285 -
 .../argumentmatching/ArgumentMatchingTool.html     |  253 -
 .../class-use/ArgumentMatchingTool.html            |  140 -
 .../argumentmatching/package-frame.html            |   32 -
 .../argumentmatching/package-summary.html          |  169 -
 .../argumentmatching/package-tree.html             |  149 -
 .../verification/argumentmatching/package-use.html |  140 -
 .../verification/checkers/AtLeastDiscrepancy.html  |  264 -
 .../AtLeastXNumberOfInvocationsChecker.html        |  253 -
 .../AtLeastXNumberOfInvocationsInOrderChecker.html |  253 -
 .../checkers/MissingInvocationChecker.html         |  251 -
 .../checkers/MissingInvocationInOrderChecker.html  |  255 -
 .../checkers/NumberOfInvocationsChecker.html       |  253 -
 .../NumberOfInvocationsInOrderChecker.html         |  255 -
 .../checkers/class-use/AtLeastDiscrepancy.html     |  140 -
 .../AtLeastXNumberOfInvocationsChecker.html        |  140 -
 .../AtLeastXNumberOfInvocationsInOrderChecker.html |  140 -
 .../class-use/MissingInvocationChecker.html        |  140 -
 .../class-use/MissingInvocationInOrderChecker.html |  140 -
 .../class-use/NumberOfInvocationsChecker.html      |  140 -
 .../NumberOfInvocationsInOrderChecker.html         |  140 -
 .../verification/checkers/package-frame.html       |   44 -
 .../verification/checkers/package-summary.html     |  193 -
 .../verification/checkers/package-tree.html        |  151 -
 .../verification/checkers/package-use.html         |  140 -
 .../internal/verification/class-use/AtLeast.html   |  140 -
 .../internal/verification/class-use/AtMost.html    |  140 -
 .../verification/class-use/InOrderContextImpl.html |  140 -
 .../verification/class-use/InOrderWrapper.html     |  140 -
 .../class-use/MockAwareVerificationMode.html       |  140 -
 .../verification/class-use/NoMoreInteractions.html |  176 -
 .../internal/verification/class-use/Only.html      |  140 -
 .../class-use/RegisteredInvocations.html           |  140 -
 .../internal/verification/class-use/Times.html     |  176 -
 .../class-use/VerificationDataImpl.html            |  140 -
 .../class-use/VerificationModeFactory.html         |  140 -
 .../class-use/VerificationWithTimeoutImpl.html     |  140 -
 .../internal/verification/package-frame.html       |   54 -
 .../internal/verification/package-summary.html     |  213 -
 .../internal/verification/package-tree.html        |  159 -
 .../mockito/internal/verification/package-use.html |  172 -
 .../org/mockito/invocation/InvocationOnMock.html   |  301 -
 .../invocation/class-use/InvocationOnMock.html     |  446 -
 .../org/mockito/invocation/package-frame.html      |   32 -
 .../org/mockito/invocation/package-summary.html    |  169 -
 .../org/mockito/invocation/package-tree.html       |  149 -
 .../org/mockito/invocation/package-use.html        |  280 -
 tools/mockito/javadoc/org/mockito/logo.jpg         |  Bin 9110 -> 0 bytes
 .../mockito/javadoc/org/mockito/package-frame.html |   99 -
 .../javadoc/org/mockito/package-summary.html       |  287 -
 .../mockito/javadoc/org/mockito/package-tree.html  |  185 -
 tools/mockito/javadoc/org/mockito/package-use.html |  458 -
 .../runners/ConsoleSpammingMockitoJUnitRunner.html |  383 -
 .../org/mockito/runners/MockitoJUnit44Runner.html  |  289 -
 .../org/mockito/runners/MockitoJUnitRunner.html    |  351 -
 .../mockito/runners/VerboseMockitoJUnitRunner.html |  334 -
 .../ConsoleSpammingMockitoJUnitRunner.html         |  140 -
 .../runners/class-use/MockitoJUnit44Runner.html    |  140 -
 .../runners/class-use/MockitoJUnitRunner.html      |  176 -
 .../class-use/VerboseMockitoJUnitRunner.html       |  140 -
 .../javadoc/org/mockito/runners/package-frame.html |   38 -
 .../org/mockito/runners/package-summary.html       |  185 -
 .../javadoc/org/mockito/runners/package-tree.html  |  157 -
 .../javadoc/org/mockito/runners/package-use.html   |  170 -
 .../javadoc/org/mockito/stubbing/Answer.html       |  232 -
 .../stubbing/DeprecatedOngoingStubbing.html        |  308 -
 .../org/mockito/stubbing/OngoingStubbing.html      |  399 -
 .../javadoc/org/mockito/stubbing/Stubber.html      |  379 -
 .../org/mockito/stubbing/VoidMethodStubbable.html  |  338 -
 .../stubbing/answers/ReturnsElementsOf.html        |  271 -
 .../answers/class-use/ReturnsElementsOf.html       |  140 -
 .../mockito/stubbing/answers/package-frame.html    |   32 -
 .../mockito/stubbing/answers/package-summary.html  |  154 -
 .../org/mockito/stubbing/answers/package-tree.html |  150 -
 .../org/mockito/stubbing/answers/package-use.html  |  140 -
 .../org/mockito/stubbing/class-use/Answer.html     |  879 --
 .../class-use/DeprecatedOngoingStubbing.html       |  349 -
 .../stubbing/class-use/OngoingStubbing.html        |  397 -
 .../org/mockito/stubbing/class-use/Stubber.html    |  373 -
 .../stubbing/class-use/VoidMethodStubbable.html    |  341 -
 .../org/mockito/stubbing/package-frame.html        |   40 -
 .../org/mockito/stubbing/package-summary.html      |  185 -
 .../javadoc/org/mockito/stubbing/package-tree.html |  149 -
 .../javadoc/org/mockito/stubbing/package-use.html  |  433 -
 .../javadoc/org/mockito/verification/Timeout.html  |  462 -
 .../org/mockito/verification/VerificationMode.html |  231 -
 .../verification/VerificationWithTimeout.html      |  407 -
 .../mockito/verification/class-use/Timeout.html    |  140 -
 .../verification/class-use/VerificationMode.html   |  730 -
 .../class-use/VerificationWithTimeout.html         |  205 -
 .../org/mockito/verification/package-frame.html    |   45 -
 .../org/mockito/verification/package-summary.html  |  173 -
 .../org/mockito/verification/package-tree.html     |  157 -
 .../org/mockito/verification/package-use.html      |  279 -
 tools/mockito/javadoc/overview-frame.html          |  124 -
 tools/mockito/javadoc/overview-summary.html        |  326 -
 tools/mockito/javadoc/overview-tree.html           |  333 -
 tools/mockito/javadoc/package-list                 |   40 -
 tools/mockito/javadoc/resources/inherit.gif        |  Bin 57 -> 0 bytes
 tools/mockito/javadoc/serialized-form.html         | 2472 ----
 tools/mockito/javadoc/stylesheet.css               |   29 -
 tools/mockito/mockito-all-1.8.5.jar                |  Bin 1419869 -> 0 bytes
 tools/mockito/separate-jars/asm-license.txt        |   29 -
 tools/mockito/separate-jars/cglib-license.txt      |  201 -
 .../com.springsource.org.hamcrest.core-1.1.0.jar   |  Bin 34332 -> 0 bytes
 .../com.springsource.org.objenesis-1.0.0.jar       |  Bin 49509 -> 0 bytes
 tools/mockito/separate-jars/hamcrest-license.txt   |   27 -
 tools/mockito/separate-jars/mockito-core-1.8.5.jar |  Bin 1338813 -> 0 bytes
 tools/mockito/separate-jars/objenesis-license.txt  |   18 -
 .../mockito/sources/mockito-all-1.8.5-sources.jar  |  Bin 683006 -> 0 bytes
 .../mockito/sources/mockito-core-1.8.5-sources.jar |  Bin 645746 -> 0 bytes
 tools/test/apisession.py                           |   68 -
 tools/test/cloudkit.py                             |   78 -
 tools/test/db.py                                   |   35 -
 tools/test/globalconfig.py                         |   35 -
 tools/test/physicalresource.py                     |   71 -
 tools/test/vm.py                                   |   69 -
 tools/test/vmcreate.py                             |   36 -
 .../tooljars/cloud-selenium-java-client-driver.jar |  Bin 16175099 -> 0 bytes
 tools/vhd-tools/Makefile                           |   16 -
 tools/vhd-tools/README                             |  321 -
 tools/vhd-tools/include/Makefile                   |   14 -
 tools/vhd-tools/include/atomicio.h                 |   33 -
 tools/vhd-tools/include/blk_uuid.h                 |  130 -
 tools/vhd-tools/include/blktaplib.h                |  250 -
 tools/vhd-tools/include/libvhd-journal.h           |   68 -
 tools/vhd-tools/include/libvhd.h                   |  326 -
 tools/vhd-tools/include/list.h                     |  124 -
 tools/vhd-tools/include/lvm-util.h                 |   71 -
 tools/vhd-tools/include/relative-path.h            |   43 -
 tools/vhd-tools/include/tapdisk-message.h          |  141 -
 tools/vhd-tools/include/vhd-util.h                 |   44 -
 tools/vhd-tools/include/vhd.h                      |  219 -
 tools/vhd-tools/lvm/Makefile                       |   38 -
 tools/vhd-tools/lvm/lvm-util.c                     |  349 -
 tools/vhd-tools/vhd/Makefile                       |   56 -
 tools/vhd-tools/vhd/lib/Makefile                   |   75 -
 tools/vhd-tools/vhd/lib/atomicio.c                 |   61 -
 tools/vhd-tools/vhd/lib/libvhd-journal.c           | 1534 --
 tools/vhd-tools/vhd/lib/libvhd.c                   | 3352 -----
 tools/vhd-tools/vhd/lib/relative-path.c            |  299 -
 tools/vhd-tools/vhd/lib/vhd-util-check.c           |  980 --
 tools/vhd-tools/vhd/lib/vhd-util-coalesce.c        |  227 -
 tools/vhd-tools/vhd/lib/vhd-util-create.c          |   80 -
 tools/vhd-tools/vhd/lib/vhd-util-fill.c            |  105 -
 tools/vhd-tools/vhd/lib/vhd-util-modify.c          |  132 -
 tools/vhd-tools/vhd/lib/vhd-util-query.c           |  159 -
 tools/vhd-tools/vhd/lib/vhd-util-read.c            |  742 -
 tools/vhd-tools/vhd/lib/vhd-util-repair.c          |   84 -
 tools/vhd-tools/vhd/lib/vhd-util-resize.c          | 1131 --
 tools/vhd-tools/vhd/lib/vhd-util-revert.c          |  106 -
 tools/vhd-tools/vhd/lib/vhd-util-scan.c            | 1317 --
 tools/vhd-tools/vhd/lib/vhd-util-set-field.c       |  106 -
 tools/vhd-tools/vhd/lib/vhd-util-snapshot.c        |  216 -
 tools/vhd-tools/vhd/vhd-update.c                   |  259 -
 tools/vhd-tools/vhd/vhd-util.c                     |  160 -
 tools/waf/javadir.py                               |   28 +-
 tools/waf/mkisofs.py                               |   30 +-
 tools/waf/tar.py                                   |   28 +-
 tools/waf/tomcat.py                                |   30 +-
 tools/waf/usermgmt.py                              |   30 +-
 tools/whisker/descriptor.xml                       | 2929 ++++
 ui/.classpath                                      |    5 -
 ui/.project                                        |   17 -
 ui/css/cloudstack3-ie7.css                         |   19 +
 ui/css/cloudstack3.css                             |  811 ++-
 ui/css/cloudstack3.ja.css                          |   18 +
 ui/dictionary.jsp                                  | 1413 ++
 ui/images/sprites.png                              |  Bin 178569 -> 180100 bytes
 ui/index.jsp                                       | 1419 +--
 ui/scripts/accounts.js                             |  201 +-
 ui/scripts/configuration.js                        |  121 +-
 ui/scripts/dashboard.js                            |   19 +-
 ui/scripts/domains.js                              |  234 +-
 ui/scripts/instanceWizard.js                       |  123 +-
 ui/scripts/instances.js                            |  147 +-
 ui/scripts/lbStickyPolicy.js                       |   38 +-
 ui/scripts/network.js                              | 2004 +++-
 ui/scripts/projects.js                             |   69 +-
 ui/scripts/sharedFunctions.js                      |  158 +-
 ui/scripts/storage.js                              |  107 +-
 ui/scripts/system.js                               | 1211 ++-
 ui/scripts/templates.js                            |   12 +-
 ui/scripts/ui-custom/dashboard.js                  |    1 +
 ui/scripts/ui-custom/enableStaticNAT.js            |   41 +-
 ui/scripts/ui-custom/instanceWizard.js             |  213 +-
 ui/scripts/ui-custom/login.js                      |   30 +-
 ui/scripts/ui-custom/projects.js                   |    9 +-
 ui/scripts/ui-custom/vpc.js                        |  568 +-
 ui/scripts/ui-custom/zoneWizard.js                 |   20 +-
 ui/scripts/ui/core.js                              |   46 +-
 ui/scripts/ui/dialog.js                            |   17 +-
 ui/scripts/ui/widgets/cloudBrowser.js              |   44 +-
 ui/scripts/ui/widgets/dataTable.js                 |    1 -
 ui/scripts/ui/widgets/detailView.js                |  116 +-
 ui/scripts/ui/widgets/listView.js                  |  163 +-
 ui/scripts/ui/widgets/multiEdit.js                 |  126 +-
 ui/scripts/ui/widgets/notifications.js             |    2 +-
 ui/scripts/ui/widgets/tagger.js                    |  233 +
 ui/scripts/vpc.js                                  | 2290 +++-
 ui/scripts/zoneWizard.js                           |  199 +-
 ui/tests/index.html                                |   18 +
 usage/.classpath                                   |   11 -
 usage/.project                                     |   17 -
 usage/conf/log4j-cloud_usage.xml.in                |   18 +
 usage/conf/usage-components.xml.in                 |   18 +
 .../centos/SYSCONFDIR/rc.d/init.d/cloud-usage.in   |  172 +-
 .../fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in   |  172 +-
 .../opensuse/SYSCONFDIR/init.d/cloud-usage.in      |  177 +-
 .../rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in     |  172 +-
 usage/distro/sles/SYSCONFDIR/init.d/cloud-usage.in |  177 +-
 .../distro/ubuntu/SYSCONFDIR/init.d/cloud-usage.in |  177 +-
 usage/libexec/usage-runner.in                      |   37 -
 usage/pom.xml                                      |   40 +
 usage/scripts/usageserver.sh                       |   45 -
 usage/src/com/cloud/usage/UsageManagerImpl.java    |  476 +-
 usage/src/com/cloud/usage/UsageSanityChecker.java  |   14 +-
 usage/src/com/cloud/usage/UsageServer.java         |   19 +-
 .../cloud/usage/parser/IPAddressUsageParser.java   |    2 +-
 .../usage/parser/LoadBalancerUsageParser.java      |   80 +-
 .../usage/parser/NetworkOfferingUsageParser.java   |   94 +-
 .../com/cloud/usage/parser/NetworkUsageParser.java |   28 +-
 .../usage/parser/PortForwardingUsageParser.java    |   72 +-
 .../usage/parser/SecurityGroupUsageParser.java     |   82 +-
 .../com/cloud/usage/parser/StorageUsageParser.java |  144 +-
 usage/src/com/cloud/usage/parser/UsageParser.java  |   22 +-
 .../cloud/usage/parser/VMInstanceUsageParser.java  |   96 +-
 .../com/cloud/usage/parser/VPNUserUsageParser.java |   88 +-
 .../com/cloud/usage/parser/VolumeUsageParser.java  |   88 +-
 utils/.classpath                                   |   10 -
 utils/.project                                     |   17 -
 utils/LICENSE                                      |  202 -
 utils/conf/db.properties                           |   18 +
 utils/conf/log4j-vmops.xml                         |   18 +
 utils/pom.xml                                      |  174 +
 .../backoff/impl/ConstantTimeBackoffMBean.java     |    4 -
 .../cloud/utils/component/ComponentLocator.java    |  196 +-
 .../cloud/utils/component/PluggableService.java    |    3 +-
 utils/src/com/cloud/utils/component/Plugin.java    |   64 +
 utils/src/com/cloud/utils/db/Attribute.java        |    7 +-
 utils/src/com/cloud/utils/db/Encrypt.java          |   32 +
 utils/src/com/cloud/utils/db/GenericDaoBase.java   |    3 +-
 utils/src/com/cloud/utils/db/JoinType.java         |   32 +
 utils/src/com/cloud/utils/db/SearchCriteria.java   |    5 +-
 utils/src/com/cloud/utils/db/SqlGenerator.java     |   17 +-
 utils/src/com/cloud/utils/db/Transaction.java      |   87 +-
 utils/src/com/cloud/utils/encoding/Base64.java     | 1739 ---
 .../utils/exception/CSExceptionErrorCode.java      |  217 +-
 utils/src/com/cloud/utils/net/NetUtils.java        |  110 +-
 utils/src/com/cloud/utils/script/Script.java       |    9 +
 utils/src/com/cloud/utils/ssh/SshHelper.java       |    4 +-
 utils/src/javax/ejb/Local.java                     |   56 -
 .../src/javax/persistence/AssociationOverride.java |   97 -
 .../javax/persistence/AssociationOverrides.java    |   88 -
 utils/src/javax/persistence/AttributeOverride.java |  105 -
 .../src/javax/persistence/AttributeOverrides.java  |   70 -
 utils/src/javax/persistence/Basic.java             |   86 -
 utils/src/javax/persistence/CascadeType.java       |   62 -
 utils/src/javax/persistence/CollectionTable.java   |   22 -
 utils/src/javax/persistence/Column.java            |  144 -
 utils/src/javax/persistence/ColumnResult.java      |   80 -
 .../src/javax/persistence/DiscriminatorColumn.java |  101 -
 utils/src/javax/persistence/DiscriminatorType.java |   53 -
 .../src/javax/persistence/DiscriminatorValue.java  |   95 -
 utils/src/javax/persistence/ElementCollection.java |   16 -
 utils/src/javax/persistence/Embeddable.java        |   62 -
 utils/src/javax/persistence/Embedded.java          |   67 -
 utils/src/javax/persistence/EmbeddedId.java        |   62 -
 utils/src/javax/persistence/Entity.java            |   59 -
 .../javax/persistence/EntityExistsException.java   |   87 -
 utils/src/javax/persistence/EntityListeners.java   |   57 -
 .../javax/persistence/EntityNotFoundException.java |   71 -
 utils/src/javax/persistence/EntityResult.java      |   86 -
 utils/src/javax/persistence/EntityTransaction.java |   90 -
 utils/src/javax/persistence/EnumType.java          |   51 -
 utils/src/javax/persistence/Enumerated.java        |   73 -
 utils/src/javax/persistence/FetchType.java         |   65 -
 utils/src/javax/persistence/FieldResult.java       |   81 -
 utils/src/javax/persistence/FlushModeType.java     |   67 -
 utils/src/javax/persistence/GeneratedValue.java    |   90 -
 utils/src/javax/persistence/GenerationType.java    |   74 -
 utils/src/javax/persistence/Id.java                |   59 -
 utils/src/javax/persistence/IdClass.java           |   73 -
 utils/src/javax/persistence/Inheritance.java       |   70 -
 utils/src/javax/persistence/InheritanceType.java   |   58 -
 utils/src/javax/persistence/JoinColumn.java        |  139 -
 utils/src/javax/persistence/JoinColumns.java       |   71 -
 utils/src/javax/persistence/JoinTable.java         |  122 -
 utils/src/javax/persistence/Lob.java               |   68 -
 utils/src/javax/persistence/LockModeType.java      |   86 -
 utils/src/javax/persistence/ManyToMany.java        |  146 -
 utils/src/javax/persistence/ManyToOne.java         |   99 -
 utils/src/javax/persistence/MapKey.java            |  120 -
 utils/src/javax/persistence/MappedSuperclass.java  |  152 -
 utils/src/javax/persistence/OneToMany.java         |  123 -
 utils/src/javax/persistence/OneToOne.java          |  134 -
 utils/src/javax/persistence/OrderBy.java           |  110 -
 .../javax/persistence/PersistenceException.java    |   86 -
 utils/src/javax/persistence/PostLoad.java          |   54 -
 utils/src/javax/persistence/PostPersist.java       |   54 -
 utils/src/javax/persistence/PostRemove.java        |   54 -
 utils/src/javax/persistence/PostUpdate.java        |   54 -
 .../javax/persistence/PrimaryKeyJoinColumn.java    |  120 -
 .../javax/persistence/PrimaryKeyJoinColumns.java   |   73 -
 utils/src/javax/persistence/SecondaryTable.java    |  120 -
 utils/src/javax/persistence/SecondaryTables.java   |   80 -
 utils/src/javax/persistence/SequenceGenerator.java |   91 -
 .../src/javax/persistence/SqlResultSetMapping.java |   87 -
 .../javax/persistence/SqlResultSetMappings.java    |   54 -
 utils/src/javax/persistence/Table.java             |   91 -
 utils/src/javax/persistence/TableGenerator.java    |  157 -
 utils/src/javax/persistence/Temporal.java          |   69 -
 utils/src/javax/persistence/TemporalType.java      |   54 -
 utils/src/javax/persistence/Transient.java         |   64 -
 utils/src/javax/persistence/UniqueConstraint.java  |   67 -
 utils/src/javax/persistence/Version.java           |   77 -
 utils/src/javax/persistence/package.html           |   19 -
 .../utils/component/MockComponentLocator.java      |    2 +
 utils/test/com/cloud/utils/net/NetUtilsTest.java   |   19 +-
 utils/test/resources/log4j.xml                     |   20 +-
 version-info.in                                    |   20 +-
 vmware-base/.classpath                             |    8 -
 vmware-base/.project                               |   17 -
 vmware-base/pom.xml                                |   73 +
 .../src/com/cloud/hypervisor/vmware/mo/HostMO.java |   69 +-
 .../hypervisor/vmware/mo/HypervisorHostHelper.java |   14 +-
 .../vmware/mo/TestVmwareContextFactory.java        |   43 +
 .../cloud/hypervisor/vmware/mo/TestVmwareMO.java   |   40 +
 .../hypervisor/vmware/util/TestVmwareUtil.java     |  107 +
 vmware-base/test/com/cloud/vmware/TestVMWare.java  | 1140 ++
 waf.bat                                            |   18 +-
 wscript                                            |  154 +-
 wscript_build                                      |   90 +-
 wscript_configure                                  |   90 +-
 3458 files changed, 177058 insertions(+), 317136 deletions(-)
----------------------------------------------------------------------



Mime
View raw message