diff options
author | Simon Steiner <ssteiner@apache.org> | 2019-01-22 11:53:31 +0000 |
---|---|---|
committer | Simon Steiner <ssteiner@apache.org> | 2019-01-22 11:53:31 +0000 |
commit | e82460e4937fd9206bba32e2659fdfb9e2830db8 (patch) | |
tree | bb6466138b9620bdb1c5d37a05995b7fed59d88d /fop/examples | |
parent | d5b0798c2b6bd1aa8c65e5c744beb5d5096d1e54 (diff) | |
download | xmlgraphics-fop-e82460e4937fd9206bba32e2659fdfb9e2830db8.tar.gz xmlgraphics-fop-e82460e4937fd9206bba32e2659fdfb9e2830db8.zip |
FOP-2733: Drop dependency on Avalon-Framework
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1851806 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'fop/examples')
4 files changed, 8 insertions, 11 deletions
diff --git a/fop/examples/embedding/build.xml b/fop/examples/embedding/build.xml index 0ad70d03c..2439f73f6 100644 --- a/fop/examples/embedding/build.xml +++ b/fop/examples/embedding/build.xml @@ -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"/> diff --git a/fop/examples/embedding/java/embedding/ExampleAWTViewer.java b/fop/examples/embedding/java/embedding/ExampleAWTViewer.java index 0d75a7319..24718ce49 100644 --- a/fop/examples/embedding/java/embedding/ExampleAWTViewer.java +++ b/fop/examples/embedding/java/embedding/ExampleAWTViewer.java @@ -31,8 +31,6 @@ import javax.xml.transform.TransformerFactory; 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); } } diff --git a/fop/examples/embedding/java/embedding/ExampleEPS.java b/fop/examples/embedding/java/embedding/ExampleEPS.java index d35413f60..03540c41b 100644 --- a/fop/examples/embedding/java/embedding/ExampleEPS.java +++ b/fop/examples/embedding/java/embedding/ExampleEPS.java @@ -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); diff --git a/fop/examples/embedding/java/embedding/ExampleJava2D2PDF.java b/fop/examples/embedding/java/embedding/ExampleJava2D2PDF.java index 7a9b12cd0..abe6d7f86 100644 --- a/fop/examples/embedding/java/embedding/ExampleJava2D2PDF.java +++ b/fop/examples/embedding/java/embedding/ExampleJava2D2PDF.java @@ -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; |