Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/threading/AvalonAdapter.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/threading/AvalonAdapter.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/threading/AvalonAdapter.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/threading/AvalonAdapter.java Mon Jan 14 16:49:36 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/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/threading/FOPTestbed.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/threading/FOPTestbed.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/threading/FOPTestbed.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/threading/FOPTestbed.java Mon Jan 14 16:49:36 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/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/threading/FOProcessorImpl.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/threading/FOProcessorImpl.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/threading/FOProcessorImpl.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/threading/FOProcessorImpl.java Mon Jan 14 16:49:36 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/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/threading/IFProcessorImpl.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/threading/IFProcessorImpl.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/threading/IFProcessorImpl.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/threading/IFProcessorImpl.java Mon Jan 14 16:49:36 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/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/threading/Main.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/threading/Main.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/threading/Main.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/threading/Main.java Mon Jan 14 16:49:36 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/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/threading/Processor.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/threading/Processor.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/threading/Processor.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/threading/Processor.java Mon Jan 14 16:49:36 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/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/visual/AbstractPSPDFBitmapProducer.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/visual/AbstractPSPDFBitmapProducer.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/visual/AbstractPSPDFBitmapProducer.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/visual/AbstractPSPDFBitmapProducer.java Mon Jan 14 16:49:36 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/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/visual/BatchDiffer.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/visual/BatchDiffer.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/visual/BatchDiffer.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/visual/BatchDiffer.java Mon Jan 14 16:49:36 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/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/visual/BitmapProducer.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/visual/BitmapProducer.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/visual/BitmapProducer.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/visual/BitmapProducer.java Mon Jan 14 16:49:36 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/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/visual/BitmapProducerJava2D.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/visual/BitmapProducerJava2D.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/visual/BitmapProducerJava2D.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/visual/BitmapProducerJava2D.java Mon Jan 14 16:49:36 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/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/visual/ReferenceBitmapLoader.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/visual/ReferenceBitmapLoader.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/visual/ReferenceBitmapLoader.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/visual/ReferenceBitmapLoader.java Mon Jan 14 16:49:36 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/branches/Temp_Avalon/fop-servlet/pom.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-servlet/pom.xml?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-servlet/pom.xml (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-servlet/pom.xml Mon Jan 14 16:49:36 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/branches/Temp_Avalon/fop-transcoder-allinone/pom.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-transcoder-allinone/pom.xml?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-transcoder-allinone/pom.xml (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-transcoder-allinone/pom.xml Mon Jan 14 16:49:36 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/branches/Temp_Avalon/fop-transcoder-allinone/src/tools/resources/assembly/assembly.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-transcoder-allinone/src/tools/resources/assembly/assembly.xml?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-transcoder-allinone/src/tools/resources/assembly/assembly.xml (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-transcoder-allinone/src/tools/resources/assembly/assembly.xml Mon Jan 14 16:49:36 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/branches/Temp_Avalon/fop/build.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop/build.xml?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop/build.xml (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop/build.xml Mon Jan 14 16:49:36 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/branches/Temp_Avalon/fop/examples/embedding/build.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop/examples/embedding/build.xml?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop/examples/embedding/build.xml (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop/examples/embedding/build.xml Mon Jan 14 16:49:36 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/branches/Temp_Avalon/fop/examples/embedding/java/embedding/ExampleAWTViewer.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop/examples/embedding/java/embedding/ExampleAWTViewer.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop/examples/embedding/java/embedding/ExampleAWTViewer.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop/examples/embedding/java/embedding/ExampleAWTViewer.java Mon Jan 14 16:49:36 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/branches/Temp_Avalon/fop/examples/embedding/java/embedding/ExampleEPS.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop/examples/embedding/java/embedding/ExampleEPS.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop/examples/embedding/java/embedding/ExampleEPS.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop/examples/embedding/java/embedding/ExampleEPS.java Mon Jan 14 16:49:36 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/branches/Temp_Avalon/fop/examples/embedding/java/embedding/ExampleJava2D2PDF.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop/examples/embedding/java/embedding/ExampleJava2D2PDF.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop/examples/embedding/java/embedding/ExampleJava2D2PDF.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop/examples/embedding/java/embedding/ExampleJava2D2PDF.java Mon Jan 14 16:49:36 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/branches/Temp_Avalon/fop/lib/README.txt URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop/lib/README.txt?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop/lib/README.txt (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop/lib/README.txt Mon Jan 14 16:49:36 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 Modified: xmlgraphics/fop/branches/Temp_Avalon/pom.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/pom.xml?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/pom.xml (original) +++ xmlgraphics/fop/branches/Temp_Avalon/pom.xml Mon Jan 14 16:49:36 2019 @@ -12,7 +12,6 @@ <properties> <antrun.plugin.version>1.8</antrun.plugin.version> - <avalon.version>4.3.1</avalon.version> <batik.version>1.11.0-SNAPSHOT</batik.version> <build.helper.plugin.version>1.9.1</build.helper.plugin.version> <checkstyle.plugin.version>2.14</checkstyle.plugin.version> --------------------------------------------------------------------- To unsubscribe, e-mail: fop-commits-unsubscr...@xmlgraphics.apache.org For additional commands, e-mail: fop-commits-h...@xmlgraphics.apache.org