Return-Path: X-Original-To: apmail-logging-commits-archive@minotaur.apache.org Delivered-To: apmail-logging-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5A62DD58E for ; Sat, 20 Oct 2012 17:30:39 +0000 (UTC) Received: (qmail 98435 invoked by uid 500); 20 Oct 2012 17:30:39 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 98409 invoked by uid 500); 20 Oct 2012 17:30:39 -0000 Mailing-List: contact commits-help@logging.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@logging.apache.org Delivered-To: mailing list commits@logging.apache.org Received: (qmail 98401 invoked by uid 99); 20 Oct 2012 17:30:39 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 Oct 2012 17:30:39 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 Oct 2012 17:30:36 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 14A28238890D; Sat, 20 Oct 2012 17:29:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1400491 - in /logging/log4j/log4j2/trunk/core/src: main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java Date: Sat, 20 Oct 2012 17:29:51 -0000 To: commits@logging.apache.org From: rgoers@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121020172952.14A28238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rgoers Date: Sat Oct 20 17:29:51 2012 New Revision: 1400491 URL: http://svn.apache.org/viewvc?rev=1400491&view=rev Log: LOG4J2-29 - Replace newline in message with br tag Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java 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=1400491&r1=1400490&r2=1400491&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 Sat Oct 20 17:29:51 2012 @@ -45,7 +45,7 @@ public final class HTMLLayout extends Ab private static final int BUF_SIZE = 256; - private static final String TRACE_PREFIX = "
    "; + private static final String TRACE_PREFIX = "
    "; private static final String LINE_SEP = System.getProperty("line.separator"); @@ -157,7 +157,7 @@ public final class HTMLLayout extends Ab } sbuf.append(""); - sbuf.append(Transform.escapeTags(event.getMessage().getFormattedMessage())); + sbuf.append(Transform.escapeTags(event.getMessage().getFormattedMessage()).replaceAll(LINE_SEP, "
")); sbuf.append("").append(LINE_SEP); sbuf.append("").append(LINE_SEP); Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java?rev=1400491&r1=1400490&r2=1400491&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java (original) +++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java Sat Oct 20 17:29:51 2012 @@ -56,6 +56,9 @@ public class HTMLLayoutTest { private static final String body = "java.lang.NullPointerException: test"; + private static final String multiLine = + "First line
Second line"; + /** * Test case for MDC conversion pattern. @@ -77,6 +80,8 @@ public class HTMLLayoutTest { root.debug("empty mdc"); + root.debug("First line\nSecond line"); + ThreadContext.put("key1", "value1"); ThreadContext.put("key2", "value2"); @@ -93,7 +98,8 @@ public class HTMLLayoutTest { assertTrue("Incorrect number of lines. Require at least 85 " + list.size(), list.size() > 85); assertTrue("Incorrect header", list.get(3).equals("Log4J Log Messages")); assertTrue("Incorrect footer", list.get(list.size() - 1).equals("")); - assertTrue("Incorrect body", list.get(61).equals(body)); + assertTrue("Incorrect multiline", list.get(49).equals(multiLine)); + assertTrue("Incorrect body", list.get(70).equals(body)); } }