From 94837b09d543e995c25151abb15cb5b64d5df06f Mon Sep 17 00:00:00 2001
From: joehw <unknown>
Date: Mon, 25 Nov 2013 16:53:30 -0800
Subject: [PATCH] 8027973:
 javax/xml/jaxp/transform/jdk8004476/XSLTExFuncTest.java hangs (win)
 Reviewed-by: alanb, dfuchs, joehw Contributed-by: patrick.zhang@oracle.com

---
 .../{jdk8004476 => 8004476}/SecureProcessingTest.xml        | 0
 .../jaxp/transform/{jdk8004476 => 8004476}/TestBase.java    | 0
 .../transform/{jdk8004476 => 8004476}/XPathExFuncTest.java  | 0
 .../transform/{jdk8004476 => 8004476}/XSLTExFuncTest.java   | 6 +++---
 .../xml/jaxp/transform/{jdk8004476 => 8004476}/tokenize.xml | 0
 .../xml/jaxp/transform/{jdk8004476 => 8004476}/tokenize.xsl | 0
 6 files changed, 3 insertions(+), 3 deletions(-)
 rename test/javax/xml/jaxp/transform/{jdk8004476 => 8004476}/SecureProcessingTest.xml (100%)
 rename test/javax/xml/jaxp/transform/{jdk8004476 => 8004476}/TestBase.java (100%)
 rename test/javax/xml/jaxp/transform/{jdk8004476 => 8004476}/XPathExFuncTest.java (100%)
 rename test/javax/xml/jaxp/transform/{jdk8004476 => 8004476}/XSLTExFuncTest.java (96%)
 rename test/javax/xml/jaxp/transform/{jdk8004476 => 8004476}/tokenize.xml (100%)
 rename test/javax/xml/jaxp/transform/{jdk8004476 => 8004476}/tokenize.xsl (100%)

diff --git a/test/javax/xml/jaxp/transform/jdk8004476/SecureProcessingTest.xml b/test/javax/xml/jaxp/transform/8004476/SecureProcessingTest.xml
similarity index 100%
rename from test/javax/xml/jaxp/transform/jdk8004476/SecureProcessingTest.xml
rename to test/javax/xml/jaxp/transform/8004476/SecureProcessingTest.xml
diff --git a/test/javax/xml/jaxp/transform/jdk8004476/TestBase.java b/test/javax/xml/jaxp/transform/8004476/TestBase.java
similarity index 100%
rename from test/javax/xml/jaxp/transform/jdk8004476/TestBase.java
rename to test/javax/xml/jaxp/transform/8004476/TestBase.java
diff --git a/test/javax/xml/jaxp/transform/jdk8004476/XPathExFuncTest.java b/test/javax/xml/jaxp/transform/8004476/XPathExFuncTest.java
similarity index 100%
rename from test/javax/xml/jaxp/transform/jdk8004476/XPathExFuncTest.java
rename to test/javax/xml/jaxp/transform/8004476/XPathExFuncTest.java
diff --git a/test/javax/xml/jaxp/transform/jdk8004476/XSLTExFuncTest.java b/test/javax/xml/jaxp/transform/8004476/XSLTExFuncTest.java
similarity index 96%
rename from test/javax/xml/jaxp/transform/jdk8004476/XSLTExFuncTest.java
rename to test/javax/xml/jaxp/transform/8004476/XSLTExFuncTest.java
index 3565ba759..b86bcff49 100644
--- a/test/javax/xml/jaxp/transform/jdk8004476/XSLTExFuncTest.java
+++ b/test/javax/xml/jaxp/transform/8004476/XSLTExFuncTest.java
@@ -66,10 +66,10 @@ public class XSLTExFuncTest extends TestBase {
         xslFile = filepath + "/tokenize.xsl";
 
         /**
-         * if (isWindows) { xslFile = "/" + xslFile; }
-         *
+         * On Windows platform it needs triple '/' for valid URL while double '/' is enough on Linux or Solaris.
+         * Here use file:/// directly to make it work on Windows and it will not impact other platforms.
          */
-        xslFileId = "file://" + xslFile;
+        xslFileId = "file:///" + xslFile;
     }
 
     /**
diff --git a/test/javax/xml/jaxp/transform/jdk8004476/tokenize.xml b/test/javax/xml/jaxp/transform/8004476/tokenize.xml
similarity index 100%
rename from test/javax/xml/jaxp/transform/jdk8004476/tokenize.xml
rename to test/javax/xml/jaxp/transform/8004476/tokenize.xml
diff --git a/test/javax/xml/jaxp/transform/jdk8004476/tokenize.xsl b/test/javax/xml/jaxp/transform/8004476/tokenize.xsl
similarity index 100%
rename from test/javax/xml/jaxp/transform/jdk8004476/tokenize.xsl
rename to test/javax/xml/jaxp/transform/8004476/tokenize.xsl
-- 
GitLab