Tomas Jelinek has submitted this change and it was merged. Change subject: webadmin: Web consoles warnings ...................................................................... webadmin: Web consoles warnings Patternfly alert popup is in Spice HTML5 and noVNC if there is a problem to connect to the websocket proxy server. Warnings suggests to check that: * websocket proxy is running, * firewalls ares set * https is used (only for noVNC, Spice HTML5 can work with http) * app is accessed using predefined hostname (i.e. it doesn't work with e.g. numeric ip address as a hostname) * packages spice-html5/novnc are installed Both Spice HTML5 and noVNC now works with http. Internally it uses 'wss'. Previously it tried to use 'ws' with 'http' however websocket proxy server doesn't support 'ws'. novnc-main.html and spicehtml5-main.html were changed to JSP to allow includes to allow sharing html template. Encoding of *.jsp was set to UTF-8 in 'services' module. BrandingServlet was enabled for services module to get access to Patternfly resources. Change-Id: Ifdda870e13d77b24b95fe7109de377d560a0a86a Bug-Url: https://bugzilla.redhat.com/1036221 Signed-off-by: Jakub Niedermertl <jniederm@redhat.com> --- A backend/manager/modules/services/src/main/webapp/WEB-INF/warning-template.html M backend/manager/modules/services/src/main/webapp/WEB-INF/web.xml A backend/manager/modules/services/src/main/webapp/html-console-common.css A backend/manager/modules/services/src/main/webapp/html-console-common.js D backend/manager/modules/services/src/main/webapp/novnc-main.html A backend/manager/modules/services/src/main/webapp/novnc-main.jsp D backend/manager/modules/services/src/main/webapp/spicehtml5-main.html A backend/manager/modules/services/src/main/webapp/spicehtml5-main.jsp M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/NoVncImpl.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceHtml5Impl.java 10 files changed, 604 insertions(+), 430 deletions(-) Approvals: Tomas Jelinek: Looks good to me, approved Jakub Niedermertl: Verified Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/61791 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifdda870e13d77b24b95fe7109de377d560a0a86a Gerrit-PatchSet: 9 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Jakub Niedermertl <jniederm@redhat.com> Gerrit-Reviewer: Jakub Niedermertl <jniederm@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Betak <mbetak@redhat.com> Gerrit-Reviewer: Tomas Jelinek <tjelinek@redhat.com> Gerrit-Reviewer: Vojtech Szocs <vszocs@redhat.com> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org>