cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [76/76] [abbrv] git commit: updated refs/heads/ui-restyle to 9dd6ff6
Date Fri, 08 Nov 2013 18:09:32 GMT
Merge branch 'master' into ui-restyle

Conflicts:
	ui/scripts/sharedFunctions.js


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

Branch: refs/heads/ui-restyle
Commit: 9dd6ff6fc07df6d90d71b1ff9246550ffb998492
Parents: d0e8fa3 fdb3b49
Author: Brian Federle <bfederle@gmail.com>
Authored: Fri Nov 8 10:07:20 2013 -0800
Committer: Brian Federle <bfederle@gmail.com>
Committed: Fri Nov 8 10:07:20 2013 -0800

----------------------------------------------------------------------
 CHANGES                                         |    1 +
 .../cloud/agent/api/HostVmStateReportEntry.java |   41 +
 .../com/cloud/agent/api/to/LoadBalancerTO.java  |   23 +-
 .../cloud/agent/api/to/MonitorServiceTO.java    |   74 +
 .../agent/manager/allocator/HostAllocator.java  |   68 +-
 api/src/com/cloud/event/EventTypes.java         |    8 +
 api/src/com/cloud/host/Host.java                |    5 +
 .../com/cloud/network/MonitoringService.java    |   42 +
 api/src/com/cloud/network/Network.java          |    2 +
 api/src/com/cloud/network/NetworkService.java   |    4 +-
 .../network/PhysicalNetworkTrafficType.java     |    2 +
 .../network/VirtualNetworkApplianceService.java |    6 +
 api/src/com/cloud/network/lb/CertService.java   |   32 +
 .../com/cloud/network/lb/LoadBalancingRule.java |   61 +-
 .../network/lb/LoadBalancingRulesService.java   |    8 +-
 api/src/com/cloud/network/lb/SslCert.java       |   16 +
 .../com/cloud/network/router/VirtualRouter.java |    1 +
 .../network/vpc/VpcProvisioningService.java     |   13 +-
 api/src/com/cloud/offering/DiskOffering.java    |    3 +
 api/src/com/cloud/offering/ServiceOffering.java |    8 +-
 api/src/com/cloud/storage/Volume.java           |    4 +
 api/src/com/cloud/storage/VolumeApiService.java |    2 +-
 api/src/com/cloud/vm/UserVmService.java         |   33 +-
 api/src/com/cloud/vm/VirtualMachine.java        |   19 +
 .../org/apache/cloudstack/api/ApiConstants.java |    8 +
 .../cloudstack/api/ResponseGenerator.java       |    4 +
 .../api/command/admin/host/ListHostsCmd.java    |    8 +
 .../admin/network/AddNetworkDeviceCmd.java      |    3 +-
 .../admin/network/ListNetworkDeviceCmd.java     |    2 +-
 .../admin/offering/CreateDiskOfferingCmd.java   |    7 +
 .../offering/CreateServiceOfferingCmd.java      |   23 +-
 .../command/admin/router/ListRoutersCmd.java    |   11 +-
 .../admin/router/UpgradeRouterTemplateCmd.java  |  143 ++
 .../command/admin/usage/AddTrafficTypeCmd.java  |    9 +-
 .../admin/usage/UpdateTrafficTypeCmd.java       |    9 +-
 .../api/command/admin/vm/AssignVMCmd.java       |    2 +-
 .../command/admin/vpc/CreateVPCOfferingCmd.java |   33 +-
 .../AssignCertToLoadBalancerCmd.java            |   92 +
 .../loadbalancer/CreateLoadBalancerRuleCmd.java |    9 +-
 .../user/loadbalancer/DeleteSslCertCmd.java     |   83 +
 .../user/loadbalancer/ListSslCertsCmd.java      |  106 +
 .../RemoveCertFromLoadBalancerCmd.java          |   82 +
 .../user/loadbalancer/UploadSslCertCmd.java     |  103 +
 .../user/snapshot/CreateSnapshotCmd.java        |   12 +-
 .../api/command/user/vm/DeployVMCmd.java        |   34 +-
 .../api/response/DomainRouterResponse.java      |   23 +-
 .../cloudstack/api/response/HostResponse.java   |    7 +
 .../api/response/SslCertResponse.java           |   90 +
 .../api/response/TrafficTypeResponse.java       |   10 +
 .../response/UpgradeRouterTemplateResponse.java |   45 +
 .../network/ExternalNetworkDeviceManager.java   |    1 +
 .../classes/resources/messages.properties       |    8 +
 client/pom.xml                                  |    5 +
 .../tomcatconf/cloudmanagementserver.keystore   |  Bin 1316 -> 0 bytes
 .../cloudmanagementserver.keystore.in           |  Bin 0 -> 1316 bytes
 client/tomcatconf/commands.properties.in        |   20 +
 client/tomcatconf/db.properties.in              |   24 +-
 .../agent/api/RevertToVMSnapshotCommand.java    |   15 +-
 .../cloud/agent/api/StartupRoutingCommand.java  |    9 +
 .../api/routing/LoadBalancerConfigCommand.java  |    1 +
 .../api/routing/SetMonitorServiceCommand.java   |   56 +
 .../virtualnetwork/VirtualRoutingResource.java  |    6 +
 .../cloudstack/storage/to/SnapshotObjectTO.java |   10 +
 .../api/agent/test/CheckOnHostCommandTest.java  |   10 +
 debian/cloudstack-management.postinst           |    5 +-
 .../src/com/cloud/vm/VirtualMachineManager.java |    6 +-
 .../src/org/apache/cloudstack/engine/Rules.java |   85 -
 .../service/VolumeOrchestrationService.java     |    2 +-
 .../service/api/OrchestrationService.java       |    4 +-
 .../api/storage/DataStoreProvider.java          |    2 +-
 .../subsystem/api/storage/SnapshotInfo.java     |    1 +
 .../api/storage/StoragePoolAllocator.java       |    5 +
 .../src/com/cloud/event/UsageEventUtils.java    |   16 +
 .../network/lb/LoadBalancingRulesManager.java   |    5 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java |    8 +-
 .../cloud/vm/VirtualMachinePowerStateSync.java  |   32 +
 .../vm/VirtualMachinePowerStateSyncImpl.java    |  125 ++
 .../datacenter/entity/api/db/EngineHostVO.java  |    8 +
 .../engine/orchestration/CloudOrchestrator.java |    7 +-
 .../orchestration/VolumeOrchestrator.java       |   30 +-
 .../spring-engine-schema-core-daos-context.xml  |    4 +
 .../com/cloud/event/UsageEventDetailsVO.java    |   72 +
 .../src/com/cloud/event/dao/UsageEventDao.java  |    3 +
 .../com/cloud/event/dao/UsageEventDaoImpl.java  |    9 +-
 .../cloud/event/dao/UsageEventDetailsDao.java   |   33 +
 .../event/dao/UsageEventDetailsDaoImpl.java     |  104 +
 engine/schema/src/com/cloud/host/HostVO.java    |   12 +
 .../network/dao/LoadBalancerCertMapDao.java     |   29 +
 .../network/dao/LoadBalancerCertMapDaoImpl.java |   79 +
 .../network/dao/LoadBalancerCertMapVO.java      |   96 +
 .../com/cloud/network/dao/LoadBalancerVO.java   |   16 +-
 .../cloud/network/dao/MonitoringServiceDao.java |   31 +
 .../network/dao/MonitoringServiceDaoImpl.java   |   68 +
 .../cloud/network/dao/MonitoringServiceVO.java  |  116 +
 .../dao/PhysicalNetworkTrafficTypeDaoImpl.java  |   13 +-
 .../dao/PhysicalNetworkTrafficTypeVO.java       |   15 +-
 .../src/com/cloud/network/dao/SslCertDao.java   |   27 +
 .../com/cloud/network/dao/SslCertDaoImpl.java   |   31 +
 .../src/com/cloud/network/dao/SslCertVO.java    |  132 ++
 .../com/cloud/network/vpc/dao/VpcDaoImpl.java   |    2 +-
 .../com/cloud/service/ServiceOfferingVO.java    |   43 +-
 .../cloud/service/dao/ServiceOfferingDao.java   |    5 +
 .../service/dao/ServiceOfferingDaoImpl.java     |   52 +-
 .../src/com/cloud/storage/DiskOfferingVO.java   |   11 +
 .../schema/src/com/cloud/storage/VolumeVO.java  |   14 +-
 .../com/cloud/upgrade/dao/Upgrade420to421.java  |   64 +-
 .../schema/src/com/cloud/vm/VMInstanceVO.java   |   49 +
 .../src/com/cloud/vm/dao/DomainRouterDao.java   |    3 +-
 .../com/cloud/vm/dao/DomainRouterDaoImpl.java   |    7 +
 .../src/com/cloud/vm/dao/VMInstanceDao.java     |    5 +
 .../src/com/cloud/vm/dao/VMInstanceDaoImpl.java |   66 +-
 .../cloud/vm/snapshot/VMSnapshotDetailsVO.java  |   44 +-
 .../vm/snapshot/dao/VMSnapshotDetailsDao.java   |    7 +-
 .../snapshot/dao/VMSnapshotDetailsDaoImpl.java  |   31 +-
 .../vm/snapshot/dao/VmSnapshotDaoTest.java      |   11 +-
 .../storage/snapshot/SnapshotObject.java        |    7 +
 .../image/db/SnapshotDataStoreDaoImpl.java      |    7 +-
 .../cloudstack/storage/volume/VolumeObject.java |   10 +
 .../config/dao/ConfigurationDaoImpl.java        |   26 +-
 .../db/src/com/cloud/dao/EntityManagerImpl.java |    3 +-
 .../com/cloud/utils/db/ConnectionConcierge.java |    6 +-
 .../db/src/com/cloud/utils/db/Merovingian2.java |   10 +-
 .../com/cloud/utils/db/TransactionLegacy.java   |   45 +-
 .../framework/jobs/dao/VmWorkJobDao.java        |   35 +
 .../framework/jobs/dao/VmWorkJobDaoImpl.java    |  125 ++
 .../framework/jobs/impl/VmWorkJobVO.java        |  101 +
 .../lifecycle/registry/ExtensionRegistry.java   |   15 +-
 .../lifecycle/registry/RegistryLifecycle.java   |   46 +-
 .../lifecycle/registry/RegistryUtils.java       |   35 +
 .../context/ResourceApplicationContext.java     |    8 +
 .../module/factory/CloudStackSpringContext.java |    1 +
 .../module/factory/QuietLoaderFactory.java      |   62 +
 .../model/impl/DefaultModuleDefinition.java     |    3 +-
 .../model/impl/DefaultModuleDefinitionSet.java  |   59 +-
 .../web/CloudStackContextLoaderListener.java    |    1 +
 .../spring/module/web/ModuleBasedFilter.java    |   61 +
 .../module/model/impl/defaults-context.xml      |    9 +
 .../factory/ModuleBasedContextFactoryTest.java  |   10 +
 ...ClasspathModuleDefinitionSetLocatorTest.java |    2 +-
 .../testhierarchy/excluded/module.properties    |   19 +
 .../testhierarchy/excluded/test-context.xml     |   33 +
 .../testhierarchy/excluded2/module.properties   |   19 +
 .../testhierarchy/excluded2/test-context.xml    |   33 +
 .../orphan-of-excluded/defaults.properties      |   20 +
 .../orphan-of-excluded/module.properties        |   19 +
 .../orphan-of-excluded/test-context.xml         |   33 +
 packaging/centos63/cloud.spec                   |   10 +-
 .../implicitplanner/ImplicitPlannerTest.java    |    3 +-
 .../networkservice/BaremetalPxeManagerImpl.java |    2 +-
 .../hyperv/DotNet/ServerResource/.gitignore     |   17 +
 .../HypervResource/CloudStackTypes.cs           |   36 +
 .../HypervResource/HypervResourceController.cs  |  196 +-
 .../HypervResource/IWmiCallsV2.cs               |    1 +
 .../ServerResource/HypervResource/Utils.cs      |  221 +-
 .../ServerResource/HypervResource/WmiCallsV2.cs |   21 +-
 .../resource/HypervDirectConnectResource.java   |  111 +-
 .../kvm/resource/BridgeVifDriver.java           |    6 +-
 .../kvm/resource/LibvirtComputingResource.java  |   96 +-
 .../manager/VmwareStorageManagerImpl.java       |   42 +-
 .../vmware/resource/VmwareResource.java         |   79 +-
 .../VmwareSecondaryStorageContextFactory.java   |    2 +
 .../xen/resource/CitrixResourceBase.java        |   62 +-
 .../lb/ElasticLoadBalancerManagerImpl.java      |   10 +-
 .../lb/InternalLoadBalancerVMManagerImpl.java   |    1 +
 .../InternalLBVMManagerTest.java                |    8 +-
 .../management/ContrailManagerImpl.java         |    3 +-
 .../contrail/management/ServerDBSyncImpl.java   |    3 +-
 .../management/ServerEventHandlerImpl.java      |    4 -
 .../network/contrail/model/ModelObject.java     |   19 +-
 .../network/contrail/model/ModelObjectBase.java |   18 +-
 .../management/ManagementServerMock.java        |    6 +-
 .../cloud/network/element/NetscalerElement.java |   14 +-
 .../network/resource/NetscalerResource.java     |  259 ++-
 plugins/network-elements/palo-alto/pom.xml      |   29 +
 .../cloudstack/paloalto/module.properties       |   18 +
 .../paloalto/spring-paloalto-context.xml        |   33 +
 .../api/commands/AddExternalFirewallCmd.java    |  112 +
 .../api/commands/AddPaloAltoFirewallCmd.java    |  135 ++
 .../commands/ConfigurePaloAltoFirewallCmd.java  |  114 +
 .../api/commands/DeleteExternalFirewallCmd.java |   88 +
 .../api/commands/DeletePaloAltoFirewallCmd.java |  105 +
 .../api/commands/ListExternalFirewallsCmd.java  |   88 +
 .../ListPaloAltoFirewallNetworksCmd.java        |   95 +
 .../api/commands/ListPaloAltoFirewallsCmd.java  |  103 +
 .../api/response/PaloAltoFirewallResponse.java  |  142 ++
 .../PaloAltoExternalFirewallElement.java        |  538 +++++
 .../element/PaloAltoFirewallElementService.java |   88 +
 .../network/resource/PaloAltoResource.java      | 2030 ++++++++++++++++++
 .../cloud/network/utils/HttpClientWrapper.java  |   85 +
 .../resource/MockablePaloAltoResource.java      |  460 ++++
 .../network/resource/PaloAltoResourceTest.java  |  507 +++++
 .../cloudstack/network/dao/SspCredentialVO.java |    3 +
 plugins/pom.xml                                 |    1 +
 .../CloudStackPrimaryDataStoreDriverImpl.java   |   15 +-
 .../driver/SolidfirePrimaryDataStoreDriver.java |   21 +-
 pom.xml                                         |    2 +-
 .../spring-server-core-managers-context.xml     |    2 +
 .../impl/UserConcentratedAllocator.java         |    2 +-
 server/src/com/cloud/api/ApiDispatcher.java     |    6 +-
 server/src/com/cloud/api/ApiResponseHelper.java |   20 +-
 .../com/cloud/api/query/QueryManagerImpl.java   |   20 +-
 .../com/cloud/api/query/ViewResponseHelper.java |    2 +
 .../api/query/dao/DomainRouterJoinDaoImpl.java  |    7 +
 .../cloud/api/query/dao/HostJoinDaoImpl.java    |    1 +
 .../src/com/cloud/api/query/vo/HostJoinVO.java  |    7 +
 .../com/cloud/capacity/CapacityManagerImpl.java |   89 +-
 server/src/com/cloud/configuration/Config.java  |    5 +
 .../configuration/ConfigurationManagerImpl.java |  158 +-
 .../deploy/DeploymentPlanningManagerImpl.java   |   68 +-
 .../ExternalLoadBalancerDeviceManagerImpl.java  |    6 +-
 .../com/cloud/network/IpAddressManagerImpl.java |    5 +-
 .../src/com/cloud/network/NetworkModelImpl.java |   18 +
 .../com/cloud/network/NetworkServiceImpl.java   |   13 +-
 .../lb/LoadBalancingRulesManagerImpl.java       |  200 +-
 .../VirtualNetworkApplianceManagerImpl.java     |  181 +-
 .../com/cloud/network/vpc/VpcManagerImpl.java   |  374 ++--
 .../com/cloud/resource/ResourceManagerImpl.java |    1 +
 .../cloud/server/ConfigurationServerImpl.java   |    2 +-
 .../com/cloud/server/ManagementServerImpl.java  |   12 +
 .../cloud/storage/CreateSnapshotPayload.java    |    9 +
 .../com/cloud/storage/StorageManagerImpl.java   |   17 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java |    3 +-
 .../storage/snapshot/SnapshotManagerImpl.java   |    2 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java  |  551 ++---
 .../affinity/AffinityGroupServiceImpl.java      | 1108 +++++-----
 .../lb/ApplicationLoadBalancerManagerImpl.java  |    2 +-
 .../cloudstack/network/lb/CertServiceImpl.java  |  477 ++++
 .../com/cloud/capacity/CapacityManagerTest.java |    2 +-
 server/test/com/cloud/vm/UserVmManagerTest.java |    2 +-
 .../com/cloud/vpc/MockNetworkManagerImpl.java   |    4 +-
 .../MockVpcVirtualNetworkApplianceManager.java  |    7 +-
 .../affinity/AffinityApiUnitTest.java           |    7 +-
 .../lb/ApplicationLoadBalancerTest.java         |  380 ----
 .../network/lb/ApplicationLoadBalancerTest.java |  381 ++++
 .../cloudstack/network/lb/CertServiceTest.java  |  791 +++++++
 .../CreateNetworkOfferingTest.java              |   12 +
 .../service/ServiceOfferingVOTest.java          |   49 +
 server/test/resources/certs/bad_format_cert.crt |    1 +
 server/test/resources/certs/dsa_self_signed.crt |   26 +
 server/test/resources/certs/dsa_self_signed.key |   20 +
 server/test/resources/certs/expired_cert.crt    |   20 +
 server/test/resources/certs/non_x509_pem.crt    |   17 +
 server/test/resources/certs/root_chain.crt      |   22 +
 server/test/resources/certs/rsa_ca_signed.crt   |   23 +
 server/test/resources/certs/rsa_ca_signed.key   |   30 +
 server/test/resources/certs/rsa_ca_signed2.crt  |   23 +
 server/test/resources/certs/rsa_ca_signed2.key  |   30 +
 server/test/resources/certs/rsa_random_pkey.key |   28 +
 server/test/resources/certs/rsa_self_signed.crt |   19 +
 server/test/resources/certs/rsa_self_signed.key |   27 +
 .../certs/rsa_self_signed_with_pwd.crt          |   19 +
 .../certs/rsa_self_signed_with_pwd.key          |   30 +
 server/test/resources/createNetworkOffering.xml |    4 +-
 .../console-proxy-rdp/rdpconsole/README.txt     |   50 +
 services/console-proxy-rdp/rdpconsole/pom.xml   |   48 +
 .../console-proxy-rdp/rdpconsole/rdp-config.bat |   42 +
 .../src/main/java/common/AwtBellAdapter.java    |   76 +
 .../src/main/java/common/AwtCanvasAdapter.java  |  164 ++
 .../main/java/common/AwtClipboardAdapter.java   |   55 +
 .../src/main/java/common/AwtKeyEventSource.java |   53 +
 .../main/java/common/AwtMouseEventSource.java   |   71 +
 .../src/main/java/common/BitmapOrder.java       |   48 +
 .../src/main/java/common/BitmapRectangle.java   |   74 +
 .../main/java/common/BufferedImageCanvas.java   |   79 +
 .../common/BufferedImageCopyRectAdapter.java    |  124 ++
 .../java/common/BufferedImagePixelsAdapter.java |  147 ++
 .../rdpconsole/src/main/java/common/Client.java |  137 ++
 .../src/main/java/common/CopyRectOrder.java     |   39 +
 .../src/main/java/common/KeyOrder.java          |   45 +
 .../src/main/java/common/MouseOrder.java        |   41 +
 .../src/main/java/common/OrderType.java         |   22 +
 .../src/main/java/common/ScreenDescription.java |  168 ++
 .../main/java/common/SizeChangeListener.java    |   22 +
 .../java/rdpclient/AwtRdpKeyboardAdapter.java   |  351 +++
 .../main/java/rdpclient/AwtRdpMouseAdapter.java |  180 ++
 .../java/rdpclient/ClientConfirmActivePDU.java  | 1132 ++++++++++
 .../main/java/rdpclient/ClientFastPathPDU.java  |   55 +
 .../src/main/java/rdpclient/ClientInfoPDU.java  |  456 ++++
 .../rdpclient/ClientMCSAttachUserRequest.java   |  102 +
 ...JoinRequest_ServerMCSChannelConfirmPDUs.java |  222 ++
 .../java/rdpclient/ClientMCSConnectInitial.java |  669 ++++++
 .../rdpclient/ClientMCSErectDomainRequest.java  |  190 ++
 .../java/rdpclient/ClientPacketSniffer.java     |   50 +
 .../java/rdpclient/ClientSynchronizePDU.java    |  248 +++
 .../src/main/java/rdpclient/ClientTpkt.java     |   54 +
 .../ClientX224ConnectionRequestPDU.java         |  156 ++
 .../main/java/rdpclient/ClientX224DataPdu.java  |   54 +
 .../src/main/java/rdpclient/HandshakeEnd.java   |   27 +
 .../src/main/java/rdpclient/MockServer.java     |  197 ++
 .../src/main/java/rdpclient/PacketSniffer.java  |   75 +
 .../java/rdpclient/RLEBitmapDecompression.java  | 1014 +++++++++
 .../src/main/java/rdpclient/RdpClient.java      |  214 ++
 .../src/main/java/rdpclient/RdpConstants.java   |   74 +
 .../src/main/java/rdpclient/RdpState.java       |   33 +
 .../main/java/rdpclient/ServerBitmapUpdate.java |  201 ++
 .../java/rdpclient/ServerChannel1003Router.java |  530 +++++
 .../rdpclient/ServerControlPDUCooperate.java    |  117 +
 .../ServerControlPDUGrantedControl.java         |  114 +
 .../java/rdpclient/ServerDemandActivePDU.java   |  661 ++++++
 .../src/main/java/rdpclient/ServerFastPath.java |  259 +++
 .../ServerLicenseErrorPDUValidClient.java       |  121 ++
 .../ServerMCSAttachUserConfirmPDU.java          |  133 ++
 .../ServerMCSChannelJoinConfirmPDU.java         |   89 +
 .../rdpclient/ServerMCSConnectResponse.java     |  283 +++
 .../src/main/java/rdpclient/ServerMCSPDU.java   |  149 ++
 .../java/rdpclient/ServerPacketSniffer.java     |   52 +
 .../java/rdpclient/ServerPaletteUpdate.java     |   78 +
 .../java/rdpclient/ServerSynchronizePDU.java    |  115 +
 .../src/main/java/rdpclient/ServerTpkt.java     |   70 +
 .../ServerX224ConnectionConfirmPDU.java         |  237 ++
 .../main/java/rdpclient/ServerX224DataPdu.java  |   64 +
 .../rdpclient/TrustAllX509TrustManager.java     |   40 +
 .../main/java/rdpclient/UpgradeSocketToSSL.java |   44 +
 .../main/java/streamer/AssertingByteBuffer.java |  107 +
 .../src/main/java/streamer/BaseElement.java     |  417 ++++
 .../src/main/java/streamer/BufferPool.java      |   36 +
 .../src/main/java/streamer/ByteBuffer.java      |  826 +++++++
 .../src/main/java/streamer/DataSink.java        |   24 +
 .../src/main/java/streamer/DataSource.java      |   60 +
 .../src/main/java/streamer/Direction.java       |   21 +
 .../src/main/java/streamer/Element.java         |  120 ++
 .../src/main/java/streamer/Event.java           |   33 +
 .../src/main/java/streamer/FakeSink.java        |   69 +
 .../src/main/java/streamer/FakeSource.java      |  125 ++
 .../main/java/streamer/InputStreamSource.java   |  194 ++
 .../rdpconsole/src/main/java/streamer/Link.java |   66 +
 .../src/main/java/streamer/MockSink.java        |  111 +
 .../src/main/java/streamer/MockSource.java      |   88 +
 .../src/main/java/streamer/OneTimeSwitch.java   |  133 ++
 .../src/main/java/streamer/Order.java           |   23 +
 .../main/java/streamer/OutputStreamSink.java    |  153 ++
 .../src/main/java/streamer/Pipeline.java        |   91 +
 .../src/main/java/streamer/PipelineImpl.java    |  309 +++
 .../src/main/java/streamer/Queue.java           |  136 ++
 .../src/main/java/streamer/SocketWrapper.java   |  239 +++
 .../src/main/java/streamer/SyncLink.java        |  402 ++++
 .../vncclient/AwtKeyboardEventToVncAdapter.java |  369 ++++
 .../vncclient/AwtMouseEventToVncAdapter.java    |   71 +
 .../main/java/vncclient/EncodingsMessage.java   |   63 +
 .../vncclient/FrameBufferUpdateRequest.java     |  127 ++
 .../vncclient/RGB888LE32PixelFormatRequest.java |   90 +
 .../src/main/java/vncclient/RfbConstants.java   |   85 +
 .../src/main/java/vncclient/VncClient.java      |  107 +
 .../src/main/java/vncclient/VncInitializer.java |  244 +++
 .../main/java/vncclient/VncMessageHandler.java  |  419 ++++
 .../java/vncclient/Vnc_3_3_Authentication.java  |  291 +++
 .../src/main/java/vncclient/Vnc_3_3_Hello.java  |  115 +
 .../rdpconsole/src/test/doc/README.txt          |   32 +
 .../rdpconsole/src/test/doc/dev-rdp-config.bat  |  126 ++
 .../rdpconsole/src/test/doc/rdp-key.pem         |   23 +
 .../src/test/java/rdpclient/MockServerTest.java |  189 ++
 setup/db/create-schema.sql                      |    8 +-
 setup/db/db/schema-421to430.sql                 |  134 +-
 .../config/opt/cloud/bin/monitor_service.sh     |   71 +
 .../debian/config/root/monitorServices.py       |  263 +++
 .../debian/vpn/opt/cloud/bin/vpn_l2tp.sh        |    8 +-
 .../component/cpu_limits/test_cpu_limits.py     |  745 -------
 .../component/cpu_limits/test_domain_limits.py  |  764 -------
 .../component/cpu_limits/test_maximum_limits.py |  377 ----
 .../component/cpu_limits/test_project_limits.py |  347 ---
 .../maint/test_egress_rules_host_maintenance.py |    2 +-
 .../component/maint/test_high_availability.py   |    2 +-
 .../maint/test_vpc_host_maintenance.py          |    2 +-
 .../memory_limits/test_domain_limits.py         |  781 -------
 .../memory_limits/test_maximum_limits.py        |  352 ---
 .../memory_limits/test_memory_limits.py         |  764 -------
 .../memory_limits/test_project_limits.py        |  350 ---
 test/integration/component/test_accounts.py     |    2 +-
 .../component/test_affinity_groups.py           |    2 +-
 test/integration/component/test_asa1000v_fw.py  |    2 +-
 test/integration/component/test_baremetal.py    |    2 +-
 .../component/test_cpu_domain_limits.py         |  764 +++++++
 test/integration/component/test_cpu_limits.py   |  745 +++++++
 .../component/test_cpu_max_limits.py            |  377 ++++
 .../component/test_cpu_project_limits.py        |  347 +++
 .../component/test_deploy_vm_userdata_reg.py    |    2 +-
 .../component/test_egress_fw_rules.py           |    4 +-
 test/integration/component/test_egress_rules.py |    2 +-
 test/integration/component/test_eip_elb.py      |   18 +-
 .../component/test_explicit_dedication.py       |    2 +-
 test/integration/component/test_haproxy.py      |    4 +-
 .../component/test_implicit_planner.py          |    2 +-
 .../integration/component/test_memory_limits.py |  764 +++++++
 .../component/test_mm_domain_limits.py          |  780 +++++++
 .../integration/component/test_mm_max_limits.py |  352 +++
 .../component/test_mm_project_limits.py         |  350 +++
 .../component/test_netscaler_configs.py         |   16 +-
 test/integration/component/test_netscaler_lb.py |   20 +-
 .../component/test_netscaler_lb_algo.py         |   32 +-
 .../component/test_netscaler_lb_sticky.py       |   20 +-
 .../component/test_netscaler_nw_off.py          |    2 +-
 .../component/test_network_offering.py          |    2 +-
 test/integration/component/test_portable_ip.py  |    6 +-
 .../component/test_project_configs.py           |    2 +-
 .../component/test_project_resources.py         |    2 +-
 .../integration/component/test_project_usage.py |    2 +-
 test/integration/component/test_projects.py     |    2 +-
 .../component/test_security_groups.py           |    6 +-
 .../component/test_snapshot_limits.py           |    2 +-
 test/integration/component/test_snapshots.py    |  158 +-
 test/integration/component/test_stopped_vm.py   |    2 +-
 .../component/test_storage_motion.py            |    2 +-
 test/integration/component/test_templates.py    |    2 +-
 test/integration/component/test_usage.py        |    2 +-
 .../component/test_vm_passwdenabled.py          |    2 +-
 test/integration/component/test_vpc_network.py  |    2 +-
 .../integration/component/test_vpc_offerings.py |    2 +-
 test/integration/component/test_vpc_routers.py  |    2 +-
 .../component/test_vpc_vm_life_cycle.py         |   19 +-
 .../component/test_vpc_vms_deployment.py        |    2 +-
 test/integration/smoke/test_affinity_groups.py  |    2 +-
 test/integration/smoke/test_loadbalance.py      |    4 +-
 test/integration/smoke/test_network.py          |   10 +-
 test/integration/smoke/test_nic.py              |    2 +-
 test/integration/smoke/test_pvlan.py            |    2 +-
 test/integration/smoke/test_resource_detail.py  |    2 +-
 test/integration/smoke/test_routers.py          |    2 +-
 test/integration/smoke/test_ssvm.py             |    2 +-
 test/integration/smoke/test_templates.py        |    2 +-
 test/integration/smoke/test_volumes.py          |    2 +-
 tools/apidoc/gen_toc.py                         |    1 +
 tools/marvin/marvin/cloudstackTestCase.py       |   14 +
 tools/marvin/marvin/codes.py                    |    2 +
 tools/marvin/marvin/integration/lib/common.py   |   17 +-
 tools/marvin/marvin/integration/lib/utils.py    |  140 +-
 tools/marvin/marvin/remoteSSHClient.py          |  108 -
 .../marvin/sandbox/demo/live/testSshDeployVM.py |    4 +-
 .../demo/simulator/testcase/libs/common.py      |    4 +-
 .../demo/simulator/testcase/libs/utils.py       |    8 +-
 .../simulator/testcase/test_vm_life_cycle.py    |    2 +-
 tools/marvin/marvin/sshClient.py                |  182 ++
 ui/css/cloudstack3.css                          |  123 +-
 ui/dictionary.jsp                               |   10 +-
 ui/index.jsp                                    |    4 +-
 ui/scripts/configuration.js                     |   21 +-
 ui/scripts/docs.js                              |   73 +
 ui/scripts/domains.js                           |   23 +
 ui/scripts/network.js                           |   40 +
 ui/scripts/sharedFunctions.js                   |   16 +-
 ui/scripts/system.js                            |  891 +++++++-
 ui/scripts/ui/widgets/multiEdit.js              |   19 +-
 ui/scripts/vpc.js                               |   10 +-
 utils/src/com/cloud/maint/Version.java          |    8 +
 utils/src/com/cloud/utils/FileUtil.java         |   22 +-
 utils/src/com/cloud/utils/db/DbProperties.java  |    5 +-
 utils/src/com/cloud/utils/db/EntityManager.java |    9 +
 utils/src/com/cloud/utils/net/NetUtils.java     |    3 +
 .../com/cloud/hypervisor/vmware/mo/HostMO.java  |    1 +
 .../vmware/mo/HypervisorHostHelper.java         |    6 +-
 .../vmware/mo/VmwareHypervisorHost.java         |    1 -
 .../mo/VmwareHypervisorHostResourceSummary.java |    9 +
 .../hypervisor/vmware/util/VmwareClient.java    |    4 +-
 .../vmware/util/VmwareGuestOsMapper.java        |    8 +
 453 files changed, 36581 insertions(+), 7097 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9dd6ff6f/ui/dictionary.jsp
----------------------------------------------------------------------
diff --cc ui/dictionary.jsp
index e2bef0f,0ccfc23..d3bfc37
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@@ -23,12 -23,8 +23,12 @@@ under the License
  </c:if>
  <fmt:setBundle basename="resources/messages"/>
  <% long now = System.currentTimeMillis(); %>
- <script language="javascript">
+ <script type="text/javascript">
  dictionary = {
 +'message.select.compute.offering': '<fmt:message key="message.select.compute.offering"
/>',
 +'message.select.disk.offering': '<fmt:message key="message.select.disk.offering" />',
 +'label.home': '<fmt:message key="label.home" />',
 +'label.use.default.language': '<fmt:message key="label.use.default.language" />',
  'label.hypervisors': '<fmt:message key="label.hypervisors" />',
  'label.home': '<fmt:message key="label.home" />',
  'label.sockets': '<fmt:message key="label.sockets" />',

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9dd6ff6f/ui/index.jsp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9dd6ff6f/ui/scripts/sharedFunctions.js
----------------------------------------------------------------------
diff --cc ui/scripts/sharedFunctions.js
index de8e693,40440df..95fc558
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@@ -45,8 -45,9 +45,7 @@@ var md5Hashed = false
  var md5HashedLogin = false;
  
  //page size for API call (e.g."listXXXXXXX&pagesize=N" )
 -var pageSize = 20;
 -//var pageSize = 1; //for testing only
 -
 +var pageSize = 30;
- 
  var rootAccountId = 1;
  
  //async action


Mime
View raw message