You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2012/10/10 19:30:13 UTC
svn commit: r1396703 - in
/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core:
./ appender/ layout/
Author: ggregory
Date: Wed Oct 10 17:30:12 2012
New Revision: 1396703
URL: http://svn.apache.org/viewvc?rev=1396703&view=rev
Log:
Reanme Layout.toSerialized() to Layout.toSerializable().
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Layout.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java
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/HTMLLayout.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Layout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Layout.java?rev=1396703&r1=1396702&r2=1396703&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Layout.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Layout.java Wed Oct 10 17:30:12 2012
@@ -43,7 +43,7 @@ public interface Layout<T extends Serial
* @param event The Logging Event.
* @return The formatted event.
*/
- T toSerialized(LogEvent event);
+ T toSerializable(LogEvent event);
/**
* Returns the header for the layout format.
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java?rev=1396703&r1=1396702&r2=1396703&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java Wed Oct 10 17:30:12 2012
@@ -47,7 +47,7 @@ public final class JMSQueueAppender exte
*/
public void append(LogEvent event) {
try {
- manager.send(getLayout().toSerialized(event));
+ manager.send(getLayout().toSerializable(event));
} catch (Exception ex) {
throw new AppenderRuntimeException(ex);
}
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java?rev=1396703&r1=1396702&r2=1396703&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java Wed Oct 10 17:30:12 2012
@@ -47,7 +47,7 @@ public final class JMSTopicAppender exte
*/
public void append(LogEvent event) {
try {
- manager.send(getLayout().toSerialized(event));
+ manager.send(getLayout().toSerializable(event));
} catch (Exception ex) {
throw new AppenderRuntimeException(ex);
}
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=1396703&r1=1396702&r2=1396703&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 Wed Oct 10 17:30:12 2012
@@ -55,7 +55,7 @@ public abstract class AbstractStringLayo
* @return The formatted event as a byte array.
*/
public byte[] toByteArray(LogEvent event) {
- return encoder.getBytes(toSerialized(event));
+ return encoder.getBytes(toSerializable(event));
}
protected Charset getCharset() {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java?rev=1396703&r1=1396702&r2=1396703&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java Wed Oct 10 17:30:12 2012
@@ -74,7 +74,7 @@ public final class HTMLLayout extends Ab
* @param event The Logging Event.
* @return A String containging the LogEvent as HTML.
*/
- public String toSerialized(LogEvent event) {
+ public String toSerializable(LogEvent event) {
StringBuilder sbuf = new StringBuilder(BUF_SIZE);
sbuf.append(LINE_SEP).append("<tr>").append(LINE_SEP);
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java?rev=1396703&r1=1396702&r2=1396703&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java Wed Oct 10 17:30:12 2012
@@ -135,7 +135,7 @@ public final class PatternLayout extends
* @param event logging event to be formatted.
* @return The event formatted as a String.
*/
- public String toSerialized(final LogEvent event) {
+ public String toSerializable(final LogEvent event) {
StringBuilder buf = new StringBuilder();
for (PatternFormatter formatter : formatters) {
formatter.format(event, buf);
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java?rev=1396703&r1=1396702&r2=1396703&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java Wed Oct 10 17:30:12 2012
@@ -152,7 +152,7 @@ public final class RFC5424Layout extends
* @param event The LogEvent.
* @return The RFC 5424 String representation of the LogEvent.
*/
- public String toSerialized(final LogEvent event) {
+ public String toSerializable(final LogEvent event) {
Message msg = event.getMessage();
boolean isStructured = msg instanceof StructuredDataMessage;
StringBuilder buf = new StringBuilder();
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=1396703&r1=1396702&r2=1396703&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 Wed Oct 10 17:30:12 2012
@@ -70,7 +70,7 @@ public final class SerializedLayout exte
* @param event The Logging Event.
* @return The LogEvent.
*/
- public LogEvent toSerialized(final LogEvent event) {
+ public LogEvent toSerializable(final LogEvent event) {
return event;
}
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java?rev=1396703&r1=1396702&r2=1396703&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java Wed Oct 10 17:30:12 2012
@@ -62,7 +62,7 @@ public class SyslogLayout extends Abstra
* @param event The LogEvent
* @return the event formatted as a String.
*/
- public String toSerialized(final LogEvent event) {
+ public String toSerializable(final LogEvent event) {
StringBuilder buf = new StringBuilder();
buf.append("<");
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java?rev=1396703&r1=1396702&r2=1396703&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java Wed Oct 10 17:30:12 2012
@@ -94,7 +94,7 @@ public class XMLLayout extends AbstractS
* @param event The LogEvent.
* @return The XML representation of the LogEvent.
*/
- public String toSerialized(final LogEvent event) {
+ public String toSerializable(final LogEvent event) {
StringBuilder buf = new StringBuilder(DEFAULT_SIZE);
// We yield to the \r\n heresy.