Author: cbowditch
Date: Thu May 7 15:08:30 2009
New Revision: 772672
URL: http://svn.apache.org/viewvc?rev=772672&view=rev
Log:
bug fix: allow back slashes for file URLs as they are commonly used in Windows
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOURIResolver.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FOURIResolverTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/UserConfigTestSuite.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOURIResolver.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOURIResolver.java?rev=772672&r1=772671&r2=772672&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOURIResolver.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOURIResolver.java Thu
May 7 15:08:30 2009
@@ -68,6 +68,8 @@
* @throws MalformedURLException if there's a problem with a file URL
*/
public String checkBaseURL(String base) throws MalformedURLException {
+ // replace back slash with forward slash to ensure windows file:///
URLS are supported
+ base = base.replace('\\', '/');
if (!base.endsWith("/")) {
// The behavior described by RFC 3986 regarding resolution of
relative
// references may be misleading for normal users:
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FOURIResolverTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FOURIResolverTestCase.java?rev=772672&r1=772671&r2=772672&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FOURIResolverTestCase.java
(original)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FOURIResolverTestCase.java
Thu May 7 15:08:30 2009
@@ -39,6 +39,7 @@
System.out.println(resolver.checkBaseURL("./test/config"));
System.out.println(resolver.checkBaseURL("file:test/config"));
System.out.println(resolver.checkBaseURL("fantasy:myconfig"));
+ System.out.println(resolver.checkBaseURL("file:test\\config\\"));
try {
resolver.checkBaseURL("./doesnotexist");
fail("Expected an exception for a inexistent base directory");
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/UserConfigTestSuite.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/config/UserConfigTestSuite.java?rev=772672&r1=772671&r2=772672&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/UserConfigTestSuite.java
(original)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/UserConfigTestSuite.java
Thu May 7 15:08:30 2009
@@ -45,6 +45,7 @@
suite.addTest(new TestSuite(FontsDirectoryRecursiveTestCase.class));
suite.addTest(new TestSuite(FontsAutoDetectTestCase.class));
suite.addTest(new TestSuite(FontsSubstitutionTestCase.class));
+ suite.addTest(new TestSuite(FOURIResolverTestCase.class));
//$JUnit-END$
return suite;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
