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/test-win32-smb_share.bat | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100755 make/scripts/test-win32-smb_share.bat (limited to 'make/scripts/test-win32-smb_share.bat') diff --git a/make/scripts/test-win32-smb_share.bat b/make/scripts/test-win32-smb_share.bat new file mode 100755 index 0000000..5f55583 --- /dev/null +++ b/make/scripts/test-win32-smb_share.bat @@ -0,0 +1,24 @@ + +set SMB_ROOT=\\risa.goethel.localnet\deployment\test\jogamp + +set BLD_SUB=build-win32 +set J2RE_HOME=c:\jre1.7.0_45_x32 +set JAVA_HOME=c:\jdk1.7.0_45_x32 +set ANT_PATH=C:\apache-ant-1.8.2 + +set PROJECT_ROOT=%SMB_ROOT%\gluegen +set BLD_DIR=%PROJECT_ROOT%\%BLD_SUB% + +set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;%PATH% + +set D_ARGS="-Djogamp.debug=all" + +set LIB_DIR= + +set CP_ALL=.;%BLD_DIR%\gluegen-rt.jar;%PROJECT_ROOT%\make\lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar + +echo CP_ALL %CP_ALL% + +%J2RE_HOME%\bin\java -classpath %CP_ALL% %D_ARGS% %X_ARGS% com.jogamp.common.GlueGenVersion > java-win.log 2>&1 +tail java-win.log + -- cgit v1.2.3