From efb7c478fda04336292104b10c3adf985d59b173 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Wed, 22 Jan 2014 20:14:00 +0100 Subject: Bug 945 - GlueGen's IOUtil does not consider file URI's authority when converting to file-path or URI (Windows UNC / share host) Note: Authority for 'file-scheme' URI's is used on Windows to denote the host of the shared resource -> UNC Following methods of IOUtil didn't consider the authority for file-scheme URI: 'URL toURL(final URI uri)' 'String decodeURIToFilePath(final String uriPath)' 'String decodeURIIfFilePath(final URI uri)' Further more, the patterns 'patternSingleFS' and 'patternSingleBS' converted multiple '\' '/' to one replacement. However, we should not change the separator count and replace them one-by-one. TestIOUtilURIHandling: - Added shared-file-host 'filehost' test cases to file URIs and plain file path tests. - Passed on Unix and Windows. Added 'make/scripts/test-win32-smb_share.bat' - Testing actual windows share usage - Passed on Windows --- make/scripts/java-win32.bat | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'make/scripts/java-win32.bat') diff --git a/make/scripts/java-win32.bat b/make/scripts/java-win32.bat index 20952cc..12a95a3 100755 --- a/make/scripts/java-win32.bat +++ b/make/scripts/java-win32.bat @@ -13,4 +13,7 @@ set CP_ALL=.;%BLD_DIR%\gluegen-rt.jar;%BLD_DIR%\test\build\gluegen-test.jar;lib\ echo CP_ALL %CP_ALL% -%J2RE_HOME%\bin\java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %1 %2 %3 %4 %5 %6 %7 %8 %9 > java-win32.log 2>&1 +set D_ARGS="-Djogamp.debug.IOUtil" +REM set D_ARGS="-Djogamp.debug=all" + +%J2RE_HOME%\bin\java -classpath %CP_ALL% %D_ARGS% "-Djava.library.path=%LIB_DIR%" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %1 %2 %3 %4 %5 %6 %7 %8 %9 > java-win32.log 2>&1 -- cgit v1.2.3