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

4 files changed, 33 insertions, 5 deletions

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

diff --git a/make/scripts/runtest-x32.bat b/make/scripts/runtest-x32.bat
index a2238df..a594f4a 100755
--- a/make/scripts/runtest-x32.bat
+++ b/make/scripts/runtest-x32.bat
@@ -1,5 +1,6 @@
 REM scripts\java-win32.bat com.jogamp.common.GlueGenVersion 
 REM scripts\java-win32.bat com.jogamp.common.util.TestVersionInfo
 REM scripts\java-win32.bat com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter
-scripts\java-win32.bat com.jogamp.common.os.TestElfReader01
+REM scripts\java-win32.bat com.jogamp.common.os.TestElfReader01
+scripts\java-win32.bat com.jogamp.common.util.TestIOUtilURIHandling
 
diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh
index 8251995..7651bc5 100755
--- a/make/scripts/runtest.sh
+++ b/make/scripts/runtest.sh
@@ -52,7 +52,7 @@ rm -f $LOG
 #D_ARGS="-Djogamp.debug.Lock"
 #D_ARGS="-Djogamp.debug.Lock -Djogamp.debug.Lock.TraceLock"
 #D_ARGS="-Djogamp.debug.Lock.TraceLock"
-#D_ARGS="-Djogamp.debug.IOUtil"
+D_ARGS="-Djogamp.debug.IOUtil"
 #D_ARGS="-Djogamp.debug=all"
 
 function onetest() {
@@ -95,8 +95,8 @@ function onetest() {
 #onetest com.jogamp.common.util.TestRunnableTask01 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.util.TestIOUtil01 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.util.TestIOUtilURICompose 2>&1 | tee -a $LOG
-onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestIOUtilURIHandling 2>&1 | tee -a $LOG
+#onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestIOUtilURIHandling 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.util.TestTempJarCache 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.util.TestJarUtil 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.util.TestValueConversion 2>&1 | tee -a $LOG
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

+