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 DFEDA10635 for ; Mon, 7 Oct 2013 16:13:02 +0000 (UTC) Received: (qmail 20091 invoked by uid 500); 7 Oct 2013 16:13:02 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 19941 invoked by uid 500); 7 Oct 2013 16:13:00 -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 19907 invoked by uid 99); 7 Oct 2013 16:12:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Oct 2013 16:12:56 +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; Mon, 07 Oct 2013 16:12:53 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id AC12223888E4; Mon, 7 Oct 2013 16:12:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1529989 - in /logging/log4j/log4j2/trunk/src: changes/changes.xml site/xdoc/manual/architecture.xml Date: Mon, 07 Oct 2013 16:12:31 -0000 To: commits@logging.apache.org From: ggregory@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131007161231.AC12223888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ggregory Date: Mon Oct 7 16:12:31 2013 New Revision: 1529989 URL: http://svn.apache.org/r1529989 Log: - [LOG4J2-417] Fix Event Level / LoggerConfig Level table at the architecture documentation page. - Link to Apache Commons Lang in attribution. Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml logging/log4j/log4j2/trunk/src/site/xdoc/manual/architecture.xml Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1529989&r1=1529988&r2=1529989&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/src/changes/changes.xml (original) +++ logging/log4j/log4j2/trunk/src/changes/changes.xml Mon Oct 7 16:12:31 2013 @@ -21,6 +21,9 @@ + + Fix Event Level / LoggerConfig Level table at the architecture documentation page. + Format log event time as UNIX time (seconds or milliseconds). Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/architecture.xml URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/architecture.xml?rev=1529989&r1=1529988&r2=1529989&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/src/site/xdoc/manual/architecture.xml (original) +++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/architecture.xml Mon Oct 7 16:12:31 2013 @@ -388,14 +388,16 @@ Logger y = Logger.getLogger("wombat"); WARN ERROR FATAL + OFF ALL - NO - NO - NO - NO - NO + YES + YES + YES + YES + YES + YES NO @@ -406,6 +408,7 @@ Logger y = Logger.getLogger("wombat"); NO NO NO + NO DEBUG @@ -415,6 +418,7 @@ Logger y = Logger.getLogger("wombat"); NO NO NO + NO INFO @@ -424,6 +428,7 @@ Logger y = Logger.getLogger("wombat"); NO NO NO + NO WARN @@ -433,6 +438,7 @@ Logger y = Logger.getLogger("wombat"); YES NO NO + NO ERROR @@ -442,6 +448,7 @@ Logger y = Logger.getLogger("wombat"); YES YES NO + NO FATAL @@ -451,15 +458,17 @@ Logger y = Logger.getLogger("wombat"); YES YES YES + NO OFF - YES - YES - YES - YES - YES - YES + NO + NO + NO + NO + NO + NO + NO @@ -623,8 +632,9 @@ Logger y = Logger.getLogger("wombat"); class and StrLookup - interface were borrowed from Apache Commons Lang and then modified to support evaluating LogEvents. In - addition the + interface were borrowed from + Apache Commons Lang and then modified + to support evaluating LogEvents. In addition the Interpolator class was borrowed from Apache Commons Configuration to allow the StrSubstitutor to evaluate variables that from multiple StrLookups. It too was modified to support evaluating LogEvents. Together these