Fixed FOP anttask

Added task for example PDF generation

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@195191 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.xml b/build.xml
index c0219dcbfffdeb140f3e4655927427758b40d128..c9f6bda703953fa74c500abe154916bcbea90d39 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -199,6 +199,7 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
     <property name="src.dir" value="./src"/>
     <property name="src.codegen" value="./src/codegen"/>
     <property name="docs.dir" value="./docs"/>
+    <property name="fo.examples.dir" value="./docs/examples/fo"/>
     <property name="lib.dir" value="./lib"/>
     <property name="hyph.dir" value="./hyph"/>
     <property name="conf.dir" value="./conf"/>
@@ -219,6 +220,7 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
     <property name="build.dest" value="./build/classes"/>
     <property name="build.docs" value="./build/docs"/>
     <property name="build.javadocs" value="./build/javadocs"/>
+    <property name="build.examples.dir" value="${build.dir}/examples"/>
 
     <property name="viewer.resources.dest.dir" value="${build.dest}/org/apache/fop/viewer/resources"/>
     <property name="viewer.images.dest.dir" value="${build.dest}/org/apache/fop/viewer/Images"/>
@@ -750,6 +752,21 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
 
   </target>
 
+  <!-- =================================================================== -->
+  <!-- Generate example PDFs                                               -->
+  <!-- =================================================================== -->
+  <target name="examples" depends="package" description="Generates example PDF files">
+    <taskdef name="fop" classname="org.apache.fop.tools.anttasks.Fop"
+             classpathref="libs-run-classpath"/>
+    <mkdir dir="${build.examples.dir}"/>
+    <fop format="application/pdf" outdir="${build.examples.dir}"
+         messagelevel="debug" basedir="${fo.examples.dir}">
+      <fileset dir="${fo.examples.dir}">
+        <include name="**/*.fo"/>
+      </fileset>
+    </fop>
+  </target>
+
   <!-- =================================================================== -->
   <!-- Clean targets                                                       -->
   <!-- =================================================================== -->

diff --git a/src/org/apache/fop/tools/anttasks/Fop.java b/src/org/apache/fop/tools/anttasks/Fop.java
index 9fbf81b47e9cd92079f5ae9e96ecaae526974bde..cc9e07e3be91b226a1711f4cdf9da5296e8cf85f 100644 (file)
--- a/src/org/apache/fop/tools/anttasks/Fop.java
+++ b/src/org/apache/fop/tools/anttasks/Fop.java
@@ -338,14 +338,16 @@ class FOPTaskStarter extends Starter {
         task.log(foFile + " -> " + outFile, Project.MSG_INFO);
 
         try {
-            Driver driver = new Driver(inputHandler.getInputSource(), out);
+            Driver driver = new Driver();
             setupLogger(driver);
+            driver.initialize();
             FOUserAgent userAgent = new FOUserAgent();
             userAgent.setBaseURL(baseURL);
+            userAgent.enableLogging(getLogger());
             driver.setUserAgent(userAgent);
             driver.setRenderer(renderer);
-            driver.setXMLReader(parser);
-            driver.run();
+            driver.setOutputStream(out);
+            driver.render(parser, inputHandler.getInputSource());
             out.close();
         } catch (Exception ex) {
             getLogger().error("Couldn't render file: " + ex.getMessage());