summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Beier <dontmind@freeshell.org>2011-11-09 20:25:32 +0100
committerChristian Beier <dontmind@freeshell.org>2011-11-09 20:25:32 +0100
commitbdd7e25d2dd47c3a5d8c95366bc111dc0a176128 (patch)
tree0b4427de893174bd7a1cabcf1d9e6d4f4759cd44
parentfaadd484489efddd182d6d0df43d8ecfdbff29ff (diff)
downloadlibvncserver-bdd7e25d2dd47c3a5d8c95366bc111dc0a176128.zip
libvncserver-bdd7e25d2dd47c3a5d8c95366bc111dc0a176128.tar.gz
Move the java stuff into webclients/java-applet.included-novnc
-rw-r--r--configure.ac3
-rw-r--r--webclients/Makefile.am7
-rw-r--r--webclients/index.vnc2
-rw-r--r--webclients/java-applet/Makefile.am5
-rw-r--r--webclients/java-applet/VncViewer.jar (renamed from webclients/VncViewer.jar)bin35462 -> 35462 bytes
-rw-r--r--webclients/java-applet/javaviewer.pseudo_proxy.patch (renamed from webclients/javaviewer.pseudo_proxy.patch)0
-rw-r--r--webclients/java-applet/ssl/Makefile.am (renamed from webclients/ssl/Makefile.am)0
-rw-r--r--webclients/java-applet/ssl/README (renamed from webclients/ssl/README)0
-rw-r--r--webclients/java-applet/ssl/SignedUltraViewerSSL.jar (renamed from webclients/ssl/SignedUltraViewerSSL.jar)bin113117 -> 113117 bytes
-rw-r--r--webclients/java-applet/ssl/SignedVncViewer.jar (renamed from webclients/ssl/SignedVncViewer.jar)bin89208 -> 89208 bytes
-rw-r--r--webclients/java-applet/ssl/UltraViewerSSL.jar (renamed from webclients/ssl/UltraViewerSSL.jar)bin110040 -> 110040 bytes
-rw-r--r--webclients/java-applet/ssl/VncViewer.jar (renamed from webclients/ssl/VncViewer.jar)bin86228 -> 86228 bytes
-rw-r--r--webclients/java-applet/ssl/index.vnc (renamed from webclients/ssl/index.vnc)0
-rwxr-xr-xwebclients/java-applet/ssl/onetimekey (renamed from webclients/ssl/onetimekey)0
-rw-r--r--webclients/java-applet/ssl/proxy.vnc (renamed from webclients/ssl/proxy.vnc)0
-rwxr-xr-xwebclients/java-applet/ssl/ss_vncviewer (renamed from webclients/ssl/ss_vncviewer)0
-rw-r--r--webclients/java-applet/ssl/tightvnc-1.3dev7_javasrc-vncviewer-cursor-colors+no-tab-traversal.patch (renamed from webclients/ssl/tightvnc-1.3dev7_javasrc-vncviewer-cursor-colors+no-tab-traversal.patch)0
-rw-r--r--webclients/java-applet/ssl/tightvnc-1.3dev7_javasrc-vncviewer-ssl.patch (renamed from webclients/ssl/tightvnc-1.3dev7_javasrc-vncviewer-ssl.patch)0
-rw-r--r--webclients/java-applet/ssl/ultra.vnc (renamed from webclients/ssl/ultra.vnc)0
-rw-r--r--webclients/java-applet/ssl/ultraproxy.vnc (renamed from webclients/ssl/ultraproxy.vnc)0
-rw-r--r--webclients/java-applet/ssl/ultrasigned.vnc (renamed from webclients/ssl/ultrasigned.vnc)0
-rw-r--r--webclients/java-applet/ssl/ultravnc-102-JavaViewer-ssl-etc.patch (renamed from webclients/ssl/ultravnc-102-JavaViewer-ssl-etc.patch)0
22 files changed, 11 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 94ec6bc..39728d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -917,7 +917,8 @@ AC_CONFIG_FILES([Makefile
examples/android/Makefile
vncterm/Makefile
webclients/Makefile
- webclients/ssl/Makefile
+ webclients/java-applet/Makefile
+ webclients/java-applet/ssl/Makefile
libvncclient/Makefile
client_examples/Makefile
test/Makefile
diff --git a/webclients/Makefile.am b/webclients/Makefile.am
index c5497a8..6c2db84 100644
--- a/webclients/Makefile.am
+++ b/webclients/Makefile.am
@@ -1,5 +1,4 @@
-EXTRA_DIST=VncViewer.jar index.vnc javaviewer.pseudo_proxy.patch
-
-SUBDIRS = ssl
-DIST_SUBDIRS = ssl
+SUBDIRS = java-applet
+DIST_SUBDIRS = java-applet
+EXTRA_DIST=index.vnc novnc
diff --git a/webclients/index.vnc b/webclients/index.vnc
index 34ad25d..8254a70 100644
--- a/webclients/index.vnc
+++ b/webclients/index.vnc
@@ -10,7 +10,7 @@
$USER's $DESKTOP desktop ($DISPLAY)
</TITLE>
</head>
-<APPLET CODE=VncViewer.class ARCHIVE=VncViewer.jar
+<APPLET CODE=VncViewer.class ARCHIVE=java-applet/VncViewer.jar
WIDTH=$APPLETWIDTH HEIGHT=$APPLETHEIGHT>
<param name=PORT value=$PORT>
<param name="Open New Window" value=yes>
diff --git a/webclients/java-applet/Makefile.am b/webclients/java-applet/Makefile.am
new file mode 100644
index 0000000..d6d10e4
--- /dev/null
+++ b/webclients/java-applet/Makefile.am
@@ -0,0 +1,5 @@
+EXTRA_DIST=VncViewer.jar javaviewer.pseudo_proxy.patch
+
+SUBDIRS = ssl
+DIST_SUBDIRS = ssl
+
diff --git a/webclients/VncViewer.jar b/webclients/java-applet/VncViewer.jar
index 602fdb9..602fdb9 100644
--- a/webclients/VncViewer.jar
+++ b/webclients/java-applet/VncViewer.jar
Binary files differ
diff --git a/webclients/javaviewer.pseudo_proxy.patch b/webclients/java-applet/javaviewer.pseudo_proxy.patch
index 4d2f36e..4d2f36e 100644
--- a/webclients/javaviewer.pseudo_proxy.patch
+++ b/webclients/java-applet/javaviewer.pseudo_proxy.patch
diff --git a/webclients/ssl/Makefile.am b/webclients/java-applet/ssl/Makefile.am
index fd1c201..fd1c201 100644
--- a/webclients/ssl/Makefile.am
+++ b/webclients/java-applet/ssl/Makefile.am
diff --git a/webclients/ssl/README b/webclients/java-applet/ssl/README
index b244cf1..b244cf1 100644
--- a/webclients/ssl/README
+++ b/webclients/java-applet/ssl/README
diff --git a/webclients/ssl/SignedUltraViewerSSL.jar b/webclients/java-applet/ssl/SignedUltraViewerSSL.jar
index 6c18737..6c18737 100644
--- a/webclients/ssl/SignedUltraViewerSSL.jar
+++ b/webclients/java-applet/ssl/SignedUltraViewerSSL.jar
Binary files differ
diff --git a/webclients/ssl/SignedVncViewer.jar b/webclients/java-applet/ssl/SignedVncViewer.jar
index 95c0b0b..95c0b0b 100644
--- a/webclients/ssl/SignedVncViewer.jar
+++ b/webclients/java-applet/ssl/SignedVncViewer.jar
Binary files differ
diff --git a/webclients/ssl/UltraViewerSSL.jar b/webclients/java-applet/ssl/UltraViewerSSL.jar
index 45259fd..45259fd 100644
--- a/webclients/ssl/UltraViewerSSL.jar
+++ b/webclients/java-applet/ssl/UltraViewerSSL.jar
Binary files differ
diff --git a/webclients/ssl/VncViewer.jar b/webclients/java-applet/ssl/VncViewer.jar
index 9453c6f..9453c6f 100644
--- a/webclients/ssl/VncViewer.jar
+++ b/webclients/java-applet/ssl/VncViewer.jar
Binary files differ
diff --git a/webclients/ssl/index.vnc b/webclients/java-applet/ssl/index.vnc
index ec520dc..ec520dc 100644
--- a/webclients/ssl/index.vnc
+++ b/webclients/java-applet/ssl/index.vnc
diff --git a/webclients/ssl/onetimekey b/webclients/java-applet/ssl/onetimekey
index bf57c8f..bf57c8f 100755
--- a/webclients/ssl/onetimekey
+++ b/webclients/java-applet/ssl/onetimekey
diff --git a/webclients/ssl/proxy.vnc b/webclients/java-applet/ssl/proxy.vnc
index 6d3ab3d..6d3ab3d 100644
--- a/webclients/ssl/proxy.vnc
+++ b/webclients/java-applet/ssl/proxy.vnc
diff --git a/webclients/ssl/ss_vncviewer b/webclients/java-applet/ssl/ss_vncviewer
index 7e793ff..7e793ff 100755
--- a/webclients/ssl/ss_vncviewer
+++ b/webclients/java-applet/ssl/ss_vncviewer
diff --git a/webclients/ssl/tightvnc-1.3dev7_javasrc-vncviewer-cursor-colors+no-tab-traversal.patch b/webclients/java-applet/ssl/tightvnc-1.3dev7_javasrc-vncviewer-cursor-colors+no-tab-traversal.patch
index bc10f3c..bc10f3c 100644
--- a/webclients/ssl/tightvnc-1.3dev7_javasrc-vncviewer-cursor-colors+no-tab-traversal.patch
+++ b/webclients/java-applet/ssl/tightvnc-1.3dev7_javasrc-vncviewer-cursor-colors+no-tab-traversal.patch
diff --git a/webclients/ssl/tightvnc-1.3dev7_javasrc-vncviewer-ssl.patch b/webclients/java-applet/ssl/tightvnc-1.3dev7_javasrc-vncviewer-ssl.patch
index 801234a..801234a 100644
--- a/webclients/ssl/tightvnc-1.3dev7_javasrc-vncviewer-ssl.patch
+++ b/webclients/java-applet/ssl/tightvnc-1.3dev7_javasrc-vncviewer-ssl.patch
diff --git a/webclients/ssl/ultra.vnc b/webclients/java-applet/ssl/ultra.vnc
index 3c57445..3c57445 100644
--- a/webclients/ssl/ultra.vnc
+++ b/webclients/java-applet/ssl/ultra.vnc
diff --git a/webclients/ssl/ultraproxy.vnc b/webclients/java-applet/ssl/ultraproxy.vnc
index fd842c4..fd842c4 100644
--- a/webclients/ssl/ultraproxy.vnc
+++ b/webclients/java-applet/ssl/ultraproxy.vnc
diff --git a/webclients/ssl/ultrasigned.vnc b/webclients/java-applet/ssl/ultrasigned.vnc
index a711655..a711655 100644
--- a/webclients/ssl/ultrasigned.vnc
+++ b/webclients/java-applet/ssl/ultrasigned.vnc
diff --git a/webclients/ssl/ultravnc-102-JavaViewer-ssl-etc.patch b/webclients/java-applet/ssl/ultravnc-102-JavaViewer-ssl-etc.patch
index 3309860..3309860 100644
--- a/webclients/ssl/ultravnc-102-JavaViewer-ssl-etc.patch
+++ b/webclients/java-applet/ssl/ultravnc-102-JavaViewer-ssl-etc.patch
OpenPOWER on IntegriCloud