Author: michiel
Date: 2009-05-28 00:14:59 +0200 (Thu, 28 May 2009)
New Revision: 35456
Modified:
mmbase/trunk/src/org/mmbase/util/logging/ChainedLogger.java
mmbase/trunk/src/org/mmbase/util/logging/Level.java
mmbase/trunk/src/org/mmbase/util/logging/LoggerAccepter.java
mmbase/trunk/src/org/mmbase/util/logging/LoggerWriter.java
mmbase/trunk/src/org/mmbase/util/logging/LoggingException.java
mmbase/trunk/src/org/mmbase/util/logging/Performance.java
mmbase/trunk/src/org/mmbase/util/logging/SimpleImpl.java
mmbase/trunk/src/org/mmbase/util/logging/SimpleTimeStampImpl.java
mmbase/trunk/src/org/mmbase/util/logging/WriterLogger.java
mmbase/trunk/src/org/mmbase/util/logging/commons/CommonsLog.java
mmbase/trunk/src/org/mmbase/util/logging/commons/CommonsLogFactory.java
mmbase/trunk/src/org/mmbase/util/logging/java/Impl.java
mmbase/trunk/src/org/mmbase/util/logging/java/MMBaseLogger.java
mmbase/trunk/src/org/mmbase/util/logging/log4j/Log4jImpl.java
mmbase/trunk/src/org/mmbase/util/logging/log4j/Log4jLevel.java
mmbase/trunk/src/org/mmbase/util/logging/log4j/Log4jPriority.java
mmbase/trunk/src/org/mmbase/util/logging/log4j/LoggerRepository.java
mmbase/trunk/src/org/mmbase/util/logging/log4j/MMPatternLayout.java
mmbase/trunk/src/org/mmbase/util/logging/log4j/MMPatternParser.java
mmbase/trunk/src/org/mmbase/util/logging/log4j/StacktraceLoggingPatternLayout.java
Log:
Conventions only.
Modified: mmbase/trunk/src/org/mmbase/util/logging/ChainedLogger.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/logging/ChainedLogger.java 2009-05-27
21:05:58 UTC (rev 35455)
+++ mmbase/trunk/src/org/mmbase/util/logging/ChainedLogger.java 2009-05-27
22:14:59 UTC (rev 35456)
@@ -10,7 +10,6 @@
package org.mmbase.util.logging;
-import java.io.*;
import java.util.*;
import java.util.concurrent.*;
Modified: mmbase/trunk/src/org/mmbase/util/logging/Level.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/logging/Level.java 2009-05-27 21:05:58 UTC
(rev 35455)
+++ mmbase/trunk/src/org/mmbase/util/logging/Level.java 2009-05-27 22:14:59 UTC
(rev 35456)
@@ -18,6 +18,7 @@
*/
public final class Level implements java.io.Serializable {
+ private static final long serialVersionUID = 0L;
/**
* A possible result of {...@link #toInt}
@@ -72,12 +73,22 @@
}
/**
+ * Like valueOf of real enumerations.
+ * @since MMBase-1.9.1
+ */
+ public static Level valueOf(String level) {
+ return toLevel(level);
+ }
+
+
+ /**
* Makes an integer from this object.
*/
public final int toInt() {
return level;
}
+ @Override
public final String toString() {
return string;
}
Modified: mmbase/trunk/src/org/mmbase/util/logging/LoggerAccepter.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/logging/LoggerAccepter.java
2009-05-27 21:05:58 UTC (rev 35455)
+++ mmbase/trunk/src/org/mmbase/util/logging/LoggerAccepter.java
2009-05-27 22:14:59 UTC (rev 35456)
@@ -10,9 +10,6 @@
package org.mmbase.util.logging;
-import java.io.*;
-import java.util.*;
-
/**
* A LoggerAccepter is a class with a public 'addLogger' method. The class can
log things to the as
* such provided {...@link Logger}'s which may be of interest to the caller of
that method.
Modified: mmbase/trunk/src/org/mmbase/util/logging/LoggerWriter.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/logging/LoggerWriter.java 2009-05-27
21:05:58 UTC (rev 35455)
+++ mmbase/trunk/src/org/mmbase/util/logging/LoggerWriter.java 2009-05-27
22:14:59 UTC (rev 35456)
@@ -9,7 +9,6 @@
package org.mmbase.util.logging;
import java.io.*;
-import java.util.*;
/**
* A Writer that logs every line to a certain logger.
Modified: mmbase/trunk/src/org/mmbase/util/logging/LoggingException.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/logging/LoggingException.java
2009-05-27 21:05:58 UTC (rev 35455)
+++ mmbase/trunk/src/org/mmbase/util/logging/LoggingException.java
2009-05-27 22:14:59 UTC (rev 35456)
@@ -19,6 +19,7 @@
*/
public class LoggingException extends RuntimeException {
+ private static final long serialVersionUID = 0L;
private Level level;
//javadoc is inherited
Modified: mmbase/trunk/src/org/mmbase/util/logging/Performance.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/logging/Performance.java 2009-05-27
21:05:58 UTC (rev 35455)
+++ mmbase/trunk/src/org/mmbase/util/logging/Performance.java 2009-05-27
22:14:59 UTC (rev 35456)
@@ -163,7 +163,9 @@
static void printCase(String configuration) {
String s = (description == null ? "" : description) + " (" +
configuration + ") : ";
- for (int i = s.length(); i< 50; i++) s += " "; // damn, sprintf
would be nice..
+ for (int i = s.length(); i< 50; i++) {
+ s += " "; // damn, sprintf would be nice..
+ }
System.out.print(s);
double benchmark = Case(configuration);
Modified: mmbase/trunk/src/org/mmbase/util/logging/SimpleImpl.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/logging/SimpleImpl.java 2009-05-27
21:05:58 UTC (rev 35455)
+++ mmbase/trunk/src/org/mmbase/util/logging/SimpleImpl.java 2009-05-27
22:14:59 UTC (rev 35456)
@@ -94,6 +94,7 @@
}
}
+ @Override
protected final void log (String s) {
ps.println(s);
}
Modified: mmbase/trunk/src/org/mmbase/util/logging/SimpleTimeStampImpl.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/logging/SimpleTimeStampImpl.java
2009-05-27 21:05:58 UTC (rev 35455)
+++ mmbase/trunk/src/org/mmbase/util/logging/SimpleTimeStampImpl.java
2009-05-27 22:14:59 UTC (rev 35456)
@@ -92,6 +92,7 @@
}
}
+ @Override
protected final void log (String s) {
ps.println(dateFormat.format(new java.util.Date()) + s);
}
Modified: mmbase/trunk/src/org/mmbase/util/logging/WriterLogger.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/logging/WriterLogger.java 2009-05-27
21:05:58 UTC (rev 35455)
+++ mmbase/trunk/src/org/mmbase/util/logging/WriterLogger.java 2009-05-27
22:14:59 UTC (rev 35456)
@@ -31,6 +31,7 @@
writer = w;
}
+ @Override
protected void log(String s, Level level) {
try {
writer.write(s); writer.write('\n');
Modified: mmbase/trunk/src/org/mmbase/util/logging/commons/CommonsLog.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/logging/commons/CommonsLog.java
2009-05-27 21:05:58 UTC (rev 35455)
+++ mmbase/trunk/src/org/mmbase/util/logging/commons/CommonsLog.java
2009-05-27 22:14:59 UTC (rev 35456)
@@ -17,111 +17,127 @@
* Commons logging for MMBase, contains a single Log instance
*
* @author Wouter Heijke
- * @version $Revision: 1.1 $
+ * @version $Id$
*/
public class CommonsLog extends AbstractSimpleImpl implements Logger {
- private Log log;
+ private Log log;
- public CommonsLog(Log commonsLog) {
- log = commonsLog;
- }
+ public CommonsLog(Log commonsLog) {
+ log = commonsLog;
+ }
- protected final void log(String s) {
- if (log.isTraceEnabled()) {
- log.trace(s);
- } else if (log.isDebugEnabled()) {
- log.debug(s);
- } else if (log.isInfoEnabled()) {
- log.info(s);
- } else if (log.isWarnEnabled()) {
- log.warn(s);
- } else if (log.isErrorEnabled()) {
- log.error(s);
- } else if (log.isFatalEnabled()) {
- log.fatal(s);
- }
- }
+ @Override
+ protected final void log(String s) {
+ if (log.isTraceEnabled()) {
+ log.trace(s);
+ } else if (log.isDebugEnabled()) {
+ log.debug(s);
+ } else if (log.isInfoEnabled()) {
+ log.info(s);
+ } else if (log.isWarnEnabled()) {
+ log.warn(s);
+ } else if (log.isErrorEnabled()) {
+ log.error(s);
+ } else if (log.isFatalEnabled()) {
+ log.fatal(s);
+ }
+ }
- public void debug(Object message) {
- log.debug(message);
- }
+ @Override
+ public void debug(Object message) {
+ log.debug(message);
+ }
- public void error(Object message) {
- log.error(message);
- }
+ @Override
+ public void error(Object message) {
+ log.error(message);
+ }
- public void fatal(Object message) {
- log.fatal(message);
- }
+ @Override
+ public void fatal(Object message) {
+ log.fatal(message);
+ }
- public void info(Object message) {
- log.info(message);
- }
+ @Override
+ public void info(Object message) {
+ log.info(message);
+ }
- public void service(Object message) {
- log.info(message);
- }
+ @Override
+ public void service(Object message) {
+ log.info(message);
+ }
- public void trace(Object message) {
- log.trace(message);
- }
+ @Override
+ public void trace(Object message) {
+ log.trace(message);
+ }
- public void warn(Object message) {
- log.warn(message);
- }
+ @Override
+ public void warn(Object message) {
+ log.warn(message);
+ }
- public void debug(Object message, Throwable t) {
- log.debug(message, t);
- }
+ @Override
+ public void debug(Object message, Throwable t) {
+ log.debug(message, t);
+ }
- public void error(Object message, Throwable t) {
- log.error(message, t);
- }
+ @Override
+ public void error(Object message, Throwable t) {
+ log.error(message, t);
+ }
- public void fatal(Object message, Throwable t) {
- log.fatal(message, t);
- }
+ @Override
+ public void fatal(Object message, Throwable t) {
+ log.fatal(message, t);
+ }
- public void info(Object message, Throwable t) {
- log.info(message, t);
- }
+ @Override
+ public void info(Object message, Throwable t) {
+ log.info(message, t);
+ }
- public void trace(Object message, Throwable t) {
- log.trace(message, t);
- }
+ @Override
+ public void trace(Object message, Throwable t) {
+ log.trace(message, t);
+ }
- public void warn(Object message, Throwable t) {
- log.warn(message, t);
- }
+ @Override
+ public void warn(Object message, Throwable t) {
+ log.warn(message, t);
+ }
- public boolean isDebugEnabled() {
- return log.isDebugEnabled();
- }
+ @Override
+ public boolean isDebugEnabled() {
+ return log.isDebugEnabled();
+ }
- public boolean isServiceEnabled() {
- // TODO map this via a properties file
- return log.isInfoEnabled();
- }
+ @Override
+ public boolean isServiceEnabled() {
+ // TODO map this via a properties file
+ return log.isInfoEnabled();
+ }
- public boolean isErrorEnabled() {
- return log.isErrorEnabled();
- }
+ public boolean isErrorEnabled() {
+ return log.isErrorEnabled();
+ }
- public boolean isFatalEnabled() {
- return log.isFatalEnabled();
- }
+ public boolean isFatalEnabled() {
+ return log.isFatalEnabled();
+ }
- public boolean isInfoEnabled() {
- return log.isInfoEnabled();
- }
+ public boolean isInfoEnabled() {
+ return log.isInfoEnabled();
+ }
- public boolean isTraceEnabled() {
- return log.isTraceEnabled();
- }
+ @Override
+ public boolean isTraceEnabled() {
+ return log.isTraceEnabled();
+ }
- public boolean isWarnEnabled() {
- return log.isWarnEnabled();
- }
-
+ public boolean isWarnEnabled() {
+ return log.isWarnEnabled();
+ }
}
Modified:
mmbase/trunk/src/org/mmbase/util/logging/commons/CommonsLogFactory.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/logging/commons/CommonsLogFactory.java
2009-05-27 21:05:58 UTC (rev 35455)
+++ mmbase/trunk/src/org/mmbase/util/logging/commons/CommonsLogFactory.java
2009-05-27 22:14:59 UTC (rev 35456)
@@ -9,7 +9,7 @@
*/
package org.mmbase.util.logging.commons;
-import java.util.Hashtable;
+import java.util.*;
import org.apache.commons.logging.LogFactory;
@@ -18,25 +18,25 @@
* Commons logging for MMBase
*
* @author Wouter Heijke
- * @version $Revision: 1.1 $
+ * @version $Id$
*/
public class CommonsLogFactory {
- private static Hashtable logInstances = new Hashtable();
+ private static Map<String, CommonsLog> logInstances = new
Hashtable<String, CommonsLog>();
- private CommonsLogFactory() {
- System.out.println("CommonsLogger");
- }
+ private CommonsLogFactory() {
+ System.out.println("CommonsLogger");
+ }
- public static CommonsLog getLoggerInstance(String name) {
- CommonsLog logInstance = (CommonsLog) logInstances.get(name);
- if (logInstance != null) {
- return logInstance;
- }
+ public static CommonsLog getLoggerInstance(String name) {
+ CommonsLog logInstance = logInstances.get(name);
+ if (logInstance != null) {
+ return logInstance;
+ }
- logInstance = new CommonsLog(LogFactory.getLog(name));
+ logInstance = new CommonsLog(LogFactory.getLog(name));
- logInstances.put(name, logInstance);
- return logInstance;
- }
+ logInstances.put(name, logInstance);
+ return logInstance;
+ }
}
Modified: mmbase/trunk/src/org/mmbase/util/logging/java/Impl.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/logging/java/Impl.java 2009-05-27
21:05:58 UTC (rev 35455)
+++ mmbase/trunk/src/org/mmbase/util/logging/java/Impl.java 2009-05-27
22:14:59 UTC (rev 35456)
@@ -166,10 +166,10 @@
private final java.util.logging.Level getLevel() {
java.util.logging.Level level = null;
- java.util.logging.Logger log = logger;
+ java.util.logging.Logger l = logger;
while (level == null) {
- level = log.getLevel();
- log = log.getParent();
+ level = l.getLevel();
+ l = l.getParent();
}
return level;
}
Modified: mmbase/trunk/src/org/mmbase/util/logging/java/MMBaseLogger.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/logging/java/MMBaseLogger.java
2009-05-27 21:05:58 UTC (rev 35455)
+++ mmbase/trunk/src/org/mmbase/util/logging/java/MMBaseLogger.java
2009-05-27 22:14:59 UTC (rev 35456)
@@ -51,6 +51,7 @@
/**
* See {...@link java.util.logging.Logger#log(LogRecord)}.
*/
+ @Override
public void log(LogRecord record) {
Logger l;
Modified: mmbase/trunk/src/org/mmbase/util/logging/log4j/Log4jImpl.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/logging/log4j/Log4jImpl.java
2009-05-27 21:05:58 UTC (rev 35455)
+++ mmbase/trunk/src/org/mmbase/util/logging/log4j/Log4jImpl.java
2009-05-27 22:14:59 UTC (rev 35456)
@@ -45,7 +45,7 @@
// class is final, perhaps then its methods can be inlined when compiled
with -O?
// It's enough to instantiate a factory once and for all.
- private final static org.apache.log4j.spi.LoggerRepository repository =
new LoggerRepository(getRootLogger());
+ private final static org.apache.log4j.spi.LoggerRepository log4jRepository
= new LoggerRepository(getRootLogger());
private static Logger log = Logging.getLoggerInstance(Log4jImpl.class);
private static final String classname = Log4jImpl.class.getName();
@@ -65,7 +65,7 @@
*/
public static Log4jImpl getLoggerInstance(String name) {
try {
- return (Log4jImpl) repository.getLogger(name);
+ return (Log4jImpl) log4jRepository.getLogger(name);
} catch (ClassCastException e) {
Log4jImpl root = (Log4jImpl) getRootLogger(); // make it log on
root, and log a huge error, that something is wrong.
root.error("ClassCastException, probably you've forgotten a class
attribute in your configuration file. It must say class=\"" +
Log4jImpl.class.getName() + "\"");
@@ -118,7 +118,7 @@
protected static void doConfigure(InputStream i) {
DOMConfigurator domConfigurator = new DOMConfigurator();
- domConfigurator.doConfigure(i, repository);
+ domConfigurator.doConfigure(i, log4jRepository);
}
/**
* Performs the actual parsing of the log4j configuration file and handles
the errors
@@ -150,21 +150,23 @@
/**
* This method overrides {...@link org.apache.log4j.Logger#getInstance}
by supplying
* its own factory type as a parameter.
+ * @deprecated Use {...@link #getLogger}
*/
public static org.apache.log4j.Category getInstance(String name) {
return getLogger(name);
}
public static org.apache.log4j.Logger getLogger(String name) {
- return repository.getLogger(name);
+ return log4jRepository.getLogger(name);
}
/**
* A new logging method that takes the TRACE priority.
*/
+ @Override
public final void trace(Object message) {
// disable is defined in Category
- if (repository.isDisabled(Log4jLevel.TRACE_INT)) {
+ if (log4jRepository.isDisabled(Log4jLevel.TRACE_INT)) {
return;
}
if (Log4jLevel.TRACE.isGreaterOrEqual(this.getEffectiveLevel()))
@@ -172,9 +174,10 @@
forcedLog(classname, Log4jLevel.TRACE, message, null);
}
+ @Override
public final void trace(Object message, Throwable t) {
// disable is defined in Category
- if (repository.isDisabled(Log4jLevel.TRACE_INT)) {
+ if (log4jRepository.isDisabled(Log4jLevel.TRACE_INT)) {
return;
}
if (Log4jLevel.TRACE.isGreaterOrEqual(this.getEffectiveLevel()))
@@ -187,7 +190,7 @@
*/
public final void service(Object message) {
// disable is defined in Category
- if (repository.isDisabled(Log4jLevel.SERVICE_INT)) {
+ if (log4jRepository.isDisabled(Log4jLevel.SERVICE_INT)) {
return;
}
if (Log4jLevel.SERVICE.isGreaterOrEqual(this.getEffectiveLevel()))
@@ -197,7 +200,7 @@
public final void service(Object message, Throwable t) {
// disable is defined in Category
- if (repository.isDisabled(Log4jLevel.SERVICE_INT)) {
+ if (log4jRepository.isDisabled(Log4jLevel.SERVICE_INT)) {
return;
}
if (Log4jLevel.SERVICE.isGreaterOrEqual(this.getEffectiveLevel()))
@@ -206,24 +209,25 @@
}
public final boolean isServiceEnabled() {
- if(repository.isDisabled( Log4jLevel.SERVICE_INT))
+ if(log4jRepository.isDisabled( Log4jLevel.SERVICE_INT))
return false;
return Log4jLevel.SERVICE.isGreaterOrEqual(this.getEffectiveLevel());
}
+ @Override
public final boolean isTraceEnabled() {
- if(repository.isDisabled( Log4jLevel.TRACE_INT))
+ if(log4jRepository.isDisabled( Log4jLevel.TRACE_INT))
return false;
return Log4jLevel.TRACE.isGreaterOrEqual(this.getEffectiveLevel());
}
- public static void shutdown() {
+ public static void shutdown() {
Log4jImpl err = getLoggerInstance("STDERR");
if(err.getLevel() != Log4jLevel.FATAL) {
log.service("System stderr now going to stdout");
System.setErr(System.out);
}
- repository.shutdown();
+ log4jRepository.shutdown();
}
/**
@@ -254,10 +258,15 @@
super(System.out);
}
// simply overriding all methods that possibly could be used
(forgotten some still)
+ @Override
public void print (char[] s) { log.warn(new String(s)); }
+ @Override
public void print (String s) { log.warn(s); }
+ @Override
public void print (Object s) { log.warn(s.toString()); }
+ @Override
public void println (char[] s) { log.warn(new String(s)); }
+ @Override
public void println (String s) {
// if something goes wrong log4j write to standard error
// we don't want to go in an infinite loop then, if LoggerStream
is stderr too.
@@ -269,6 +278,7 @@
checkCount--;
}
}
+ @Override
public void println (Object s) {
// it seems that exception are written to log in this way, so we
can check
// if s is an exception, in which case we want to log with FATAL.
Modified: mmbase/trunk/src/org/mmbase/util/logging/log4j/Log4jLevel.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/logging/log4j/Log4jLevel.java
2009-05-27 21:05:58 UTC (rev 35455)
+++ mmbase/trunk/src/org/mmbase/util/logging/log4j/Log4jLevel.java
2009-05-27 22:14:59 UTC (rev 35456)
@@ -31,9 +31,8 @@
public class Log4jLevel extends Level {
-
+ private static final long serialVersionUID = 0L;
final static int SERVICE_INT = 15000;
- final static int TRACE_INT = 5000;
// OFF (from log4j.Level)
// FATAL
@@ -42,9 +41,8 @@
// INFO
public static final Log4jLevel SERVICE = new Log4jLevel(SERVICE_INT,
"SERVICE", 5);
// DEBUG
- public static final Log4jLevel TRACE = new Log4jLevel(TRACE_INT,
"TRACE", 7);
+ // TRACE
-
protected Log4jLevel(int level, String strLevel, int syslogEquiv) {
super(level, strLevel, syslogEquiv);
}
@@ -54,15 +52,12 @@
return Log4jLevel.TRACE;
String stringVal = sArg.toUpperCase();
-
- if(stringVal.equals("TRACE")) return Log4jLevel.TRACE;
if(stringVal.equals("SERVICE")) return Log4jLevel.SERVICE;
return Level.toLevel(sArg);
}
public static Level toLevel(int i) throws IllegalArgumentException {
switch(i) {
- case TRACE_INT: return Log4jLevel.TRACE;
case SERVICE_INT: return Log4jLevel.SERVICE;
default:
return Level.toLevel(i);
@@ -81,7 +76,6 @@
}
String s = sArg.toUpperCase();
if (s.equals("SERVICE")) return SERVICE;
- if (s.equals("TRACE")) return TRACE;
return DEBUG;
}
Modified: mmbase/trunk/src/org/mmbase/util/logging/log4j/Log4jPriority.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/logging/log4j/Log4jPriority.java
2009-05-27 21:05:58 UTC (rev 35455)
+++ mmbase/trunk/src/org/mmbase/util/logging/log4j/Log4jPriority.java
2009-05-27 22:14:59 UTC (rev 35456)
@@ -26,7 +26,7 @@
**/
public class Log4jPriority extends Log4jLevel {
-
+ private static final long serialVersionUID = 0L;
protected Log4jPriority(int level, String strLevel, int syslogEquiv) {
super(level, strLevel, syslogEquiv);
}
Modified: mmbase/trunk/src/org/mmbase/util/logging/log4j/LoggerRepository.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/logging/log4j/LoggerRepository.java
2009-05-27 21:05:58 UTC (rev 35455)
+++ mmbase/trunk/src/org/mmbase/util/logging/log4j/LoggerRepository.java
2009-05-27 22:14:59 UTC (rev 35456)
@@ -25,6 +25,7 @@
}
+ @Override
public Logger getLogger(String name) {
return getLogger(name, defaultFactory);
}
Modified: mmbase/trunk/src/org/mmbase/util/logging/log4j/MMPatternLayout.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/logging/log4j/MMPatternLayout.java
2009-05-27 21:05:58 UTC (rev 35455)
+++ mmbase/trunk/src/org/mmbase/util/logging/log4j/MMPatternLayout.java
2009-05-27 22:14:59 UTC (rev 35456)
@@ -17,19 +17,20 @@
* @author Michiel Meeuwissen
* @since MMBase-1.6
* @version $Id$
-*/
+ */
public class MMPatternLayout extends PatternLayout {
- public MMPatternLayout() {
- this(DEFAULT_CONVERSION_PATTERN);
- }
- public MMPatternLayout(String pattern) {
- super(pattern);
- }
-
- public PatternParser createPatternParser(String pattern) {
- return new MMPatternParser(
- pattern == null ? DEFAULT_CONVERSION_PATTERN : pattern);
- }
-
+ public MMPatternLayout() {
+ this(DEFAULT_CONVERSION_PATTERN);
+ }
+
+ public MMPatternLayout(String pattern) {
+ super(pattern);
+ }
+
+ @Override
+ public PatternParser createPatternParser(String pattern) {
+ return new MMPatternParser(
+ pattern == null ? DEFAULT_CONVERSION_PATTERN : pattern);
+ }
}
Modified: mmbase/trunk/src/org/mmbase/util/logging/log4j/MMPatternParser.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/logging/log4j/MMPatternParser.java
2009-05-27 21:05:58 UTC (rev 35455)
+++ mmbase/trunk/src/org/mmbase/util/logging/log4j/MMPatternParser.java
2009-05-27 22:14:59 UTC (rev 35456)
@@ -35,6 +35,7 @@
super(pattern);
}
+ @Override
public void finalizeConverter(char c) {
if (c == 'q') {
addConverter(new TruncatedLevelPatternConverter(formattingInfo));
Modified:
mmbase/trunk/src/org/mmbase/util/logging/log4j/StacktraceLoggingPatternLayout.java
===================================================================
---
mmbase/trunk/src/org/mmbase/util/logging/log4j/StacktraceLoggingPatternLayout.java
2009-05-27 21:05:58 UTC (rev 35455)
+++
mmbase/trunk/src/org/mmbase/util/logging/log4j/StacktraceLoggingPatternLayout.java
2009-05-27 22:14:59 UTC (rev 35456)
@@ -16,6 +16,7 @@
* Overridden from PatternLayout; use the normal pattern to format
* the logevent, but also return the current stacktrace.
*/
+ @Override
public String format(LoggingEvent event) {
String res = super.format(event);
Exception e = new Exception();
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
