Michal Skrivanek has posted comments on this change.
Change subject: engine: [WIP] Integrate noVNC support
......................................................................
Patch Set 5: Looks good to me, but someone else must approve
(7 inline comments)
....................................................
File backend/manager/modules/root/src/main/webapp/WEB-INF/web.xml
Line 81: </init-param>
Line 82: </servlet>
Line 83: <servlet-mapping>
Line 84: <servlet-name>novnc</servlet-name>
Line 85: <url-pattern>/novnc/*</url-pattern>
pls check with Alon regarding common /ovirt-engine/ URIs
Line 86: </servlet-mapping>
Line 87:
Line 88: <!-- SpiceX.cab -->
Line 89: <servlet>
....................................................
File
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/NoVncImpl.java
Line 63:
Line 64: Frontend.RunQuery(VdcQueryType.SignString, new
SignStringParameters(createVncData()), signCallback); //$NON-NLS-1$
Line 65: }
Line 66:
Line 67: private native void invokeClientNative()/*-{
?
Line 68: if
([email protected]::isClientUnsupportedExplorer()())
{
Line 69: alert("NoVnc console is not supported on Internet Explorer
< 10");
Line 70: }
Line 71:
Line 129: * Holder for ws-proxy related configuration.
Line 130: */
Line 131: private class NoVncProxyConfig {
Line 132: private final String configValue;
Line 133: private static final String proxyPortDefault = "6080";
//$NON-NLS-1$
don't we rely on system wide conf file so this should never be used? I'd rather
throw an error instead of keeping defaults in multiple places
Line 134:
Line 135: private static final String HOST = "Host";//$NON-NLS-1$
Line 136: private static final String ENGINE = "Engine";//$NON-NLS-1$
Line 137:
....................................................
File
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java
Line 384: protected abstract String clientPlatformType();
Line 385:
Line 386: protected abstract void onUpdateDocumentationBaseURL();
Line 387:
Line 388:
newline?
Line 389: public boolean isSpiceProxyDefined() {
Line 390: String spiceProxy = (String)
AsyncDataProvider.getConfigValuePreConverted(ConfigurationValues.SpiceProxyDefault);
Line 391: return spiceProxy != null && !"".equals(spiceProxy);
//$NON-NLS-1$
Line 392:
....................................................
File
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VncConsoleModel.java
Line 50:
Line 51: // String noVncConfig = (String)
AsyncDataProvider.getConfigValuePreConverted(ConfigurationValues.NoVncProxy);
Line 52: // this.vncImpl = StringHelper.isNullOrEmpty(noVncConfig) ||
noVncConfig.equals("Off") ? // $NON-NLS-1$
Line 53: // (IVnc)
TypeResolver.getInstance().resolve(IVncNative.class) :
Line 54: // (IVnc) TypeResolver.getInstance().resolve(INoVnc.class);
remove
Line 55: this.vncImpl =
Line 56: (IVnc) TypeResolver.getInstance().resolve(INoVnc.class);
Line 57: }
Line 58:
....................................................
File Makefile
Line 70: PKG_SYSCONF_DIR=$(SYSCONF_DIR)/$(ENGINE_NAME)
Line 71: PKG_PKI_DIR=$(SYSCONF_DIR)/pki/$(ENGINE_NAME)
Line 72: PKG_DOC_DIR=$(DOC_DIR)/$(ENGINE_NAME)
Line 73: PKG_EAR_DIR=$(DATA_DIR)/engine.ear
Line 74: WEBROOT_JBOSS_DIR=$(PKG_EAR_DIR)/root.war
I don't think we do. Please remove
Line 75: PKG_JBOSS_MODULES=$(DATA_DIR)/modules
Line 76: PKG_CACHE_DIR=$(LOCALSTATE_DIR)/cache/$(ENGINE_NAME)
Line 77: PKG_LOG_DIR=$(LOCALSTATE_DIR)/log/$(ENGINE_NAME)
Line 78: PKG_TMP_DIR=$(LOCALSTATE_DIR)/tmp/$(ENGINE_NAME)
....................................................
File packaging/services/ovirt-websocket-proxy.sysv.in
Line 14: # Source function library.
Line 15: . /etc/rc.d/init.d/functions
Line 16:
Line 17: NAME="ovirt-websocket-proxy"
Line 18: PROG="oVirt Engine noVNC proxy"
should be websocket proxy no?
Line 19:
Line 20: [ -f "/etc/sysconfig/${NAME}" ] && . "/etc/sysconfig/${NAME}"
Line 21:
Line 22: RETVAL=0
--
To view, visit http://gerrit.ovirt.org/13931
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I44e9870b88537360a1886e89c08f18865eae2ef0
Gerrit-PatchSet: 5
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Frank Kobzik <[email protected]>
Gerrit-Reviewer: Alon Bar-Lev <[email protected]>
Gerrit-Reviewer: Barak Azulay <[email protected]>
Gerrit-Reviewer: Frank Kobzik <[email protected]>
Gerrit-Reviewer: Itamar Heim <[email protected]>
Gerrit-Reviewer: Martin Beták <[email protected]>
Gerrit-Reviewer: Michal Skrivanek <[email protected]>
Gerrit-Reviewer: Tomas Jelinek <[email protected]>
Gerrit-Reviewer: Vojtech Szocs <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
