Change in ovirt-engine[master]: engine: Integrate SPICE-HTML5 client
tjelinek at redhat.com
tjelinek at redhat.com
Wed Jul 10 13:20:33 UTC 2013
Tomas Jelinek has submitted this change and it was merged.
Change subject: engine: Integrate SPICE-HTML5 client
......................................................................
engine: Integrate SPICE-HTML5 client
This patch integrates SPICE-HTML5 client in the engine.
It makes use of the websocket proxy integrated in I44e9870b.
Invocation by this client can be enabled in the console popup. For this
to be enabled, the websocket proxy must be set in the engine.
Moreover this patch adds parameter ssl_target to the ticket which is
passed to the proxy. This parameter is necessary for telling the proxy
that the (SPICE) endpoint uses ssl. The format of the ticket has changed
from positional style to encoded json.
Change-Id: I490cb57f5d23a7a763807d3bee00ea0e4c032338
Signed-off-by: Frantisek Kobzik <fkobzik at redhat.com>
---
M backend/manager/modules/root/src/main/webapp/WEB-INF/web.xml
M backend/manager/modules/root/src/main/webapp/ovirt-engine-novnc-main.html
A backend/manager/modules/root/src/main/webapp/ovirt-engine-spicehtml5-main.html
M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/popup/ConsolePopupPresenterWidget.java
M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/NoVncImpl.java
A frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceHtml5Impl.java
M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/UiCommonDefaultTypeResolver.java
A frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/WebClientConsoleInvoker.java
A frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/WebsocketProxyConfig.java
M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/ConsolePopupView.java
M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/ConsolePopupView.ui.xml
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java
A frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ISpiceHtml5.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java
M packaging/conf/engine.conf.defaults.in
M packaging/conf/ovirt-engine-proxy.conf.v2.in
M packaging/services/ovirt-websocket-proxy.py
18 files changed, 456 insertions(+), 153 deletions(-)
Approvals:
Alon Bar-Lev: Looks good to me, but someone else must approve
Tomas Jelinek: Looks good to me, approved
Frank Kobzik: Verified
--
To view, visit http://gerrit.ovirt.org/15257
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I490cb57f5d23a7a763807d3bee00ea0e4c032338
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Frank Kobzik <fkobzik at redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl at redhat.com>
Gerrit-Reviewer: Frank Kobzik <fkobzik at redhat.com>
Gerrit-Reviewer: Itamar Heim <iheim at redhat.com>
Gerrit-Reviewer: Tomas Jelinek <tjelinek at redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
More information about the Engine-commits
mailing list