Author: ssteiner
Date: Tue Jan 22 11:53:31 2019
New Revision: 1851806
URL: http://svn.apache.org/viewvc?rev=1851806&view=rev
Log:
FOP-2733: Drop dependency on Avalon-Framework
Added:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/activity/
- copied from r1851804,
xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/activity/
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/configuration/
- copied from r1851804,
xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/
Removed:
xmlgraphics/fop/trunk/fop/lib/avalon-framework-api-4.3.1.jar
xmlgraphics/fop/trunk/fop/lib/avalon-framework-impl-4.3.1.jar
xmlgraphics/fop/trunk/fop/lib/avalon-framework.LICENSE.txt
xmlgraphics/fop/trunk/fop/lib/avalon-framework.NOTICE.TXT
Modified:
xmlgraphics/fop/trunk/ (props changed)
xmlgraphics/fop/trunk/fop-core/pom.xml
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/apps/FOUserAgent.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/apps/FopConfParser.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/apps/FopFactory.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/apps/FopFactoryBuilder.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/apps/FopFactoryConfig.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/cli/Main.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/DefaultFontConfig.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/FontConfig.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/FontManagerConfigurator.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/substitute/FontSubstitutionsConfigurator.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/RendererConfig.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/RendererConfigOption.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/XMLHandlerConfigurator.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPFontConfig.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPInfo.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererConfig.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererContext.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererOption.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPShadingMode.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/bitmap/BitmapRendererConfig.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/bitmap/PNGRendererConfig.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/bitmap/TIFFRendererConfig.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/IFRendererConfig.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DRendererConfig.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DRendererOption.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pcl/Java2DRendererOption.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pcl/PCLRendererConfig.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/PDFRendererConfig.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/PDFSVGHandler.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/PSRendererConfig.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/PSSVGHandler.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/txt/TxtRendererConfig.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/AbstractFOPTranscoder.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/PDFTranscoder.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/apps/AbstractRendererConfigParserTester.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/apps/AbstractRendererConfiguratorTest.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/apps/MutableConfig.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/config/BaseUserConfigTest.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/threading/AvalonAdapter.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/threading/FOPTestbed.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/threading/FOProcessorImpl.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/threading/IFProcessorImpl.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/threading/Main.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/threading/Processor.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/visual/AbstractPSPDFBitmapProducer.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/visual/BatchDiffer.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/visual/BitmapProducer.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/visual/BitmapProducerJava2D.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/visual/ReferenceBitmapLoader.java
xmlgraphics/fop/trunk/fop-servlet/pom.xml
xmlgraphics/fop/trunk/fop-transcoder-allinone/pom.xml
xmlgraphics/fop/trunk/fop-transcoder-allinone/src/tools/resources/assembly/assembly.xml
xmlgraphics/fop/trunk/fop/build.xml
xmlgraphics/fop/trunk/fop/examples/embedding/build.xml
xmlgraphics/fop/trunk/fop/examples/embedding/java/embedding/ExampleAWTViewer.java
xmlgraphics/fop/trunk/fop/examples/embedding/java/embedding/ExampleEPS.java
xmlgraphics/fop/trunk/fop/examples/embedding/java/embedding/ExampleJava2D2PDF.java
xmlgraphics/fop/trunk/fop/lib/README.txt
xmlgraphics/fop/trunk/pom.xml
Propchange: xmlgraphics/fop/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 22 11:53:31 2019
@@ -1,5 +1,6 @@
/xmlgraphics/fop/branches/FOP-2393_gradient-rendering:1609496-1611778
/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign:603620-746655
+/xmlgraphics/fop/branches/Temp_Avalon:1851279-1851804
/xmlgraphics/fop/branches/Temp_Color:956535-1069429
/xmlgraphics/fop/branches/Temp_FontMerging:1600596-1610938
/xmlgraphics/fop/branches/Temp_FopFontsForSVG:1508203-1564000
Modified: xmlgraphics/fop/trunk/fop-core/pom.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/pom.xml?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/pom.xml (original)
+++ xmlgraphics/fop/trunk/fop-core/pom.xml Tue Jan 22 11:53:31 2019
@@ -88,16 +88,6 @@
<version>1.8.2</version>
</dependency>
<dependency>
- <groupId>org.apache.avalon.framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- <version>${avalon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.avalon.framework</groupId>
- <artifactId>avalon-framework-impl</artifactId>
- <version>${avalon.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>fontbox</artifactId>
<version>2.0.13</version>
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/apps/FOUserAgent.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/apps/FOUserAgent.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/apps/FOUserAgent.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/apps/FOUserAgent.java
Tue Jan 22 11:53:31 2019
@@ -30,8 +30,6 @@ import java.util.Map;
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -47,6 +45,8 @@ import org.apache.fop.accessibility.Acce
import org.apache.fop.accessibility.DummyStructureTreeEventHandler;
import org.apache.fop.accessibility.StructureTreeEventHandler;
import org.apache.fop.apps.io.InternalResourceResolver;
+import org.apache.fop.configuration.Configuration;
+import org.apache.fop.configuration.ConfigurationException;
import org.apache.fop.events.DefaultEventBroadcaster;
import org.apache.fop.events.Event;
import org.apache.fop.events.EventBroadcaster;
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/apps/FopConfParser.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/apps/FopConfParser.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/apps/FopConfParser.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/apps/FopConfParser.java
Tue Jan 22 11:53:31 2019
@@ -31,9 +31,6 @@ import java.util.Map;
import org.xml.sax.SAXException;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -43,6 +40,9 @@ import org.apache.xmlgraphics.io.Resourc
import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.apps.io.ResourceResolverFactory;
+import org.apache.fop.configuration.Configuration;
+import org.apache.fop.configuration.ConfigurationException;
+import org.apache.fop.configuration.DefaultConfigurationBuilder;
import org.apache.fop.fonts.FontManagerConfigurator;
import org.apache.fop.hyphenation.HyphenationTreeCache;
import org.apache.fop.hyphenation.Hyphenator;
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/apps/FopFactory.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/apps/FopFactory.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/apps/FopFactory.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/apps/FopFactory.java
Tue Jan 22 11:53:31 2019
@@ -30,7 +30,6 @@ import java.util.Set;
import org.xml.sax.SAXException;
-import org.apache.avalon.framework.configuration.Configuration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -41,6 +40,7 @@ import org.apache.xmlgraphics.util.UnitC
import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.apps.io.ResourceResolverFactory;
+import org.apache.fop.configuration.Configuration;
import org.apache.fop.fo.ElementMapping;
import org.apache.fop.fo.ElementMappingRegistry;
import org.apache.fop.fonts.FontManager;
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/apps/FopFactoryBuilder.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/apps/FopFactoryBuilder.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/apps/FopFactoryBuilder.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/apps/FopFactoryBuilder.java
Tue Jan 22 11:53:31 2019
@@ -26,8 +26,6 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import org.apache.avalon.framework.configuration.Configuration;
-
import org.apache.xmlgraphics.image.loader.ImageContext;
import org.apache.xmlgraphics.image.loader.ImageManager;
import
org.apache.xmlgraphics.image.loader.impl.AbstractImageSessionContext.FallbackResolver;
@@ -35,6 +33,7 @@ import org.apache.xmlgraphics.io.Resourc
import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.apps.io.ResourceResolverFactory;
+import org.apache.fop.configuration.Configuration;
import org.apache.fop.fonts.FontManager;
import org.apache.fop.layoutmgr.LayoutManagerMaker;
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/apps/FopFactoryConfig.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/apps/FopFactoryConfig.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/apps/FopFactoryConfig.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/apps/FopFactoryConfig.java
Tue Jan 22 11:53:31 2019
@@ -23,13 +23,12 @@ import java.net.URI;
import java.util.Map;
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.InternalResourceResolver;
+import org.apache.fop.configuration.Configuration;
import org.apache.fop.fonts.FontManager;
import org.apache.fop.layoutmgr.LayoutManagerMaker;
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/cli/Main.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/cli/Main.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/cli/Main.java
(original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/cli/Main.java
Tue Jan 22 11:53:31 2019
@@ -112,9 +112,6 @@ public final class Main {
try {
//System.out.println(Thread.currentThread().getContextClassLoader());
Class clazz = Class.forName("org.apache.commons.io.IOUtils");
- if (clazz != null) {
- clazz =
Class.forName("org.apache.avalon.framework.configuration.Configuration");
- }
return (clazz != null);
} catch (Exception e) {
return false;
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/DefaultFontConfig.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/DefaultFontConfig.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/DefaultFontConfig.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/DefaultFontConfig.java
Tue Jan 22 11:53:31 2019
@@ -23,12 +23,12 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fop.apps.FOPException;
+import org.apache.fop.configuration.Configuration;
+import org.apache.fop.configuration.ConfigurationException;
import org.apache.fop.events.EventProducer;
import org.apache.fop.util.LogUtil;
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/FontConfig.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/FontConfig.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/FontConfig.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/FontConfig.java
Tue Jan 22 11:53:31 2019
@@ -19,9 +19,8 @@
package org.apache.fop.fonts;
-import org.apache.avalon.framework.configuration.Configuration;
-
import org.apache.fop.apps.FOPException;
+import org.apache.fop.configuration.Configuration;
import org.apache.fop.events.EventProducer;
/**
@@ -45,6 +44,6 @@ public interface FontConfig {
* @throws FOPException if an error occurs creating the font
configuration object
*/
FontConfig parse(Configuration cfg, FontManager fontManager, boolean
strict,
- EventProducer eventProducer) throws FOPException;
+ EventProducer eventProducer) throws FOPException;
}
}
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/FontManagerConfigurator.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/FontManagerConfigurator.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/FontManagerConfigurator.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/FontManagerConfigurator.java
Tue Jan 22 11:53:31 2019
@@ -24,8 +24,6 @@ import java.net.URISyntaxException;
import java.util.List;
import java.util.regex.Pattern;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -34,6 +32,8 @@ import org.apache.xmlgraphics.io.Resourc
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.apps.io.ResourceResolverFactory;
+import org.apache.fop.configuration.Configuration;
+import org.apache.fop.configuration.ConfigurationException;
import org.apache.fop.fonts.substitute.FontSubstitutions;
import org.apache.fop.fonts.substitute.FontSubstitutionsConfigurator;
import org.apache.fop.util.LogUtil;
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/substitute/FontSubstitutionsConfigurator.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/substitute/FontSubstitutionsConfigurator.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/substitute/FontSubstitutionsConfigurator.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/substitute/FontSubstitutionsConfigurator.java
Tue Jan 22 11:53:31 2019
@@ -19,9 +19,8 @@
package org.apache.fop.fonts.substitute;
-import org.apache.avalon.framework.configuration.Configuration;
-
import org.apache.fop.apps.FOPException;
+import org.apache.fop.configuration.Configuration;
/**
* Configures a font substitution catalog
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/RendererConfig.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/RendererConfig.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/RendererConfig.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/RendererConfig.java
Tue Jan 22 11:53:31 2019
@@ -19,10 +19,9 @@
package org.apache.fop.render;
-import org.apache.avalon.framework.configuration.Configuration;
-
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.configuration.Configuration;
import org.apache.fop.fonts.FontConfig;
/**
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/RendererConfigOption.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/RendererConfigOption.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/RendererConfigOption.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/RendererConfigOption.java
Tue Jan 22 11:53:31 2019
@@ -26,4 +26,6 @@ package org.apache.fop.render;
public interface RendererConfigOption {
/** The name of the option. */
String getName();
+
+ Object getDefaultValue();
}
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/XMLHandlerConfigurator.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/XMLHandlerConfigurator.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/XMLHandlerConfigurator.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/XMLHandlerConfigurator.java
Tue Jan 22 11:53:31 2019
@@ -19,13 +19,13 @@
package org.apache.fop.render;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.configuration.Configuration;
+import org.apache.fop.configuration.ConfigurationException;
/**
* Configurator for XMLHandler objects.
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPFontConfig.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPFontConfig.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPFontConfig.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPFontConfig.java
Tue Jan 22 11:53:31 2019
@@ -27,8 +27,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -44,6 +42,8 @@ import org.apache.fop.afp.fonts.RasterFo
import org.apache.fop.afp.util.AFPResourceAccessor;
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.io.InternalResourceResolver;
+import org.apache.fop.configuration.Configuration;
+import org.apache.fop.configuration.ConfigurationException;
import org.apache.fop.events.EventProducer;
import org.apache.fop.fonts.EmbedFontInfo;
import org.apache.fop.fonts.FontConfig;
@@ -85,7 +85,7 @@ public final class AFPFontConfig impleme
/** {@inheritDoc}} */
public AFPFontConfig parse(Configuration cfg, FontManager fontManager,
boolean strict,
- EventProducer eventProducer) throws FOPException {
+ EventProducer eventProducer) throws
FOPException {
try {
return new ParserHelper(cfg, fontManager, strict,
(AFPEventProducer) eventProducer).fontConfig;
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPInfo.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPInfo.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPInfo.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPInfo.java
Tue Jan 22 11:53:31 2019
@@ -19,12 +19,11 @@
package org.apache.fop.render.afp;
-import org.apache.avalon.framework.configuration.Configuration;
-
import org.apache.fop.afp.AFPGraphics2D;
import org.apache.fop.afp.AFPPaintingState;
import org.apache.fop.afp.AFPResourceInfo;
import org.apache.fop.afp.AFPResourceManager;
+import org.apache.fop.configuration.Configuration;
import org.apache.fop.fonts.FontInfo;
/**
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererConfig.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererConfig.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererConfig.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererConfig.java
Tue Jan 22 11:53:31 2019
@@ -23,8 +23,6 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.util.EnumMap;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -38,6 +36,8 @@ import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.MimeConstants;
import org.apache.fop.apps.io.InternalResourceResolver;
+import org.apache.fop.configuration.Configuration;
+import org.apache.fop.configuration.ConfigurationException;
import org.apache.fop.fonts.FontManager;
import org.apache.fop.render.RendererConfig;
import org.apache.fop.render.afp.AFPFontConfig.AFPFontInfoConfigParser;
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererContext.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererContext.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererContext.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererContext.java
Tue Jan 22 11:53:31 2019
@@ -21,12 +21,11 @@ package org.apache.fop.render.afp;
import java.util.Map;
-import org.apache.avalon.framework.configuration.Configuration;
-
import org.apache.fop.afp.AFPPaintingState;
import org.apache.fop.afp.AFPResourceInfo;
import org.apache.fop.afp.AFPResourceManager;
import org.apache.fop.afp.modca.ResourceObject;
+import org.apache.fop.configuration.Configuration;
import org.apache.fop.render.AbstractRenderer;
import org.apache.fop.render.ImageHandlerUtil;
import org.apache.fop.render.RendererContext;
@@ -58,7 +57,7 @@ public class AFPRendererContext extends
info.setHeight((Integer) getProperty(RendererContextConstants.HEIGHT));
info.setX((Integer) getProperty(RendererContextConstants.XPOS));
info.setY((Integer) getProperty(RendererContextConstants.YPOS));
- info.setHandlerConfiguration((Configuration)getProperty(
+ info.setHandlerConfiguration((Configuration) getProperty(
RendererContextConstants.HANDLER_CONFIGURATION));
info.setFontInfo((org.apache.fop.fonts.FontInfo)getProperty(
AFPRendererContextConstants.AFP_FONT_INFO));
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererOption.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererOption.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererOption.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererOption.java
Tue Jan 22 11:53:31 2019
@@ -61,4 +61,9 @@ public enum AFPRendererOption implements
public Class<?> getType() {
return type;
}
+
+ @Override
+ public Object getDefaultValue() {
+ return null;
+ }
}
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPShadingMode.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPShadingMode.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPShadingMode.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPShadingMode.java
Tue Jan 22 11:53:31 2019
@@ -49,7 +49,7 @@ public enum AFPShadingMode {
* @return the enumeration object
*/
public static AFPShadingMode getValueOf(String name) {
- if (COLOR.getName().equalsIgnoreCase(name)) {
+ if (name == null || "".equals(name) ||
COLOR.getName().equalsIgnoreCase(name)) {
return COLOR;
} else if (DITHERED.getName().equalsIgnoreCase(name)) {
return DITHERED;
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/bitmap/BitmapRendererConfig.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/bitmap/BitmapRendererConfig.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/bitmap/BitmapRendererConfig.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/bitmap/BitmapRendererConfig.java
Tue Jan 22 11:53:31 2019
@@ -23,10 +23,9 @@ import java.awt.Color;
import java.awt.image.BufferedImage;
import java.util.EnumMap;
-import org.apache.avalon.framework.configuration.Configuration;
-
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.configuration.Configuration;
import org.apache.fop.fonts.DefaultFontConfig;
import org.apache.fop.fonts.DefaultFontConfig.DefaultFontConfigParser;
import org.apache.fop.fonts.FontEventAdapter;
@@ -170,7 +169,18 @@ public class BitmapRendererConfig implem
}
private String getValue(Configuration cfg, BitmapRendererOption
option) {
- return cfg.getChild(option.getName()).getValue(null);
+ Object defaultValue = option.getDefaultValue();
+ Object result = cfg.getChild(option.getName()).getValue(null);
+ if (result == null || "".equals(result)) {
+ result = defaultValue;
+ }
+ if (result == null) {
+ return null;
+ }
+ if (result instanceof Color) {
+ return ColorUtil.colorToString((Color) result);
+ }
+ return result.toString();
}
public String getMimeType() {
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/bitmap/PNGRendererConfig.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/bitmap/PNGRendererConfig.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/bitmap/PNGRendererConfig.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/bitmap/PNGRendererConfig.java
Tue Jan 22 11:53:31 2019
@@ -17,12 +17,11 @@
package org.apache.fop.render.bitmap;
-import org.apache.avalon.framework.configuration.Configuration;
-
import org.apache.xmlgraphics.util.MimeConstants;
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.configuration.Configuration;
import org.apache.fop.fonts.DefaultFontConfig;
import org.apache.fop.fonts.DefaultFontConfig.DefaultFontConfigParser;
import org.apache.fop.fonts.FontEventAdapter;
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/bitmap/TIFFRendererConfig.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/bitmap/TIFFRendererConfig.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/bitmap/TIFFRendererConfig.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/bitmap/TIFFRendererConfig.java
Tue Jan 22 11:53:31 2019
@@ -21,13 +21,12 @@ package org.apache.fop.render.bitmap;
import java.util.EnumMap;
-import org.apache.avalon.framework.configuration.Configuration;
-
import org.apache.xmlgraphics.image.writer.Endianness;
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.MimeConstants;
+import org.apache.fop.configuration.Configuration;
import org.apache.fop.fonts.DefaultFontConfig;
import org.apache.fop.fonts.DefaultFontConfig.DefaultFontConfigParser;
import org.apache.fop.fonts.FontEventAdapter;
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/IFRendererConfig.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/IFRendererConfig.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/IFRendererConfig.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/IFRendererConfig.java
Tue Jan 22 11:53:31 2019
@@ -19,10 +19,9 @@
package org.apache.fop.render.intermediate;
-import org.apache.avalon.framework.configuration.Configuration;
-
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.configuration.Configuration;
import org.apache.fop.fonts.DefaultFontConfig;
import org.apache.fop.fonts.DefaultFontConfig.DefaultFontConfigParser;
import org.apache.fop.fonts.FontConfig;
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DRendererConfig.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DRendererConfig.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DRendererConfig.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DRendererConfig.java
Tue Jan 22 11:53:31 2019
@@ -21,10 +21,9 @@ package org.apache.fop.render.java2d;
import java.util.EnumMap;
-import org.apache.avalon.framework.configuration.Configuration;
-
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.configuration.Configuration;
import org.apache.fop.fonts.DefaultFontConfig;
import org.apache.fop.fonts.DefaultFontConfig.DefaultFontConfigParser;
import org.apache.fop.fonts.FontEventAdapter;
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DRendererOption.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DRendererOption.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DRendererOption.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DRendererOption.java
Tue Jan 22 11:53:31 2019
@@ -34,4 +34,9 @@ public enum Java2DRendererOption impleme
public String getName() {
return name;
}
+
+ @Override
+ public Object getDefaultValue() {
+ return null;
+ }
}
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pcl/Java2DRendererOption.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pcl/Java2DRendererOption.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pcl/Java2DRendererOption.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pcl/Java2DRendererOption.java
Tue Jan 22 11:53:31 2019
@@ -25,19 +25,25 @@ import org.apache.fop.render.RendererCon
*/
public enum Java2DRendererOption implements RendererConfigOption {
- RENDERING_MODE("rendering", PCLRenderingMode.class),
- TEXT_RENDERING("text-rendering", Boolean.class),
- DISABLE_PJL("disable-pjl", Boolean.class),
- OPTIMIZE_RESOURCES("optimize-resources", Boolean.class),
- MODE_COLOR("color", Boolean.class);
+ RENDERING_MODE("rendering", PCLRenderingMode.class,
PCLRenderingMode.QUALITY),
+ TEXT_RENDERING("text-rendering", Boolean.class, Boolean.FALSE),
+ DISABLE_PJL("disable-pjl", Boolean.class, Boolean.FALSE),
+ OPTIMIZE_RESOURCES("optimize-resources", Boolean.class, Boolean.FALSE),
+ MODE_COLOR("color", Boolean.class, Boolean.FALSE);
private final String name;
private final Class<?> type;
- private Java2DRendererOption(String name, Class<?> type) {
+ private final Object defaultValue;
+
+ private Java2DRendererOption(String name, Class<?> type, Object
defaultValue) {
this.name = name;
this.type = type;
+ this.defaultValue = defaultValue;
+ if (defaultValue != null &&
!(type.isAssignableFrom(defaultValue.getClass()))) {
+ throw new IllegalArgumentException("default value " + defaultValue
+ " is not of type " + type);
+ }
}
/** {@inheritDoc} */
@@ -48,4 +54,9 @@ public enum Java2DRendererOption impleme
Class<?> getType() {
return type;
}
+
+ @Override
+ public Object getDefaultValue() {
+ return defaultValue;
+ }
}
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pcl/PCLRendererConfig.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pcl/PCLRendererConfig.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pcl/PCLRendererConfig.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pcl/PCLRendererConfig.java
Tue Jan 22 11:53:31 2019
@@ -22,11 +22,10 @@ package org.apache.fop.render.pcl;
import java.util.EnumMap;
import java.util.Map;
-import org.apache.avalon.framework.configuration.Configuration;
-
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.MimeConstants;
+import org.apache.fop.configuration.Configuration;
import org.apache.fop.fonts.DefaultFontConfig;
import org.apache.fop.fonts.DefaultFontConfig.DefaultFontConfigParser;
import org.apache.fop.fonts.FontEventAdapter;
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/PDFRendererConfig.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/PDFRendererConfig.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/PDFRendererConfig.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/PDFRendererConfig.java
Tue Jan 22 11:53:31 2019
@@ -25,15 +25,14 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.MimeConstants;
+import org.apache.fop.configuration.Configuration;
+import org.apache.fop.configuration.ConfigurationException;
import org.apache.fop.fonts.DefaultFontConfig;
import org.apache.fop.fonts.DefaultFontConfig.DefaultFontConfigParser;
import org.apache.fop.fonts.FontEventAdapter;
@@ -217,7 +216,12 @@ public final class PDFRendererConfig imp
private String parseConfig(Configuration cfg, RendererConfigOption
option) {
Configuration child = cfg.getChild(option.getName());
- return child.getValue(null);
+ String value = child.getValue(null);
+ if (value == null || "".equals(value)) {
+ Object v = option.getDefaultValue();
+ return v == null ? null : v.toString();
+ }
+ return value;
}
private boolean doesValueExist(Configuration cfg, RendererConfigOption
option) {
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/PDFSVGHandler.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/PDFSVGHandler.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/PDFSVGHandler.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/PDFSVGHandler.java
Tue Jan 22 11:53:31 2019
@@ -22,10 +22,10 @@ package org.apache.fop.render.pdf;
import java.io.OutputStream;
import java.util.Map;
-import org.apache.avalon.framework.configuration.Configuration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.fop.configuration.Configuration;
import org.apache.fop.fonts.FontInfo;
import org.apache.fop.pdf.PDFDocument;
import org.apache.fop.pdf.PDFPage;
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/PSRendererConfig.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/PSRendererConfig.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/PSRendererConfig.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/PSRendererConfig.java
Tue Jan 22 11:53:31 2019
@@ -22,14 +22,14 @@ package org.apache.fop.render.ps;
import java.util.EnumMap;
import java.util.Locale;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.MimeConstants;
+import org.apache.fop.configuration.Configuration;
+import org.apache.fop.configuration.ConfigurationException;
import org.apache.fop.fonts.DefaultFontConfig;
import org.apache.fop.fonts.DefaultFontConfig.DefaultFontConfigParser;
import org.apache.fop.fonts.FontEventAdapter;
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/PSSVGHandler.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/PSSVGHandler.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/PSSVGHandler.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/PSSVGHandler.java
Tue Jan 22 11:53:31 2019
@@ -26,8 +26,6 @@ import java.util.Map;
import org.w3c.dom.Document;
-import org.apache.avalon.framework.configuration.Configuration;
-
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.GVTBuilder;
import org.apache.batik.gvt.GraphicsNode;
@@ -35,6 +33,7 @@ import org.apache.batik.gvt.GraphicsNode
import org.apache.xmlgraphics.java2d.ps.PSGraphics2D;
import org.apache.xmlgraphics.ps.PSGenerator;
+import org.apache.fop.configuration.Configuration;
import org.apache.fop.fonts.FontInfo;
import org.apache.fop.image.loader.batik.BatikUtil;
import org.apache.fop.render.AbstractGenericSVGHandler;
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/txt/TxtRendererConfig.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/txt/TxtRendererConfig.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/txt/TxtRendererConfig.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/txt/TxtRendererConfig.java
Tue Jan 22 11:53:31 2019
@@ -21,11 +21,10 @@ package org.apache.fop.render.txt;
import java.util.EnumMap;
-import org.apache.avalon.framework.configuration.Configuration;
-
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.MimeConstants;
+import org.apache.fop.configuration.Configuration;
import org.apache.fop.fonts.DefaultFontConfig;
import org.apache.fop.fonts.DefaultFontConfig.DefaultFontConfigParser;
import org.apache.fop.fonts.FontEventAdapter;
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/AbstractFOPTranscoder.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/AbstractFOPTranscoder.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/AbstractFOPTranscoder.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/AbstractFOPTranscoder.java
Tue Jan 22 11:53:31 2019
@@ -28,10 +28,6 @@ import javax.xml.transform.stream.Stream
import org.w3c.dom.DOMImplementation;
import org.xml.sax.EntityResolver;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.impl.SimpleLog;
@@ -55,6 +51,10 @@ import org.apache.xmlgraphics.image.load
import org.apache.xmlgraphics.image.loader.impl.AbstractImageSessionContext;
import org.apache.xmlgraphics.util.UnitConv;
+import org.apache.fop.configuration.Configurable;
+import org.apache.fop.configuration.Configuration;
+import org.apache.fop.configuration.ConfigurationException;
+import org.apache.fop.configuration.DefaultConfiguration;
import org.apache.fop.svg.font.FOPFontFamilyResolver;
/**
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java
Tue Jan 22 11:53:31 2019
@@ -23,12 +23,11 @@ import java.io.File;
import java.net.URI;
import java.util.List;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.apps.io.ResourceResolverFactory;
+import org.apache.fop.configuration.Configuration;
+import org.apache.fop.configuration.ConfigurationException;
import org.apache.fop.fonts.DefaultFontConfig;
import org.apache.fop.fonts.DefaultFontConfigurator;
import org.apache.fop.fonts.EmbedFontInfo;
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/PDFTranscoder.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/PDFTranscoder.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/PDFTranscoder.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/PDFTranscoder.java
Tue Jan 22 11:53:31 2019
@@ -27,8 +27,6 @@ import java.io.OutputStream;
import org.w3c.dom.Document;
import org.w3c.dom.svg.SVGLength;
-import org.apache.avalon.framework.configuration.Configuration;
-
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.UnitProcessor;
import org.apache.batik.ext.awt.RenderingHintsKeyExt;
@@ -37,6 +35,7 @@ import org.apache.batik.transcoder.Trans
import org.apache.batik.transcoder.image.ImageTranscoder;
import org.apache.fop.Version;
+import org.apache.fop.configuration.Configuration;
import org.apache.fop.fonts.FontInfo;
import org.apache.fop.svg.font.FOPFontFamilyResolverImpl;
Modified:
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/apps/AbstractRendererConfigParserTester.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/apps/AbstractRendererConfigParserTester.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/apps/AbstractRendererConfigParserTester.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/apps/AbstractRendererConfigParserTester.java
Tue Jan 22 11:53:31 2019
@@ -22,10 +22,9 @@ package org.apache.fop.apps;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
-
import org.apache.fop.apps.FopConfBuilder.RendererConfBuilder;
+import org.apache.fop.configuration.Configuration;
+import org.apache.fop.configuration.DefaultConfigurationBuilder;
import org.apache.fop.events.DefaultEventBroadcaster;
import org.apache.fop.fonts.FontManager;
import org.apache.fop.render.RendererConfig;
Modified:
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/apps/AbstractRendererConfiguratorTest.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/apps/AbstractRendererConfiguratorTest.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/apps/AbstractRendererConfiguratorTest.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/apps/AbstractRendererConfiguratorTest.java
Tue Jan 22 11:53:31 2019
@@ -27,9 +27,8 @@ import org.xml.sax.SAXException;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-
import org.apache.fop.apps.FopConfBuilder.RendererConfBuilder;
+import org.apache.fop.configuration.ConfigurationException;
import org.apache.fop.render.PrintRendererConfigurator;
import org.apache.fop.render.intermediate.IFDocumentHandler;
Modified:
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/apps/MutableConfig.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/apps/MutableConfig.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/apps/MutableConfig.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/apps/MutableConfig.java
Tue Jan 22 11:53:31 2019
@@ -21,13 +21,12 @@ import java.net.URI;
import java.util.Map;
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.InternalResourceResolver;
+import org.apache.fop.configuration.Configuration;
import org.apache.fop.fonts.FontManager;
import org.apache.fop.layoutmgr.LayoutManagerMaker;
Modified:
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/config/BaseUserConfigTest.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/config/BaseUserConfigTest.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/config/BaseUserConfigTest.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/config/BaseUserConfigTest.java
Tue Jan 22 11:53:31 2019
@@ -25,11 +25,11 @@ import java.io.InputStream;
import org.xml.sax.SAXException;
-import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.configuration.DefaultConfigurationBuilder;
import org.apache.fop.render.pdf.BasePDFTest;
import static org.apache.fop.FOPTestUtils.getBaseDir;
Modified:
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/threading/AvalonAdapter.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/threading/AvalonAdapter.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/threading/AvalonAdapter.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/threading/AvalonAdapter.java
Tue Jan 22 11:53:31 2019
@@ -19,7 +19,7 @@
package org.apache.fop.threading;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
import org.apache.fop.events.Event;
import org.apache.fop.events.EventFormatter;
@@ -31,10 +31,10 @@ import org.apache.fop.events.model.Event
*/
class AvalonAdapter implements EventListener {
- private final Logger logger;
+ private final Log logger;
private String filename;
- public AvalonAdapter(Logger logger, String filename) {
+ public AvalonAdapter(Log logger, String filename) {
this.logger = logger;
this.filename = filename;
}
@@ -49,7 +49,7 @@ class AvalonAdapter implements EventList
} else if (severity == EventSeverity.ERROR) {
logger.error(filename + ": " + msg);
} else if (severity == EventSeverity.FATAL) {
- logger.fatalError(filename + ": " + msg);
+ logger.fatal(filename + ": " + msg);
} else {
assert false;
}
Modified:
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/threading/FOPTestbed.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/threading/FOPTestbed.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/threading/FOPTestbed.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/threading/FOPTestbed.java
Tue Jan 22 11:53:31 2019
@@ -31,25 +31,27 @@ import javax.xml.transform.TransformerCo
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamSource;
-import org.apache.avalon.framework.CascadingRuntimeException;
-import org.apache.avalon.framework.activity.Executable;
-import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.output.CountingOutputStream;
import org.apache.commons.io.output.NullOutputStream;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.fop.activity.ContainerUtil;
+import org.apache.fop.activity.Initializable;
+import org.apache.fop.configuration.Configurable;
+import org.apache.fop.configuration.Configuration;
+import org.apache.fop.configuration.ConfigurationException;
/**
* Testbed for multi-threading tests. The class can run a configurable set of
task a number of
* times in a configurable number of threads to easily reproduce
multi-threading issues.
*/
-public class FOPTestbed extends AbstractLogEnabled
+public class FOPTestbed
implements Configurable, Initializable {
+ private static final Log LOG = LogFactory.getLog(FOPTestbed.class);
+
private int repeat;
private List taskList = new java.util.ArrayList();
private int threads;
@@ -85,7 +87,7 @@ public class FOPTestbed extends Abstract
* Starts the stress test.
*/
public void doStressTest() {
- getLogger().info("Starting stress test...");
+ LOG.info("Starting stress test...");
long start = System.currentTimeMillis();
this.counter = 0;
@@ -94,7 +96,7 @@ public class FOPTestbed extends Abstract
List threadList = new java.util.LinkedList();
for (int ti = 0; ti < this.threads; ti++) {
TaskRunner runner = new TaskRunner();
- ContainerUtil.enableLogging(runner, getLogger());
+ // ContainerUtil.enableLogging(runner, logger);
Thread thread = new Thread(workerGroup, runner, "Worker- " + ti);
threadList.add(thread);
}
@@ -150,7 +152,7 @@ public class FOPTestbed extends Abstract
}
}
- private class TaskRunner extends AbstractLogEnabled implements Runnable {
+ private class TaskRunner implements Runnable {
public void run() {
try {
@@ -158,12 +160,12 @@ public class FOPTestbed extends Abstract
for (Object aTaskList : taskList) {
TaskDef def = (TaskDef) aTaskList;
final Task task = new Task(def, counter++,
foprocessor);
- ContainerUtil.enableLogging(task, getLogger());
+ // ContainerUtil.enableLogging(task, logger);
task.execute();
}
}
} catch (Exception e) {
- getLogger().error("Thread ended with an exception", e);
+ LOG.error("Thread ended with an exception", e);
}
}
@@ -178,12 +180,12 @@ public class FOPTestbed extends Abstract
Class clazz = Class.forName(this.fopCfg.getAttribute("class",
"org.apache.fop.threading.FOProcessorImpl"));
Processor fop =
(Processor)clazz.getDeclaredConstructor().newInstance();
- ContainerUtil.enableLogging(fop, getLogger());
+ // ContainerUtil.enableLogging(fop, logger);
ContainerUtil.configure(fop, this.fopCfg);
ContainerUtil.initialize(fop);
return fop;
} catch (Exception e) {
- throw new CascadingRuntimeException("Error creating FO Processor",
e);
+ throw new RuntimeException("Error creating FO Processor", e);
}
}
@@ -243,7 +245,7 @@ public class FOPTestbed extends Abstract
}
- private class Task extends AbstractLogEnabled implements Executable {
+ private class Task {
private TaskDef def;
private int num;
@@ -257,7 +259,7 @@ public class FOPTestbed extends Abstract
public void execute() throws Exception {
- getLogger().info("Processing: " + def);
+ LOG.info("Processing: " + def);
long start = System.currentTimeMillis();
try {
DecimalFormat df = new DecimalFormat("00000");
Modified:
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/threading/FOProcessorImpl.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/threading/FOProcessorImpl.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/threading/FOProcessorImpl.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/threading/FOProcessorImpl.java
Tue Jan 22 11:53:31 2019
@@ -36,25 +36,29 @@ import javax.xml.transform.sax.SAXResult
import org.xml.sax.SAXException;
-import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.fop.activity.Initializable;
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.MimeConstants;
+import org.apache.fop.configuration.Configurable;
+import org.apache.fop.configuration.Configuration;
+import org.apache.fop.configuration.ConfigurationException;
/**
* Default implementation of the {@link Processor} interface using FOP.
*/
-public class FOProcessorImpl extends AbstractLogEnabled
+public class FOProcessorImpl
implements Processor, Configurable, Initializable {
+ private static final Log LOG = LogFactory.getLog(FOProcessorImpl.class);
+
private FopFactory fopFactory;
private TransformerFactory factory = TransformerFactory.newInstance();
private URI userconfig;
@@ -74,7 +78,7 @@ public class FOProcessorImpl extends Abs
public void initialize() throws Exception {
if (this.userconfig != null) {
- getLogger().debug("Setting user config: " + userconfig);
+ LOG.debug("Setting user config: " + userconfig);
fopFactory = FopFactory.newInstance(new File(userconfig));
} else {
fopFactory = FopFactory.newInstance(new File(".").toURI());
@@ -92,7 +96,7 @@ public class FOProcessorImpl extends Abs
URL url = new URL(src.getSystemId());
String filename = FilenameUtils.getName(url.getPath());
foUserAgent.getEventBroadcaster().addEventListener(
- new AvalonAdapter(getLogger(), filename));
+ new AvalonAdapter(LOG, filename));
} catch (MalformedURLException mfue) {
throw new RuntimeException(mfue);
}
Modified:
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/threading/IFProcessorImpl.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/threading/IFProcessorImpl.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/threading/IFProcessorImpl.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/threading/IFProcessorImpl.java
Tue Jan 22 11:53:31 2019
@@ -35,17 +35,19 @@ import javax.xml.transform.stream.Stream
import org.xml.sax.ContentHandler;
-import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.fop.activity.Initializable;
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.FopFactory;
import org.apache.fop.apps.MimeConstants;
+import org.apache.fop.configuration.Configurable;
+import org.apache.fop.configuration.Configuration;
+import org.apache.fop.configuration.ConfigurationException;
import org.apache.fop.render.intermediate.IFDocumentHandler;
import org.apache.fop.render.intermediate.IFException;
import org.apache.fop.render.intermediate.IFParser;
@@ -54,9 +56,12 @@ import org.apache.fop.render.intermediat
/**
* Implementation of the {@link Processor} interface that renders IF XML to a
final output format.
*/
-public class IFProcessorImpl extends AbstractLogEnabled
+public class IFProcessorImpl
implements Processor, Configurable, Initializable {
+ private static final Log LOGGER = LogFactory.getLog(IFProcessorImpl.class);
+
+
private FopFactory fopFactory;
private TransformerFactory factory = TransformerFactory.newInstance();
private String userconfig;
@@ -73,7 +78,7 @@ public class IFProcessorImpl extends Abs
/** {@inheritDoc} */
public void initialize() throws Exception {
if (this.userconfig != null) {
- getLogger().debug("Setting user config: " + userconfig);
+ LOGGER.debug("Setting user config: " + userconfig);
fopFactory = FopFactory.newInstance(new File(this.userconfig));
} else {
fopFactory = FopFactory.newInstance(new File(".").toURI());
@@ -89,7 +94,7 @@ public class IFProcessorImpl extends Abs
URL url = new URL(src.getSystemId());
String filename = FilenameUtils.getName(url.getPath());
foUserAgent.getEventBroadcaster().addEventListener(
- new AvalonAdapter(getLogger(), filename));
+ new AvalonAdapter(LOGGER, filename));
} catch (MalformedURLException mfue) {
throw new RuntimeException(mfue);
}
Modified:
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/threading/Main.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/threading/Main.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/threading/Main.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/threading/Main.java
Tue Jan 22 11:53:31 2019
@@ -23,11 +23,9 @@ import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
-import org.apache.avalon.framework.ExceptionUtil;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
-import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.avalon.framework.logger.ConsoleLogger;
+import org.apache.fop.activity.ContainerUtil;
+import org.apache.fop.configuration.Configuration;
+import org.apache.fop.configuration.DefaultConfigurationBuilder;
/**
* Starter class for the multi-threading testbed.
@@ -61,7 +59,7 @@ public final class Main {
//Setup testbed
FOPTestbed testbed = new FOPTestbed();
- ContainerUtil.enableLogging(testbed, new
ConsoleLogger(ConsoleLogger.LEVEL_INFO));
+ // ContainerUtil.enableLogging(testbed, new
ConsoleLogger(ConsoleLogger.LEVEL_INFO));
ContainerUtil.configure(testbed, cfg);
ContainerUtil.initialize(testbed);
@@ -70,7 +68,8 @@ public final class Main {
System.exit(0);
} catch (Exception e) {
- System.err.println(ExceptionUtil.printStackTrace(e));
+ // System.err.println(ExceptionUtil.printStackTrace(e));
+ e.printStackTrace(System.err);
System.exit(-1);
}
}
Modified:
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/threading/Processor.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/threading/Processor.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/threading/Processor.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/threading/Processor.java
Tue Jan 22 11:53:31 2019
@@ -24,10 +24,13 @@ import java.io.OutputStream;
import javax.xml.transform.Source;
import javax.xml.transform.Templates;
+import org.apache.fop.activity.Initializable;
+import org.apache.fop.configuration.Configurable;
+
/**
* Represents a processor.
*/
-public interface Processor {
+public interface Processor extends Configurable, Initializable {
/**
* Process a file.
Modified:
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/visual/AbstractPSPDFBitmapProducer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/visual/AbstractPSPDFBitmapProducer.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/visual/AbstractPSPDFBitmapProducer.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/visual/AbstractPSPDFBitmapProducer.java
Tue Jan 22 11:53:31 2019
@@ -32,14 +32,14 @@ import javax.xml.transform.Transformer;
import javax.xml.transform.sax.SAXResult;
import javax.xml.transform.stream.StreamSource;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.commons.io.IOUtils;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FopFactory;
+import org.apache.fop.configuration.Configurable;
+import org.apache.fop.configuration.Configuration;
+import org.apache.fop.configuration.ConfigurationException;
import org.apache.fop.util.DefaultErrorListener;
/**
Modified:
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/visual/BatchDiffer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/visual/BatchDiffer.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/visual/BatchDiffer.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/visual/BatchDiffer.java
Tue Jan 22 11:53:31 2019
@@ -30,10 +30,6 @@ import javax.xml.transform.stream.Stream
import org.xml.sax.SAXException;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.filefilter.AndFileFilter;
import org.apache.commons.io.filefilter.IOFileFilter;
@@ -44,6 +40,10 @@ import org.apache.commons.logging.LogFac
import org.apache.xmlgraphics.image.writer.ImageWriterUtil;
+import org.apache.fop.activity.ContainerUtil;
+import org.apache.fop.configuration.Configuration;
+import org.apache.fop.configuration.ConfigurationException;
+import org.apache.fop.configuration.DefaultConfigurationBuilder;
import org.apache.fop.layoutengine.LayoutEngineTestUtils;
/**
Modified:
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/visual/BitmapProducer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/visual/BitmapProducer.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/visual/BitmapProducer.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/visual/BitmapProducer.java
Tue Jan 22 11:53:31 2019
@@ -22,10 +22,12 @@ package org.apache.fop.visual;
import java.awt.image.BufferedImage;
import java.io.File;
+import org.apache.fop.configuration.Configurable;
+
/**
* Interface for a converter.
*/
-public interface BitmapProducer {
+public interface BitmapProducer extends Configurable {
/**
* Produces a BufferedImage from the source file by invoking the FO
processor and
Modified:
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/visual/BitmapProducerJava2D.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/visual/BitmapProducerJava2D.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/visual/BitmapProducerJava2D.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/visual/BitmapProducerJava2D.java
Tue Jan 22 11:53:31 2019
@@ -30,15 +30,15 @@ import javax.xml.transform.Transformer;
import javax.xml.transform.sax.SAXResult;
import javax.xml.transform.stream.StreamSource;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.commons.io.IOUtils;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FopFactory;
import org.apache.fop.apps.MimeConstants;
+import org.apache.fop.configuration.Configurable;
+import org.apache.fop.configuration.Configuration;
+import org.apache.fop.configuration.ConfigurationException;
import org.apache.fop.util.DefaultErrorListener;
/**
Modified:
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/visual/ReferenceBitmapLoader.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/visual/ReferenceBitmapLoader.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/visual/ReferenceBitmapLoader.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/visual/ReferenceBitmapLoader.java
Tue Jan 22 11:53:31 2019
@@ -23,9 +23,9 @@ import java.awt.image.BufferedImage;
import java.io.File;
import java.net.URI;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.fop.configuration.Configurable;
+import org.apache.fop.configuration.Configuration;
+import org.apache.fop.configuration.ConfigurationException;
/**
* BitmapProducer implementation that simply loads preproduced reference
bitmaps from a
@@ -47,7 +47,6 @@ public class ReferenceBitmapLoader exten
super(baseUri);
}
- /** @see org.apache.avalon.framework.configuration.Configurable */
public void configure(Configuration cfg) throws ConfigurationException {
this.bitmapDirectory = new
File(cfg.getChild("directory").getValue(null));
if (!bitmapDirectory.exists()) {
Modified: xmlgraphics/fop/trunk/fop-servlet/pom.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-servlet/pom.xml?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-servlet/pom.xml (original)
+++ xmlgraphics/fop/trunk/fop-servlet/pom.xml Tue Jan 22 11:53:31 2019
@@ -44,16 +44,6 @@
<artifactId>commons-logging</artifactId>
<version>${commons.logging.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.avalon.framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- <version>${avalon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.avalon.framework</groupId>
- <artifactId>avalon-framework-impl</artifactId>
- <version>${avalon.version}</version>
- </dependency>
</dependencies>
<build>
@@ -63,8 +53,6 @@
<version>${war.plugin.version}</version>
<configuration>
<packagingIncludes>
- WEB-INF/lib/avalon-framework-api-${avalon.version}.jar,
- WEB-INF/lib/avalon-framework-impl-${avalon.version}.jar,
WEB-INF/lib/batik-all-*.jar,
WEB-INF/lib/commons-io-${commons.io.version}.jar,
WEB-INF/lib/commons-logging-${commons.logging.version}.jar,
Modified: xmlgraphics/fop/trunk/fop-transcoder-allinone/pom.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-transcoder-allinone/pom.xml?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-transcoder-allinone/pom.xml (original)
+++ xmlgraphics/fop/trunk/fop-transcoder-allinone/pom.xml Tue Jan 22 11:53:31
2019
@@ -42,17 +42,6 @@
<version>${commons.logging.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.avalon.framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- <version>${avalon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.avalon.framework</groupId>
- <artifactId>avalon-framework-impl</artifactId>
- <version>${avalon.version}</version>
- </dependency>
- <!-- test deps -->
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
Modified:
xmlgraphics/fop/trunk/fop-transcoder-allinone/src/tools/resources/assembly/assembly.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-transcoder-allinone/src/tools/resources/assembly/assembly.xml?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-transcoder-allinone/src/tools/resources/assembly/assembly.xml
(original)
+++
xmlgraphics/fop/trunk/fop-transcoder-allinone/src/tools/resources/assembly/assembly.xml
Tue Jan 22 11:53:31 2019
@@ -22,10 +22,6 @@
<unpack>true</unpack>
<unpackOptions>
<includes>
- <include>org/apache/avalon/framework/*</include>
- <include>org/apache/avalon/framework/activity/*</include>
- <include>org/apache/avalon/framework/configuration/*</include>
- <include>org/apache/avalon/framework/container/*</include>
<include>org/apache/commons/io/*.class</include>
<include>org/apache/commons/io/filefilter/*.class</include>
<include>org/apache/commons/io/output/*.class</include>
Modified: xmlgraphics/fop/trunk/fop/build.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop/build.xml?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop/build.xml (original)
+++ xmlgraphics/fop/trunk/fop/build.xml Tue Jan 22 11:53:31 2019
@@ -73,7 +73,6 @@ list of possible build targets.
<fileset dir="${basedir}/.." id="dist.bin.lib">
<patternset id="dist.lib">
<include name="fop/lib/README*"/>
- <include name="fop/lib/avalon-framework*"/>
<include name="fop/lib/batik*"/>
<include name="fop/lib/commons-io*"/>
<include name="fop/lib/commons-logging*"/>
@@ -597,7 +596,6 @@ list of possible build targets.
<echo message="Creating the WAR file"/>
<war warfile="${build.dir}/fop.war"
webxml="${servlet.src.dir}/main/webapp/WEB-INF/web.xml">
<lib dir="${lib.dir}">
- <include name="avalon-framework*.jar"/>
<include name="commons-logging*.jar"/>
<include name="batik*.jar"/>
<include name="commons-io*.jar"/>
@@ -642,6 +640,7 @@ list of possible build targets.
<include name="org/apache/fop/util/DecimalFormatCache*.class"/>
<include name="org/apache/fop/util/ImageObject.class"/>
<include name="org/apache/fop/util/HexEncoder.class"/>
+ <include name="org/apache/fop/configuration/**"/>
</patternset>
<!-- PDF transcoder -->
<patternset>
@@ -665,7 +664,6 @@ list of possible build targets.
</fileset>
<fileset dir="${lib.dir}" id="transcoder-lib-files">
<include name="commons-io*.jar"/>
- <include name="avalon-framework*.jar"/>
<include name="commons-logging*.jar"/>
<include name="xmlgraphics-commons*.jar"/>
</fileset>
@@ -698,10 +696,6 @@ list of possible build targets.
<mkdir dir="${transcoder-deps}"/>
<unjar dest="${transcoder-deps}">
<patternset>
- <include name="org/apache/avalon/framework/*"/>
- <include name="org/apache/avalon/framework/activity/*"/>
- <include name="org/apache/avalon/framework/configuration/*"/>
- <include name="org/apache/avalon/framework/container/*"/>
<include name="org/apache/commons/logging/**"/>
<include name="org/apache/commons/io/*.class"/>
<include name="org/apache/commons/io/filefilter/*.class"/>
@@ -712,7 +706,6 @@ list of possible build targets.
<mkdir dir="${transcoder-deps}/legal"/>
<copy todir="${transcoder-deps}/legal">
<fileset dir="${lib.dir}">
- <include name="avalon.LICENSE.txt"/>
<include name="commons-io.LICENSE.txt"/>
<include name="commons-logging.LICENSE.txt"/>
</fileset>
Modified: xmlgraphics/fop/trunk/fop/examples/embedding/build.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop/examples/embedding/build.xml?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop/examples/embedding/build.xml (original)
+++ xmlgraphics/fop/trunk/fop/examples/embedding/build.xml Tue Jan 22 11:53:31
2019
@@ -33,7 +33,6 @@
<!-- stuff -->
<path id="project.class.path">
<fileset dir="${fop.lib.dir}">
- <include name="avalon-framework*.jar"/>
<include name="batik*.jar"/>
<include name="xml-apis*.jar"/>
<include name="xerces*.jar"/>
Modified:
xmlgraphics/fop/trunk/fop/examples/embedding/java/embedding/ExampleAWTViewer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop/examples/embedding/java/embedding/ExampleAWTViewer.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop/examples/embedding/java/embedding/ExampleAWTViewer.java
(original)
+++
xmlgraphics/fop/trunk/fop/examples/embedding/java/embedding/ExampleAWTViewer.java
Tue Jan 22 11:53:31 2019
@@ -31,8 +31,6 @@ import javax.xml.transform.TransformerFa
import javax.xml.transform.sax.SAXResult;
import javax.xml.transform.stream.StreamSource;
-import org.apache.avalon.framework.ExceptionUtil;
-
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FopFactory;
@@ -103,7 +101,7 @@ public class ExampleAWTViewer {
System.out.println("Success!");
} catch (Exception e) {
- System.err.println(ExceptionUtil.printStackTrace(e));
+// System.err.println(ExceptionUtil.printStackTrace(e));
System.exit(-1);
}
}
Modified:
xmlgraphics/fop/trunk/fop/examples/embedding/java/embedding/ExampleEPS.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop/examples/embedding/java/embedding/ExampleEPS.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop/examples/embedding/java/embedding/ExampleEPS.java
(original)
+++ xmlgraphics/fop/trunk/fop/examples/embedding/java/embedding/ExampleEPS.java
Tue Jan 22 11:53:31 2019
@@ -21,12 +21,12 @@
package embedding;
import java.awt.Font;
+import java.io.File;
import java.io.FileOutputStream;
import java.io.OutputStream;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
-
+import org.apache.fop.configuration.Configuration;
+import org.apache.fop.configuration.DefaultConfigurationBuilder;
import org.apache.xmlgraphics.java2d.GraphicContext;
import org.apache.xmlgraphics.java2d.ps.EPSDocumentGraphics2D;
@@ -43,7 +43,7 @@ public class ExampleEPS {
try {
String configFile = "examples/fop-eps.xconf";
DefaultConfigurationBuilder cfgBuilder = new
DefaultConfigurationBuilder();
- Configuration c = cfgBuilder.buildFromFile(configFile);
+ Configuration c = cfgBuilder.buildFromFile(new File(configFile));
FontInfo fontInfo = PDFDocumentGraphics2DConfigurator.createFontInfo(c,
false);
Modified:
xmlgraphics/fop/trunk/fop/examples/embedding/java/embedding/ExampleJava2D2PDF.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop/examples/embedding/java/embedding/ExampleJava2D2PDF.java?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop/examples/embedding/java/embedding/ExampleJava2D2PDF.java
(original)
+++
xmlgraphics/fop/trunk/fop/examples/embedding/java/embedding/ExampleJava2D2PDF.java
Tue Jan 22 11:53:31 2019
@@ -30,13 +30,13 @@ import java.io.StringReader;
import javax.swing.JEditorPane;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.commons.io.IOUtils;
import org.apache.xmlgraphics.util.UnitConv;
+import org.apache.fop.configuration.Configuration;
+import org.apache.fop.configuration.ConfigurationException;
+import org.apache.fop.configuration.DefaultConfiguration;
import org.apache.fop.svg.PDFDocumentGraphics2D;
import org.apache.fop.svg.PDFDocumentGraphics2DConfigurator;
Modified: xmlgraphics/fop/trunk/fop/lib/README.txt
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop/lib/README.txt?rev=1851806&r1=1851805&r2=1851806&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop/lib/README.txt (original)
+++ xmlgraphics/fop/trunk/fop/lib/README.txt Tue Jan 22 11:53:31 2019
@@ -27,14 +27,6 @@ Normal Dependencies
Apache License v2.0
-- Apache Avalon Framework
-
- avalon-framework-*.jar
- http://excalibur.apache.org/framework/
- (Avalon Framework, maintained by the Apache Excalibur project)
-
- Apache License v2.0
-
- Apache XML Graphics Commons
xmlgraphics-commons-*.jar
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscr...@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-h...@xmlgraphics.apache.org
