From bdd7e25d2dd47c3a5d8c95366bc111dc0a176128 Mon Sep 17 00:00:00 2001 From: Christian Beier Date: Wed, 9 Nov 2011 20:25:32 +0100 Subject: [PATCH] Move the java stuff into webclients/java-applet. --- configure.ac | 3 ++- webclients/Makefile.am | 7 +++---- webclients/index.vnc | 2 +- webclients/java-applet/Makefile.am | 5 +++++ webclients/{ => java-applet}/VncViewer.jar | Bin .../{ => java-applet}/javaviewer.pseudo_proxy.patch | 0 webclients/{ => java-applet}/ssl/Makefile.am | 0 webclients/{ => java-applet}/ssl/README | 0 .../{ => java-applet}/ssl/SignedUltraViewerSSL.jar | Bin .../{ => java-applet}/ssl/SignedVncViewer.jar | Bin webclients/{ => java-applet}/ssl/UltraViewerSSL.jar | Bin webclients/{ => java-applet}/ssl/VncViewer.jar | Bin webclients/{ => java-applet}/ssl/index.vnc | 0 webclients/{ => java-applet}/ssl/onetimekey | 0 webclients/{ => java-applet}/ssl/proxy.vnc | 0 webclients/{ => java-applet}/ssl/ss_vncviewer | 0 ...c-vncviewer-cursor-colors+no-tab-traversal.patch | 0 .../tightvnc-1.3dev7_javasrc-vncviewer-ssl.patch | 0 webclients/{ => java-applet}/ssl/ultra.vnc | 0 webclients/{ => java-applet}/ssl/ultraproxy.vnc | 0 webclients/{ => java-applet}/ssl/ultrasigned.vnc | 0 .../ssl/ultravnc-102-JavaViewer-ssl-etc.patch | 0 22 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 webclients/java-applet/Makefile.am rename webclients/{ => java-applet}/VncViewer.jar (100%) rename webclients/{ => java-applet}/javaviewer.pseudo_proxy.patch (100%) rename webclients/{ => java-applet}/ssl/Makefile.am (100%) rename webclients/{ => java-applet}/ssl/README (100%) rename webclients/{ => java-applet}/ssl/SignedUltraViewerSSL.jar (100%) rename webclients/{ => java-applet}/ssl/SignedVncViewer.jar (100%) rename webclients/{ => java-applet}/ssl/UltraViewerSSL.jar (100%) rename webclients/{ => java-applet}/ssl/VncViewer.jar (100%) rename webclients/{ => java-applet}/ssl/index.vnc (100%) rename webclients/{ => java-applet}/ssl/onetimekey (100%) rename webclients/{ => java-applet}/ssl/proxy.vnc (100%) rename webclients/{ => java-applet}/ssl/ss_vncviewer (100%) rename webclients/{ => java-applet}/ssl/tightvnc-1.3dev7_javasrc-vncviewer-cursor-colors+no-tab-traversal.patch (100%) rename webclients/{ => java-applet}/ssl/tightvnc-1.3dev7_javasrc-vncviewer-ssl.patch (100%) rename webclients/{ => java-applet}/ssl/ultra.vnc (100%) rename webclients/{ => java-applet}/ssl/ultraproxy.vnc (100%) rename webclients/{ => java-applet}/ssl/ultrasigned.vnc (100%) rename webclients/{ => java-applet}/ssl/ultravnc-102-JavaViewer-ssl-etc.patch (100%) 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) - 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 similarity index 100% rename from webclients/VncViewer.jar rename to webclients/java-applet/VncViewer.jar diff --git a/webclients/javaviewer.pseudo_proxy.patch b/webclients/java-applet/javaviewer.pseudo_proxy.patch similarity index 100% rename from webclients/javaviewer.pseudo_proxy.patch rename to webclients/java-applet/javaviewer.pseudo_proxy.patch diff --git a/webclients/ssl/Makefile.am b/webclients/java-applet/ssl/Makefile.am similarity index 100% rename from webclients/ssl/Makefile.am rename to webclients/java-applet/ssl/Makefile.am diff --git a/webclients/ssl/README b/webclients/java-applet/ssl/README similarity index 100% rename from webclients/ssl/README rename to webclients/java-applet/ssl/README diff --git a/webclients/ssl/SignedUltraViewerSSL.jar b/webclients/java-applet/ssl/SignedUltraViewerSSL.jar similarity index 100% rename from webclients/ssl/SignedUltraViewerSSL.jar rename to webclients/java-applet/ssl/SignedUltraViewerSSL.jar diff --git a/webclients/ssl/SignedVncViewer.jar b/webclients/java-applet/ssl/SignedVncViewer.jar similarity index 100% rename from webclients/ssl/SignedVncViewer.jar rename to webclients/java-applet/ssl/SignedVncViewer.jar diff --git a/webclients/ssl/UltraViewerSSL.jar b/webclients/java-applet/ssl/UltraViewerSSL.jar similarity index 100% rename from webclients/ssl/UltraViewerSSL.jar rename to webclients/java-applet/ssl/UltraViewerSSL.jar diff --git a/webclients/ssl/VncViewer.jar b/webclients/java-applet/ssl/VncViewer.jar similarity index 100% rename from webclients/ssl/VncViewer.jar rename to webclients/java-applet/ssl/VncViewer.jar diff --git a/webclients/ssl/index.vnc b/webclients/java-applet/ssl/index.vnc similarity index 100% rename from webclients/ssl/index.vnc rename to webclients/java-applet/ssl/index.vnc diff --git a/webclients/ssl/onetimekey b/webclients/java-applet/ssl/onetimekey similarity index 100% rename from webclients/ssl/onetimekey rename to webclients/java-applet/ssl/onetimekey diff --git a/webclients/ssl/proxy.vnc b/webclients/java-applet/ssl/proxy.vnc similarity index 100% rename from webclients/ssl/proxy.vnc rename to webclients/java-applet/ssl/proxy.vnc diff --git a/webclients/ssl/ss_vncviewer b/webclients/java-applet/ssl/ss_vncviewer similarity index 100% rename from webclients/ssl/ss_vncviewer rename to 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 similarity index 100% rename from webclients/ssl/tightvnc-1.3dev7_javasrc-vncviewer-cursor-colors+no-tab-traversal.patch rename to 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 similarity index 100% rename from webclients/ssl/tightvnc-1.3dev7_javasrc-vncviewer-ssl.patch rename to 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 similarity index 100% rename from webclients/ssl/ultra.vnc rename to webclients/java-applet/ssl/ultra.vnc diff --git a/webclients/ssl/ultraproxy.vnc b/webclients/java-applet/ssl/ultraproxy.vnc similarity index 100% rename from webclients/ssl/ultraproxy.vnc rename to webclients/java-applet/ssl/ultraproxy.vnc diff --git a/webclients/ssl/ultrasigned.vnc b/webclients/java-applet/ssl/ultrasigned.vnc similarity index 100% rename from webclients/ssl/ultrasigned.vnc rename to 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 similarity index 100% rename from webclients/ssl/ultravnc-102-JavaViewer-ssl-etc.patch rename to webclients/java-applet/ssl/ultravnc-102-JavaViewer-ssl-etc.patch