CVS: jfor/src/org/jfor/jfor/main CmdLineConverter.java,1.7,1.8 JForVersionInfo.java,1.37,1.38

Bertrand Delacretaz <[email protected]> Tue, 24 Sep 2002 03:12:14 -0700
Newsgroups gmane.text.xml.jfor.cvs
Message-ID <[email protected]>
Update of /cvsroot/jfor/jfor/src/org/jfor/jfor/main
In directory usw-pr-cvs1:/tmp/cvs-serv14993/src/org/jfor/jfor/main

Modified Files:
	CmdLineConverter.java JForVersionInfo.java 
Log Message:
 V0.7.2dev-e - uses Apache logkit for more precise and configurable logging

Index: CmdLineConverter.java
===================================================================
RCS file: /cvsroot/jfor/jfor/src/org/jfor/jfor/main/CmdLineConverter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CmdLineConverter.java	15 Aug 2002 15:16:09 -0000	1.7
--- CmdLineConverter.java	24 Sep 2002 10:12:11 -0000	1.8
***************
*** 7,10 ****
--- 7,12 ----
  import org.xml.sax.*;
  import org.jfor.jfor.converter.Converter;
+ import org.apache.log.Hierarchy; 
+ import org.apache.log.Logger; 
  
  /*-----------------------------------------------------------------------------
***************
*** 65,68 ****
--- 67,73 ----
  // $Id$
  // $Log$
+ // Revision 1.8  2002/09/24 10:12:11  bdelacretaz
+ //  V0.7.2dev-e - uses Apache logkit for more precise and configurable logging
+ //
  // Revision 1.7  2002/08/15 15:16:09  bdelacretaz
  // bug corrected, no error message was printed if parser classes were missing
***************
*** 98,101 ****
--- 103,108 ----
  public class CmdLineConverter
  {
+     private static final Logger m_logger = Hierarchy.getDefaultHierarchy().getLoggerFor("jfor").getChildLogger("cmdlineconverter");
+     
  	public static void main(String args[])
  	throws Exception
***************
*** 114,118 ****
  			final String rtfOutput = args[1];
  
! 			System.err.println("Creating input and output objects...");
  			final InputSource input = new InputSource(xslInput);
  			final Writer output = new BufferedWriter(new FileWriter(rtfOutput));
--- 121,126 ----
  			final String rtfOutput = args[1];
  
!             JForLogConfig.configure();
! 			m_logger.info("Creating input and output objects...");
  			final InputSource input = new InputSource(xslInput);
  			final Writer output = new BufferedWriter(new FileWriter(rtfOutput));
***************
*** 121,127 ****
  			setUserDir (new File (xslInput).getCanonicalFile().getParent ());
  
! 			System.err.println("Converting XSL:FO file '" + xslInput + "' to RTF output '" + rtfOutput + "'...");
  			new Converter(input,output,Converter.createConverterOption ());
! 			System.err.println("Done writing RTF output '" + rtfOutput + "'.");
  			// Used by relative image path.
  			setUserDir (userDir);
--- 129,135 ----
  			setUserDir (new File (xslInput).getCanonicalFile().getParent ());
  
! 			m_logger.info("Converting XSL:FO file '" + xslInput + "' to RTF output '" + rtfOutput + "'...");
  			new Converter(input,output,Converter.createConverterOption ());
! 			m_logger.info("Done writing RTF output '" + rtfOutput + "'.");
  			// Used by relative image path.
  			setUserDir (userDir);
***************
*** 145,149 ****
  		if (dir == null)
  		{
! 			System.out.println ("relative image path is not supported");
  			return;
  		}
--- 153,157 ----
  		if (dir == null)
  		{
! 			m_logger.warn("relative image path is not supported");
  			return;
  		}

Index: JForVersionInfo.java
===================================================================
RCS file: /cvsroot/jfor/jfor/src/org/jfor/jfor/main/JForVersionInfo.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** JForVersionInfo.java	23 Sep 2002 13:21:13 -0000	1.37
--- JForVersionInfo.java	24 Sep 2002 10:12:11 -0000	1.38
***************
*** 58,61 ****
--- 58,64 ----
  // $Id$
  // $Log$
+ // Revision 1.38  2002/09/24 10:12:11  bdelacretaz
+ //  V0.7.2dev-e - uses Apache logkit for more precise and configurable logging
+ //
  // Revision 1.37  2002/09/23 13:21:13  rmarra
  // V0.7.2dev-d - jfor-cmd processing added, RtfParagraph reset properties added
***************
*** 250,254 ****
      private static final int VERSION_MAJOR = 0;
      private static final int VERSION_MINOR = 7;
!     private static final String VERSION_MINOR_MINOR = "2dev-d";
      private static final String PROJECT_URL = "http://www.jfor.org";
      
--- 253,257 ----
      private static final int VERSION_MAJOR = 0;
      private static final int VERSION_MINOR = 7;
!     private static final String VERSION_MINOR_MINOR = "2dev-e";
      private static final String PROJECT_URL = "http://www.jfor.org";
      



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf