Author: ggregory
Date: Tue Oct 9 17:07:47 2012
New Revision: 1396115
URL: http://svn.apache.org/viewvc?rev=1396115&view=rev
Log:
Rename LayoutBase to AbstractLayout.
Added:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
- copied, changed from r1396106,
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/LayoutBase.java
Removed:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/LayoutBase.java
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java
Copied:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
(from r1396106,
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/LayoutBase.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java?p2=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java&p1=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/LayoutBase.java&r1=1396106&r2=1396115&rev=1396115&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/LayoutBase.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
Tue Oct 9 17:07:47 2012
@@ -26,7 +26,7 @@ import java.io.Serializable;
* Base class for Layouts.
* @param <T> The Class that the Layout will format the LogEvent into.
*/
-public abstract class LayoutBase<T extends Serializable> implements Layout<T> {
+public abstract class AbstractLayout<T extends Serializable> implements
Layout<T> {
/**
* Allow subclasses access to the status logger without creating another
instance.
*/
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java?rev=1396115&r1=1396114&r2=1396115&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
Tue Oct 9 17:07:47 2012
@@ -24,7 +24,7 @@ import java.nio.charset.Charset;
/**
* Base class for Layouts that result in a String.
*/
-public abstract class AbstractStringLayout extends LayoutBase<String> {
+public abstract class AbstractStringLayout extends AbstractLayout<String> {
/**
* The charset of the formatted message.
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java?rev=1396115&r1=1396114&r2=1396115&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java
Tue Oct 9 17:07:47 2012
@@ -29,7 +29,7 @@ import java.io.OutputStream;
* Format a LogEvent in its serialized form.
*/
@Plugin(name = "SerializedLayout", type = "Core", elementType = "layout",
printObject = true)
-public final class SerializedLayout extends LayoutBase<LogEvent> {
+public final class SerializedLayout extends AbstractLayout<LogEvent> {
private static byte[] header;
