70 files changed, 10 insertions, 10 deletions

diff --git a/LibVNCServer.spec.in b/LibVNCServer.spec.in
index 3e93334..13fe351 100755
--- a/LibVNCServer.spec.in
+++ b/LibVNCServer.spec.in
@@ -59,7 +59,7 @@ make
 %makeinstall includedir="%{buildroot}%{_includedir}/rfb"
 
 %{__install} -d -m0755 %{buildroot}%{_datadir}/x11vnc/classes
-%{__install} classes/VncViewer.jar classes/index.vnc \
+%{__install} webclients/VncViewer.jar webclients/index.vnc \
   %{buildroot}%{_datadir}/x11vnc/classes
 
 %clean
diff --git a/Makefile.am b/Makefile.am
index 0125b5b..e244fe8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,8 +2,8 @@ if WITH_X11VNC
 X11VNC=x11vnc
 endif
 
-SUBDIRS=libvncserver examples libvncclient vncterm classes client_examples test $(X11VNC)
-DIST_SUBDIRS=libvncserver examples libvncclient vncterm classes client_examples test
+SUBDIRS=libvncserver examples libvncclient vncterm webclients client_examples test $(X11VNC)
+DIST_SUBDIRS=libvncserver examples libvncclient vncterm webclients client_examples test
 EXTRA_DIST = CMakeLists.txt rfb/rfbint.h.cmake rfb/rfbconfig.h.cmake
 
 bin_SCRIPTS = libvncserver-config
diff --git a/README b/README
index f062225..499b72b 100644
--- a/README
+++ b/README
@@ -163,7 +163,7 @@ If you already have a socket to talk to, just set rfbScreen->inetdSock
 
 To also start an HTTP server (running on port 5800+display_number), you have
 to set rfbScreen->httpdDir to a directory containing vncviewer.jar and
-index.vnc (like the included "classes" directory).
+index.vnc (like the included "webclients" directory).
 
 Hooks and IO functions
 ----------------------
diff --git a/configure.ac b/configure.ac
index ab65308..94ec6bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -916,8 +916,8 @@ AC_CONFIG_FILES([Makefile
 	examples/Makefile
 	examples/android/Makefile
 	vncterm/Makefile
-	classes/Makefile
-	classes/ssl/Makefile
+	webclients/Makefile
+	webclients/ssl/Makefile
 	libvncclient/Makefile
 	client_examples/Makefile
 	test/Makefile
diff --git a/examples/example.c b/examples/example.c
index 93fdf28..fc156c0 100644
--- a/examples/example.c
+++ b/examples/example.c
@@ -288,7 +288,7 @@ int main(int argc,char** argv)
   rfbScreen->ptrAddEvent = doptr;
   rfbScreen->kbdAddEvent = dokey;
   rfbScreen->newClientHook = newclient;
-  rfbScreen->httpDir = "../classes";
+  rfbScreen->httpDir = "../webclients";
   rfbScreen->httpEnableProxyConnect = TRUE;
 
   initBuffer((unsigned char*)rfbScreen->frameBuffer);
diff --git a/examples/pnmshow.c b/examples/pnmshow.c
index 6ced92a..dbb66ab 100644
--- a/examples/pnmshow.c
+++ b/examples/pnmshow.c
@@ -75,7 +75,7 @@ int main(int argc,char** argv)
   rfbScreen->kbdAddEvent = HandleKey;
 
   /* enable http */
-  rfbScreen->httpDir = "../classes";
+  rfbScreen->httpDir = "../webclients";
 
   /* allocate picture and read it */
   rfbScreen->frameBuffer = (char*)malloc(paddedWidth*bytesPerPixel*height);
diff --git a/examples/pnmshow24.c b/examples/pnmshow24.c
index 81389d7..0c772ea 100644
--- a/examples/pnmshow24.c
+++ b/examples/pnmshow24.c
@@ -70,7 +70,7 @@ int main(int argc,char** argv)
   rfbScreen->kbdAddEvent = HandleKey;
 
   /* enable http */
-  rfbScreen->httpDir = "../classes";
+  rfbScreen->httpDir = "../webclients";
 
   /* allocate picture and read it */
   rfbScreen->frameBuffer = (char*)malloc(paddedWidth*3*height);
diff --git a/rfb/rfb.h b/rfb/rfb.h
index 004383d..3317e54 100644
--- a/rfb/rfb.h
+++ b/rfb/rfb.h
@@ -1097,7 +1097,7 @@ rfbBool rfbUpdateClient(rfbClientPtr cl);
 
  To also start an HTTP server (running on port 5800+display_number), you have
  to set rfbScreenInfo::httpDir to a directory containing vncviewer.jar and
- index.vnc (like the included "classes" directory).
+ index.vnc (like the included "webclients" directory).
 
  @section making_it_interactive Making it interactive
 
diff --git a/classes/Makefile.am b/webclients/Makefile.am
index c5497a8..c5497a8 100644
--- a/classes/Makefile.am
+++ b/webclients/Makefile.am
diff --git a/classes/VncViewer.jar b/webclients/VncViewer.jar
index 602fdb9..602fdb9 100644
--- a/classes/VncViewer.jar
+++ b/webclients/VncViewer.jar
diff --git a/classes/index.vnc b/webclients/index.vnc
index 34ad25d..34ad25d 100644
--- a/classes/index.vnc
+++ b/webclients/index.vnc
diff --git a/classes/javaviewer.pseudo_proxy.patch b/webclients/javaviewer.pseudo_proxy.patch
index 4d2f36e..4d2f36e 100644
--- a/classes/javaviewer.pseudo_proxy.patch
+++ b/webclients/javaviewer.pseudo_proxy.patch
diff --git a/classes/novnc/LICENSE.txt b/webclients/novnc/LICENSE.txt
index 755ace3..755ace3 100644
--- a/classes/novnc/LICENSE.txt
+++ b/webclients/novnc/LICENSE.txt
diff --git a/classes/novnc/README.md b/webclients/novnc/README.md
index 4672969..4672969 100644
--- a/classes/novnc/README.md
+++ b/webclients/novnc/README.md
diff --git a/classes/novnc/favicon.ico b/webclients/novnc/favicon.ico
index 45399c8..45399c8 120000
--- a/classes/novnc/favicon.ico
+++ b/webclients/novnc/favicon.ico
diff --git a/classes/novnc/images/clipboard.png b/webclients/novnc/images/clipboard.png
index 24df33c..24df33c 100644
--- a/classes/novnc/images/clipboard.png
+++ b/webclients/novnc/images/clipboard.png
diff --git a/classes/novnc/images/connect.png b/webclients/novnc/images/connect.png
index 79e71ad..79e71ad 100644
--- a/classes/novnc/images/connect.png
+++ b/webclients/novnc/images/connect.png
diff --git a/classes/novnc/images/ctrlaltdel.png b/webclients/novnc/images/ctrlaltdel.png
index 31922e5..31922e5 100644
--- a/classes/novnc/images/ctrlaltdel.png
+++ b/webclients/novnc/images/ctrlaltdel.png
diff --git a/classes/novnc/images/disconnect.png b/webclients/novnc/images/disconnect.png
index 8832f5e..8832f5e 100644
--- a/classes/novnc/images/disconnect.png
+++ b/webclients/novnc/images/disconnect.png
diff --git a/classes/novnc/images/drag.png b/webclients/novnc/images/drag.png
index 433f896..433f896 100644
--- a/classes/novnc/images/drag.png
+++ b/webclients/novnc/images/drag.png
diff --git a/classes/novnc/images/favicon.ico b/webclients/novnc/images/favicon.ico
index c999634..c999634 100644
--- a/classes/novnc/images/favicon.ico
+++ b/webclients/novnc/images/favicon.ico
diff --git a/classes/novnc/images/favicon.png b/webclients/novnc/images/favicon.png
index e2bdb19..e2bdb19 100644
--- a/classes/novnc/images/favicon.png
+++ b/webclients/novnc/images/favicon.png
diff --git a/classes/novnc/images/keyboard.png b/webclients/novnc/images/keyboard.png
index f797952..f797952 100644
--- a/classes/novnc/images/keyboard.png
+++ b/webclients/novnc/images/keyboard.png
diff --git a/classes/novnc/images/mouse_left.png b/webclients/novnc/images/mouse_left.png
index 1de7a48..1de7a48 100644
--- a/classes/novnc/images/mouse_left.png
+++ b/webclients/novnc/images/mouse_left.png
diff --git a/classes/novnc/images/mouse_middle.png b/webclients/novnc/images/mouse_middle.png
index 81fbd9b..81fbd9b 100644
--- a/classes/novnc/images/mouse_middle.png
+++ b/webclients/novnc/images/mouse_middle.png
diff --git a/classes/novnc/images/mouse_none.png b/webclients/novnc/images/mouse_none.png
index 93dbf57..93dbf57 100644
--- a/classes/novnc/images/mouse_none.png
+++ b/webclients/novnc/images/mouse_none.png
diff --git a/classes/novnc/images/mouse_right.png b/webclients/novnc/images/mouse_right.png
index 355b25d..355b25d 100644
--- a/classes/novnc/images/mouse_right.png
+++ b/webclients/novnc/images/mouse_right.png
diff --git a/classes/novnc/images/screen_320x460.png b/webclients/novnc/images/screen_320x460.png
index 172ec55..172ec55 100644
--- a/classes/novnc/images/screen_320x460.png
+++ b/webclients/novnc/images/screen_320x460.png
diff --git a/classes/novnc/images/screen_57x57.png b/webclients/novnc/images/screen_57x57.png
index e2085f2..e2085f2 100644
--- a/classes/novnc/images/screen_57x57.png
+++ b/webclients/novnc/images/screen_57x57.png
diff --git a/classes/novnc/images/screen_700x700.png b/webclients/novnc/images/screen_700x700.png
index ae67768..ae67768 100644
--- a/classes/novnc/images/screen_700x700.png
+++ b/webclients/novnc/images/screen_700x700.png
diff --git a/classes/novnc/images/settings.png b/webclients/novnc/images/settings.png
index a43f5e1..a43f5e1 100644
--- a/classes/novnc/images/settings.png
+++ b/webclients/novnc/images/settings.png
diff --git a/classes/novnc/include/Orbitron700.ttf b/webclients/novnc/include/Orbitron700.ttf
index e28729d..e28729d 100644
--- a/classes/novnc/include/Orbitron700.ttf
+++ b/webclients/novnc/include/Orbitron700.ttf
diff --git a/classes/novnc/include/Orbitron700.woff b/webclients/novnc/include/Orbitron700.woff
index 61db630..61db630 100644
--- a/classes/novnc/include/Orbitron700.woff
+++ b/webclients/novnc/include/Orbitron700.woff
diff --git a/classes/novnc/include/base.css b/webclients/novnc/include/base.css
index 0a62a1b..0a62a1b 100644
--- a/classes/novnc/include/base.css
+++ b/webclients/novnc/include/base.css
diff --git a/classes/novnc/include/base64.js b/webclients/novnc/include/base64.js
index c68b33a..c68b33a 100644
--- a/classes/novnc/include/base64.js
+++ b/webclients/novnc/include/base64.js
diff --git a/classes/novnc/include/black.css b/webclients/novnc/include/black.css
index 8f80f66..8f80f66 100644
--- a/classes/novnc/include/black.css
+++ b/webclients/novnc/include/black.css
diff --git a/classes/novnc/include/blue.css b/webclients/novnc/include/blue.css
index a8baf70..a8baf70 100644
--- a/classes/novnc/include/blue.css
+++ b/webclients/novnc/include/blue.css
diff --git a/classes/novnc/include/des.js b/webclients/novnc/include/des.js
index 1f95285..1f95285 100644
--- a/classes/novnc/include/des.js
+++ b/webclients/novnc/include/des.js
diff --git a/classes/novnc/include/display.js b/webclients/novnc/include/display.js
index 2cf262d..2cf262d 100644
--- a/classes/novnc/include/display.js
+++ b/webclients/novnc/include/display.js
diff --git a/classes/novnc/include/input.js b/webclients/novnc/include/input.js
index 3124d08..3124d08 100644
--- a/classes/novnc/include/input.js
+++ b/webclients/novnc/include/input.js
diff --git a/classes/novnc/include/logo.js b/webclients/novnc/include/logo.js
index befa598..befa598 100644
--- a/classes/novnc/include/logo.js
+++ b/webclients/novnc/include/logo.js
diff --git a/classes/novnc/include/playback.js b/webclients/novnc/include/playback.js
index 22a00a3..22a00a3 100644
--- a/classes/novnc/include/playback.js
+++ b/webclients/novnc/include/playback.js
diff --git a/classes/novnc/include/rfb.js b/webclients/novnc/include/rfb.js
index b7aa3f6..b7aa3f6 100644
--- a/classes/novnc/include/rfb.js
+++ b/webclients/novnc/include/rfb.js
diff --git a/classes/novnc/include/ui.js b/webclients/novnc/include/ui.js
index 74a0005..74a0005 100644
--- a/classes/novnc/include/ui.js
+++ b/webclients/novnc/include/ui.js
diff --git a/classes/novnc/include/util.js b/webclients/novnc/include/util.js
index 0a9e0e0..0a9e0e0 100644
--- a/classes/novnc/include/util.js
+++ b/webclients/novnc/include/util.js
diff --git a/classes/novnc/include/vnc.js b/webclients/novnc/include/vnc.js
index f938be7..f938be7 100644
--- a/classes/novnc/include/vnc.js
+++ b/webclients/novnc/include/vnc.js
diff --git a/classes/novnc/include/web-socket-js/README.txt b/webclients/novnc/include/web-socket-js/README.txt
index 2e32ea7..2e32ea7 100644
--- a/classes/novnc/include/web-socket-js/README.txt
+++ b/webclients/novnc/include/web-socket-js/README.txt
diff --git a/classes/novnc/include/web-socket-js/WebSocketMain.swf b/webclients/novnc/include/web-socket-js/WebSocketMain.swf
index 244c445..244c445 100644
--- a/classes/novnc/include/web-socket-js/WebSocketMain.swf
+++ b/webclients/novnc/include/web-socket-js/WebSocketMain.swf
diff --git a/classes/novnc/include/web-socket-js/swfobject.js b/webclients/novnc/include/web-socket-js/swfobject.js
index 8eafe9d..8eafe9d 100644
--- a/classes/novnc/include/web-socket-js/swfobject.js
+++ b/webclients/novnc/include/web-socket-js/swfobject.js
diff --git a/classes/novnc/include/web-socket-js/web_socket.js b/webclients/novnc/include/web-socket-js/web_socket.js
index ec2a8b7..ec2a8b7 100644
--- a/classes/novnc/include/web-socket-js/web_socket.js
+++ b/webclients/novnc/include/web-socket-js/web_socket.js
diff --git a/classes/novnc/include/websock.js b/webclients/novnc/include/websock.js
index a688f76..a688f76 100644
--- a/classes/novnc/include/websock.js
+++ b/webclients/novnc/include/websock.js
diff --git a/classes/novnc/include/webutil.js b/webclients/novnc/include/webutil.js
index 95138f8..95138f8 100644
--- a/classes/novnc/include/webutil.js
+++ b/webclients/novnc/include/webutil.js
diff --git a/classes/novnc/vnc.html b/webclients/novnc/vnc.html
index 281b4d3..281b4d3 100644
--- a/classes/novnc/vnc.html
+++ b/webclients/novnc/vnc.html
diff --git a/classes/novnc/vnc_auto.html b/webclients/novnc/vnc_auto.html
index a500b79..a500b79 100644
--- a/classes/novnc/vnc_auto.html
+++ b/webclients/novnc/vnc_auto.html
diff --git a/classes/ssl/Makefile.am b/webclients/ssl/Makefile.am
index fd1c201..fd1c201 100644
--- a/classes/ssl/Makefile.am
+++ b/webclients/ssl/Makefile.am
diff --git a/classes/ssl/README b/webclients/ssl/README
index b244cf1..b244cf1 100644
--- a/classes/ssl/README
+++ b/webclients/ssl/README
diff --git a/classes/ssl/SignedUltraViewerSSL.jar b/webclients/ssl/SignedUltraViewerSSL.jar
index 6c18737..6c18737 100644
--- a/classes/ssl/SignedUltraViewerSSL.jar
+++ b/webclients/ssl/SignedUltraViewerSSL.jar
diff --git a/classes/ssl/SignedVncViewer.jar b/webclients/ssl/SignedVncViewer.jar
index 95c0b0b..95c0b0b 100644
--- a/classes/ssl/SignedVncViewer.jar
+++ b/webclients/ssl/SignedVncViewer.jar
diff --git a/classes/ssl/UltraViewerSSL.jar b/webclients/ssl/UltraViewerSSL.jar
index 45259fd..45259fd 100644
--- a/classes/ssl/UltraViewerSSL.jar
+++ b/webclients/ssl/UltraViewerSSL.jar
diff --git a/classes/ssl/VncViewer.jar b/webclients/ssl/VncViewer.jar
index 9453c6f..9453c6f 100644
--- a/classes/ssl/VncViewer.jar
+++ b/webclients/ssl/VncViewer.jar
diff --git a/classes/ssl/index.vnc b/webclients/ssl/index.vnc
index ec520dc..ec520dc 100644
--- a/classes/ssl/index.vnc
+++ b/webclients/ssl/index.vnc
diff --git a/classes/ssl/onetimekey b/webclients/ssl/onetimekey
index bf57c8f..bf57c8f 100755
--- a/classes/ssl/onetimekey
+++ b/webclients/ssl/onetimekey
diff --git a/classes/ssl/proxy.vnc b/webclients/ssl/proxy.vnc
index 6d3ab3d..6d3ab3d 100644
--- a/classes/ssl/proxy.vnc
+++ b/webclients/ssl/proxy.vnc
diff --git a/classes/ssl/ss_vncviewer b/webclients/ssl/ss_vncviewer
index 7e793ff..7e793ff 100755
--- a/classes/ssl/ss_vncviewer
+++ b/webclients/ssl/ss_vncviewer
diff --git a/classes/ssl/tightvnc-1.3dev7_javasrc-vncviewer-cursor-colors+no-tab-traversal.patch b/webclients/ssl/tightvnc-1.3dev7_javasrc-vncviewer-cursor-colors+no-tab-traversal.patch
index bc10f3c..bc10f3c 100644
--- a/classes/ssl/tightvnc-1.3dev7_javasrc-vncviewer-cursor-colors+no-tab-traversal.patch
+++ b/webclients/ssl/tightvnc-1.3dev7_javasrc-vncviewer-cursor-colors+no-tab-traversal.patch
diff --git a/classes/ssl/tightvnc-1.3dev7_javasrc-vncviewer-ssl.patch b/webclients/ssl/tightvnc-1.3dev7_javasrc-vncviewer-ssl.patch
index 801234a..801234a 100644
--- a/classes/ssl/tightvnc-1.3dev7_javasrc-vncviewer-ssl.patch
+++ b/webclients/ssl/tightvnc-1.3dev7_javasrc-vncviewer-ssl.patch
diff --git a/classes/ssl/ultra.vnc b/webclients/ssl/ultra.vnc
index 3c57445..3c57445 100644
--- a/classes/ssl/ultra.vnc
+++ b/webclients/ssl/ultra.vnc
diff --git a/classes/ssl/ultraproxy.vnc b/webclients/ssl/ultraproxy.vnc
index fd842c4..fd842c4 100644
--- a/classes/ssl/ultraproxy.vnc
+++ b/webclients/ssl/ultraproxy.vnc
diff --git a/classes/ssl/ultrasigned.vnc b/webclients/ssl/ultrasigned.vnc
index a711655..a711655 100644
--- a/classes/ssl/ultrasigned.vnc
+++ b/webclients/ssl/ultrasigned.vnc
diff --git a/classes/ssl/ultravnc-102-JavaViewer-ssl-etc.patch b/webclients/ssl/ultravnc-102-JavaViewer-ssl-etc.patch
index 3309860..3309860 100644
--- a/classes/ssl/ultravnc-102-JavaViewer-ssl-etc.patch
+++ b/webclients/ssl/ultravnc-102-JavaViewer-ssl-etc.patch