gmazza      2004/04/01 15:24:57

  Modified:    examples/embedding build.xml
               examples/embedding/java/embedding ExampleDOM2PDF.java
                        ExampleFO2PDF.java ExampleObj2PDF.java
                        ExampleXML2PDF.java
  Log:
  Updated examples to use Commons-Logging.
  
  Revision  Changes    Path
  1.5       +19 -0     xml-fop/examples/embedding/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-fop/examples/embedding/build.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.xml 27 Feb 2004 19:35:43 -0000      1.4
  +++ build.xml 1 Apr 2004 23:24:57 -0000       1.5
  @@ -39,6 +39,7 @@
           <include name="xerces*.jar"/>
           <include name="xalan*.jar"/>
           <include name="commons-io*.jar"/>
  +        <include name="commons-logging*.jar"/>
        </fileset>
        <fileset dir="${fop.lib.dir}/../build">
                 <include name="fop.jar"/>
  @@ -113,6 +114,24 @@
        <target name="example5" depends="compile" description="Runs the Object to PDF 
example">
                <echo message="Running the Object to PDF example"/>
                <java classname="${name}.ExampleObj2PDF" fork="yes">
  +               <classpath>
  +                 <path refid="project.class.path"/>
  +                 <pathelement location="${build.dest}"/>
  +               </classpath>
  +             </java>
  +     </target>
  +     <target name="example6" depends="compile" description="Runs the DOM to PDF 
example">
  +             <echo message="Running the Object to PDF example"/>
  +             <java classname="${name}.ExampleDOM2PDF" fork="yes">
  +               <classpath>
  +                 <path refid="project.class.path"/>
  +                 <pathelement location="${build.dest}"/>
  +               </classpath>
  +             </java>
  +     </target>
  +     <target name="example7" depends="compile" description="Runs the SVG to PDF 
example">
  +             <echo message="Running the Object to PDF example"/>
  +             <java classname="${name}.ExampleSVG2PDF" fork="yes">
                  <classpath>
                    <path refid="project.class.path"/>
                    <pathelement location="${build.dest}"/>
  
  
  
  1.5       +12 -10    xml-fop/examples/embedding/java/embedding/ExampleDOM2PDF.java
  
  Index: ExampleDOM2PDF.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/examples/embedding/java/embedding/ExampleDOM2PDF.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ExampleDOM2PDF.java       27 Feb 2004 17:34:50 -0000      1.4
  +++ ExampleDOM2PDF.java       1 Apr 2004 23:24:57 -0000       1.5
  @@ -33,10 +33,11 @@
   import org.w3c.dom.Node;
   import org.w3c.dom.Text;
   
  -// Avalon
  +//Avalon
   import org.apache.avalon.framework.ExceptionUtil;
  -import org.apache.avalon.framework.logger.ConsoleLogger;
  -import org.apache.avalon.framework.logger.Logger;
  +
  +// Commons-Logging
  +import org.apache.commons.logging.impl.SimpleLog;
   
   //FOP
   import org.apache.fop.apps.Driver;
  @@ -60,18 +61,19 @@
        */
       public void convertDOM2PDF(Document xslfoDoc, File pdf) 
                   throws IOException, FOPException {
  -        //Construct driver
  +        // Construct driver
           Driver driver = new Driver();
           
  -        //Setup logger
  -        Logger logger = new ConsoleLogger(ConsoleLogger.LEVEL_INFO);
  -        driver.enableLogging(logger);
  +        // Setup logger
  +        SimpleLog logger = new SimpleLog("log");
  +        logger.setLevel(SimpleLog.LOG_LEVEL_INFO);
  +        driver.setLogger(logger);
           driver.initialize();
           
  -        //Setup Renderer (output format)        
  +        // Setup Renderer (output format)        
           driver.setRenderer(Driver.RENDER_PDF);
           
  -        //Setup output
  +        // Setup output
           OutputStream out = new java.io.FileOutputStream(pdf);
           out = new java.io.BufferedOutputStream(out);
           
  
  
  
  1.5       +10 -8     xml-fop/examples/embedding/java/embedding/ExampleFO2PDF.java
  
  Index: ExampleFO2PDF.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/examples/embedding/java/embedding/ExampleFO2PDF.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ExampleFO2PDF.java        27 Feb 2004 17:34:50 -0000      1.4
  +++ ExampleFO2PDF.java        1 Apr 2004 23:24:57 -0000       1.5
  @@ -29,8 +29,9 @@
   
   //Avalon
   import org.apache.avalon.framework.ExceptionUtil;
  -import org.apache.avalon.framework.logger.Logger;
  -import org.apache.avalon.framework.logger.ConsoleLogger;
  +
  +// Commons-Logging
  +import org.apache.commons.logging.impl.SimpleLog;
   
   //FOP
   import org.apache.fop.apps.Driver;
  @@ -50,18 +51,19 @@
        */
       public void convertFO2PDF(File fo, File pdf) throws IOException, FOPException {
           
  -        //Construct driver
  +        // Construct driver
           Driver driver = new Driver();
           
  -        //Setup logger
  -        Logger logger = new ConsoleLogger(ConsoleLogger.LEVEL_INFO);
  -        driver.enableLogging(logger);
  +        // Setup logger
  +        SimpleLog logger = new SimpleLog("log");
  +        logger.setLevel(SimpleLog.LOG_LEVEL_INFO);
  +        driver.setLogger(logger);
           driver.initialize();
   
  -        //Setup Renderer (output format)        
  +        // Setup Renderer (output format)        
           driver.setRenderer(Driver.RENDER_PDF);
           
  -        //Setup output
  +        // Setup output
           OutputStream out = new java.io.FileOutputStream(pdf);
           out = new java.io.BufferedOutputStream(out);
           try {
  
  
  
  1.5       +16 -14    xml-fop/examples/embedding/java/embedding/ExampleObj2PDF.java
  
  Index: ExampleObj2PDF.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/examples/embedding/java/embedding/ExampleObj2PDF.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ExampleObj2PDF.java       27 Feb 2004 17:34:50 -0000      1.4
  +++ ExampleObj2PDF.java       1 Apr 2004 23:24:57 -0000       1.5
  @@ -34,8 +34,9 @@
   
   //Avalon
   import org.apache.avalon.framework.ExceptionUtil;
  -import org.apache.avalon.framework.logger.ConsoleLogger;
  -import org.apache.avalon.framework.logger.Logger;
  +
  +// Commons-Logging
  +import org.apache.commons.logging.impl.SimpleLog;
   
   //FOP
   import org.apache.fop.apps.Driver;
  @@ -61,34 +62,35 @@
       public void convertProjectTeam2PDF(ProjectTeam team, File xslt, File pdf) 
                   throws IOException, FOPException, TransformerException {
                       
  -        //Construct driver
  +        // Construct driver
           Driver driver = new Driver();
           
  -        //Setup logger
  -        Logger logger = new ConsoleLogger(ConsoleLogger.LEVEL_INFO);
  -        driver.enableLogging(logger);
  +        // Setup logger
  +        SimpleLog logger = new SimpleLog("log");
  +        logger.setLevel(SimpleLog.LOG_LEVEL_INFO);
  +        driver.setLogger(logger);
           driver.initialize();
   
  -        //Setup Renderer (output format)        
  +        // Setup Renderer (output format)        
           driver.setRenderer(Driver.RENDER_PDF);
   
  -        //Setup output
  +        // Setup output
           OutputStream out = new java.io.FileOutputStream(pdf);
           out = new java.io.BufferedOutputStream(out);
           try {
               driver.setOutputStream(out);
   
  -            //Setup XSLT
  +            // Setup XSLT
               TransformerFactory factory = TransformerFactory.newInstance();
               Transformer transformer = factory.newTransformer(new 
StreamSource(xslt));
           
  -            //Setup input for XSLT transformation
  +            // Setup input for XSLT transformation
               Source src = team.getSourceForProjectTeam();
           
  -            //Resulting SAX events (the generated FO) must be piped through to FOP
  +            // Resulting SAX events (the generated FO) must be piped through to FOP
               Result res = new SAXResult(driver.getContentHandler());
   
  -            //Start XSLT transformation and FOP processing
  +            // Start XSLT transformation and FOP processing
               transformer.transform(src, res);
           } finally {
               out.close();
  @@ -105,12 +107,12 @@
               System.out.println("FOP ExampleObj2PDF\n");
               System.out.println("Preparing...");
               
  -            //Setup directories
  +            // Setup directories
               File baseDir = new File(".");
               File outDir = new File(baseDir, "out");
               outDir.mkdirs();
   
  -            //Setup input and output
  +            // Setup input and output
               File xsltfile = new File(baseDir, "xml/xslt/projectteam2FO.xsl");
               File pdffile = new File(outDir, "ResultObj2PDF.pdf");
   
  
  
  
  1.6       +17 -15    xml-fop/examples/embedding/java/embedding/ExampleXML2PDF.java
  
  Index: ExampleXML2PDF.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/examples/embedding/java/embedding/ExampleXML2PDF.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ExampleXML2PDF.java       27 Feb 2004 17:34:50 -0000      1.5
  +++ ExampleXML2PDF.java       1 Apr 2004 23:24:57 -0000       1.6
  @@ -34,8 +34,9 @@
   
   //Avalon
   import org.apache.avalon.framework.ExceptionUtil;
  -import org.apache.avalon.framework.logger.ConsoleLogger;
  -import org.apache.avalon.framework.logger.Logger;
  +
  +// Commons-Logging
  +import org.apache.commons.logging.impl.SimpleLog;
   
   //FOP
   import org.apache.fop.apps.Driver;
  @@ -56,12 +57,12 @@
               System.out.println("FOP ExampleXML2PDF\n");
               System.out.println("Preparing...");
   
  -            //Setup directories
  +            // Setup directories
               File baseDir = new File(".");
               File outDir = new File(baseDir, "out");
               outDir.mkdirs();
   
  -            //Setup input and output files            
  +            // Setup input and output files            
               File xmlfile = new File(baseDir, "xml/xml/projectteam.xml");
               File xsltfile = new File(baseDir, "xml/xslt/projectteam2FO.xsl");
               File pdffile = new File(outDir, "ResultXML2PDF.pdf");
  @@ -72,37 +73,38 @@
               System.out.println();
               System.out.println("Transforming...");
               
  -            //Construct driver
  +            // Construct driver
               Driver driver = new Driver();
               
  -            //Setup logger
  -            Logger logger = new ConsoleLogger(ConsoleLogger.LEVEL_INFO);
  -            driver.enableLogging(logger);
  +            // Setup logger
  +            SimpleLog logger = new SimpleLog("log");
  +            logger.setLevel(SimpleLog.LOG_LEVEL_INFO);
  +            driver.setLogger(logger);
               driver.initialize();
       
  -            //Setup Renderer (output format)        
  +            // Setup Renderer (output format)        
               driver.setRenderer(Driver.RENDER_PDF);
               
  -            //Setup output
  +            // Setup output
               OutputStream out = new java.io.FileOutputStream(pdffile);
               out = new java.io.BufferedOutputStream(out);
               try {
                   driver.setOutputStream(out);
       
  -                //Setup XSLT
  +                // Setup XSLT
                   TransformerFactory factory = TransformerFactory.newInstance();
                   Transformer transformer = factory.newTransformer(new 
StreamSource(xsltfile));
                   
  -                // set the value of a <param> in the stylesheet
  +                // Set the value of a <param> in the stylesheet
                   transformer.setParameter("versionParam", "2.0");
               
  -                //Setup input for XSLT transformation
  +                // Setup input for XSLT transformation
                   Source src = new StreamSource(xmlfile);
               
  -                //Resulting SAX events (the generated FO) must be piped through to 
FOP
  +                // Resulting SAX events (the generated FO) must be piped through to 
FOP
                   Result res = new SAXResult(driver.getContentHandler());
       
  -                //Start XSLT transformation and FOP processing
  +                // Start XSLT transformation and FOP processing
                   transformer.transform(src, res);
               } finally {
                   out.close();
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to