Frank Kobzik has uploaded a new change for review.
Change subject: frontend: minor SPICE cleanup
......................................................................
frontend: minor SPICE cleanup
This patch removes confusing code that acts like it's responsible for
installing SPICE plugin. In 3.y era we actually don't support this (on
windows, the plugin installation is handled internally by activex, on
Linux we don't support plugin installation at all.).
Change-Id: Ib3af00d6eba93756db881229edd112085f217260
Signed-off-by: Frantisek Kobzik <fkob...@redhat.com>
---
M
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/SpiceNativeImpl.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpicePluginImpl.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ISpice.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java
5 files changed, 3 insertions(+), 71 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/32/27132/1
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceHtml5Impl.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceHtml5Impl.java
index 180ecee..e802975 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceHtml5Impl.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceHtml5Impl.java
@@ -25,11 +25,4 @@
invoker.invokeClient();
}
- @Override
- public void install() { }
-
- @Override
- public boolean getIsInstalled() {
- return true;
- }
}
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceNativeImpl.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceNativeImpl.java
index fc7f7bf..8d72378 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceNativeImpl.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceNativeImpl.java
@@ -11,11 +11,6 @@
}
@Override
- public boolean getIsInstalled() {
- return true;
- }
-
- @Override
public void connect() {
StringBuilder configBuilder = new StringBuilder("[virt-viewer]");
//$NON-NLS-1$
@@ -96,10 +91,6 @@
return (sslChanels == null)
? "" //$NON-NLS-1$
: sslChanels.replace(',', ';');
- }
-
- @Override
- public void install() {
}
}
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpicePluginImpl.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpicePluginImpl.java
index b9d4b4e..b0dc38d 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpicePluginImpl.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpicePluginImpl.java
@@ -395,45 +395,4 @@
}
}-*/;
- @Override
- public void install() {
- logger.finer("Spice must be installed ahead..."); //$NON-NLS-1$
- installNatively();
- }
-
- public native void installNatively() /*-{
- alert("Spice must be already
installed!");
- }-*/;
-
- @Override
- public boolean getIsInstalled() {
- boolean result = getIsInstalledNative();
- logger.finer("Determining whether spice is installed [" + result +
"]"); //$NON-NLS-1$ //$NON-NLS-2$
-
- return result;
- }
-
- public native boolean getIsInstalledNative() /*-{
- return true;
- //var daPlugins = "Spice";
- //var pluginFound = false;
- //if (navigator.plugins &&
navigator.plugins.length > 0) {
- //var pluginsArrayLength =
navigator.plugins.length;
- //for (pluginsArrayCounter=0;
pluginsArrayCounter < pluginsArrayLength; pluginsArrayCounter++ ) {
- //var numFound = 0;
- //for(namesCounter=0;
namesCounter < daPlugins.length; namesCounter++) {
- //if(
(navigator.plugins[pluginsArrayCounter].name.indexOf(daPlugins[namesCounter])
>= 0) ||
-
//(navigator.plugins[pluginsArrayCounter].description.indexOf(daPlugins[namesCounter])
>= 0) ) {
- //numFound++;
- //}
- //}
- //if(numFound ==
daPlugins.length) {
- //pluginFound = true;
- //break;
- //}
- //}
- //}
- //return pluginFound;
- }-*/;
-
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ISpice.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ISpice.java
index b15aad3..e79ac96 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ISpice.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ISpice.java
@@ -28,8 +28,6 @@
Version getCurrentVersion();
- boolean getIsInstalled();
-
Version getDesiredVersion();
void setDesiredVersion(Version value);
@@ -135,8 +133,6 @@
void setUsbFilter(String value);
void connect();
-
- void install();
void setCurrentVersion(Version currentVersion);
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java
index d1062bd..771ee7e 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.ui.uicommonweb.models.vms;
+import com.google.gwt.user.client.Window;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -151,24 +152,16 @@
protected void connect() {
if (getEntity() != null) {
getLogger().debug("Connecting to Spice console..."); //$NON-NLS-1$
- if (!getspice().getIsInstalled()) {
- getLogger().info("Spice client is not installed.");
//$NON-NLS-1$
- getspice().install();
- return;
- }
-
// Check a spice version.
if (getConfigurator().getIsAdmin()
&&
getspice().getCurrentVersion().compareTo(getspice().getDesiredVersion()) < 0)
{
- getLogger().info("Spice client version is not as desired (" +
getspice().getDesiredVersion() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
- getspice().install();
+ Window.alert("Spice client version is not as desired (" +
getspice().getDesiredVersion() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
return;
}
// Don't connect if there VM is not running on any host.
- if (getEntity().getRunOnVds() == null)
- {
+ if (getEntity().getRunOnVds() == null) {
return;
}
--
To view, visit http://gerrit.ovirt.org/27132
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3af00d6eba93756db881229edd112085f217260
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Frank Kobzik <fkob...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
