FOP-2861: Allow resource loading from jar
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1903877 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/fop-core/src/main/java/org/apache/fop/apps/io/InternalResourceResolver.java b/fop-core/src/main/java/org/apache/fop/apps/io/InternalResourceResolver.java
index a6fbfaf..470f2e4 100644
--- a/fop-core/src/main/java/org/apache/fop/apps/io/InternalResourceResolver.java
+++ b/fop-core/src/main/java/org/apache/fop/apps/io/InternalResourceResolver.java
@@ -22,8 +22,10 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
+import java.net.URL;
import javax.xml.transform.Source;
import javax.xml.transform.TransformerException;
@@ -110,7 +112,11 @@
* @return the resolved URI
*/
public URI resolveFromBase(URI uri) {
- return baseUri.resolve(uri);
+ try {
+ return new URL(baseUri.toURL(), uri.toString()).toURI();
+ } catch (MalformedURLException | URISyntaxException | IllegalArgumentException e) {
+ return baseUri.resolve(uri);
+ }
}
/**
diff --git a/fop-core/src/test/java/org/apache/fop/apps/io/URIResolverWrapperTestCase.java b/fop-core/src/test/java/org/apache/fop/apps/io/URIResolverWrapperTestCase.java
index c5dee2f..5bab320 100644
--- a/fop-core/src/test/java/org/apache/fop/apps/io/URIResolverWrapperTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/apps/io/URIResolverWrapperTestCase.java
@@ -46,12 +46,10 @@
public class URIResolverWrapperTestCase {
private static final List<String> BASE_URIS = Collections.unmodifiableList(Arrays.asList(
- new String[] {
- ".",
- "../",
- "some/path",
- "file:///absolute/file/path"}
- ));
+ ".",
+ "../",
+ "some/path",
+ "file:///absolute/file/path"));
private URI base;
@@ -151,4 +149,11 @@
// PASS
}
}
+
+ @Test
+ public void testJarUri() {
+ URI uri = new InternalResourceResolver(URI.create("jar:file:/home/my.jar!/fop.xconf"), null)
+ .resolveFromBase(URI.create("x"));
+ assertEquals(uri.toString(), "jar:file:/home/my.jar!/x");
+ }
}