From: <dr...@us...> - 2002-11-10 20:35:11
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/util In directory usw-pr-cvs1:/tmp/cvs-serv29126/src/org/webmacro/util Modified Files: LogFile.java LogSource.java LogTarget.java Log Message: - make WMServlet.doGet() non-final - make logging API's use Throwable instead of Exception You'll want to do an "ant clean" before you try to compile. Index: LogFile.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/LogFile.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** LogFile.java 17 Jul 2002 07:18:22 -0000 1.10 --- LogFile.java 10 Nov 2002 20:35:08 -0000 1.11 *************** *** 124,128 **** } ! public void log( Date date, String name, String level, String message, Exception e ) { Object[] _args = new Object[ 4 ]; --- 124,128 ---- } ! public void log( Date date, String name, String level, String message, Throwable e ) { Object[] _args = new Object[ 4 ]; *************** *** 159,164 **** } ! } ! ! ! --- 159,161 ---- } ! } \ No newline at end of file Index: LogSource.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/LogSource.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** LogSource.java 11 Jun 2002 17:43:23 -0000 1.7 --- LogSource.java 10 Nov 2002 20:35:08 -0000 1.8 *************** *** 165,169 **** * during development. */ ! public void debug(String msg, Exception e) { log(LogSystem.DEBUG, msg, e); } --- 165,169 ---- * during development. */ ! public void debug(String msg, Throwable e) { log(LogSystem.DEBUG, msg, e); } *************** *** 202,206 **** * system you would expect to see only a few warnings. */ ! public void warning(String msg, Exception e) { log(LogSystem.WARNING, msg, e); } --- 202,206 ---- * system you would expect to see only a few warnings. */ ! public void warning(String msg, Throwable e) { log(LogSystem.WARNING, msg, e); } *************** *** 226,230 **** * to see any error messages. */ ! public void error(String msg, Exception e) { log(LogSystem.ERROR, msg, e); } --- 226,230 ---- * to see any error messages. */ ! public void error(String msg, Throwable e) { log(LogSystem.ERROR, msg, e); } *************** *** 247,251 **** } ! protected void log(int level, String msg, Exception e) { LogTarget[] targets = _targets[level]; if (targets == null) { --- 247,251 ---- } ! protected void log(int level, String msg, Throwable e) { LogTarget[] targets = _targets[level]; if (targets == null) { Index: LogTarget.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/LogTarget.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** LogTarget.java 11 Jun 2002 17:43:23 -0000 1.6 --- LogTarget.java 10 Nov 2002 20:35:08 -0000 1.7 *************** *** 36,40 **** * accepted. */ ! public void log(java.util.Date date, String type, String level, String message, Exception e); /** --- 36,40 ---- * accepted. */ ! public void log(java.util.Date date, String type, String level, String message, Throwable e); /** *************** *** 74,78 **** public void removeObserver(LogSystem ls); ! } ! ! --- 74,76 ---- public void removeObserver(LogSystem ls); ! } \ No newline at end of file |