[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/deploy/compile RmlCompiler.java,1.6,1.7 Compile
Brought to you by:
bigman921
Menu
▾
▴
[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/deploy/compile RmlCompiler.java,1.6,1.7 CompilerState.java,1.7,1.8 RMLHandler.java,1.8,1.9
|
From: Marc B. <big...@us...> - 2004-08-30 00:56:28
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12162/src/net/sourceforge/idrs/deploy/compile Modified Files: RmlCompiler.java CompilerState.java RMLHandler.java Log Message: Added log4j support. cleaned up the logs Index: RmlCompiler.java =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile/RmlCompiler.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** RmlCompiler.java 29 Aug 2004 05:01:39 -0000 1.6 --- RmlCompiler.java 30 Aug 2004 00:56:09 -0000 1.7 *************** *** 20,23 **** --- 20,25 ---- import java.util.*; import java.io.*; + + import org.apache.log4j.Logger; import org.xml.sax.*; import org.xml.sax.helpers.*; *************** *** 30,33 **** --- 32,36 ---- */ public class RmlCompiler { + static Logger logger = Logger.getLogger(RmlCompiler.class.getName()); IDRSRep rep; String xmlsrc; *************** *** 38,42 **** /** Creates new RmlCompiler */ public RmlCompiler( ! PrintWriter log, String rml, String xmlParser, --- 41,45 ---- /** Creates new RmlCompiler */ public RmlCompiler( ! String rml, String xmlParser, *************** *** 55,59 **** MacroToXML trans = new MacroToXML(xmlParser, schemaSrc, isFile, rmlNS); ! log.println("Transformation : "); try { --- 58,62 ---- MacroToXML trans = new MacroToXML(xmlParser, schemaSrc, isFile, rmlNS); ! logger.debug("Transformation : "); try { *************** *** 64,68 **** fail = false; } catch (Exception e) { ! e.printStackTrace(System.out); fail = true; this.xmlsrc = rml; --- 67,71 ---- fail = false; } catch (Exception e) { ! logger.error("Could not compile rml",e); fail = true; this.xmlsrc = rml; *************** *** 70,83 **** this.errLine = trans.getLine(); this.errorWord = trans.getErrWord(); ! log.println(rml); ! log.println("ERROR : " + err); ! log.println("Error Word : " + this.errorWord); ! log.println("Line : " + this.errLine); return; } ! System.out.println("here"); ! log.println(transformOut.getBuffer()); ! log.flush(); --- 73,86 ---- this.errLine = trans.getLine(); this.errorWord = trans.getErrWord(); ! logger.debug(rml); ! logger.error("ERROR : " + err); ! logger.error("Error Word : " + this.errorWord); ! logger.error("Line : " + this.errLine); return; } ! ! logger.debug(transformOut.getBuffer()); ! *************** *** 90,94 **** XMLReader parser = XMLReaderFactory.createXMLReader(xmlParser); RMLHandler rmlHandler = new RMLHandler(comp); ! rmlHandler.setOut(log); rmlHandler.setDocumentLocator(locator); RmlErrorHandler err = new RmlErrorHandler(); --- 93,97 ---- XMLReader parser = XMLReaderFactory.createXMLReader(xmlParser); RMLHandler rmlHandler = new RMLHandler(comp); ! //rmlHandler.setOut(log); rmlHandler.setDocumentLocator(locator); RmlErrorHandler err = new RmlErrorHandler(); *************** *** 100,104 **** parser.parse(in); } catch (Exception e) { ! e.printStackTrace(System.out); String msg = e.toString(); msg = msg.substring(msg.indexOf("###") + 3); --- 103,107 ---- parser.parse(in); } catch (Exception e) { ! logger.error("Could not parse RML",e); String msg = e.toString(); msg = msg.substring(msg.indexOf("###") + 3); *************** *** 107,114 **** this.errorWord = comp.getErrorWord(); ! log.println("ERROR : " + msg /*+ " - Line : " +err.getException().getLineNumber()*/ ); ! log.println("Error Word : " + comp.getErrorWord()); /*if (locator.getLineNumber() != -1 && comp.getErrorWord() != null) { String tmp = transformOut.getBuffer().toString(); --- 110,117 ---- this.errorWord = comp.getErrorWord(); ! logger.error("ERROR : " + msg,e /*+ " - Line : " +err.getException().getLineNumber()*/ ); ! logger.error("Error Word : " + comp.getErrorWord()); /*if (locator.getLineNumber() != -1 && comp.getErrorWord() != null) { String tmp = transformOut.getBuffer().toString(); *************** *** 126,130 **** else {*/ int lineNum = err.getLineNumber() == -1 ? rmlHandler.getLastLineNum() : err.getLineNumber(); ! log.println("Line: " + lineNum) ; this.errLine = lineNum; //} --- 129,133 ---- else {*/ int lineNum = err.getLineNumber() == -1 ? rmlHandler.getLastLineNum() : err.getLineNumber(); ! logger.error("Line: " + lineNum) ; this.errLine = lineNum; //} *************** *** 135,142 **** if (fail) { ! log.println("Compilation Failed"); return; } ! log.flush(); rep = comp.getReport(); --- 138,145 ---- if (fail) { ! logger.error("Compilation Failed"); return; } ! rep = comp.getReport(); Index: CompilerState.java =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile/CompilerState.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CompilerState.java 29 Aug 2004 05:01:39 -0000 1.7 --- CompilerState.java 30 Aug 2004 00:56:09 -0000 1.8 *************** *** 14,17 **** --- 14,20 ---- import java.util.*; + + import org.apache.log4j.Logger; + import net.sourceforge.idrs.core.report.*; import net.sourceforge.idrs.utils.*; *************** *** 26,30 **** */ public class CompilerState { ! java.util.Stack nodes; Line currentLine; --- 29,33 ---- */ public class CompilerState { ! static Logger logger = Logger.getLogger(CompilerState.class.getName()); java.util.Stack nodes; Line currentLine; *************** *** 49,53 **** public void pushLines() throws Exception { lines.push(new Vector()); ! System.out.println("Stack size : " + lines.size()); } --- 52,56 ---- public void pushLines() throws Exception { lines.push(new Vector()); ! logger.debug("Stack size : " + lines.size()); } *************** *** 59,65 **** Enumeration e = vec.elements(); while (e.hasMoreElements()) { ! System.out.println(e.nextElement()); } ! System.out.println("Stack size : " + lines.size()); return vec; } --- 62,68 ---- Enumeration e = vec.elements(); while (e.hasMoreElements()) { ! logger.debug(e.nextElement()); } ! logger.debug("Stack size : " + lines.size()); return vec; } Index: RMLHandler.java =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile/RMLHandler.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** RMLHandler.java 29 Aug 2004 05:01:39 -0000 1.8 --- RMLHandler.java 30 Aug 2004 00:56:09 -0000 1.9 *************** *** 14,17 **** --- 14,18 ---- package net.sourceforge.idrs.deploy.compile; + import org.apache.log4j.Logger; import org.xml.sax.*; import org.xml.sax.helpers.*; *************** *** 37,41 **** PrintWriter out; protected int lastLineNum; ! Locator locator; public static String BASE_PACKAGE = "net.sourceforge.idrs.deploy.compile.units"; --- 38,42 ---- PrintWriter out; protected int lastLineNum; ! static Logger logger = Logger.getLogger(RMLHandler.class.getName()); Locator locator; public static String BASE_PACKAGE = "net.sourceforge.idrs.deploy.compile.units"; *************** *** 103,107 **** } catch (Exception e) { ! e.printStackTrace(System.out); } --- 104,108 ---- } catch (Exception e) { ! logger.error("Could not compile rml page",e); } *************** *** 182,186 **** } catch (Exception e) { ! e.printStackTrace(System.out); throw new SAXParseException(e.toString(),this.locator); } --- 183,187 ---- } catch (Exception e) { ! logger.error("Could not seal chunk",e); throw new SAXParseException(e.toString(),this.locator); } |
