incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [50/50] [abbrv] git commit: refs/heads/ui-plugins - Merge branch 'master' into ui-plugins
Date Wed, 13 Feb 2013 22:04:20 GMT
Updated Branches:
  refs/heads/ui-plugins 6e02fb96c -> dfaffceba


Merge branch 'master' into ui-plugins

Conflicts:
	ui/index.jsp


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

Branch: refs/heads/ui-plugins
Commit: dfaffcebad5a06f8c9dcf9aa01428097e0111fff
Parents: 6e02fb9 8652e5f
Author: Brian Federle <brian.federle@citrix.com>
Authored: Wed Feb 13 14:03:53 2013 -0800
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Wed Feb 13 14:03:53 2013 -0800

----------------------------------------------------------------------
 LICENSE                                            |  185 ++-
 NOTICE                                             |   49 +-
 .../cloud/agent/api/CreateVMSnapshotAnswer.java    |   62 +
 .../cloud/agent/api/CreateVMSnapshotCommand.java   |   42 +
 .../api/CreateVolumeFromVMSnapshotAnswer.java      |   54 +
 .../api/CreateVolumeFromVMSnapshotCommand.java     |   88 +
 .../cloud/agent/api/DeleteVMSnapshotAnswer.java    |   49 +
 .../cloud/agent/api/DeleteVMSnapshotCommand.java   |   28 +
 .../cloud/agent/api/RevertToVMSnapshotAnswer.java  |   63 +
 .../cloud/agent/api/RevertToVMSnapshotCommand.java |   29 +
 .../com/cloud/agent/api/VMSnapshotBaseCommand.java |   74 +
 api/src/com/cloud/agent/api/VMSnapshotTO.java      |   90 +
 api/src/com/cloud/agent/api/to/VolumeTO.java       |    4 +
 api/src/com/cloud/configuration/Resource.java      |    4 +-
 api/src/com/cloud/event/EventTypes.java            |    5 +
 api/src/com/cloud/server/ResourceTag.java          |    3 +-
 api/src/com/cloud/vm/VirtualMachine.java           |    6 +-
 api/src/com/cloud/vm/snapshot/VMSnapshot.java      |  110 ++
 .../com/cloud/vm/snapshot/VMSnapshotService.java   |   48 +
 .../org/apache/cloudstack/api/ApiConstants.java    |    5 +
 .../apache/cloudstack/api/ApiConstants.java.orig   |  468 +++++
 api/src/org/apache/cloudstack/api/BaseCmd.java     |    2 +
 .../apache/cloudstack/api/ResponseGenerator.java   |    5 +-
 .../user/resource/UpdateResourceCountCmd.java      |    9 +-
 .../user/resource/UpdateResourceLimitCmd.java      |    8 +-
 .../user/vmsnapshot/CreateVMSnapshotCmd.java       |  125 ++
 .../user/vmsnapshot/DeleteVMSnapshotCmd.java       |   85 +
 .../command/user/vmsnapshot/ListVMSnapshotCmd.java |   89 +
 .../user/vmsnapshot/RevertToSnapshotCmd.java       |   92 +
 .../cloudstack/api/response/AccountResponse.java   |   42 +
 .../api/response/ResourceCountResponse.java        |    2 +-
 .../api/response/ResourceLimitResponse.java        |    2 +-
 .../api/response/VMSnapshotResponse.java           |  220 +++
 .../com/cloud/bridge/service/EC2RestServlet.java   |   74 +-
 .../cloud/bridge/service/EC2SoapServiceImpl.java   |   63 +-
 .../service/core/ec2/EC2AvailabilityZone.java      |   55 +
 .../core/ec2/EC2AvailabilityZonesFilterSet.java    |   21 +-
 .../ec2/EC2DescribeAvailabilityZonesResponse.java  |   36 +-
 .../cloud/bridge/service/core/ec2/EC2Engine.java   |  102 +-
 .../bridge/service/core/ec2/EC2GroupFilterSet.java |   22 +-
 .../bridge/service/core/ec2/EC2StopInstances.java  |    9 +
 .../cloud/bridge/service/core/ec2/EC2Volume.java   |   16 +
 .../service/core/ec2/EC2VolumeFilterSet.java       |    5 +-
 awsapi/src/com/cloud/stack/CloudStackClient.java   |    3 +-
 .../WEB-INF/classes/resources/messages.properties  |   14 +
 client/pom.xml                                     |    2 +-
 client/tomcatconf/commands.properties.in           |    6 +
 client/tomcatconf/componentContext.xml.in          |    4 -
 console-proxy/bindir/cloud-setup-console-proxy.in  |  220 ---
 console-proxy/certs/localhost.crt                  |   22 -
 console-proxy/certs/localhost.key                  |   27 -
 console-proxy/certs/realhostip.crt                 |   31 -
 console-proxy/certs/realhostip.csr                 |   15 -
 console-proxy/certs/realhostip.key                 |   24 -
 console-proxy/certs/realhostip.keystore            |  Bin 8690 -> 0 bytes
 console-proxy/conf.dom0/agent.properties.in        |   46 -
 console-proxy/conf.dom0/consoleproxy.properties.in |   23 -
 console-proxy/conf.dom0/log4j-cloud.xml.in         |  101 -
 console-proxy/conf/agent.properties                |   19 -
 console-proxy/conf/consoleproxy.properties         |   23 -
 console-proxy/conf/log4j-cloud.xml                 |  102 -
 console-proxy/css/ajaxviewer.css                   |  144 --
 console-proxy/css/logger.css                       |  139 --
 .../SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in  |   98 -
 .../SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in  |   98 -
 .../SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in  |   98 -
 .../SYSCONFDIR/init.d/cloud-console-proxy.in       |  112 --
 console-proxy/images/back.gif                      |  Bin 149 -> 0 bytes
 console-proxy/images/bright-green.png              |  Bin 3903 -> 0 bytes
 console-proxy/images/cad.gif                       |  Bin 918 -> 0 bytes
 console-proxy/images/cannotconnect.jpg             |  Bin 1810 -> 0 bytes
 console-proxy/images/clr_button.gif                |  Bin 1274 -> 0 bytes
 console-proxy/images/clr_button_hover.gif          |  Bin 437 -> 0 bytes
 console-proxy/images/dot.cur                       |  Bin 326 -> 0 bytes
 console-proxy/images/gray-green.png                |  Bin 3833 -> 0 bytes
 console-proxy/images/grid_headerbg.gif             |  Bin 196 -> 0 bytes
 console-proxy/images/left.png                      |  Bin 3024 -> 0 bytes
 console-proxy/images/minimize_button.gif           |  Bin 634 -> 0 bytes
 console-proxy/images/minimize_button_hover.gif     |  Bin 227 -> 0 bytes
 console-proxy/images/notready.jpg                  |  Bin 1827 -> 0 bytes
 console-proxy/images/play_button.gif               |  Bin 657 -> 0 bytes
 console-proxy/images/play_button_hover.gif         |  Bin 243 -> 0 bytes
 console-proxy/images/right.png                     |  Bin 3131 -> 0 bytes
 console-proxy/images/right2.png                    |  Bin 3156 -> 0 bytes
 console-proxy/images/shrink_button.gif             |  Bin 655 -> 0 bytes
 console-proxy/images/shrink_button_hover.gif       |  Bin 243 -> 0 bytes
 console-proxy/images/stop_button.gif               |  Bin 649 -> 0 bytes
 console-proxy/images/stop_button_hover.gif         |  Bin 231 -> 0 bytes
 console-proxy/images/winlog.png                    |  Bin 2629 -> 0 bytes
 console-proxy/js/ajaxkeys.js                       |   77 -
 console-proxy/js/ajaxviewer.js                     | 1444 ---------------
 console-proxy/js/cloud.logger.js                   |  338 ----
 console-proxy/js/handler.js                        |   72 -
 console-proxy/js/jquery.js                         |   19 -
 console-proxy/libexec/console-proxy-runner.in      |   90 -
 console-proxy/pom.xml                              |  246 ---
 console-proxy/scripts/_run.sh                      |   63 -
 console-proxy/scripts/config_auth.sh               |   69 -
 console-proxy/scripts/config_ssl.sh                |  174 --
 console-proxy/scripts/ipfirewall.sh                |   50 -
 console-proxy/scripts/run-proxy.sh                 |   48 -
 console-proxy/scripts/run.bat                      |   18 -
 console-proxy/scripts/run.sh                       |   45 -
 console-proxy/scripts/ssvm-check.sh                |  136 --
 .../com/cloud/consoleproxy/AjaxFIFOImageCache.java |   83 -
 .../consoleproxy/AuthenticationException.java      |   33 -
 .../src/com/cloud/consoleproxy/ConsoleProxy.java   |  499 -----
 .../consoleproxy/ConsoleProxyAjaxHandler.java      |  406 ----
 .../consoleproxy/ConsoleProxyAjaxImageHandler.java |  159 --
 .../ConsoleProxyAuthenticationResult.java          |   81 -
 .../ConsoleProxyBaseServerFactoryImpl.java         |   48 -
 .../com/cloud/consoleproxy/ConsoleProxyClient.java |   69 -
 .../cloud/consoleproxy/ConsoleProxyClientBase.java |  457 -----
 .../consoleproxy/ConsoleProxyClientListener.java   |   25 -
 .../consoleproxy/ConsoleProxyClientParam.java      |  110 --
 .../ConsoleProxyClientStatsCollector.java          |   88 -
 .../cloud/consoleproxy/ConsoleProxyCmdHandler.java |   70 -
 .../cloud/consoleproxy/ConsoleProxyGCThread.java   |  109 --
 .../ConsoleProxyHttpHandlerHelper.java             |   74 -
 .../consoleproxy/ConsoleProxyLoggerFactory.java    |   89 -
 .../cloud/consoleproxy/ConsoleProxyMonitor.java    |  153 --
 .../ConsoleProxyPasswordBasedEncryptor.java        |  142 --
 .../consoleproxy/ConsoleProxyResourceHandler.java  |  181 --
 .../ConsoleProxySecureServerFactoryImpl.java       |  145 --
 .../consoleproxy/ConsoleProxyServerFactory.java    |   29 -
 .../consoleproxy/ConsoleProxyThumbnailHandler.java |  212 ---
 .../cloud/consoleproxy/ConsoleProxyVncClient.java  |  235 ---
 .../src/com/cloud/consoleproxy/InputEventType.java |   58 -
 .../cloud/consoleproxy/util/ITileScanListener.java |   25 -
 .../com/cloud/consoleproxy/util/ImageHelper.java   |   32 -
 .../src/com/cloud/consoleproxy/util/Logger.java    |  223 ---
 .../com/cloud/consoleproxy/util/LoggerFactory.java |   21 -
 .../src/com/cloud/consoleproxy/util/RawHTTP.java   |  249 ---
 .../src/com/cloud/consoleproxy/util/Region.java    |   90 -
 .../cloud/consoleproxy/util/RegionClassifier.java  |   58 -
 .../src/com/cloud/consoleproxy/util/TileInfo.java  |   55 -
 .../com/cloud/consoleproxy/util/TileTracker.java   |  269 ---
 .../consoleproxy/vnc/BufferedImageCanvas.java      |  150 --
 .../cloud/consoleproxy/vnc/FrameBufferCanvas.java  |   30 -
 .../vnc/FrameBufferUpdateListener.java             |   26 -
 .../vnc/PaintNotificationListener.java             |   27 -
 .../com/cloud/consoleproxy/vnc/RfbConstants.java   |   82 -
 .../src/com/cloud/consoleproxy/vnc/VncClient.java  |  451 -----
 .../consoleproxy/vnc/VncClientPacketSender.java    |  258 ---
 .../consoleproxy/vnc/VncScreenDescription.java     |   89 -
 .../consoleproxy/vnc/VncServerPacketReceiver.java  |  123 --
 .../vnc/packet/client/ClientPacket.java            |   26 -
 .../client/FramebufferUpdateRequestPacket.java     |   53 -
 .../vnc/packet/client/KeyboardEventPacket.java     |   42 -
 .../vnc/packet/client/MouseEventPacket.java        |   43 -
 .../vnc/packet/client/SetEncodingsPacket.java      |   45 -
 .../vnc/packet/client/SetPixelFormatPacket.java    |   75 -
 .../vnc/packet/server/AbstractRect.java            |   53 -
 .../consoleproxy/vnc/packet/server/CopyRect.java   |   39 -
 .../server/FrameBufferSizeChangeRequest.java       |   39 -
 .../vnc/packet/server/FramebufferUpdatePacket.java |  102 -
 .../consoleproxy/vnc/packet/server/RawRect.java    |   75 -
 .../cloud/consoleproxy/vnc/packet/server/Rect.java |   33 -
 .../vnc/packet/server/ServerCutText.java           |   49 -
 console-proxy/systemvm-descriptor.xml              |  113 --
 console-proxy/ui/viewer-bad-sid.ftl                |   29 -
 console-proxy/ui/viewer-connect-failed.ftl         |   29 -
 console-proxy/ui/viewer-update.ftl                 |   24 -
 console-proxy/ui/viewer.ftl                        |   60 -
 console-proxy/vm-script/vmops                      |  119 --
 developer/pom.xml                                  |    4 +-
 .../management-server-install-db-external.xml      |    7 +-
 docs/en-US/management-server-install-db-local.xml  |    9 +-
 .../en-US/management-server-install-multi-node.xml |    4 +-
 packaging/centos63/cloud.spec                      |   13 +-
 packaging/centos63/replace.properties              |    3 +-
 patches/systemvm/debian/config/root/func.sh        |    6 +-
 .../manager/BareMetalTemplateAdapter.java          |    5 +
 .../vmware/manager/VmwareStorageManager.java       |   16 +-
 .../vmware/manager/VmwareStorageManagerImpl.java   |  332 +++-
 .../hypervisor/vmware/resource/VmwareResource.java |   50 +-
 .../xen/resource/CitrixResourceBase.java           |  304 +++-
 pom.xml                                            |   18 +-
 python/lib/cloudutils/serviceConfigServer.py       |    2 +-
 scripts/vm/hypervisor/kvm/setup_agent.sh           |   12 +-
 scripts/vm/hypervisor/xenserver/vmopsSnapshot      |   29 +-
 server/src/com/cloud/api/ApiDBUtils.java           |   12 +-
 server/src/com/cloud/api/ApiResponseHelper.java    |   29 +-
 .../cloud/api/query/dao/AccountJoinDaoImpl.java    |   18 +
 .../src/com/cloud/api/query/vo/AccountJoinVO.java  |   54 +-
 .../cloud/baremetal/BareMetalTemplateAdapter.java  |    7 +-
 .../cloud/baremetal/BareMetalVmManagerImpl.java    |   10 +-
 .../com/cloud/capacity/CapacityManagerImpl.java    |   43 +-
 server/src/com/cloud/configuration/Config.java     |   19 +-
 .../kvm/discoverer/KvmServerDiscoverer.java        |    2 +-
 .../src/com/cloud/network/NetworkManagerImpl.java  |    9 +-
 server/src/com/cloud/network/NetworkModelImpl.java |   17 +-
 .../src/com/cloud/network/NetworkServiceImpl.java  |   12 +
 .../network/firewall/FirewallManagerImpl.java      |   21 +
 .../network/lb/LoadBalancingRulesManagerImpl.java  |    5 +
 .../com/cloud/network/rules/RulesManagerImpl.java  |   25 +-
 .../com/cloud/resource/ResourceManagerImpl.java    |    4 +-
 .../resourcelimit/ResourceLimitManagerImpl.java    |   69 +-
 .../src/com/cloud/server/ManagementServerImpl.java |    8 +
 .../storage/snapshot/SnapshotManagerImpl.java      |   14 +-
 .../com/cloud/tags/TaggedResourceManagerImpl.java  |    4 +
 .../cloud/template/HyervisorTemplateAdapter.java   |    5 +
 server/src/com/cloud/user/AccountManagerImpl.java  |    2 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java     |  156 ++-
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |   65 +-
 .../com/cloud/vm/snapshot/VMSnapshotManager.java   |   47 +
 .../cloud/vm/snapshot/VMSnapshotManagerImpl.java   |  833 +++++++++
 .../com/cloud/vm/snapshot/dao/VMSnapshotDao.java   |   39 +
 .../cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java   |  161 ++
 .../ResourceLimitManagerImplTest.java              |   92 +
 .../cloud/vm/snapshot/VMSnapshotManagerTest.java   |  186 ++
 .../cloud/vpc/MockResourceLimitManagerImpl.java    |   17 +-
 services/console-proxy/plugin/pom.xml              |   35 +
 services/console-proxy/pom.xml                     |   37 +
 .../server/bindir/cloud-setup-console-proxy.in     |  220 +++
 services/console-proxy/server/certs/localhost.crt  |   22 +
 services/console-proxy/server/certs/localhost.key  |   27 +
 services/console-proxy/server/certs/realhostip.crt |   31 +
 services/console-proxy/server/certs/realhostip.csr |   15 +
 services/console-proxy/server/certs/realhostip.key |   24 +
 .../console-proxy/server/certs/realhostip.keystore |  Bin 0 -> 8690 bytes
 .../server/conf.dom0/agent.properties.in           |   46 +
 .../server/conf.dom0/consoleproxy.properties.in    |   23 +
 .../server/conf.dom0/log4j-cloud.xml.in            |  101 +
 .../console-proxy/server/conf/agent.properties     |   19 +
 .../server/conf/consoleproxy.properties            |   23 +
 services/console-proxy/server/conf/log4j-cloud.xml |  102 +
 services/console-proxy/server/css/ajaxviewer.css   |  144 ++
 services/console-proxy/server/css/logger.css       |  139 ++
 .../SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in  |   98 +
 .../SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in  |   98 +
 .../SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in  |   98 +
 .../SYSCONFDIR/init.d/cloud-console-proxy.in       |  112 ++
 services/console-proxy/server/images/back.gif      |  Bin 0 -> 149 bytes
 .../console-proxy/server/images/bright-green.png   |  Bin 0 -> 3903 bytes
 services/console-proxy/server/images/cad.gif       |  Bin 0 -> 918 bytes
 .../console-proxy/server/images/cannotconnect.jpg  |  Bin 0 -> 1810 bytes
 .../console-proxy/server/images/clr_button.gif     |  Bin 0 -> 1274 bytes
 .../server/images/clr_button_hover.gif             |  Bin 0 -> 437 bytes
 services/console-proxy/server/images/dot.cur       |  Bin 0 -> 326 bytes
 .../console-proxy/server/images/gray-green.png     |  Bin 0 -> 3833 bytes
 .../console-proxy/server/images/grid_headerbg.gif  |  Bin 0 -> 196 bytes
 services/console-proxy/server/images/left.png      |  Bin 0 -> 3024 bytes
 .../server/images/minimize_button.gif              |  Bin 0 -> 634 bytes
 .../server/images/minimize_button_hover.gif        |  Bin 0 -> 227 bytes
 services/console-proxy/server/images/notready.jpg  |  Bin 0 -> 1827 bytes
 .../console-proxy/server/images/play_button.gif    |  Bin 0 -> 657 bytes
 .../server/images/play_button_hover.gif            |  Bin 0 -> 243 bytes
 services/console-proxy/server/images/right.png     |  Bin 0 -> 3131 bytes
 services/console-proxy/server/images/right2.png    |  Bin 0 -> 3156 bytes
 .../console-proxy/server/images/shrink_button.gif  |  Bin 0 -> 655 bytes
 .../server/images/shrink_button_hover.gif          |  Bin 0 -> 243 bytes
 .../console-proxy/server/images/stop_button.gif    |  Bin 0 -> 649 bytes
 .../server/images/stop_button_hover.gif            |  Bin 0 -> 231 bytes
 services/console-proxy/server/images/winlog.png    |  Bin 0 -> 2629 bytes
 services/console-proxy/server/js/ajaxkeys.js       |   77 +
 services/console-proxy/server/js/ajaxviewer.js     | 1444 +++++++++++++++
 services/console-proxy/server/js/cloud.logger.js   |  338 ++++
 services/console-proxy/server/js/handler.js        |   72 +
 services/console-proxy/server/js/jquery.js         |   19 +
 .../server/libexec/console-proxy-runner.in         |   90 +
 services/console-proxy/server/pom.xml              |  247 +++
 services/console-proxy/server/scripts/_run.sh      |   63 +
 .../console-proxy/server/scripts/config_auth.sh    |   69 +
 .../console-proxy/server/scripts/config_ssl.sh     |  174 ++
 .../console-proxy/server/scripts/ipfirewall.sh     |   50 +
 services/console-proxy/server/scripts/run-proxy.sh |   48 +
 services/console-proxy/server/scripts/run.bat      |   18 +
 services/console-proxy/server/scripts/run.sh       |   45 +
 .../console-proxy/server/scripts/ssvm-check.sh     |  136 ++
 .../com/cloud/consoleproxy/AjaxFIFOImageCache.java |   83 +
 .../consoleproxy/AuthenticationException.java      |   33 +
 .../src/com/cloud/consoleproxy/ConsoleProxy.java   |  499 +++++
 .../consoleproxy/ConsoleProxyAjaxHandler.java      |  406 ++++
 .../consoleproxy/ConsoleProxyAjaxImageHandler.java |  159 ++
 .../ConsoleProxyAuthenticationResult.java          |   81 +
 .../ConsoleProxyBaseServerFactoryImpl.java         |   48 +
 .../com/cloud/consoleproxy/ConsoleProxyClient.java |   69 +
 .../cloud/consoleproxy/ConsoleProxyClientBase.java |  457 +++++
 .../consoleproxy/ConsoleProxyClientListener.java   |   25 +
 .../consoleproxy/ConsoleProxyClientParam.java      |  110 ++
 .../ConsoleProxyClientStatsCollector.java          |   88 +
 .../cloud/consoleproxy/ConsoleProxyCmdHandler.java |   70 +
 .../cloud/consoleproxy/ConsoleProxyGCThread.java   |  109 ++
 .../ConsoleProxyHttpHandlerHelper.java             |   74 +
 .../consoleproxy/ConsoleProxyLoggerFactory.java    |   89 +
 .../cloud/consoleproxy/ConsoleProxyMonitor.java    |  153 ++
 .../ConsoleProxyPasswordBasedEncryptor.java        |  142 ++
 .../consoleproxy/ConsoleProxyResourceHandler.java  |  181 ++
 .../ConsoleProxySecureServerFactoryImpl.java       |  145 ++
 .../consoleproxy/ConsoleProxyServerFactory.java    |   29 +
 .../consoleproxy/ConsoleProxyThumbnailHandler.java |  212 +++
 .../cloud/consoleproxy/ConsoleProxyVncClient.java  |  235 +++
 .../src/com/cloud/consoleproxy/InputEventType.java |   58 +
 .../cloud/consoleproxy/util/ITileScanListener.java |   25 +
 .../com/cloud/consoleproxy/util/ImageHelper.java   |   32 +
 .../src/com/cloud/consoleproxy/util/Logger.java    |  223 +++
 .../com/cloud/consoleproxy/util/LoggerFactory.java |   21 +
 .../src/com/cloud/consoleproxy/util/RawHTTP.java   |  249 +++
 .../src/com/cloud/consoleproxy/util/Region.java    |   90 +
 .../cloud/consoleproxy/util/RegionClassifier.java  |   58 +
 .../src/com/cloud/consoleproxy/util/TileInfo.java  |   55 +
 .../com/cloud/consoleproxy/util/TileTracker.java   |  269 +++
 .../consoleproxy/vnc/BufferedImageCanvas.java      |  150 ++
 .../cloud/consoleproxy/vnc/FrameBufferCanvas.java  |   30 +
 .../vnc/FrameBufferUpdateListener.java             |   26 +
 .../vnc/PaintNotificationListener.java             |   27 +
 .../com/cloud/consoleproxy/vnc/RfbConstants.java   |   82 +
 .../src/com/cloud/consoleproxy/vnc/VncClient.java  |  451 +++++
 .../consoleproxy/vnc/VncClientPacketSender.java    |  258 +++
 .../consoleproxy/vnc/VncScreenDescription.java     |   89 +
 .../consoleproxy/vnc/VncServerPacketReceiver.java  |  123 ++
 .../vnc/packet/client/ClientPacket.java            |   26 +
 .../client/FramebufferUpdateRequestPacket.java     |   53 +
 .../vnc/packet/client/KeyboardEventPacket.java     |   42 +
 .../vnc/packet/client/MouseEventPacket.java        |   43 +
 .../vnc/packet/client/SetEncodingsPacket.java      |   45 +
 .../vnc/packet/client/SetPixelFormatPacket.java    |   75 +
 .../vnc/packet/server/AbstractRect.java            |   53 +
 .../consoleproxy/vnc/packet/server/CopyRect.java   |   39 +
 .../server/FrameBufferSizeChangeRequest.java       |   39 +
 .../vnc/packet/server/FramebufferUpdatePacket.java |  102 +
 .../consoleproxy/vnc/packet/server/RawRect.java    |   75 +
 .../cloud/consoleproxy/vnc/packet/server/Rect.java |   33 +
 .../vnc/packet/server/ServerCutText.java           |   49 +
 .../console-proxy/server/systemvm-descriptor.xml   |  113 ++
 .../console-proxy/server/ui/viewer-bad-sid.ftl     |   29 +
 .../server/ui/viewer-connect-failed.ftl            |   29 +
 services/console-proxy/server/ui/viewer-update.ftl |   24 +
 services/console-proxy/server/ui/viewer.ftl        |   60 +
 services/console-proxy/server/vm-script/vmops      |  119 ++
 services/pom.xml                                   |   36 +
 setup/db/create-schema-view.sql                    |   16 +
 setup/db/create-schema.sql                         |   30 +
 setup/db/db/schema-40to410.sql                     |   24 +
 setup/db/server-setup.xml                          |    2 +-
 .../appliance/definitions/systemvmtemplate/LICENSE |   21 -
 .../appliance/definitions/systemvmtemplate/base.sh |   18 -
 .../definitions/systemvmtemplate/cleanup.sh        |   20 +-
 .../systemvmtemplate/cloudstack-packages.sh        |  152 --
 .../definitions/systemvmtemplate/definition.rb     |   19 +-
 .../definitions/systemvmtemplate/postinstall.sh    |  161 +-
 .../definitions/systemvmtemplate/preseed.cfg       |   17 -
 .../definitions/systemvmtemplate/zerodisk.sh       |   20 +-
 tools/devcloud-kvm/pom.xml                         |    2 +-
 tools/devcloud/pom.xml                             |    2 +-
 .../src/deps/boxes/basebox-build/definition.rb     |   17 -
 .../src/deps/boxes/basebox-build/preseed.cfg       |   17 -
 tools/whisker/descriptor.xml                       |   31 +-
 ui/css/cloudstack3.css                             |    2 +-
 ui/dictionary.jsp                                  |   12 +-
 ui/index.jsp                                       |    4 +-
 ui/scripts/autoscaler.js                           |   22 +-
 ui/scripts/cloudStack.js                           |   16 +-
 ui/scripts/instances.js                            |  259 +++-
 ui/scripts/sharedFunctions.js                      |    1 +
 ui/scripts/system.js                               |   24 +-
 ui/scripts/ui-custom/physicalResources.js          |    2 +-
 ui/scripts/ui-custom/zoneWizard.js                 |   13 +-
 ui/scripts/ui/widgets/detailView.js                |   13 +-
 ui/scripts/ui/widgets/notifications.js             |    4 +-
 ui/scripts/vm_snapshots.js                         |  196 ++
 ui/scripts/zoneWizard.js                           |   56 +-
 usage/pom.xml                                      |    4 +-
 .../src/com/cloud/hypervisor/vmware/mo/HostMO.java |   18 +
 .../hypervisor/vmware/mo/VirtualMachineMO.java     |   20 +
 366 files changed, 16993 insertions(+), 11913 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dfaffceb/ui/css/cloudstack3.css
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dfaffceb/ui/dictionary.jsp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dfaffceb/ui/index.jsp
----------------------------------------------------------------------
diff --cc ui/index.jsp
index b41ebb1,8af1478..462ddaf
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@@ -1675,12 -1674,8 +1675,12 @@@ under the License
      <script type="text/javascript" src="scripts/system.js?t=<%=now%>"></script>
      <script type="text/javascript" src="scripts/domains.js?t=<%=now%>"></script>
      <script type="text/javascript" src="scripts/docs.js?t=<%=now%>"></script>
 -    <script type="text/javascript" src="scripts/domains.js?t=<%=now%>"></script>
  
+     <script type="text/javascript" src="scripts/vm_snapshots.js?t=<%=now%>"></script>
 
 +
-     <script type="text/javascript" src="scripts/ui-custom/plugins.js?t=<%=now%>"></script>
-     
 +    <!-- Plugins -->
++    <script type="text/javascript" src="scripts/ui-custom/plugins.js?t=<%=now%>"></script>
 +    <script type="text/javascript" src="plugins/plugins.js?t=<%=now%>"></script>
 +    <script type="text/javascript" src="scripts/plugins.js?t=<%=now%>"></script>
    </body>
  </html>
  <jsp:include page="dictionary.jsp" />

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dfaffceb/ui/scripts/cloudStack.js
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dfaffceb/ui/scripts/ui/widgets/detailView.js
----------------------------------------------------------------------


Mime
View raw message