Author: mehdi
Date: Thu Sep 27 14:00:16 2012
New Revision: 1391016
URL: http://svn.apache.org/viewvc?rev=1391016&view=rev
Log:
Merge of Temp_XGC_URI_Resolution
Removed:
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/io/Resource.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/io/ResourceResolver.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/io/TempResourceResolver.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/io/TempResourceURIGenerator.java
Modified:
xmlgraphics/fop/trunk/ (props changed)
xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PreloaderPlan.java
xmlgraphics/fop/trunk/lib/xmlgraphics-commons-1.5svn.jar
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPStreamer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/EnvironmentProfile.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/EnvironmentalProfileFactory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOUserAgent.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopConfParser.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryBuilder.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryConfig.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/io/InternalResourceResolver.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/io/ResourceResolverFactory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CachedRenderPagesModel.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontManagerConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/PreloaderSVG.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/PreloaderWMF.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSDocumentHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/servlet/FopServlet.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/URIResolutionTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/EnvironmentalProfileFactoryTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/MutableConfig.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/BaseURIResolutionTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/FontURIResolver.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/ResourceResolverFactoryTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/TestingResourceResolver.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/URIResolverWrapperTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/TestAssistant.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFFactoryTestCase.java
Propchange: xmlgraphics/fop/trunk/
------------------------------------------------------------------------------
Merged /xmlgraphics/fop/branches/Temp_XGC_URI_Resolution:r1365471-1391007
Modified:
xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PreloaderPlan.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PreloaderPlan.java?rev=1391016&r1=1391015&r2=1391016&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PreloaderPlan.java
(original)
+++
xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PreloaderPlan.java
Thu Sep 27 14:00:16 2012
@@ -43,6 +43,7 @@ import org.apache.xmlgraphics.image.load
import org.apache.xmlgraphics.image.loader.impl.AbstractImagePreloader;
import org.apache.xmlgraphics.image.loader.impl.ImageXMLDOM;
import org.apache.xmlgraphics.image.loader.util.ImageUtil;
+import org.apache.xmlgraphics.io.XmlSourceUtil;
import org.apache.fop.util.DefaultErrorListener;
import org.apache.fop.util.UnclosableInputStream;
Modified: xmlgraphics/fop/trunk/lib/xmlgraphics-commons-1.5svn.jar
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/lib/xmlgraphics-commons-1.5svn.jar?rev=1391016&r1=1391015&r2=1391016&view=diff
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPStreamer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPStreamer.java?rev=1391016&r1=1391015&r2=1391016&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPStreamer.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPStreamer.java Thu Sep
27 14:00:16 2012
@@ -32,10 +32,11 @@ import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.xmlgraphics.io.TempResourceURIGenerator;
+
import org.apache.fop.afp.modca.ResourceGroup;
import org.apache.fop.afp.modca.StreamedResourceGroup;
import org.apache.fop.apps.io.InternalResourceResolver;
-import org.apache.fop.apps.io.TempResourceURIGenerator;
/**
* Manages the streaming of the AFP output
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/EnvironmentProfile.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/EnvironmentProfile.java?rev=1391016&r1=1391015&r2=1391016&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/EnvironmentProfile.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/EnvironmentProfile.java
Thu Sep 27 14:00:16 2012
@@ -21,7 +21,9 @@ package org.apache.fop.apps;
import java.net.URI;
-import org.apache.fop.apps.io.ResourceResolver;
+import
org.apache.xmlgraphics.image.loader.impl.AbstractImageSessionContext.FallbackResolver;
+import org.apache.xmlgraphics.io.ResourceResolver;
+
import org.apache.fop.fonts.FontManager;
/**
@@ -52,4 +54,7 @@ public interface EnvironmentProfile {
* @return the default base URI
*/
URI getDefaultBaseURI();
+
+ /** @see FopFactoryConfig#getFallbackResolver() */
+ FallbackResolver getFallbackResolver();
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/EnvironmentalProfileFactory.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/EnvironmentalProfileFactory.java?rev=1391016&r1=1391015&r2=1391016&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/EnvironmentalProfileFactory.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/EnvironmentalProfileFactory.java
Thu Sep 27 14:00:16 2012
@@ -21,8 +21,12 @@ package org.apache.fop.apps;
import java.net.URI;
+import
org.apache.xmlgraphics.image.loader.impl.AbstractImageSessionContext.FallbackResolver;
+import
org.apache.xmlgraphics.image.loader.impl.AbstractImageSessionContext.RestrictedFallbackResolver;
+import
org.apache.xmlgraphics.image.loader.impl.AbstractImageSessionContext.UnrestrictedFallbackResolver;
+import org.apache.xmlgraphics.io.ResourceResolver;
+
import org.apache.fop.apps.io.InternalResourceResolver;
-import org.apache.fop.apps.io.ResourceResolver;
import org.apache.fop.apps.io.ResourceResolverFactory;
import org.apache.fop.fonts.FontCacheManager;
import org.apache.fop.fonts.FontCacheManagerFactory;
@@ -51,7 +55,8 @@ public final class EnvironmentalProfileF
return new Profile(defaultBaseUri, resourceResolver,
createFontManager(defaultBaseUri, resourceResolver,
FontDetectorFactory.createDefault(),
- FontCacheManagerFactory.createDefault()));
+ FontCacheManagerFactory.createDefault()),
+ new UnrestrictedFallbackResolver());
}
/**
@@ -67,7 +72,8 @@ public final class EnvironmentalProfileF
return new Profile(defaultBaseUri, resourceResolver,
createFontManager(defaultBaseUri, resourceResolver,
FontDetectorFactory.createDisabled(),
- FontCacheManagerFactory.createDisabled()));
+ FontCacheManagerFactory.createDisabled()),
+ new RestrictedFallbackResolver());
}
private static final class Profile implements EnvironmentProfile {
@@ -78,8 +84,10 @@ public final class EnvironmentalProfileF
private final URI defaultBaseURI;
+ private final FallbackResolver fallbackResolver;
+
private Profile(URI defaultBaseURI, ResourceResolver resourceResolver,
- FontManager fontManager) {
+ FontManager fontManager, FallbackResolver fallbackResolver) {
if (defaultBaseURI == null) {
throw new IllegalArgumentException("Default base URI must not
be null");
}
@@ -92,6 +100,7 @@ public final class EnvironmentalProfileF
this.defaultBaseURI = defaultBaseURI;
this.resourceResolver = resourceResolver;
this.fontManager = fontManager;
+ this.fallbackResolver = fallbackResolver;
}
public ResourceResolver getResourceResolver() {
@@ -105,6 +114,10 @@ public final class EnvironmentalProfileF
public URI getDefaultBaseURI() {
return defaultBaseURI;
}
+
+ public FallbackResolver getFallbackResolver() {
+ return fallbackResolver;
+ }
}
private static FontManager createFontManager(URI defaultBaseUri,
ResourceResolver resourceResolver,
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOUserAgent.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOUserAgent.java?rev=1391016&r1=1391015&r2=1391016&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOUserAgent.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOUserAgent.java Thu Sep
27 14:00:16 2012
@@ -131,21 +131,7 @@ public class FOUserAgent {
/** Set of keywords applicable to this document. */
protected String keywords = null;
- private ImageSessionContext imageSessionContext = new
AbstractImageSessionContext() {
-
- public ImageContext getParentContext() {
- return factory;
- }
-
- public float getTargetResolution() {
- return FOUserAgent.this.getTargetResolution();
- }
-
- public Source resolveURI(String uri) {
- return FOUserAgent.this.resolveURI(uri);
- }
-
- };
+ private final ImageSessionContext imageSessionContext;
/**
* Main constructor. <b>This constructor should not be called directly.
Please use the
@@ -154,11 +140,25 @@ public class FOUserAgent {
* @param resourceResolver the resolver used to acquire resources
* @see org.apache.fop.apps.FopFactory
*/
- FOUserAgent(FopFactory factory, InternalResourceResolver resourceResolver)
{
+ FOUserAgent(final FopFactory factory, InternalResourceResolver
resourceResolver) {
this.factory = factory;
this.resourceResolver = resourceResolver;
setTargetResolution(factory.getTargetResolution());
setAccessibility(factory.isAccessibilityEnabled());
+ imageSessionContext = new
AbstractImageSessionContext(factory.getFallbackResolver()) {
+
+ public ImageContext getParentContext() {
+ return factory;
+ }
+
+ public float getTargetResolution() {
+ return FOUserAgent.this.getTargetResolution();
+ }
+
+ public Source resolveURI(String uri) {
+ return FOUserAgent.this.resolveURI(uri);
+ }
+ };
}
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopConfParser.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopConfParser.java?rev=1391016&r1=1391015&r2=1391016&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopConfParser.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopConfParser.java Thu
Sep 27 14:00:16 2012
@@ -39,9 +39,9 @@ import org.apache.commons.logging.LogFac
import org.apache.xmlgraphics.image.loader.spi.ImageImplRegistry;
import org.apache.xmlgraphics.image.loader.util.Penalty;
+import org.apache.xmlgraphics.io.ResourceResolver;
import org.apache.fop.apps.io.InternalResourceResolver;
-import org.apache.fop.apps.io.ResourceResolver;
import org.apache.fop.apps.io.ResourceResolverFactory;
import org.apache.fop.fonts.FontManagerConfigurator;
import org.apache.fop.hyphenation.HyphenationTreeCache;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java?rev=1391016&r1=1391015&r2=1391016&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java Thu Sep
27 14:00:16 2012
@@ -36,6 +36,7 @@ import org.apache.commons.logging.LogFac
import org.apache.xmlgraphics.image.loader.ImageContext;
import org.apache.xmlgraphics.image.loader.ImageManager;
+import
org.apache.xmlgraphics.image.loader.impl.AbstractImageSessionContext.FallbackResolver;
import org.apache.xmlgraphics.util.UnitConv;
import org.apache.fop.apps.io.InternalResourceResolver;
@@ -418,6 +419,11 @@ public final class FopFactory implements
return config.getFontManager();
}
+ /** @see FopFactoryConfig#getFallbackResolver() */
+ FallbackResolver getFallbackResolver() {
+ return config.getFallbackResolver();
+ }
+
/**
* Returns the color space cache for this instance.
* <p>
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryBuilder.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryBuilder.java?rev=1391016&r1=1391015&r2=1391016&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryBuilder.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryBuilder.java
Thu Sep 27 14:00:16 2012
@@ -30,8 +30,9 @@ import org.apache.avalon.framework.confi
import org.apache.xmlgraphics.image.loader.ImageContext;
import org.apache.xmlgraphics.image.loader.ImageManager;
+import
org.apache.xmlgraphics.image.loader.impl.AbstractImageSessionContext.FallbackResolver;
+import org.apache.xmlgraphics.io.ResourceResolver;
-import org.apache.fop.apps.io.ResourceResolver;
import org.apache.fop.apps.io.ResourceResolverFactory;
import org.apache.fop.fonts.FontManager;
import org.apache.fop.layoutmgr.LayoutManagerMaker;
@@ -464,6 +465,10 @@ public final class FopFactoryBuilder {
public Map<String, String> getHyphenationPatternNames() {
return hyphPatNames;
}
+
+ public FallbackResolver getFallbackResolver() {
+ return enviro.getFallbackResolver();
+ }
}
private interface FopFactoryConfigBuilder {
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryConfig.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryConfig.java?rev=1391016&r1=1391015&r2=1391016&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryConfig.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryConfig.java
Thu Sep 27 14:00:16 2012
@@ -26,8 +26,9 @@ import java.util.Set;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.xmlgraphics.image.loader.ImageManager;
+import
org.apache.xmlgraphics.image.loader.impl.AbstractImageSessionContext.FallbackResolver;
+import org.apache.xmlgraphics.io.ResourceResolver;
-import org.apache.fop.apps.io.ResourceResolver;
import org.apache.fop.fonts.FontManager;
import org.apache.fop.layoutmgr.LayoutManagerMaker;
@@ -163,4 +164,11 @@ public interface FopFactoryConfig {
/** @return the hyphenation pattern names */
Map<String, String> getHyphenationPatternNames();
+
+ /**
+ * Controls the mechanisms that are used in the event that {@link
javax.xml.transform.Source}
+ * used for resources couldn't be read.
+ * @return the fallback resolver
+ */
+ FallbackResolver getFallbackResolver();
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/io/InternalResourceResolver.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/io/InternalResourceResolver.java?rev=1391016&r1=1391015&r2=1391016&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/io/InternalResourceResolver.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/io/InternalResourceResolver.java
Thu Sep 27 14:00:16 2012
@@ -29,12 +29,14 @@ import javax.xml.transform.Source;
import javax.xml.transform.TransformerException;
import javax.xml.transform.stream.StreamSource;
+import org.apache.xmlgraphics.io.Resource;
+import org.apache.xmlgraphics.io.ResourceResolver;
import org.apache.xmlgraphics.util.uri.DataURIResolver;
/**
* This object holds the base URI from which to resolve URIs against as well
as the resolver for
* resource acquisition. It also does some URI sanitization of common URI
syntactical errors. This
- * class takes in a {@link org.apache.fop.apps.io.ResourceResolver} and
delegates all relevant
+ * class takes in a {@link org.apache.xmlgraphics.io.ResourceResolver} and
delegates all relevant
* URIs to it.
*/
public class InternalResourceResolver {
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/io/ResourceResolverFactory.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/io/ResourceResolverFactory.java?rev=1391016&r1=1391015&r2=1391016&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/io/ResourceResolverFactory.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/io/ResourceResolverFactory.java
Thu Sep 27 14:00:16 2012
@@ -28,6 +28,11 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import org.apache.xmlgraphics.io.Resource;
+import org.apache.xmlgraphics.io.ResourceResolver;
+import org.apache.xmlgraphics.io.TempResourceResolver;
+import org.apache.xmlgraphics.io.TempResourceURIGenerator;
+
/**
* A factory class for {@link ResourceResolver}s.
*/
@@ -70,10 +75,10 @@ public final class ResourceResolverFacto
}
/**
- * Creates a temporary-resource-schema aware resource resolver. Temporary
resource URIs are
+ * Creates a temporary-resource-scheme aware resource resolver. Temporary
resource URIs are
* created by {@link TempResourceURIGenerator}.
*
- * @param tempResourceResolver the temporary-resource-schema resolver to
use
+ * @param tempResourceResolver the temporary-resource-scheme resolver to
use
* @param defaultResourceResolver the default resource resolver to use
* @return the ressource resolver
*/
@@ -84,17 +89,17 @@ public final class ResourceResolverFacto
}
/**
- * This creates the builder class for binding URI schemas to
implementations of
- * {@link ResourceResolver}. This allows users to define their own URI
schemas such that they
+ * This creates the builder class for binding URI schemes to
implementations of
+ * {@link ResourceResolver}. This allows users to define their own URI
schemes such that they
* have finer control over the acquisition of resources.
*
* @param defaultResolver the default resource resolver that should be
used in the event that
- * none of the other registered resolvers match the schema
- * @return the schema aware {@link ResourceResolver} builder
+ * none of the other registered resolvers match the scheme
+ * @return the scheme aware {@link ResourceResolver} builder
*/
- public static SchemaAwareResourceResolverBuilder
createSchemaAwareResourceResolverBuilder(
+ public static SchemeAwareResourceResolverBuilder
createSchemeAwareResourceResolverBuilder(
ResourceResolver defaultResolver) {
- return new SchemaAwareResourceResolverBuilderImpl(defaultResolver);
+ return new SchemeAwareResourceResolverBuilderImpl(defaultResolver);
}
private static final class DefaultResourceResolver implements
ResourceResolver {
@@ -132,13 +137,13 @@ public final class ResourceResolverFacto
this.defaultResourceResolver = defaultResourceResolver;
}
- private static boolean isTempUri(URI uri) {
- return TempResourceURIGenerator.isTempUri(uri);
+ private static boolean isTempURI(URI uri) {
+ return TempResourceURIGenerator.isTempURI(uri);
}
/** {@inheritDoc} */
public Resource getResource(URI uri) throws IOException {
- if (isTempUri(uri)) {
+ if (isTempURI(uri)) {
return tempResourceResolver.getResource(uri.getPath());
} else {
return defaultResourceResolver.getResource(uri);
@@ -147,7 +152,7 @@ public final class ResourceResolverFacto
/** {@inheritDoc} */
public OutputStream getOutputStream(URI uri) throws IOException {
- if (isTempUri(uri)) {
+ if (isTempURI(uri)) {
return tempResourceResolver.getOutputStream(uri.getPath());
} else {
return defaultResourceResolver.getOutputStream(uri);
@@ -188,23 +193,23 @@ public final class ResourceResolverFacto
}
}
- private static final class SchemaAwareResourceResolver implements
ResourceResolver {
+ private static final class SchemeAwareResourceResolver implements
ResourceResolver {
- private final Map<String, ResourceResolver>
schemaHandlingResourceResolvers;
+ private final Map<String, ResourceResolver>
schemeHandlingResourceResolvers;
private final ResourceResolver defaultResolver;
- private SchemaAwareResourceResolver(
- Map<String, ResourceResolver> schemaHandlingResourceResolvers,
+ private SchemeAwareResourceResolver(
+ Map<String, ResourceResolver> schemEHandlingResourceResolvers,
ResourceResolver defaultResolver) {
- this.schemaHandlingResourceResolvers =
schemaHandlingResourceResolvers;
+ this.schemeHandlingResourceResolvers =
schemEHandlingResourceResolvers;
this.defaultResolver = defaultResolver;
}
- private ResourceResolver getResourceResolverForSchema(URI uri) {
- String schema = uri.getScheme();
- if (schemaHandlingResourceResolvers.containsKey(schema)) {
- return schemaHandlingResourceResolvers.get(schema);
+ private ResourceResolver getResourceResolverForScheme(URI uri) {
+ String scheme = uri.getScheme();
+ if (schemeHandlingResourceResolvers.containsKey(scheme)) {
+ return schemeHandlingResourceResolvers.get(scheme);
} else {
return defaultResolver;
}
@@ -212,58 +217,58 @@ public final class ResourceResolverFacto
/** {@inheritDoc} */
public Resource getResource(URI uri) throws IOException {
- return getResourceResolverForSchema(uri).getResource(uri);
+ return getResourceResolverForScheme(uri).getResource(uri);
}
/** {@inheritDoc} */
public OutputStream getOutputStream(URI uri) throws IOException {
- return getResourceResolverForSchema(uri).getOutputStream(uri);
+ return getResourceResolverForScheme(uri).getOutputStream(uri);
}
}
/**
* Implementations of this interface will be builders for {@link
ResourceResolver}, they bind
- * URI schemas to their respective resolver. This gives users more control
over the mechanisms
+ * URI schemes to their respective resolver. This gives users more control
over the mechanisms
* by which URIs are resolved.
* <p>
* Here is an example of how this could be used:
* </p>
* <p><code>
- * SchemaAwareResourceResolverBuilder builder
- * =
ResourceResolverFactory.createSchemaAwareResourceResolverBuilder(defaultResolver);
- * builder.registerResourceResolverForSchema("test", testResolver);
- * builder.registerResourceResolverForSchema("anotherTest", test2Resolver);
+ * SchemeAwareResourceResolverBuilder builder
+ * =
ResourceResolverFactory.createSchemeAwareResourceResolverBuilder(defaultResolver);
+ * builder.registerResourceResolverForScheme("test", testResolver);
+ * builder.registerResourceResolverForScheme("anotherTest", test2Resolver);
* ResourceResolver resolver = builder.build();
* </code></p>
* This will result in all URIs for the form "test:///..." will be
resolved using the
* <code>testResolver</code> object; URIs of the form "anotherTest:///..."
will be resolved
* using <code>test2Resolver</code>; all other URIs will be resolved from
the defaultResolver.
*/
- public interface SchemaAwareResourceResolverBuilder {
+ public interface SchemeAwareResourceResolverBuilder {
/**
- * Register a schema with its respective {@link ResourceResolver}.
This resolver will be
- * used as the only resolver for the specified schema.
+ * Register a scheme with its respective {@link ResourceResolver}.
This resolver will be
+ * used as the only resolver for the specified scheme.
*
- * @param schema the schema to be used with the given resolver
+ * @param scheme the scheme to be used with the given resolver
* @param resourceResolver the resource resolver
*/
- void registerResourceResolverForSchema(String schema, ResourceResolver
resourceResolver);
+ void registerResourceResolverForScheme(String scheme, ResourceResolver
resourceResolver);
/**
* Builds a {@link ResourceResolver} that will delegate to the
respective resource resolver
- * when a registered URI schema is given
+ * when a registered URI scheme is given
*
- * @return a resolver that delegates to the appropriate schema resolver
+ * @return a resolver that delegates to the appropriate scheme resolver
*/
ResourceResolver build();
}
- private static final class CompletedSchemaAwareResourceResolverBuilder
- implements SchemaAwareResourceResolverBuilder {
+ private static final class CompletedSchemeAwareResourceResolverBuilder
+ implements SchemeAwareResourceResolverBuilder {
- private static final SchemaAwareResourceResolverBuilder INSTANCE
- = new CompletedSchemaAwareResourceResolverBuilder();
+ private static final SchemeAwareResourceResolverBuilder INSTANCE
+ = new CompletedSchemeAwareResourceResolverBuilder();
/** {@inheritDoc} */
public ResourceResolver build() {
@@ -271,59 +276,58 @@ public final class ResourceResolverFacto
}
/** {@inheritDoc} */
- public void registerResourceResolverForSchema(String schema,
+ public void registerResourceResolverForScheme(String scheme,
ResourceResolver resourceResolver) {
throw new IllegalStateException("Resource resolver already built");
}
}
- private static final class ActiveSchemaAwareResourceResolverBuilder
- implements SchemaAwareResourceResolverBuilder {
+ private static final class ActiveSchemeAwareResourceResolverBuilder
+ implements SchemeAwareResourceResolverBuilder {
- private final Map<String, ResourceResolver>
schemaHandlingResourceResolvers
+ private final Map<String, ResourceResolver>
schemeHandlingResourceResolvers
= new HashMap<String, ResourceResolver>();
private final ResourceResolver defaultResolver;
- private ActiveSchemaAwareResourceResolverBuilder(ResourceResolver
defaultResolver) {
+ private ActiveSchemeAwareResourceResolverBuilder(ResourceResolver
defaultResolver) {
this.defaultResolver = defaultResolver;
}
/** {@inheritDoc} */
- public void registerResourceResolverForSchema(String schema,
+ public void registerResourceResolverForScheme(String scheme,
ResourceResolver resourceResolver) {
- schemaHandlingResourceResolvers.put(schema, resourceResolver);
+ schemeHandlingResourceResolvers.put(scheme, resourceResolver);
}
/** {@inheritDoc} */
public ResourceResolver build() {
- return new SchemaAwareResourceResolver(
-
Collections.unmodifiableMap(schemaHandlingResourceResolvers), defaultResolver);
+ return new SchemeAwareResourceResolver(
+
Collections.unmodifiableMap(schemeHandlingResourceResolvers), defaultResolver);
}
}
- private static final class SchemaAwareResourceResolverBuilderImpl
- implements SchemaAwareResourceResolverBuilder {
+ private static final class SchemeAwareResourceResolverBuilderImpl
+ implements SchemeAwareResourceResolverBuilder {
- private SchemaAwareResourceResolverBuilder delegate;
+ private SchemeAwareResourceResolverBuilder delegate;
- private SchemaAwareResourceResolverBuilderImpl(ResourceResolver
defaultResolver) {
- this.delegate = new
ActiveSchemaAwareResourceResolverBuilder(defaultResolver);
+ private SchemeAwareResourceResolverBuilderImpl(ResourceResolver
defaultResolver) {
+ this.delegate = new
ActiveSchemeAwareResourceResolverBuilder(defaultResolver);
}
/** {@inheritDoc} */
- public void registerResourceResolverForSchema(String schema,
+ public void registerResourceResolverForScheme(String scheme,
ResourceResolver resourceResolver) {
- delegate.registerResourceResolverForSchema(schema,
resourceResolver);
+ delegate.registerResourceResolverForScheme(scheme,
resourceResolver);
}
/** {@inheritDoc} */
public ResourceResolver build() {
ResourceResolver resourceResolver = delegate.build();
- delegate = CompletedSchemaAwareResourceResolverBuilder.INSTANCE;
+ delegate = CompletedSchemeAwareResourceResolverBuilder.INSTANCE;
return resourceResolver;
}
}
-
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CachedRenderPagesModel.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CachedRenderPagesModel.java?rev=1391016&r1=1391015&r2=1391016&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CachedRenderPagesModel.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CachedRenderPagesModel.java
Thu Sep 27 14:00:16 2012
@@ -35,9 +35,10 @@ import org.xml.sax.SAXException;
import org.apache.commons.io.IOUtils;
+import org.apache.xmlgraphics.io.TempResourceURIGenerator;
+
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
-import org.apache.fop.apps.io.TempResourceURIGenerator;
import org.apache.fop.fonts.FontInfo;
/**
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontManagerConfigurator.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontManagerConfigurator.java?rev=1391016&r1=1391015&r2=1391016&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontManagerConfigurator.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontManagerConfigurator.java
Thu Sep 27 14:00:16 2012
@@ -29,9 +29,10 @@ import org.apache.avalon.framework.confi
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.xmlgraphics.io.ResourceResolver;
+
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.io.InternalResourceResolver;
-import org.apache.fop.apps.io.ResourceResolver;
import org.apache.fop.apps.io.ResourceResolverFactory;
import org.apache.fop.fonts.substitute.FontSubstitutions;
import org.apache.fop.fonts.substitute.FontSubstitutionsConfigurator;
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/PreloaderSVG.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/PreloaderSVG.java?rev=1391016&r1=1391015&r2=1391016&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/PreloaderSVG.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/PreloaderSVG.java
Thu Sep 27 14:00:16 2012
@@ -45,6 +45,7 @@ import org.apache.xmlgraphics.image.load
import org.apache.xmlgraphics.image.loader.impl.AbstractImagePreloader;
import org.apache.xmlgraphics.image.loader.impl.ImageXMLDOM;
import org.apache.xmlgraphics.image.loader.util.ImageUtil;
+import org.apache.xmlgraphics.io.XmlSourceUtil;
import org.apache.xmlgraphics.util.MimeConstants;
import org.apache.xmlgraphics.util.UnitConv;
@@ -79,7 +80,7 @@ public class PreloaderSVG extends Abstra
}
}
if (info != null) {
- ImageUtil.closeQuietly(src); //Image is fully read
+ XmlSourceUtil.closeQuietly(src); //Image is fully read
}
return info;
}
@@ -119,7 +120,7 @@ public class PreloaderSVG extends Abstra
DOMSource domSrc = (DOMSource)src;
doc = (SVGDocument)domSrc.getNode();
} else {
- in = new
UnclosableInputStream(ImageUtil.needInputStream(src));
+ in = new
UnclosableInputStream(XmlSourceUtil.needInputStream(src));
int length = in.available();
in.mark(length + 1);
SAXSVGDocumentFactory factory = new SAXSVGDocumentFactory(
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/PreloaderWMF.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/PreloaderWMF.java?rev=1391016&r1=1391015&r2=1391016&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/PreloaderWMF.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/PreloaderWMF.java
Thu Sep 27 14:00:16 2012
@@ -38,6 +38,7 @@ import org.apache.xmlgraphics.image.load
import org.apache.xmlgraphics.image.loader.ImageSize;
import org.apache.xmlgraphics.image.loader.impl.AbstractImagePreloader;
import org.apache.xmlgraphics.image.loader.util.ImageUtil;
+import org.apache.xmlgraphics.io.XmlSourceUtil;
import org.apache.fop.util.UnclosableInputStream;
@@ -69,7 +70,7 @@ public class PreloaderWMF extends Abstra
}
}
if (info != null) {
- ImageUtil.closeQuietly(src); //Image is fully read
+ XmlSourceUtil.closeQuietly(src); //Image is fully read
}
return info;
}
@@ -88,7 +89,7 @@ public class PreloaderWMF extends Abstra
ImageContext context) {
// parse document and get the size attributes of the svg element
- InputStream in = new
UnclosableInputStream(ImageUtil.needInputStream(src));
+ InputStream in = new
UnclosableInputStream(XmlSourceUtil.needInputStream(src));
try {
in.mark(4 + 1);
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSDocumentHandler.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSDocumentHandler.java?rev=1391016&r1=1391015&r2=1391016&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSDocumentHandler.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSDocumentHandler.java
Thu Sep 27 14:00:16 2012
@@ -39,6 +39,7 @@ import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.xmlgraphics.io.TempResourceURIGenerator;
import org.apache.xmlgraphics.java2d.Dimension2DDouble;
import org.apache.xmlgraphics.ps.DSCConstants;
import org.apache.xmlgraphics.ps.PSDictionary;
@@ -53,7 +54,6 @@ import org.apache.xmlgraphics.ps.dsc.eve
import org.apache.xmlgraphics.ps.dsc.events.DSCCommentHiResBoundingBox;
import org.apache.fop.apps.MimeConstants;
-import org.apache.fop.apps.io.TempResourceURIGenerator;
import
org.apache.fop.render.intermediate.AbstractBinaryWritingIFDocumentHandler;
import org.apache.fop.render.intermediate.IFContext;
import org.apache.fop.render.intermediate.IFDocumentHandlerConfigurator;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/servlet/FopServlet.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/servlet/FopServlet.java?rev=1391016&r1=1391015&r2=1391016&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/servlet/FopServlet.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/servlet/FopServlet.java Thu
Sep 27 14:00:16 2012
@@ -41,14 +41,15 @@ import javax.xml.transform.stream.Stream
import org.apache.commons.io.output.ByteArrayOutputStream;
+import org.apache.xmlgraphics.io.Resource;
+import org.apache.xmlgraphics.io.ResourceResolver;
+
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FopFactory;
import org.apache.fop.apps.FopFactoryBuilder;
import org.apache.fop.apps.MimeConstants;
-import org.apache.fop.apps.io.Resource;
-import org.apache.fop.apps.io.ResourceResolver;
/**
* Example servlet to generate a PDF from a servlet.
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/URIResolutionTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/URIResolutionTestCase.java?rev=1391016&r1=1391015&r2=1391016&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/URIResolutionTestCase.java
(original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/URIResolutionTestCase.java
Thu Sep 27 14:00:16 2012
@@ -46,14 +46,15 @@ import org.apache.commons.io.output.Byte
import org.apache.xpath.XPathAPI;
import org.apache.xpath.objects.XObject;
+import org.apache.xmlgraphics.io.Resource;
+import org.apache.xmlgraphics.io.ResourceResolver;
+
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FopFactory;
import org.apache.fop.apps.FopFactoryBuilder;
import org.apache.fop.apps.MimeConstants;
-import org.apache.fop.apps.io.Resource;
-import org.apache.fop.apps.io.ResourceResolver;
import org.apache.fop.apps.io.ResourceResolverFactory;
import org.apache.fop.render.xml.XMLRenderer;
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/EnvironmentalProfileFactoryTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/EnvironmentalProfileFactoryTestCase.java?rev=1391016&r1=1391015&r2=1391016&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/EnvironmentalProfileFactoryTestCase.java
(original)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/EnvironmentalProfileFactoryTestCase.java
Thu Sep 27 14:00:16 2012
@@ -21,11 +21,12 @@ import java.net.URI;
import org.junit.Test;
-import org.apache.fop.apps.io.ResourceResolver;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
+import org.apache.xmlgraphics.io.ResourceResolver;
+
public class EnvironmentalProfileFactoryTestCase {
private final URI testURI = URI.create("this.is.purely.for.test.purposes");
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/MutableConfig.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/MutableConfig.java?rev=1391016&r1=1391015&r2=1391016&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/MutableConfig.java
(original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/MutableConfig.java Thu
Sep 27 14:00:16 2012
@@ -24,8 +24,9 @@ import java.util.Set;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.xmlgraphics.image.loader.ImageManager;
+import
org.apache.xmlgraphics.image.loader.impl.AbstractImageSessionContext.FallbackResolver;
+import org.apache.xmlgraphics.io.ResourceResolver;
-import org.apache.fop.apps.io.ResourceResolver;
import org.apache.fop.fonts.FontManager;
import org.apache.fop.layoutmgr.LayoutManagerMaker;
@@ -130,4 +131,8 @@ public final class MutableConfig impleme
public Map<String, String> getHyphenationPatternNames() {
return delegate.getHyphenationPatternNames();
}
+
+ public FallbackResolver getFallbackResolver() {
+ return delegate.getFallbackResolver();
+ }
}
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/BaseURIResolutionTest.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/BaseURIResolutionTest.java?rev=1391016&r1=1391015&r2=1391016&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/BaseURIResolutionTest.java
(original)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/BaseURIResolutionTest.java
Thu Sep 27 14:00:16 2012
@@ -37,6 +37,8 @@ import org.xml.sax.SAXException;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.output.ByteArrayOutputStream;
+import org.apache.xmlgraphics.io.ResourceResolver;
+
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/FontURIResolver.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/FontURIResolver.java?rev=1391016&r1=1391015&r2=1391016&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/FontURIResolver.java
(original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/FontURIResolver.java
Thu Sep 27 14:00:16 2012
@@ -39,6 +39,8 @@ import org.apache.fop.apps.PDFRendererCo
import static org.junit.Assert.assertTrue;
+import org.apache.xmlgraphics.io.Resource;
+
public class FontURIResolver extends BaseURIResolutionTest {
public enum Event {
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/ResourceResolverFactoryTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/ResourceResolverFactoryTestCase.java?rev=1391016&r1=1391015&r2=1391016&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/ResourceResolverFactoryTestCase.java
(original)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/ResourceResolverFactoryTestCase.java
Thu Sep 27 14:00:16 2012
@@ -36,6 +36,10 @@ import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
+import org.apache.xmlgraphics.io.Resource;
+import org.apache.xmlgraphics.io.ResourceResolver;
+import org.apache.xmlgraphics.io.TempResourceResolver;
+
public class ResourceResolverFactoryTestCase {
private static final byte[] DATA = new byte[]{(byte) 0, (byte) 1, (byte)
2};
@@ -193,10 +197,10 @@ public class ResourceResolverFactoryTest
final ResourceResolver sut;
TestCreateSchemaAwareResourceResolverBuilderHelper() {
- ResourceResolverFactory.SchemaAwareResourceResolverBuilder builder
- =
ResourceResolverFactory.createSchemaAwareResourceResolverBuilder(
+ ResourceResolverFactory.SchemeAwareResourceResolverBuilder builder
+ =
ResourceResolverFactory.createSchemeAwareResourceResolverBuilder(
defaultResourceResolver);
- builder.registerResourceResolverForSchema(SCHEMA,
registedResourceResolver);
+ builder.registerResourceResolverForScheme(SCHEMA,
registedResourceResolver);
sut = builder.build();
}
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/TestingResourceResolver.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/TestingResourceResolver.java?rev=1391016&r1=1391015&r2=1391016&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/TestingResourceResolver.java
(original)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/TestingResourceResolver.java
Thu Sep 27 14:00:16 2012
@@ -24,6 +24,8 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import org.apache.xmlgraphics.io.ResourceResolver;
+
abstract class TestingResourceResolver implements ResourceResolver {
private final Map<URI, Object> checker;
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/URIResolverWrapperTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/URIResolverWrapperTestCase.java?rev=1391016&r1=1391015&r2=1391016&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/URIResolverWrapperTestCase.java
(original)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/URIResolverWrapperTestCase.java
Thu Sep 27 14:00:16 2012
@@ -35,6 +35,8 @@ import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
+import org.apache.xmlgraphics.io.ResourceResolver;
+
public class URIResolverWrapperTestCase {
private static final List<String> BASE_URIS =
Collections.unmodifiableList(Arrays.asList(
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/TestAssistant.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/TestAssistant.java?rev=1391016&r1=1391015&r2=1391016&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/TestAssistant.java
(original)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/TestAssistant.java
Thu Sep 27 14:00:16 2012
@@ -42,8 +42,11 @@ import org.w3c.dom.Element;
import org.apache.xpath.XPathAPI;
import org.apache.xpath.objects.XObject;
+import org.apache.fop.apps.EnvironmentProfile;
+import org.apache.fop.apps.EnvironmentalProfileFactory;
import org.apache.fop.apps.FopFactory;
import org.apache.fop.apps.FopFactoryBuilder;
+import org.apache.fop.apps.io.ResourceResolverFactory;
/**
* Helper class for running FOP tests.
@@ -115,7 +118,10 @@ public class TestAssistant {
public FopFactory getFopFactory(Document testDoc) {
boolean base14KerningEnabled = isBase14KerningEnabled(testDoc);
boolean strictValidation = isStrictValidation(testDoc);
- FopFactoryBuilder builder = new
FopFactoryBuilder(testDir.getParentFile().toURI());
+ EnvironmentProfile envProfile =
EnvironmentalProfileFactory.createRestrictedIO(
+ testDir.getParentFile().toURI(),
+ ResourceResolverFactory.createDefaultResourceResolver());
+ FopFactoryBuilder builder = new FopFactoryBuilder(envProfile);
builder.setStrictFOValidation(strictValidation);
builder.getFontManager().setBase14KerningEnabled(base14KerningEnabled);
return builder.build();
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFFactoryTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFFactoryTestCase.java?rev=1391016&r1=1391015&r2=1391016&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFFactoryTestCase.java
(original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFFactoryTestCase.java
Thu Sep 27 14:00:16 2012
@@ -26,8 +26,9 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
+import org.apache.xmlgraphics.io.ResourceResolver;
+
import org.apache.fop.apps.io.InternalResourceResolver;
-import org.apache.fop.apps.io.ResourceResolver;
import org.apache.fop.apps.io.ResourceResolverFactory;
import org.apache.fop.fonts.CIDSet;
import org.apache.fop.fonts.CIDSubset;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
