Move Java source up one level and allow Java viewer to be built as a standalone project (per community request)

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4715 3789f03b-4d11-0410-bbf8-ca57d06f2519

106 files changed, 10 insertions, 4 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5bba01f1..ebf2e539 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -262,7 +262,7 @@ endif()
 
 option(BUILD_JAVA "Build Java version of the TigerVNC Viewer" FALSE)
 if(BUILD_JAVA)
-  add_subdirectory(java/src)
+  add_subdirectory(java)
 endif()
 
 # Check for FLTK
diff --git a/doc/dev/version_numbers b/doc/dev/version_numbers
index e6678370..543aba0a 100644
--- a/doc/dev/version_numbers
+++ b/doc/dev/version_numbers
@@ -2,4 +2,5 @@ Files written below contain release numbers which should be changed during
 release process.
 
 CMakeLists.txt
+java/CMakeLists.txt
 unix/xserver/hw/vnc/xvnc.cc
diff --git a/java/src/CMakeLists.txt b/java/CMakeLists.txt
index a6b4ec8a..a6ca8000 100644
--- a/java/src/CMakeLists.txt
+++ b/java/CMakeLists.txt
@@ -1,3 +1,8 @@
+cmake_minimum_required(VERSION 2.8)
+
+project(tigervnc-java Java)
+set(VERSION 1.1.80)
+
 find_package(Java)
 
 set(DEFAULT_JAVACFLAGS "-source 1.5 -target 1.5 -Xlint:all,-serial,-cast")
@@ -94,7 +99,7 @@ add_custom_command(OUTPUT VncViewer.jar
   COMMAND ${CMAKE_COMMAND}
   ARGS -DJava_PATH=${Java_PATH}
     -DJAR_FILE=${CMAKE_CURRENT_BINARY_DIR}/VncViewer.jar
-    -P ${CMAKE_SOURCE_DIR}/cmake/SignJar.cmake
+    -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/SignJar.cmake
   WORKING_DIRECTORY ${OBJDIR})
 
 add_custom_target(java ALL DEPENDS VncViewer.jar)
diff --git a/cmake/SignJar.cmake b/java/cmake/SignJar.cmake
index abc35ba6..abc35ba6 100644
--- a/cmake/SignJar.cmake
+++ b/java/cmake/SignJar.cmake
diff --git a/java/src/com/jcraft/jzlib/Adler32.java b/java/com/jcraft/jzlib/Adler32.java
index d8b6ef86..d8b6ef86 100644
--- a/java/src/com/jcraft/jzlib/Adler32.java
+++ b/java/com/jcraft/jzlib/Adler32.java
diff --git a/java/src/com/jcraft/jzlib/ChangeLog b/java/com/jcraft/jzlib/ChangeLog
index c828fae3..c828fae3 100644
--- a/java/src/com/jcraft/jzlib/ChangeLog
+++ b/java/com/jcraft/jzlib/ChangeLog
diff --git a/java/src/com/jcraft/jzlib/Deflate.java b/java/com/jcraft/jzlib/Deflate.java
index 99788020..99788020 100644
--- a/java/src/com/jcraft/jzlib/Deflate.java
+++ b/java/com/jcraft/jzlib/Deflate.java
diff --git a/java/src/com/jcraft/jzlib/InfBlocks.java b/java/com/jcraft/jzlib/InfBlocks.java
index f6997fc6..f6997fc6 100644
--- a/java/src/com/jcraft/jzlib/InfBlocks.java
+++ b/java/com/jcraft/jzlib/InfBlocks.java
diff --git a/java/src/com/jcraft/jzlib/InfCodes.java b/java/com/jcraft/jzlib/InfCodes.java
index c768fb1c..c768fb1c 100644
--- a/java/src/com/jcraft/jzlib/InfCodes.java
+++ b/java/com/jcraft/jzlib/InfCodes.java
diff --git a/java/src/com/jcraft/jzlib/InfTree.java b/java/com/jcraft/jzlib/InfTree.java
index cbca4366..cbca4366 100644
--- a/java/src/com/jcraft/jzlib/InfTree.java
+++ b/java/com/jcraft/jzlib/InfTree.java
diff --git a/java/src/com/jcraft/jzlib/Inflate.java b/java/com/jcraft/jzlib/Inflate.java
index 30310f68..30310f68 100644
--- a/java/src/com/jcraft/jzlib/Inflate.java
+++ b/java/com/jcraft/jzlib/Inflate.java
diff --git a/java/src/com/jcraft/jzlib/JZlib.java b/java/com/jcraft/jzlib/JZlib.java
index b84d7a1f..b84d7a1f 100644
--- a/java/src/com/jcraft/jzlib/JZlib.java
+++ b/java/com/jcraft/jzlib/JZlib.java
diff --git a/java/src/com/jcraft/jzlib/LICENSE.txt b/java/com/jcraft/jzlib/LICENSE.txt
index cdce5007..cdce5007 100644
--- a/java/src/com/jcraft/jzlib/LICENSE.txt
+++ b/java/com/jcraft/jzlib/LICENSE.txt
diff --git a/java/src/com/jcraft/jzlib/README b/java/com/jcraft/jzlib/README
index 45027db9..45027db9 100644
--- a/java/src/com/jcraft/jzlib/README
+++ b/java/com/jcraft/jzlib/README
diff --git a/java/src/com/jcraft/jzlib/StaticTree.java b/java/com/jcraft/jzlib/StaticTree.java
index 0f7f5779..0f7f5779 100644
--- a/java/src/com/jcraft/jzlib/StaticTree.java
+++ b/java/com/jcraft/jzlib/StaticTree.java
diff --git a/java/src/com/jcraft/jzlib/Tree.java b/java/com/jcraft/jzlib/Tree.java
index 81038978..81038978 100644
--- a/java/src/com/jcraft/jzlib/Tree.java
+++ b/java/com/jcraft/jzlib/Tree.java
diff --git a/java/src/com/jcraft/jzlib/ZInputStream.java b/java/com/jcraft/jzlib/ZInputStream.java
index 3f97c448..3f97c448 100644
--- a/java/src/com/jcraft/jzlib/ZInputStream.java
+++ b/java/com/jcraft/jzlib/ZInputStream.java
diff --git a/java/src/com/jcraft/jzlib/ZOutputStream.java b/java/com/jcraft/jzlib/ZOutputStream.java
index afee65b3..afee65b3 100644
--- a/java/src/com/jcraft/jzlib/ZOutputStream.java
+++ b/java/com/jcraft/jzlib/ZOutputStream.java
diff --git a/java/src/com/jcraft/jzlib/ZStream.java b/java/com/jcraft/jzlib/ZStream.java
index 334475e9..334475e9 100644
--- a/java/src/com/jcraft/jzlib/ZStream.java
+++ b/java/com/jcraft/jzlib/ZStream.java
diff --git a/java/src/com/jcraft/jzlib/ZStreamException.java b/java/com/jcraft/jzlib/ZStreamException.java
index 308bb8a1..308bb8a1 100644
--- a/java/src/com/jcraft/jzlib/ZStreamException.java
+++ b/java/com/jcraft/jzlib/ZStreamException.java
diff --git a/java/src/com/tigervnc/rdr/EndOfStream.java b/java/com/tigervnc/rdr/EndOfStream.java
index bdcf7c27..bdcf7c27 100644
--- a/java/src/com/tigervnc/rdr/EndOfStream.java
+++ b/java/com/tigervnc/rdr/EndOfStream.java
diff --git a/java/src/com/tigervnc/rdr/Exception.java b/java/com/tigervnc/rdr/Exception.java
index a5fe938d..a5fe938d 100644
--- a/java/src/com/tigervnc/rdr/Exception.java
+++ b/java/com/tigervnc/rdr/Exception.java
diff --git a/java/src/com/tigervnc/rdr/IOException.java b/java/com/tigervnc/rdr/IOException.java
index 6343d7a4..6343d7a4 100644
--- a/java/src/com/tigervnc/rdr/IOException.java
+++ b/java/com/tigervnc/rdr/IOException.java
diff --git a/java/src/com/tigervnc/rdr/InStream.java b/java/com/tigervnc/rdr/InStream.java
index 1e0d226e..1e0d226e 100644
--- a/java/src/com/tigervnc/rdr/InStream.java
+++ b/java/com/tigervnc/rdr/InStream.java
diff --git a/java/src/com/tigervnc/rdr/JavaInStream.java b/java/com/tigervnc/rdr/JavaInStream.java
index ce8efddc..ce8efddc 100644
--- a/java/src/com/tigervnc/rdr/JavaInStream.java
+++ b/java/com/tigervnc/rdr/JavaInStream.java
diff --git a/java/src/com/tigervnc/rdr/JavaOutStream.java b/java/com/tigervnc/rdr/JavaOutStream.java
index 015f81f5..015f81f5 100644
--- a/java/src/com/tigervnc/rdr/JavaOutStream.java
+++ b/java/com/tigervnc/rdr/JavaOutStream.java
diff --git a/java/src/com/tigervnc/rdr/MemInStream.java b/java/com/tigervnc/rdr/MemInStream.java
index 32911a3a..32911a3a 100644
--- a/java/src/com/tigervnc/rdr/MemInStream.java
+++ b/java/com/tigervnc/rdr/MemInStream.java
diff --git a/java/src/com/tigervnc/rdr/MemOutStream.java b/java/com/tigervnc/rdr/MemOutStream.java
index b3040793..b3040793 100644
--- a/java/src/com/tigervnc/rdr/MemOutStream.java
+++ b/java/com/tigervnc/rdr/MemOutStream.java
diff --git a/java/src/com/tigervnc/rdr/OutStream.java b/java/com/tigervnc/rdr/OutStream.java
index 0919453e..0919453e 100644
--- a/java/src/com/tigervnc/rdr/OutStream.java
+++ b/java/com/tigervnc/rdr/OutStream.java
diff --git a/java/src/com/tigervnc/rdr/ZlibInStream.java b/java/com/tigervnc/rdr/ZlibInStream.java
index 62c45bd8..62c45bd8 100644
--- a/java/src/com/tigervnc/rdr/ZlibInStream.java
+++ b/java/com/tigervnc/rdr/ZlibInStream.java
diff --git a/java/src/com/tigervnc/rfb/AliasParameter.java b/java/com/tigervnc/rfb/AliasParameter.java
index 2570b877..2570b877 100644
--- a/java/src/com/tigervnc/rfb/AliasParameter.java
+++ b/java/com/tigervnc/rfb/AliasParameter.java
diff --git a/java/src/com/tigervnc/rfb/AuthFailureException.java b/java/com/tigervnc/rfb/AuthFailureException.java
index 35fabef0..35fabef0 100644
--- a/java/src/com/tigervnc/rfb/AuthFailureException.java
+++ b/java/com/tigervnc/rfb/AuthFailureException.java
diff --git a/java/src/com/tigervnc/rfb/BoolParameter.java b/java/com/tigervnc/rfb/BoolParameter.java
index 06c6ed79..06c6ed79 100644
--- a/java/src/com/tigervnc/rfb/BoolParameter.java
+++ b/java/com/tigervnc/rfb/BoolParameter.java
diff --git a/java/src/com/tigervnc/rfb/CConnection.java b/java/com/tigervnc/rfb/CConnection.java
index 15e19896..15e19896 100644
--- a/java/src/com/tigervnc/rfb/CConnection.java
+++ b/java/com/tigervnc/rfb/CConnection.java
diff --git a/java/src/com/tigervnc/rfb/CMsgHandler.java b/java/com/tigervnc/rfb/CMsgHandler.java
index 81fd2a1b..81fd2a1b 100644
--- a/java/src/com/tigervnc/rfb/CMsgHandler.java
+++ b/java/com/tigervnc/rfb/CMsgHandler.java
diff --git a/java/src/com/tigervnc/rfb/CMsgReader.java b/java/com/tigervnc/rfb/CMsgReader.java
index 41230560..41230560 100644
--- a/java/src/com/tigervnc/rfb/CMsgReader.java
+++ b/java/com/tigervnc/rfb/CMsgReader.java
diff --git a/java/src/com/tigervnc/rfb/CMsgReaderV3.java b/java/com/tigervnc/rfb/CMsgReaderV3.java
index 6d9e254b..6d9e254b 100644
--- a/java/src/com/tigervnc/rfb/CMsgReaderV3.java
+++ b/java/com/tigervnc/rfb/CMsgReaderV3.java
diff --git a/java/src/com/tigervnc/rfb/CMsgWriter.java b/java/com/tigervnc/rfb/CMsgWriter.java
index 7cafddde..7cafddde 100644
--- a/java/src/com/tigervnc/rfb/CMsgWriter.java
+++ b/java/com/tigervnc/rfb/CMsgWriter.java
diff --git a/java/src/com/tigervnc/rfb/CMsgWriterV3.java b/java/com/tigervnc/rfb/CMsgWriterV3.java
index ec30a826..ec30a826 100644
--- a/java/src/com/tigervnc/rfb/CMsgWriterV3.java
+++ b/java/com/tigervnc/rfb/CMsgWriterV3.java
diff --git a/java/src/com/tigervnc/rfb/CSecurity.java b/java/com/tigervnc/rfb/CSecurity.java
index e5b300f6..e5b300f6 100644
--- a/java/src/com/tigervnc/rfb/CSecurity.java
+++ b/java/com/tigervnc/rfb/CSecurity.java
diff --git a/java/src/com/tigervnc/rfb/CSecurityIdent.java b/java/com/tigervnc/rfb/CSecurityIdent.java
index 6523e411..6523e411 100644
--- a/java/src/com/tigervnc/rfb/CSecurityIdent.java
+++ b/java/com/tigervnc/rfb/CSecurityIdent.java
diff --git a/java/src/com/tigervnc/rfb/CSecurityManaged.java b/java/com/tigervnc/rfb/CSecurityManaged.java
index 2461682d..2461682d 100644
--- a/java/src/com/tigervnc/rfb/CSecurityManaged.java
+++ b/java/com/tigervnc/rfb/CSecurityManaged.java
diff --git a/java/src/com/tigervnc/rfb/CSecurityNone.java b/java/com/tigervnc/rfb/CSecurityNone.java
index e31056da..e31056da 100644
--- a/java/src/com/tigervnc/rfb/CSecurityNone.java
+++ b/java/com/tigervnc/rfb/CSecurityNone.java
diff --git a/java/src/com/tigervnc/rfb/CSecurityPlain.java b/java/com/tigervnc/rfb/CSecurityPlain.java
index 707915cc..707915cc 100644
--- a/java/src/com/tigervnc/rfb/CSecurityPlain.java
+++ b/java/com/tigervnc/rfb/CSecurityPlain.java
diff --git a/java/src/com/tigervnc/rfb/CSecurityStack.java b/java/com/tigervnc/rfb/CSecurityStack.java
index 5886268e..5886268e 100644
--- a/java/src/com/tigervnc/rfb/CSecurityStack.java
+++ b/java/com/tigervnc/rfb/CSecurityStack.java
diff --git a/java/src/com/tigervnc/rfb/CSecurityTLS.java b/java/com/tigervnc/rfb/CSecurityTLS.java
index 73eb6199..73eb6199 100644
--- a/java/src/com/tigervnc/rfb/CSecurityTLS.java
+++ b/java/com/tigervnc/rfb/CSecurityTLS.java
diff --git a/java/src/com/tigervnc/rfb/CSecurityVeNCrypt.java b/java/com/tigervnc/rfb/CSecurityVeNCrypt.java
index ae758e7f..ae758e7f 100644
--- a/java/src/com/tigervnc/rfb/CSecurityVeNCrypt.java
+++ b/java/com/tigervnc/rfb/CSecurityVeNCrypt.java
diff --git a/java/src/com/tigervnc/rfb/CSecurityVncAuth.java b/java/com/tigervnc/rfb/CSecurityVncAuth.java
index 405e79fa..405e79fa 100644
--- a/java/src/com/tigervnc/rfb/CSecurityVncAuth.java
+++ b/java/com/tigervnc/rfb/CSecurityVncAuth.java
diff --git a/java/src/com/tigervnc/rfb/Configuration.java b/java/com/tigervnc/rfb/Configuration.java
index bc676087..bc676087 100644
--- a/java/src/com/tigervnc/rfb/Configuration.java
+++ b/java/com/tigervnc/rfb/Configuration.java
diff --git a/java/src/com/tigervnc/rfb/ConnFailedException.java b/java/com/tigervnc/rfb/ConnFailedException.java
index d1ddcb4e..d1ddcb4e 100644
--- a/java/src/com/tigervnc/rfb/ConnFailedException.java
+++ b/java/com/tigervnc/rfb/ConnFailedException.java
diff --git a/java/src/com/tigervnc/rfb/ConnParams.java b/java/com/tigervnc/rfb/ConnParams.java
index 70d6114f..70d6114f 100644
--- a/java/src/com/tigervnc/rfb/ConnParams.java
+++ b/java/com/tigervnc/rfb/ConnParams.java
diff --git a/java/src/com/tigervnc/rfb/Cursor.java b/java/com/tigervnc/rfb/Cursor.java
index 420eb82a..420eb82a 100644
--- a/java/src/com/tigervnc/rfb/Cursor.java
+++ b/java/com/tigervnc/rfb/Cursor.java
diff --git a/java/src/com/tigervnc/rfb/Decoder.java b/java/com/tigervnc/rfb/Decoder.java
index 8d42ea5e..8d42ea5e 100644
--- a/java/src/com/tigervnc/rfb/Decoder.java
+++ b/java/com/tigervnc/rfb/Decoder.java
diff --git a/java/src/com/tigervnc/rfb/DesCipher.java b/java/com/tigervnc/rfb/DesCipher.java
index f7ae9db9..f7ae9db9 100644
--- a/java/src/com/tigervnc/rfb/DesCipher.java
+++ b/java/com/tigervnc/rfb/DesCipher.java
diff --git a/java/src/com/tigervnc/rfb/Encoder.java b/java/com/tigervnc/rfb/Encoder.java
index 0964f88e..0964f88e 100644
--- a/java/src/com/tigervnc/rfb/Encoder.java
+++ b/java/com/tigervnc/rfb/Encoder.java
diff --git a/java/src/com/tigervnc/rfb/Encodings.java b/java/com/tigervnc/rfb/Encodings.java
index 493d5488..493d5488 100644
--- a/java/src/com/tigervnc/rfb/Encodings.java
+++ b/java/com/tigervnc/rfb/Encodings.java
diff --git a/java/src/com/tigervnc/rfb/Exception.java b/java/com/tigervnc/rfb/Exception.java
index 26ac355b..26ac355b 100644
--- a/java/src/com/tigervnc/rfb/Exception.java
+++ b/java/com/tigervnc/rfb/Exception.java
diff --git a/java/src/com/tigervnc/rfb/Hextile.java b/java/com/tigervnc/rfb/Hextile.java
index 9c05b729..9c05b729 100644
--- a/java/src/com/tigervnc/rfb/Hextile.java
+++ b/java/com/tigervnc/rfb/Hextile.java
diff --git a/java/src/com/tigervnc/rfb/HextileDecoder.java b/java/com/tigervnc/rfb/HextileDecoder.java
index 4c32b52c..4c32b52c 100644
--- a/java/src/com/tigervnc/rfb/HextileDecoder.java
+++ b/java/com/tigervnc/rfb/HextileDecoder.java
diff --git a/java/src/com/tigervnc/rfb/Hostname.java b/java/com/tigervnc/rfb/Hostname.java
index 42fda537..42fda537 100644
--- a/java/src/com/tigervnc/rfb/Hostname.java
+++ b/java/com/tigervnc/rfb/Hostname.java
diff --git a/java/src/com/tigervnc/rfb/IntParameter.java b/java/com/tigervnc/rfb/IntParameter.java
index 877063e7..877063e7 100644
--- a/java/src/com/tigervnc/rfb/IntParameter.java
+++ b/java/com/tigervnc/rfb/IntParameter.java
diff --git a/java/src/com/tigervnc/rfb/Keysyms.java b/java/com/tigervnc/rfb/Keysyms.java
index 6bfafeaf..6bfafeaf 100644
--- a/java/src/com/tigervnc/rfb/Keysyms.java
+++ b/java/com/tigervnc/rfb/Keysyms.java
diff --git a/java/src/com/tigervnc/rfb/LogWriter.java b/java/com/tigervnc/rfb/LogWriter.java
index c5730531..c5730531 100644
--- a/java/src/com/tigervnc/rfb/LogWriter.java
+++ b/java/com/tigervnc/rfb/LogWriter.java
diff --git a/java/src/com/tigervnc/rfb/ManagedPixelBuffer.java b/java/com/tigervnc/rfb/ManagedPixelBuffer.java
index 46b5acf7..46b5acf7 100644
--- a/java/src/com/tigervnc/rfb/ManagedPixelBuffer.java
+++ b/java/com/tigervnc/rfb/ManagedPixelBuffer.java
diff --git a/java/src/com/tigervnc/rfb/MsgTypes.java b/java/com/tigervnc/rfb/MsgTypes.java
index a009b396..a009b396 100644
--- a/java/src/com/tigervnc/rfb/MsgTypes.java
+++ b/java/com/tigervnc/rfb/MsgTypes.java
diff --git a/java/src/com/tigervnc/rfb/PixelBuffer.java b/java/com/tigervnc/rfb/PixelBuffer.java
index f87fead8..f87fead8 100644
--- a/java/src/com/tigervnc/rfb/PixelBuffer.java
+++ b/java/com/tigervnc/rfb/PixelBuffer.java
diff --git a/java/src/com/tigervnc/rfb/PixelFormat.java b/java/com/tigervnc/rfb/PixelFormat.java
index a8ab5f11..a8ab5f11 100644
--- a/java/src/com/tigervnc/rfb/PixelFormat.java
+++ b/java/com/tigervnc/rfb/PixelFormat.java
diff --git a/java/src/com/tigervnc/rfb/Point.java b/java/com/tigervnc/rfb/Point.java
index 25de8c20..25de8c20 100644
--- a/java/src/com/tigervnc/rfb/Point.java
+++ b/java/com/tigervnc/rfb/Point.java
diff --git a/java/src/com/tigervnc/rfb/RREDecoder.java b/java/com/tigervnc/rfb/RREDecoder.java
index e0ff5cfe..e0ff5cfe 100644
--- a/java/src/com/tigervnc/rfb/RREDecoder.java
+++ b/java/com/tigervnc/rfb/RREDecoder.java
diff --git a/java/src/com/tigervnc/rfb/RawDecoder.java b/java/com/tigervnc/rfb/RawDecoder.java
index 79db8260..79db8260 100644
--- a/java/src/com/tigervnc/rfb/RawDecoder.java
+++ b/java/com/tigervnc/rfb/RawDecoder.java
diff --git a/java/src/com/tigervnc/rfb/Rect.java b/java/com/tigervnc/rfb/Rect.java
index fab4f5dd..fab4f5dd 100644
--- a/java/src/com/tigervnc/rfb/Rect.java
+++ b/java/com/tigervnc/rfb/Rect.java
diff --git a/java/src/com/tigervnc/rfb/Screen.java b/java/com/tigervnc/rfb/Screen.java
index 90b22b6d..90b22b6d 100644
--- a/java/src/com/tigervnc/rfb/Screen.java
+++ b/java/com/tigervnc/rfb/Screen.java
diff --git a/java/src/com/tigervnc/rfb/ScreenSet.java b/java/com/tigervnc/rfb/ScreenSet.java
index 071282ff..071282ff 100644
--- a/java/src/com/tigervnc/rfb/ScreenSet.java
+++ b/java/com/tigervnc/rfb/ScreenSet.java
diff --git a/java/src/com/tigervnc/rfb/Security.java b/java/com/tigervnc/rfb/Security.java
index 379851d8..379851d8 100644
--- a/java/src/com/tigervnc/rfb/Security.java
+++ b/java/com/tigervnc/rfb/Security.java
diff --git a/java/src/com/tigervnc/rfb/SecurityClient.java b/java/com/tigervnc/rfb/SecurityClient.java
index a8abd9e1..a8abd9e1 100644
--- a/java/src/com/tigervnc/rfb/SecurityClient.java
+++ b/java/com/tigervnc/rfb/SecurityClient.java
diff --git a/java/src/com/tigervnc/rfb/StringParameter.java b/java/com/tigervnc/rfb/StringParameter.java
index d7fd1a51..d7fd1a51 100644
--- a/java/src/com/tigervnc/rfb/StringParameter.java
+++ b/java/com/tigervnc/rfb/StringParameter.java
diff --git a/java/src/com/tigervnc/rfb/TightDecoder.java b/java/com/tigervnc/rfb/TightDecoder.java
index 5cce3a93..5cce3a93 100644
--- a/java/src/com/tigervnc/rfb/TightDecoder.java
+++ b/java/com/tigervnc/rfb/TightDecoder.java
diff --git a/java/src/com/tigervnc/rfb/UnicodeToKeysym.java b/java/com/tigervnc/rfb/UnicodeToKeysym.java
index 44f61ba6..44f61ba6 100644
--- a/java/src/com/tigervnc/rfb/UnicodeToKeysym.java
+++ b/java/com/tigervnc/rfb/UnicodeToKeysym.java
diff --git a/java/src/com/tigervnc/rfb/UserMsgBox.java b/java/com/tigervnc/rfb/UserMsgBox.java
index e83d9956..e83d9956 100644
--- a/java/src/com/tigervnc/rfb/UserMsgBox.java
+++ b/java/com/tigervnc/rfb/UserMsgBox.java
diff --git a/java/src/com/tigervnc/rfb/UserPasswdGetter.java b/java/com/tigervnc/rfb/UserPasswdGetter.java
index 9796b66f..9796b66f 100644
--- a/java/src/com/tigervnc/rfb/UserPasswdGetter.java
+++ b/java/com/tigervnc/rfb/UserPasswdGetter.java
diff --git a/java/src/com/tigervnc/rfb/VncAuth.java b/java/com/tigervnc/rfb/VncAuth.java
index cce8d81c..cce8d81c 100644
--- a/java/src/com/tigervnc/rfb/VncAuth.java
+++ b/java/com/tigervnc/rfb/VncAuth.java
diff --git a/java/src/com/tigervnc/rfb/VoidParameter.java b/java/com/tigervnc/rfb/VoidParameter.java
index f41f4c84..f41f4c84 100644
--- a/java/src/com/tigervnc/rfb/VoidParameter.java
+++ b/java/com/tigervnc/rfb/VoidParameter.java
diff --git a/java/src/com/tigervnc/rfb/ZRLEDecoder.java b/java/com/tigervnc/rfb/ZRLEDecoder.java
index 4f740f9d..4f740f9d 100644
--- a/java/src/com/tigervnc/rfb/ZRLEDecoder.java
+++ b/java/com/tigervnc/rfb/ZRLEDecoder.java
diff --git a/java/src/com/tigervnc/rfb/screenTypes.java b/java/com/tigervnc/rfb/screenTypes.java
index d46741c6..d46741c6 100644
--- a/java/src/com/tigervnc/rfb/screenTypes.java
+++ b/java/com/tigervnc/rfb/screenTypes.java
diff --git a/java/src/com/tigervnc/vncviewer/CConn.java b/java/com/tigervnc/vncviewer/CConn.java
index 7d76beed..7d76beed 100644
--- a/java/src/com/tigervnc/vncviewer/CConn.java
+++ b/java/com/tigervnc/vncviewer/CConn.java
diff --git a/java/src/com/tigervnc/vncviewer/ClipboardDialog.java b/java/com/tigervnc/vncviewer/ClipboardDialog.java
index dca85f25..dca85f25 100644
--- a/java/src/com/tigervnc/vncviewer/ClipboardDialog.java
+++ b/java/com/tigervnc/vncviewer/ClipboardDialog.java
diff --git a/java/src/com/tigervnc/vncviewer/DesktopWindow.java b/java/com/tigervnc/vncviewer/DesktopWindow.java
index f5acfff1..f5acfff1 100644
--- a/java/src/com/tigervnc/vncviewer/DesktopWindow.java
+++ b/java/com/tigervnc/vncviewer/DesktopWindow.java
diff --git a/java/src/com/tigervnc/vncviewer/Dialog.java b/java/com/tigervnc/vncviewer/Dialog.java
index 6a11fb3a..6a11fb3a 100644
--- a/java/src/com/tigervnc/vncviewer/Dialog.java
+++ b/java/com/tigervnc/vncviewer/Dialog.java
diff --git a/java/src/com/tigervnc/vncviewer/F8Menu.java b/java/com/tigervnc/vncviewer/F8Menu.java
index 9b617857..9b617857 100644
--- a/java/src/com/tigervnc/vncviewer/F8Menu.java
+++ b/java/com/tigervnc/vncviewer/F8Menu.java
diff --git a/java/src/com/tigervnc/vncviewer/LICENCE.TXT b/java/com/tigervnc/vncviewer/LICENCE.TXT
index ae3b5319..ae3b5319 100644
--- a/java/src/com/tigervnc/vncviewer/LICENCE.TXT
+++ b/java/com/tigervnc/vncviewer/LICENCE.TXT
diff --git a/java/src/com/tigervnc/vncviewer/MANIFEST.MF b/java/com/tigervnc/vncviewer/MANIFEST.MF
index b3574fe2..b3574fe2 100644
--- a/java/src/com/tigervnc/vncviewer/MANIFEST.MF
+++ b/java/com/tigervnc/vncviewer/MANIFEST.MF
diff --git a/java/src/com/tigervnc/vncviewer/OptionsDialog.java b/java/com/tigervnc/vncviewer/OptionsDialog.java
index 9664dc99..9664dc99 100644
--- a/java/src/com/tigervnc/vncviewer/OptionsDialog.java
+++ b/java/com/tigervnc/vncviewer/OptionsDialog.java
diff --git a/java/src/com/tigervnc/vncviewer/OptionsDialogCallback.java b/java/com/tigervnc/vncviewer/OptionsDialogCallback.java
index f6897e24..f6897e24 100644
--- a/java/src/com/tigervnc/vncviewer/OptionsDialogCallback.java
+++ b/java/com/tigervnc/vncviewer/OptionsDialogCallback.java
diff --git a/java/src/com/tigervnc/vncviewer/PasswdDialog.java b/java/com/tigervnc/vncviewer/PasswdDialog.java
index eaace698..eaace698 100644
--- a/java/src/com/tigervnc/vncviewer/PasswdDialog.java
+++ b/java/com/tigervnc/vncviewer/PasswdDialog.java
diff --git a/java/src/com/tigervnc/vncviewer/PixelBufferImage.java b/java/com/tigervnc/vncviewer/PixelBufferImage.java
index 7e5e7174..7e5e7174 100644
--- a/java/src/com/tigervnc/vncviewer/PixelBufferImage.java
+++ b/java/com/tigervnc/vncviewer/PixelBufferImage.java
diff --git a/java/src/com/tigervnc/vncviewer/README b/java/com/tigervnc/vncviewer/README
index 9d825684..9d825684 100644
--- a/java/src/com/tigervnc/vncviewer/README
+++ b/java/com/tigervnc/vncviewer/README
diff --git a/java/src/com/tigervnc/vncviewer/ServerDialog.java b/java/com/tigervnc/vncviewer/ServerDialog.java
index 00a7e183..00a7e183 100644
--- a/java/src/com/tigervnc/vncviewer/ServerDialog.java
+++ b/java/com/tigervnc/vncviewer/ServerDialog.java
diff --git a/java/src/com/tigervnc/vncviewer/UserPrefs.java b/java/com/tigervnc/vncviewer/UserPrefs.java
index bc2cf0f1..bc2cf0f1 100644
--- a/java/src/com/tigervnc/vncviewer/UserPrefs.java
+++ b/java/com/tigervnc/vncviewer/UserPrefs.java
diff --git a/java/src/com/tigervnc/vncviewer/VncViewer.java b/java/com/tigervnc/vncviewer/VncViewer.java
index bea486b0..bea486b0 100644
--- a/java/src/com/tigervnc/vncviewer/VncViewer.java
+++ b/java/com/tigervnc/vncviewer/VncViewer.java
diff --git a/java/src/com/tigervnc/vncviewer/index.html b/java/com/tigervnc/vncviewer/index.html
index ba00e26b..ba00e26b 100644
--- a/java/src/com/tigervnc/vncviewer/index.html
+++ b/java/com/tigervnc/vncviewer/index.html
diff --git a/java/src/com/tigervnc/vncviewer/index.vnc b/java/com/tigervnc/vncviewer/index.vnc
index e8899875..e8899875 100644
--- a/java/src/com/tigervnc/vncviewer/index.vnc
+++ b/java/com/tigervnc/vncviewer/index.vnc
diff --git a/java/src/com/tigervnc/vncviewer/tigervnc.ico b/java/com/tigervnc/vncviewer/tigervnc.ico
index 50b90f00..50b90f00 100644
--- a/java/src/com/tigervnc/vncviewer/tigervnc.ico
+++ b/java/com/tigervnc/vncviewer/tigervnc.ico
diff --git a/java/src/com/tigervnc/vncviewer/tigervnc.png b/java/com/tigervnc/vncviewer/tigervnc.png
index 8ac883ef..8ac883ef 100644
--- a/java/src/com/tigervnc/vncviewer/tigervnc.png
+++ b/java/com/tigervnc/vncviewer/tigervnc.png
diff --git a/java/src/com/tigervnc/vncviewer/timestamp.in b/java/com/tigervnc/vncviewer/timestamp.in
index b666e7c0..b666e7c0 100644
--- a/java/src/com/tigervnc/vncviewer/timestamp.in
+++ b/java/com/tigervnc/vncviewer/timestamp.in
diff --git a/win/winvnc/CMakeLists.txt b/win/winvnc/CMakeLists.txt
index 6b873c71..3b576a7b 100644
--- a/win/winvnc/CMakeLists.txt
+++ b/win/winvnc/CMakeLists.txt
@@ -31,7 +31,7 @@ target_link_libraries(winvnc4 rfb rfb_win32 Xregion network rdr ws2_32.lib)
 
 if(BUILD_JAVA)
   set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/winvnc.rc
-    PROPERTIES OBJECT_DEPENDS ${CMAKE_BINARY_DIR}/java/src/VncViewer.jar)
+    PROPERTIES OBJECT_DEPENDS ${CMAKE_BINARY_DIR}/java/VncViewer.jar)
 endif()
 
 install(TARGETS winvnc4
diff --git a/win/winvnc/winvnc.rc.in b/win/winvnc/winvnc.rc.in
index 857f077a..3c484ed7 100644
--- a/win/winvnc/winvnc.rc.in
+++ b/win/winvnc/winvnc.rc.in
@@ -223,7 +223,7 @@ END
 #cmakedefine BUILD_JAVA
 
 #ifdef BUILD_JAVA
-/VNCVIEWER.JAR          HTTPFILE DISCARDABLE    "@CMAKE_WIN_BINARY_DIR@\\java\\src\\VncViewer.jar"
+/VNCVIEWER.JAR          HTTPFILE DISCARDABLE    "@CMAKE_WIN_BINARY_DIR@\\java\\VncViewer.jar"
 /INDEX.VNC              HTTPFILE DISCARDABLE    "@CMAKE_WIN_SOURCE_DIR@\\win\\winvnc\\index.vnc"
 #endif