You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ca...@apache.org on 2007/05/02 07:07:32 UTC
svn commit: r534310 - in
/logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging:
core/ core/impl/ core/impl/jdk/ core/impl/log4j1/ pattern/
Author: carnold
Date: Tue May 1 22:07:29 2007
New Revision: 534310
URL: http://svn.apache.org/viewvc?view=rev&rev=534310
Log:
Layout->Converter, LogRecord->LogEvent in experimental layout
Added:
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/Converter.java
- copied, changed from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/Layout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/LogEvent.java
- copied, changed from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/LogRecord.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/CompositeConverter.java
- copied, changed from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/CompositeLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/SynchronizedConverter.java
- copied, changed from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/SynchronizedLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/ThreadSafeConverterFactory.java
- copied, changed from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/ThreadSafeLayoutFactory.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/jdk/JDKLogEvent.java
- copied, changed from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/jdk/JDKLogRecord.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/log4j1/Log4j1LogEvent.java
- copied, changed from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/log4j1/Log4j1LogRecord.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/AbbreviatorConverter.java
- copied, changed from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/AbbreviatorLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/DateConverter.java
- copied, changed from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/DateLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/DecoratorConverter.java
- copied, changed from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/DecoratorLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/FieldConverter.java
- copied, changed from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/FieldLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LevelConverter.java
- copied, changed from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LevelLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LineSeparatorConverter.java
- copied, changed from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LineSeparatorLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LiteralConverter.java
- copied, changed from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LiteralLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LocalizableConverter.java
- copied, changed from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LocalizableLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LogEventDateConverter.java
- copied, changed from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LogRecordDateLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LoggerNameConverter.java
- copied, changed from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LoggerNameLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/MessageConverter.java
- copied, changed from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/MessageLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/PropertiesContextConverter.java
- copied, changed from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/PropertiesContextLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceClassNameConverter.java
- copied, changed from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceClassNameLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceFileNameConverter.java
- copied, changed from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceFileNameLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceLineNumberConverter.java
- copied, changed from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceLineNumberLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceMethodNameConverter.java
- copied, changed from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceMethodNameLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/StringConverter.java
- copied, changed from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/StringLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/ThreadNameConverter.java
- copied, changed from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/ThreadNameLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/ThrownConverter.java
- copied, changed from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/ThrownLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/ValueContextConverter.java
- copied, changed from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/ValueContextLayout.java
Removed:
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/Layout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/LogRecord.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/CompositeLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/SynchronizedLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/ThreadSafeLayoutFactory.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/jdk/JDKLogRecord.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/log4j1/Log4j1LogRecord.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/AbbreviatorLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/DateLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/DecoratorLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/FieldLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LevelLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LineSeparatorLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LiteralLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LocalizableLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LogRecordDateLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LoggerNameLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/MessageLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/PropertiesContextLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceClassNameLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceFileNameLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceLineNumberLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceMethodNameLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/StringLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/ThreadNameLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/ThrownLayout.java
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/ValueContextLayout.java
Modified:
logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/Extractor.java
Copied: logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/Converter.java (from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/Layout.java)
URL: http://svn.apache.org/viewvc/logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/Converter.java?view=diff&rev=534310&p1=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/Layout.java&r1=533406&p2=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/Converter.java&r2=534310
==============================================================================
--- logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/Layout.java (original)
+++ logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/Converter.java Tue May 1 22:07:29 2007
@@ -39,7 +39,7 @@
*
*
*/
-public interface Layout<T> extends Extractor {
+public interface Converter<T> extends Extractor {
/**
* Renders the value object obtained from an earlier call
@@ -66,6 +66,6 @@
* @throws IOException if error writing to destination.
* @throws LoggingException any other error.
*/
- void format(LogRecord record, Locale locale, T destination)
+ void format(LogEvent record, Locale locale, T destination)
throws IOException, LoggingException;
}
Modified: logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/Extractor.java
URL: http://svn.apache.org/viewvc/logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/Extractor.java?view=diff&rev=534310&r1=534309&r2=534310
==============================================================================
--- logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/Extractor.java (original)
+++ logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/Extractor.java Tue May 1 22:07:29 2007
@@ -30,5 +30,5 @@
* @param record logging record, may not be null.
* @return a value object.
*/
- Object extract(LogRecord record);
+ Object extract(LogEvent record);
}
Copied: logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/LogEvent.java (from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/LogRecord.java)
URL: http://svn.apache.org/viewvc/logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/LogEvent.java?view=diff&rev=534310&p1=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/LogRecord.java&r1=533406&p2=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/LogEvent.java&r2=534310
==============================================================================
--- logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/LogRecord.java (original)
+++ logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/LogEvent.java Tue May 1 22:07:29 2007
@@ -26,7 +26,7 @@
* specific should go in a distinct interface.
*
*/
-public interface LogRecord {
+public interface LogEvent {
/**
* Get level.
Copied: logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/CompositeConverter.java (from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/CompositeLayout.java)
URL: http://svn.apache.org/viewvc/logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/CompositeConverter.java?view=diff&rev=534310&p1=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/CompositeLayout.java&r1=533406&p2=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/CompositeConverter.java&r2=534310
==============================================================================
--- logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/CompositeLayout.java (original)
+++ logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/CompositeConverter.java Tue May 1 22:07:29 2007
@@ -16,8 +16,8 @@
*/
package org.apache.logging.core.impl;
-import org.apache.logging.core.Layout;
-import org.apache.logging.core.LogRecord;
+import org.apache.logging.core.Converter;
+import org.apache.logging.core.LogEvent;
import org.apache.logging.core.LoggingException;
import java.io.Serializable;
@@ -27,35 +27,35 @@
import java.util.Locale;
/**
- * Creates a composite layout.
+ * Creates a composite Converter.
*
*/
-public final class CompositeLayout<T>
- implements Layout<T>, Serializable {
+public final class CompositeConverter<T>
+ implements Converter<T>, Serializable {
/**
- * List of layouts.
+ * List of Converters.
*/
- private final List< Layout<T> > layouts;
+ private final List< Converter<T> > Converters;
/**
- * Creates a new thread-safe Layout by
- * externally synchronizing an existing layout.
- * @param originals original layouts, may not be null.
+ * Creates a new thread-safe Converter by
+ * externally synchronizing an existing Converter.
+ * @param originals original Converters, may not be null.
*/
- public CompositeLayout(final List< Layout<T> > originals) {
+ public CompositeConverter(final List< Converter<T> > originals) {
if (originals != null) {
- layouts = new ArrayList < Layout<T> >(originals);
+ Converters = new ArrayList < Converter<T> >(originals);
} else {
- layouts = new ArrayList < Layout<T> >();
+ Converters = new ArrayList < Converter<T> >();
}
}
/** {@inheritDoc} */
- public Object extract(final LogRecord record) {
- ArrayList<Object> values = new ArrayList<Object>(layouts.size());
+ public Object extract(final LogEvent record) {
+ ArrayList<Object> values = new ArrayList<Object>(Converters.size());
int i = 0;
- for( Layout<T> layout : layouts) {
- values.set(i++, layout.extract(record));
+ for( Converter<T> Converter : Converters) {
+ values.set(i++, Converter.extract(record));
}
return values;
}
@@ -66,18 +66,18 @@
final Locale locale,
final T destination)
throws IOException, LoggingException {
- for( Layout<T> layout : layouts) {
- layout.render(extract, locale, destination);
+ for( Converter<T> Converter : Converters) {
+ Converter.render(extract, locale, destination);
}
}
/** {@inheritDoc} */
- public void format(final LogRecord record,
+ public void format(final LogEvent record,
final Locale locale,
final T destination)
throws IOException, LoggingException {
- for( Layout<T> layout : layouts) {
- layout.format(record, locale, destination);
+ for( Converter<T> Converter : Converters) {
+ Converter.format(record, locale, destination);
}
}
}
Copied: logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/SynchronizedConverter.java (from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/SynchronizedLayout.java)
URL: http://svn.apache.org/viewvc/logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/SynchronizedConverter.java?view=diff&rev=534310&p1=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/SynchronizedLayout.java&r1=533406&p2=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/SynchronizedConverter.java&r2=534310
==============================================================================
--- logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/SynchronizedLayout.java (original)
+++ logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/SynchronizedConverter.java Tue May 1 22:07:29 2007
@@ -16,33 +16,33 @@
*/
package org.apache.logging.core.impl;
-import org.apache.logging.core.Layout;
-import org.apache.logging.core.LogRecord;
+import org.apache.logging.core.Converter;
+import org.apache.logging.core.LogEvent;
import java.io.Serializable;
import java.util.Locale;
/**
- * Class externally synchronizes a Layout.
- * After creation of the SynchronizedLayout
- * the original layout should not be directly
+ * Class externally synchronizes a Converter.
+ * After creation of the SynchronizedConverter
+ * the original Converter should not be directly
* used.
*
* @ThreadSafe
*/
-public final class SynchronizedLayout<T>
- implements Layout<T>, Serializable {
+public final class SynchronizedConverter<T>
+ implements Converter<T>, Serializable {
/**
* Base extractor.
*/
- private final Layout<T> base;
+ private final Converter<T> base;
/**
- * Creates a new thread-safe Layout by
- * externally synchronizing an existing layout.
- * @param original layout, may not be null.
+ * Creates a new thread-safe Converter by
+ * externally synchronizing an existing Converter.
+ * @param original Converter, may not be null.
*/
- public SynchronizedLayout(final Layout<T> original) {
+ public SynchronizedConverter(final Converter<T> original) {
if (original == null) {
throw new NullPointerException("original");
}
@@ -50,7 +50,7 @@
}
/** {@inheritDoc} */
- public Object extract(final LogRecord record) {
+ public Object extract(final LogEvent record) {
synchronized(base) {
return base.extract(record);
}
@@ -67,7 +67,7 @@
}
/** {@inheritDoc} */
- public void format(final LogRecord record,
+ public void format(final LogEvent record,
final Locale locale,
final T destination) {
synchronized(base) {
Copied: logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/ThreadSafeConverterFactory.java (from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/ThreadSafeLayoutFactory.java)
URL: http://svn.apache.org/viewvc/logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/ThreadSafeConverterFactory.java?view=diff&rev=534310&p1=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/ThreadSafeLayoutFactory.java&r1=533406&p2=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/ThreadSafeConverterFactory.java&r2=534310
==============================================================================
--- logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/ThreadSafeLayoutFactory.java (original)
+++ logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/ThreadSafeConverterFactory.java Tue May 1 22:07:29 2007
@@ -17,62 +17,62 @@
package org.apache.logging.core.impl;
import org.apache.logging.core.Immutable;
-import org.apache.logging.core.Layout;
+import org.apache.logging.core.Converter;
import org.apache.logging.core.ThreadSafe;
import java.util.List;
/**
- * Creates thread-safe layouts.
+ * Creates thread-safe Converters.
*
* @Immutable
*
*/
-public final class ThreadSafeLayoutFactory<T> {
+public final class ThreadSafeConverterFactory<T> {
/**
* Creates an instance.
*/
- public ThreadSafeLayoutFactory() {
+ public ThreadSafeConverterFactory() {
}
/**
- * Determines if layout is thread-safe based on class annotations.
- * @param layout layout, may not be null.
+ * Determines if Converter is thread-safe based on class annotations.
+ * @param Converter Converter, may not be null.
* @return true if thread-safe based on annotations.
*/
- public boolean isThreadSafe(final Layout<T> layout) {
- return layout.getClass().isAnnotationPresent(Immutable.class) ||
- layout.getClass().isAnnotationPresent(ThreadSafe.class);
+ public boolean isThreadSafe(final Converter<T> Converter) {
+ return Converter.getClass().isAnnotationPresent(Immutable.class) ||
+ Converter.getClass().isAnnotationPresent(ThreadSafe.class);
}
/**
- * Get a thread-safe layout given a base layout.
- * Base layout should not be directly used after this call.
+ * Get a thread-safe Converter given a base Converter.
+ * Base Converter should not be directly used after this call.
*
- * @param layout base layout, may be null.
- * @return thread-safe layout, may be same instance.
+ * @param Converter base Converter, may be null.
+ * @return thread-safe Converter, may be same instance.
*/
- public Layout<T> get(final Layout<T> layout) {
- if (isThreadSafe(layout)) {
- return layout;
+ public Converter<T> get(final Converter<T> Converter) {
+ if (isThreadSafe(Converter)) {
+ return Converter;
}
- return new SynchronizedLayout<T>(layout);
+ return new SynchronizedConverter<T>(Converter);
}
- /** Get a thread-safe composite layout given a list of layouts.
- * Base layouts should not be directly used after this call.
+ /** Get a thread-safe composite Converter given a list of Converters.
+ * Base Converters should not be directly used after this call.
*
- * @param layouts base layouts, may be null.
- * @return thread-safe layout, may be same instance.
+ * @param Converters base Converters, may be null.
+ * @return thread-safe Converter, may be same instance.
*/
- public Layout<T> get(final List< Layout<T> > layouts) {
- for (Layout<T> layout : layouts) {
- if (!isThreadSafe(layout)) {
- return new SynchronizedLayout<T>(new CompositeLayout<T>(layouts));
+ public Converter<T> get(final List< Converter<T> > Converters) {
+ for (Converter<T> Converter : Converters) {
+ if (!isThreadSafe(Converter)) {
+ return new SynchronizedConverter<T>(new CompositeConverter<T>(Converters));
}
}
- return new CompositeLayout<T>(layouts);
+ return new CompositeConverter<T>(Converters);
}
}
Copied: logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/jdk/JDKLogEvent.java (from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/jdk/JDKLogRecord.java)
URL: http://svn.apache.org/viewvc/logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/jdk/JDKLogEvent.java?view=diff&rev=534310&p1=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/jdk/JDKLogRecord.java&r1=533406&p2=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/jdk/JDKLogEvent.java&r2=534310
==============================================================================
--- logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/jdk/JDKLogRecord.java (original)
+++ logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/jdk/JDKLogEvent.java Tue May 1 22:07:29 2007
@@ -25,8 +25,8 @@
* This class wraps an instance of java.util.logging.LogRecord
* to implement the org.apache.logging.core.LogRecord interface.
*/
-public final class JDKLogRecord
- implements org.apache.logging.core.LogRecord, Serializable {
+public final class JDKLogEvent
+ implements org.apache.logging.core.LogEvent, Serializable {
/**
* Underlying instance.
*/
@@ -46,7 +46,7 @@
* Create new instance.
* @param source underlying instance, may not be null.
*/
- private JDKLogRecord(final java.util.logging.LogRecord source,
+ private JDKLogEvent(final java.util.logging.LogRecord source,
final String threadName,
final Object context) {
if (source == null) {
@@ -61,14 +61,14 @@
* Create new instance.
* @param source underlying instance, may be null.
*/
- public static JDKLogRecord getInstance(
+ public static JDKLogEvent getInstance(
final java.util.logging.LogRecord source,
final String threadName,
final Object context) {
if (source == null) {
return null;
}
- return new JDKLogRecord(source, threadName, context);
+ return new JDKLogEvent(source, threadName, context);
}
Copied: logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/log4j1/Log4j1LogEvent.java (from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/log4j1/Log4j1LogRecord.java)
URL: http://svn.apache.org/viewvc/logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/log4j1/Log4j1LogEvent.java?view=diff&rev=534310&p1=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/log4j1/Log4j1LogRecord.java&r1=533406&p2=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/log4j1/Log4j1LogEvent.java&r2=534310
==============================================================================
--- logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/log4j1/Log4j1LogRecord.java (original)
+++ logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/core/impl/log4j1/Log4j1LogEvent.java Tue May 1 22:07:29 2007
@@ -16,10 +16,12 @@
*/
package org.apache.logging.core.impl.log4j1;
-import org.apache.logging.core.Level;
-import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.spi.LocationInfo;
+import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.spi.ThrowableInformation;
+import org.apache.logging.core.Level;
+import org.apache.logging.core.LogEvent;
+
import java.io.Serializable;
@@ -27,8 +29,8 @@
* This class wraps an instance of org.apache.log4j.spi.LoggingEvent
* to implement the org.apache.logging.core.LogRecord interface.
*/
-public final class Log4j1LogRecord
- implements org.apache.logging.core.LogRecord,
+public final class Log4j1LogEvent
+ implements LogEvent,
Serializable {
/**
* Underlying instance.
@@ -45,7 +47,7 @@
* @param source underlying instance, may not be null.
* @param threadId thread id, use -1 for unavailable.
*/
- private Log4j1LogRecord(final LoggingEvent source,
+ private Log4j1LogEvent(final LoggingEvent source,
long threadId) {
if (source == null) {
throw new NullPointerException("source");
@@ -60,13 +62,13 @@
* @param threadId thread id, use -1 for unavailable.
* @return new instance of null if source is null.
*/
- public static Log4j1LogRecord getInstance(
+ public static Log4j1LogEvent getInstance(
final LoggingEvent source,
long threadId) {
if (source == null) {
return null;
}
- return new Log4j1LogRecord(source, threadId);
+ return new Log4j1LogEvent(source, threadId);
}
Copied: logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/AbbreviatorConverter.java (from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/AbbreviatorLayout.java)
URL: http://svn.apache.org/viewvc/logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/AbbreviatorConverter.java?view=diff&rev=534310&p1=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/AbbreviatorLayout.java&r1=533406&p2=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/AbbreviatorConverter.java&r2=534310
==============================================================================
--- logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/AbbreviatorLayout.java (original)
+++ logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/AbbreviatorConverter.java Tue May 1 22:07:29 2007
@@ -16,7 +16,7 @@
*/
package org.apache.logging.pattern;
-import org.apache.logging.core.Layout;
+import org.apache.logging.core.Converter;
import java.util.Locale;
@@ -25,9 +25,9 @@
*
*
*/
-public final class AbbreviatorLayout extends DecoratorLayout {
+public final class AbbreviatorConverter extends DecoratorConverter {
- public AbbreviatorLayout(final Layout<StringBuilder> nested,
+ public AbbreviatorConverter(final Converter<StringBuilder> nested,
final int width,
final boolean leftJustify) {
super(nested);
Copied: logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/DateConverter.java (from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/DateLayout.java)
URL: http://svn.apache.org/viewvc/logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/DateConverter.java?view=diff&rev=534310&p1=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/DateLayout.java&r1=533406&p2=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/DateConverter.java&r2=534310
==============================================================================
--- logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/DateLayout.java (original)
+++ logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/DateConverter.java Tue May 1 22:07:29 2007
@@ -16,26 +16,26 @@
*/
package org.apache.logging.pattern;
-import org.apache.logging.core.LogRecord;
+import org.apache.logging.core.LogEvent;
import org.apache.logging.core.*;
import java.text.DateFormat;
import java.util.Locale;
import java.io.IOException;
/**
- * Abstract base layout of any layout that extracts
+ * Abstract base Converter of any Converter that extracts
* a Date and formats using a java.text.DateFormat.
*
*/
-public abstract class DateLayout<T extends Appendable>
- implements Layout<T> {
+public abstract class DateConverter<T extends Appendable>
+ implements Converter<T> {
private final DateFormat format;
/**
* Create new instance.
*/
- public DateLayout(DateFormat fmt) {
+ public DateConverter(DateFormat fmt) {
if (fmt == null) {
throw new NullPointerException("fmt");
}
@@ -54,7 +54,7 @@
/**
* {@inheritDoc}
*/
- public void format(LogRecord record, Locale locale, T destination)
+ public void format(LogEvent record, Locale locale, T destination)
throws IOException {
render(extract(record), locale, destination);
}
Copied: logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/DecoratorConverter.java (from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/DecoratorLayout.java)
URL: http://svn.apache.org/viewvc/logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/DecoratorConverter.java?view=diff&rev=534310&p1=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/DecoratorLayout.java&r1=533406&p2=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/DecoratorConverter.java&r2=534310
==============================================================================
--- logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/DecoratorLayout.java (original)
+++ logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/DecoratorConverter.java Tue May 1 22:07:29 2007
@@ -16,8 +16,8 @@
*/
package org.apache.logging.pattern;
-import org.apache.logging.core.Layout;
-import org.apache.logging.core.LogRecord;
+import org.apache.logging.core.Converter;
+import org.apache.logging.core.LogEvent;
import org.apache.logging.core.LoggingException;
import java.io.IOException;
@@ -25,16 +25,16 @@
import java.util.Locale;
/**
- * Abstract base classes for Layouts that modify the
- * rendered content from another layout.
+ * Abstract base classes for Converters that modify the
+ * rendered content from another Converter.
*
*/
-public abstract class DecoratorLayout
- implements Layout<StringBuilder>, Serializable {
+public abstract class DecoratorConverter
+ implements Converter<StringBuilder>, Serializable {
- private final Layout<StringBuilder> nested;
+ private final Converter<StringBuilder> nested;
- protected DecoratorLayout(final Layout<StringBuilder> nested) {
+ protected DecoratorConverter(final Converter<StringBuilder> nested) {
if (nested == null) {
throw new NullPointerException("nested");
}
@@ -42,18 +42,18 @@
}
/** {*inheritDoc} */
- public Object extract(final LogRecord record) {
+ public Object extract(final LogEvent record) {
return nested.extract(record);
}
/**
- * Modifies content rendered by nested layout.
+ * Modifies content rendered by nested Converter.
* @param extract extract.
* @param locale locale.
* @param destination destination.
* @param initialPos position of destination before
- * nested layout was rendered.
+ * nested Converter was rendered.
*/
protected abstract void decorate(final Object extract,
final Locale locale,
@@ -74,7 +74,7 @@
/**
* {@inheritDoc}
*/
- public void format(LogRecord record, Locale locale,
+ public void format(LogEvent record, Locale locale,
StringBuilder destination)
throws IOException, LoggingException {
render(extract(record), locale, destination);
Copied: logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/FieldConverter.java (from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/FieldLayout.java)
URL: http://svn.apache.org/viewvc/logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/FieldConverter.java?view=diff&rev=534310&p1=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/FieldLayout.java&r1=533406&p2=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/FieldConverter.java&r2=534310
==============================================================================
--- logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/FieldLayout.java (original)
+++ logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/FieldConverter.java Tue May 1 22:07:29 2007
@@ -16,8 +16,8 @@
*/
package org.apache.logging.pattern;
-import org.apache.logging.core.Layout;
-import org.apache.logging.core.LogRecord;
+import org.apache.logging.core.Converter;
+import org.apache.logging.core.LogEvent;
import org.apache.logging.core.LoggingException;
import java.io.IOException;
@@ -29,12 +29,12 @@
*
*
*/
-public final class FieldLayout extends DecoratorLayout {
+public final class FieldConverter extends DecoratorConverter {
private final int width;
private final boolean leftJustify;
- public FieldLayout(final Layout<StringBuilder> nested,
+ public FieldConverter(final Converter<StringBuilder> nested,
final int width,
final boolean leftJustify) {
super(nested);
Copied: logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LevelConverter.java (from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LevelLayout.java)
URL: http://svn.apache.org/viewvc/logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LevelConverter.java?view=diff&rev=534310&p1=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LevelLayout.java&r1=533406&p2=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LevelConverter.java&r2=534310
==============================================================================
--- logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LevelLayout.java (original)
+++ logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LevelConverter.java Tue May 1 22:07:29 2007
@@ -16,27 +16,27 @@
*/
package org.apache.logging.pattern;
-import org.apache.logging.core.LogRecord;
+import org.apache.logging.core.LogEvent;
/**
- * This layout appends the level of the log request.
+ * This Converter appends the level of the log request.
*
* @PatternSpecifier("p", "level")
* @Immutable
*/
-public final class LevelLayout<T extends Appendable>
- extends LocalizableLayout<T> {
+public final class LevelConverter<T extends Appendable>
+ extends LocalizableConverter<T> {
/**
* Create new instance.
*/
- public LevelLayout() {
+ public LevelConverter() {
}
/**
* {@inheritDoc}
*/
- public Object extract(final LogRecord record) {
+ public Object extract(final LogEvent record) {
return record.getLevel();
}
}
Copied: logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LineSeparatorConverter.java (from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LineSeparatorLayout.java)
URL: http://svn.apache.org/viewvc/logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LineSeparatorConverter.java?view=diff&rev=534310&p1=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LineSeparatorLayout.java&r1=533406&p2=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LineSeparatorConverter.java&r2=534310
==============================================================================
--- logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LineSeparatorLayout.java (original)
+++ logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LineSeparatorConverter.java Tue May 1 22:07:29 2007
@@ -17,8 +17,8 @@
package org.apache.logging.pattern;
-import org.apache.logging.core.Layout;
-import org.apache.logging.core.LogRecord;
+import org.apache.logging.core.Converter;
+import org.apache.logging.core.LogEvent;
import java.io.IOException;
import java.io.Serializable;
@@ -31,8 +31,8 @@
* @PatternSpecifier("n")
* @Immutable
*/
-public final class LineSeparatorLayout<T extends Appendable>
- implements Layout<T>, Serializable {
+public final class LineSeparatorConverter<T extends Appendable>
+ implements Converter<T>, Serializable {
/**
* Line separator.
*/
@@ -41,7 +41,7 @@
/**
* Create a new instance.
*/
- public LineSeparatorLayout() {
+ public LineSeparatorConverter() {
String sep = "\n";
try {
sep = System.getProperty("line.separator");
@@ -51,7 +51,7 @@
}
/** {@inheritDoc} */
- public Object extract(final LogRecord record) {
+ public Object extract(final LogEvent record) {
return lineSep;
}
@@ -66,7 +66,7 @@
/**
* {@inheritDoc}
*/
- public void format(LogRecord record, Locale locale, T destination)
+ public void format(LogEvent record, Locale locale, T destination)
throws IOException {
destination.append(lineSep);
}
Copied: logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LiteralConverter.java (from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LiteralLayout.java)
URL: http://svn.apache.org/viewvc/logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LiteralConverter.java?view=diff&rev=534310&p1=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LiteralLayout.java&r1=533406&p2=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LiteralConverter.java&r2=534310
==============================================================================
--- logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LiteralLayout.java (original)
+++ logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LiteralConverter.java Tue May 1 22:07:29 2007
@@ -17,18 +17,18 @@
package org.apache.logging.pattern;
-import org.apache.logging.core.LogRecord;
+import org.apache.logging.core.LogEvent;
import java.io.Serializable;
/**
- * Layouts a string literal.
+ * Converters a string literal.
*
* @Immutable
*/
-public final class LiteralLayout<T extends Appendable>
- extends StringLayout<T> implements Serializable {
+public final class LiteralConverter<T extends Appendable>
+ extends StringConverter<T> implements Serializable {
/**
* String literal.
*/
@@ -38,12 +38,12 @@
* Create a new instance.
* @param literal string literal.
*/
- public LiteralLayout(final String literal) {
+ public LiteralConverter(final String literal) {
this.literal = literal;
}
/** {@inheritDoc} */
- public Object extract(final LogRecord record) {
+ public Object extract(final LogEvent record) {
return literal;
}
}
Copied: logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LocalizableConverter.java (from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LocalizableLayout.java)
URL: http://svn.apache.org/viewvc/logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LocalizableConverter.java?view=diff&rev=534310&p1=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LocalizableLayout.java&r1=533406&p2=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LocalizableConverter.java&r2=534310
==============================================================================
--- logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LocalizableLayout.java (original)
+++ logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LocalizableConverter.java Tue May 1 22:07:29 2007
@@ -16,18 +16,18 @@
*/
package org.apache.logging.pattern;
-import org.apache.logging.core.Layout;
+import org.apache.logging.core.Converter;
import org.apache.logging.core.Localizable;
-import org.apache.logging.core.LogRecord;
+import org.apache.logging.core.LogEvent;
import java.io.IOException;
import java.io.Serializable;
import java.util.Locale;
-public abstract class LocalizableLayout<T extends Appendable>
- implements Layout<T>, Serializable {
+public abstract class LocalizableConverter<T extends Appendable>
+ implements Converter<T>, Serializable {
- protected LocalizableLayout() {
+ protected LocalizableConverter() {
}
@@ -45,7 +45,7 @@
/**
* {@inheritDoc}
*/
- public void format(LogRecord record, Locale locale, T destination)
+ public void format(LogEvent record, Locale locale, T destination)
throws IOException {
render(extract(record), locale, destination);
}
Copied: logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LogEventDateConverter.java (from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LogRecordDateLayout.java)
URL: http://svn.apache.org/viewvc/logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LogEventDateConverter.java?view=diff&rev=534310&p1=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LogRecordDateLayout.java&r1=533406&p2=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LogEventDateConverter.java&r2=534310
==============================================================================
--- logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LogRecordDateLayout.java (original)
+++ logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LogEventDateConverter.java Tue May 1 22:07:29 2007
@@ -16,7 +16,7 @@
*/
package org.apache.logging.pattern;
-import org.apache.logging.core.LogRecord;
+import org.apache.logging.core.LogEvent;
import org.apache.logging.core.*;
import java.text.DateFormat;
import java.util.Locale;
@@ -27,15 +27,15 @@
*
* @PatternSpecifier("d", "date")
*/
-public final class LogRecordDateLayout<T extends Appendable>
- implements Layout<T> {
+public final class LogEventDateConverter<T extends Appendable>
+ implements Converter<T> {
private final DateFormat format;
/**
* Create new instance.
*/
- public LogRecordDateLayout(final DateFormat fmt) {
+ public LogEventDateConverter(final DateFormat fmt) {
if (fmt == null) {
throw new NullPointerException("fmt");
}
@@ -45,7 +45,7 @@
/**
* {@inheritDoc}
*/
- public Object extract(final LogRecord record) {
+ public Object extract(final LogEvent record) {
return record.getMillis();
}
@@ -62,7 +62,7 @@
/**
* {@inheritDoc}
*/
- public void format(LogRecord record, Locale locale, T destination)
+ public void format(LogEvent record, Locale locale, T destination)
throws IOException {
render(extract(record), locale, destination);
}
Copied: logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LoggerNameConverter.java (from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LoggerNameLayout.java)
URL: http://svn.apache.org/viewvc/logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LoggerNameConverter.java?view=diff&rev=534310&p1=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LoggerNameLayout.java&r1=533406&p2=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LoggerNameConverter.java&r2=534310
==============================================================================
--- logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LoggerNameLayout.java (original)
+++ logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/LoggerNameConverter.java Tue May 1 22:07:29 2007
@@ -16,26 +16,26 @@
*/
package org.apache.logging.pattern;
-import org.apache.logging.core.LogRecord;
+import org.apache.logging.core.LogEvent;
/**
- * This layout appends the logger associated with the log request.
+ * This Converter appends the logger associated with the log request.
*
* @PatternSpecifier("c", "logger");
*/
-public final class LoggerNameLayout<T extends Appendable>
- extends StringLayout<T> {
+public final class LoggerNameConverter<T extends Appendable>
+ extends StringConverter<T> {
/**
* Create new instance.
*/
- public LoggerNameLayout() {
+ public LoggerNameConverter() {
}
/**
* {@inheritDoc}
*/
- public Object extract(final LogRecord record) {
+ public Object extract(final LogEvent record) {
return record.getLoggerName();
}
}
Copied: logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/MessageConverter.java (from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/MessageLayout.java)
URL: http://svn.apache.org/viewvc/logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/MessageConverter.java?view=diff&rev=534310&p1=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/MessageLayout.java&r1=533406&p2=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/MessageConverter.java&r2=534310
==============================================================================
--- logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/MessageLayout.java (original)
+++ logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/MessageConverter.java Tue May 1 22:07:29 2007
@@ -16,27 +16,27 @@
*/
package org.apache.logging.pattern;
-import org.apache.logging.core.LogRecord;
+import org.apache.logging.core.LogEvent;
/**
- * This layout appends the message of the log request.
+ * This Converter appends the message of the log request.
*
* @PatternSpecifier("m", "message")
* @Immutable
*/
-public final class MessageLayout<T extends Appendable>
- extends LocalizableLayout<T> {
+public final class MessageConverter<T extends Appendable>
+ extends LocalizableConverter<T> {
/**
* Create new instance.
*/
- public MessageLayout() {
+ public MessageConverter() {
}
/**
* {@inheritDoc}
*/
- public Object extract(final LogRecord record) {
+ public Object extract(final LogEvent record) {
return record.getMessage();
}
}
Copied: logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/PropertiesContextConverter.java (from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/PropertiesContextLayout.java)
URL: http://svn.apache.org/viewvc/logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/PropertiesContextConverter.java?view=diff&rev=534310&p1=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/PropertiesContextLayout.java&r1=533406&p2=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/PropertiesContextConverter.java&r2=534310
==============================================================================
--- logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/PropertiesContextLayout.java (original)
+++ logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/PropertiesContextConverter.java Tue May 1 22:07:29 2007
@@ -16,8 +16,8 @@
*/
package org.apache.logging.pattern;
-import org.apache.logging.core.Layout;
-import org.apache.logging.core.LogRecord;
+import org.apache.logging.core.Converter;
+import org.apache.logging.core.LogEvent;
import java.io.IOException;
import java.io.Serializable;
@@ -26,31 +26,31 @@
import java.util.*;
/**
- * Abstract class for any layout that extracts a
+ * Abstract class for any Converter that extracts a
* string from the log record and writes to an Appendable.
*
* @PatternSpecifier("x");
*/
-public final class PropertiesContextLayout<T extends Appendable>
- implements Layout<T>, Serializable {
+public final class PropertiesContextConverter<T extends Appendable>
+ implements Converter<T>, Serializable {
private final String key;
/**
* Output all properties from context.
*/
- public PropertiesContextLayout() {
+ public PropertiesContextConverter() {
key = null;
}
/**
* Output one property.
*/
- public PropertiesContextLayout(final String key) {
+ public PropertiesContextConverter(final String key) {
this.key = key;
}
- public Object extract(final LogRecord record) {
+ public Object extract(final LogEvent record) {
Object context = record.getContext();
if (context instanceof PropertyContext) {
PropertyContext properties = (PropertyContext) context;
@@ -84,7 +84,7 @@
/**
* {@inheritDoc}
*/
- public void format(LogRecord record, Locale locale, T destination)
+ public void format(LogEvent record, Locale locale, T destination)
throws IOException {
render(extract(record), locale, destination);
}
Copied: logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceClassNameConverter.java (from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceClassNameLayout.java)
URL: http://svn.apache.org/viewvc/logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceClassNameConverter.java?view=diff&rev=534310&p1=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceClassNameLayout.java&r1=533406&p2=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceClassNameConverter.java&r2=534310
==============================================================================
--- logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceClassNameLayout.java (original)
+++ logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceClassNameConverter.java Tue May 1 22:07:29 2007
@@ -16,27 +16,27 @@
*/
package org.apache.logging.pattern;
-import org.apache.logging.core.LogRecord;
+import org.apache.logging.core.LogEvent;
/**
- * This layout appends the class name of the
+ * This Converter appends the class name of the
* source of the log request.
*
* @PatternSpecifier("C", "classname");
*/
-public final class SourceClassNameLayout<T extends Appendable>
- extends StringLayout<T> {
+public final class SourceClassNameConverter<T extends Appendable>
+ extends StringConverter<T> {
/**
* Create new instance.
*/
- public SourceClassNameLayout() {
+ public SourceClassNameConverter() {
}
/**
* {@inheritDoc}
*/
- public Object extract(final LogRecord record) {
+ public Object extract(final LogEvent record) {
StackTraceElement location = record.getSource();
if (location != null) {
return location.getClassName();
Copied: logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceFileNameConverter.java (from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceFileNameLayout.java)
URL: http://svn.apache.org/viewvc/logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceFileNameConverter.java?view=diff&rev=534310&p1=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceFileNameLayout.java&r1=533406&p2=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceFileNameConverter.java&r2=534310
==============================================================================
--- logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceFileNameLayout.java (original)
+++ logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceFileNameConverter.java Tue May 1 22:07:29 2007
@@ -16,27 +16,27 @@
*/
package org.apache.logging.pattern;
-import org.apache.logging.core.LogRecord;
+import org.apache.logging.core.LogEvent;
/**
- * This layout appends the method name of the
+ * This Converter appends the method name of the
* source of the log request.
*
* @PatternSpecifier("L", "line");
*/
-public final class SourceFileNameLayout<T extends Appendable>
- extends StringLayout<T> {
+public final class SourceFileNameConverter<T extends Appendable>
+ extends StringConverter<T> {
/**
* Create new instance.
*/
- public SourceFileNameLayout() {
+ public SourceFileNameConverter() {
}
/**
* {@inheritDoc}
*/
- public Object extract(final LogRecord record) {
+ public Object extract(final LogEvent record) {
StackTraceElement location = record.getSource();
if (location != null) {
return location.getFileName();
Copied: logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceLineNumberConverter.java (from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceLineNumberLayout.java)
URL: http://svn.apache.org/viewvc/logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceLineNumberConverter.java?view=diff&rev=534310&p1=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceLineNumberLayout.java&r1=533406&p2=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceLineNumberConverter.java&r2=534310
==============================================================================
--- logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceLineNumberLayout.java (original)
+++ logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceLineNumberConverter.java Tue May 1 22:07:29 2007
@@ -16,27 +16,27 @@
*/
package org.apache.logging.pattern;
-import org.apache.logging.core.LogRecord;
+import org.apache.logging.core.LogEvent;
/**
- * This layout appends the line number of the
+ * This Converter appends the line number of the
* source of the log request.
*
* @PatternSpecifier("L", "line");
*/
-public final class SourceLineNumberLayout<T extends Appendable>
- extends StringLayout<T> {
+public final class SourceLineNumberConverter<T extends Appendable>
+ extends StringConverter<T> {
/**
* Create new instance.
*/
- public SourceLineNumberLayout() {
+ public SourceLineNumberConverter() {
}
/**
* {@inheritDoc}
*/
- public Object extract(final LogRecord record) {
+ public Object extract(final LogEvent record) {
StackTraceElement location = record.getSource();
if (location != null) {
return location.getLineNumber();
Copied: logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceMethodNameConverter.java (from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceMethodNameLayout.java)
URL: http://svn.apache.org/viewvc/logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceMethodNameConverter.java?view=diff&rev=534310&p1=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceMethodNameLayout.java&r1=533406&p2=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceMethodNameConverter.java&r2=534310
==============================================================================
--- logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceMethodNameLayout.java (original)
+++ logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/SourceMethodNameConverter.java Tue May 1 22:07:29 2007
@@ -16,27 +16,27 @@
*/
package org.apache.logging.pattern;
-import org.apache.logging.core.LogRecord;
+import org.apache.logging.core.LogEvent;
/**
- * This layout appends the method name of the
+ * This Converter appends the method name of the
* source of the log request.
*
* @PatternSpecifier("M", "method");
*/
-public final class SourceMethodNameLayout<T extends Appendable>
- extends StringLayout<T> {
+public final class SourceMethodNameConverter<T extends Appendable>
+ extends StringConverter<T> {
/**
* Create new instance.
*/
- public SourceMethodNameLayout() {
+ public SourceMethodNameConverter() {
}
/**
* {@inheritDoc}
*/
- public Object extract(final LogRecord record) {
+ public Object extract(final LogEvent record) {
StackTraceElement location = record.getSource();
if (location != null) {
return location.getMethodName();
Copied: logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/StringConverter.java (from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/StringLayout.java)
URL: http://svn.apache.org/viewvc/logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/StringConverter.java?view=diff&rev=534310&p1=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/StringLayout.java&r1=533406&p2=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/StringConverter.java&r2=534310
==============================================================================
--- logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/StringLayout.java (original)
+++ logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/StringConverter.java Tue May 1 22:07:29 2007
@@ -16,21 +16,21 @@
*/
package org.apache.logging.pattern;
-import org.apache.logging.core.Layout;
-import org.apache.logging.core.LogRecord;
+import org.apache.logging.core.Converter;
+import org.apache.logging.core.LogEvent;
import java.io.IOException;
import java.util.Locale;
/**
- * Abstract class for any layout that extracts a
+ * Abstract class for any Converter that extracts a
* string from the log record and writes to an Appendable.
*
*
*/
-public abstract class StringLayout<T extends Appendable>
- implements Layout<T> {
- protected StringLayout() {
+public abstract class StringConverter<T extends Appendable>
+ implements Converter<T> {
+ protected StringConverter() {
}
@@ -45,7 +45,7 @@
/**
* {@inheritDoc}
*/
- public void format(LogRecord record, Locale locale, T destination)
+ public void format(LogEvent record, Locale locale, T destination)
throws IOException {
render(extract(record), locale, destination);
}
Copied: logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/ThreadNameConverter.java (from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/ThreadNameLayout.java)
URL: http://svn.apache.org/viewvc/logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/ThreadNameConverter.java?view=diff&rev=534310&p1=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/ThreadNameLayout.java&r1=533406&p2=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/ThreadNameConverter.java&r2=534310
==============================================================================
--- logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/ThreadNameLayout.java (original)
+++ logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/ThreadNameConverter.java Tue May 1 22:07:29 2007
@@ -16,27 +16,27 @@
*/
package org.apache.logging.pattern;
-import org.apache.logging.core.LogRecord;
+import org.apache.logging.core.LogEvent;
/**
- * This layout appends the method name of the
+ * This Converter appends the method name of the
* source of the log request.
*
* @PatternSpecifier("M", "method");
*/
-public final class ThreadNameLayout<T extends Appendable>
- extends StringLayout<T> {
+public final class ThreadNameConverter<T extends Appendable>
+ extends StringConverter<T> {
/**
* Create new instance.
*/
- public ThreadNameLayout() {
+ public ThreadNameConverter() {
}
/**
* {@inheritDoc}
*/
- public Object extract(final LogRecord record) {
+ public Object extract(final LogEvent record) {
return record.getThreadName();
}
}
Copied: logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/ThrownConverter.java (from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/ThrownLayout.java)
URL: http://svn.apache.org/viewvc/logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/ThrownConverter.java?view=diff&rev=534310&p1=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/ThrownLayout.java&r1=533406&p2=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/ThrownConverter.java&r2=534310
==============================================================================
--- logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/ThrownLayout.java (original)
+++ logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/ThrownConverter.java Tue May 1 22:07:29 2007
@@ -16,8 +16,8 @@
*/
package org.apache.logging.pattern;
-import org.apache.logging.core.Layout;
-import org.apache.logging.core.LogRecord;
+import org.apache.logging.core.Converter;
+import org.apache.logging.core.LogEvent;
import java.io.IOException;
import java.util.Locale;
@@ -28,14 +28,14 @@
* @Immutable
*
*/
-public final class ThrownLayout<T extends Appendable>
- implements Layout<T> {
- protected ThrownLayout() {
+public final class ThrownConverter<T extends Appendable>
+ implements Converter<T> {
+ protected ThrownConverter() {
}
/** {@inheritDoc} */
- public Object extract(LogRecord record) {
+ public Object extract(LogEvent record) {
return record.getThrown();
}
@@ -52,7 +52,7 @@
/**
* {@inheritDoc}
*/
- public void format(LogRecord record, Locale locale, T destination)
+ public void format(LogEvent record, Locale locale, T destination)
throws IOException {
render(extract(record), locale, destination);
}
Copied: logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/ValueContextConverter.java (from r533406, logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/ValueContextLayout.java)
URL: http://svn.apache.org/viewvc/logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/ValueContextConverter.java?view=diff&rev=534310&p1=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/ValueContextLayout.java&r1=533406&p2=logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/ValueContextConverter.java&r2=534310
==============================================================================
--- logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/ValueContextLayout.java (original)
+++ logging/sandbox/experimental/pattern-layout/src/main/java/org/apache/logging/pattern/ValueContextConverter.java Tue May 1 22:07:29 2007
@@ -16,27 +16,27 @@
*/
package org.apache.logging.pattern;
-import org.apache.logging.core.LogRecord;
+import org.apache.logging.core.LogEvent;
import org.apache.logging.core.ValueContext;
/**
- * This layout appends the value of the context of the log request.
+ * This Converter appends the value of the context of the log request.
*
* @PatternSpecifier("N", "ndc");
*/
-public final class ValueContextLayout<T extends Appendable>
- extends StringLayout<T> {
+public final class ValueContextConverter<T extends Appendable>
+ extends StringConverter<T> {
/**
* Create new instance.
*/
- public ValueContextLayout() {
+ public ValueContextConverter() {
}
/**
* {@inheritDoc}
*/
- public Object extract(final LogRecord record) {
+ public Object extract(final LogEvent record) {
Object context = record.getContext();
if (context instanceof ValueContext) {
return ((ValueContext) context).getValue();
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org