Spice web client

config.py.in

@@ -103,14 +103,9 @@ class KimchiPaths(PluginPaths):
     def __init__(self):
         super(KimchiPaths, self).__init__('kimchi')
         self.spice_file = os.path.join(self.ui_dir,
-                                       'spice-html5/pages/spice_auto.html')
+                                       'spice-web-client/index.html')
 
-        if __with_spice__ == 'yes':
-            self.spice_dir = os.path.join(self.ui_dir, 'spice-html5')
-        elif os.path.exists('@datadir@/spice-html5'):
-            self.spice_dir = '@datadir@/spice-html5'
-        else:
-            self.spice_dir = '/usr/share/spice-html5'
+        self.spice_dir = os.path.join(self.ui_dir, 'spice-web-client')
 
         if os.path.exists('@datadir@/novnc'):
             self.novnc_dir = '@datadir@/novnc'
@@ -139,12 +134,10 @@ class KimchiConfig(PluginConfig):
 
             '/novnc': {'type': 'dir',
                        'path': kimchiPaths.novnc_dir},
-            '/spice-html5': {'type': 'dir',
+            '/spice-web-client': {'type': 'dir',
                              'path': kimchiPaths.spice_dir},
-            '/spice_auto.html': {'type': 'file',
+            '/index.html': {'type': 'file',
                                  'path': kimchiPaths.spice_file},
-            '/spice-html5/spice.css': {'type': 'file',
-                                       'path': kimchiPaths.spice_css_file},
             '/serial': {'type': 'dir',
                         'path': kimchiPaths.serial_dir}}
 

configure.ac

@@ -98,10 +98,18 @@ AC_CONFIG_FILES([
     ui/css/Makefile
     ui/images/Makefile
     ui/js/Makefile
-    ui/spice-html5/Makefile
-    ui/spice-html5/css/Makefile
-    ui/spice-html5/pages/Makefile
-    ui/spice-html5/thirdparty/Makefile
+    ui/spice-web-client/Makefile
+    ui/spice-web-client/application/Makefile
+    ui/spice-web-client/keymaps/Makefile
+    ui/spice-web-client/lib/Makefile
+    ui/spice-web-client/lib/images/Makefile
+    ui/spice-web-client/network/Makefile
+    ui/spice-web-client/process/Makefile
+    ui/spice-web-client/resources/Makefile
+    ui/spice-web-client/spiceobjects/Makefile
+    ui/spice-web-client/spiceobjects/generated/Makefile
+    ui/spice-web-client/spiceproxy/Makefile
+    ui/spice-web-client/swcanvas/Makefile
     ui/pages/Makefile
     ui/pages/help/Makefile
     ui/pages/tabs/Makefile

contrib/DEBIAN/control.in

@@ -22,7 +22,6 @@ Depends: wok (>= 2.1.0),
          open-iscsi,
          python-guestfs,
          libguestfs-tools,
-         spice-html5,
          python-magic,
          python-paramiko
 Build-Depends: xsltproc,

ui/Makefile.am

@@ -15,6 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-SUBDIRS = config css images js pages spice-html5 serial
+SUBDIRS = config css images js pages spice-web-client serial
 
 uidir = $(datadir)/wok/plugins/kimchi/ui

ui/js/src/kimchi.api.js

@@ -372,22 +372,22 @@ var kimchi = {
         }).done(function(data, textStatus, xhr) {
             url = 'https://' + location.hostname + ':' + proxy_port;
             url += server_root;
-            url += "/plugins/kimchi/spice_auto.html";
+            url += "/plugins/kimchi/spice-web-client/index.html";
             /*
              * When using server_root we need pass the value with port
              * argument to be used correctly by spice_auto.html scripts
              */
             url += "?port=" + proxy_port + server_root;
-            url += "&listen=" + location.hostname;
+            url += "&host=" + location.hostname;
             /*
              * From python documentation base64.urlsafe_b64encode(s)
              * substitutes - instead of + and _ instead of / in the
              * standard Base64 alphabet, BUT the result can still
              * contain = which is not safe in a URL query component.
              * So remove it when needed as base64 can work well without it.
              * */
-            url += "&token=" + wok.urlSafeB64Encode(vm).replace(/=*$/g, "");
-            url += '&encrypt=1';
+            url += "&vmInfoToken=" + wok.urlSafeB64Encode(vm).replace(/=*$/g, "");
+            url += '&protocol=wss';
             window.open(url);
         });
     },