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 2017/06/29 21:42:35 UTC
logging-log4j2 git commit: [LOG4J2-1958] Deprecate SerializedLayout
and remove it as default.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 57b2617a3 -> 70677348c
[LOG4J2-1958] Deprecate SerializedLayout and remove it as default.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/70677348
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/70677348
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/70677348
Branch: refs/heads/master
Commit: 70677348c98b51e6bbe73466a66b77301c1b71df
Parents: 57b2617
Author: Gary Gregory <gg...@apache.org>
Authored: Thu Jun 29 14:42:33 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Thu Jun 29 14:42:33 2017 -0700
----------------------------------------------------------------------
.../core/appender/mom/activemq/AbstractJmsAppenderIT.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/70677348/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/mom/activemq/AbstractJmsAppenderIT.java
----------------------------------------------------------------------
diff --git a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/mom/activemq/AbstractJmsAppenderIT.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/mom/activemq/AbstractJmsAppenderIT.java
index d065921..13d6830 100644
--- a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/mom/activemq/AbstractJmsAppenderIT.java
+++ b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/mom/activemq/AbstractJmsAppenderIT.java
@@ -31,14 +31,15 @@ import javax.jms.Message;
import javax.jms.MessageConsumer;
import javax.jms.MessageListener;
import javax.jms.ObjectMessage;
+import javax.jms.TextMessage;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.appender.mom.JmsAppender;
import org.apache.logging.log4j.core.appender.mom.JmsManager;
import org.apache.logging.log4j.core.impl.Log4jLogEvent;
+import org.apache.logging.log4j.core.layout.JsonLayout;
import org.apache.logging.log4j.core.layout.MessageLayout;
-import org.apache.logging.log4j.core.layout.SerializedLayout;
import org.apache.logging.log4j.message.SimpleMessage;
import org.apache.logging.log4j.message.StringMapMessage;
import org.junit.Assert;
@@ -84,6 +85,8 @@ public abstract class AbstractJmsAppenderIT {
event = ((ObjectMessage) message).getObject();
} else if (message instanceof javax.jms.MapMessage) {
event = message;
+ } else if (message instanceof javax.jms.TextMessage) {
+ event = message;
} else {
Assert.fail("Unexpected Message type: " + message);
event = null;
@@ -151,11 +154,11 @@ public abstract class AbstractJmsAppenderIT {
@Test
public void testLogObjectMessageToQueue() throws Exception {
- getJmsTestConfig().createAppender(SerializedLayout.createLayout());
+ getJmsTestConfig().createAppender(JsonLayout.createDefaultLayout());
final int messageCount = 100;
final MessageConsumer messageConsumer = getJmsManager().createMessageConsumer();
try {
- final JmsQueueConsumer consumer = new JmsQueueConsumer(messageCount, ObjectMessage.class);
+ final JmsQueueConsumer consumer = new JmsQueueConsumer(messageCount, TextMessage.class);
messageConsumer.setMessageListener(consumer);
final String messageText = "Hello, World!";
final String loggerName = this.getClass().getName();