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 2013/10/07 18:12:31 UTC

svn commit: r1529989 - in /logging/log4j/log4j2/trunk/src: changes/changes.xml site/xdoc/manual/architecture.xml

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 @@
   </properties>
   <body>
     <release version="2.0RC1" date="2013-MM-DD" description="Bug fixes and enhancements">
+      <action issue="LOG4J2-417" dev="ggregory" type="fix">
+        Fix Event Level / LoggerConfig Level table at the architecture documentation page.
+      </action>
       <action issue="LOG4J2-415" dev="ggregory" type="add">
         Format log event time as UNIX time (seconds or milliseconds).
       </action>

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");
             <th>WARN</th>
             <th>ERROR</th>
             <th>FATAL</th>
+            <th>OFF</th>
           </tr>
           <tr>
             <th>ALL</th>
-            <td class="big-red">NO</td>
-            <td class="big-red">NO</td>
-            <td class="big-red">NO</td>
-            <td class="big-red">NO</td>
-            <td class="big-red">NO</td>
+            <td class="big-red">YES</td>
+            <td class="big-red">YES</td>
+            <td class="big-red">YES</td>
+            <td class="big-red">YES</td>
+            <td class="big-red">YES</td>
+            <td class="big-red">YES</td>
             <td class="big-red">NO</td>
           </tr>
           <tr>
@@ -406,6 +408,7 @@ Logger y = Logger.getLogger("wombat");
             <td class="big-red">NO</td>
             <td class="big-red">NO</td>
             <td class="big-red">NO</td>
+            <td class="big-red">NO</td>
           </tr>
           <tr>
             <th>DEBUG</th>
@@ -415,6 +418,7 @@ Logger y = Logger.getLogger("wombat");
             <td class="big-red">NO</td>
             <td class="big-red">NO</td>
             <td class="big-red">NO</td>
+            <td class="big-red">NO</td>
           </tr>
           <tr>
             <th>INFO</th>
@@ -424,6 +428,7 @@ Logger y = Logger.getLogger("wombat");
             <td class="big-red">NO</td>
             <td class="big-red">NO</td>
             <td class="big-red">NO</td>
+            <td class="big-red">NO</td>
           </tr>
           <tr>
             <th>WARN</th>
@@ -433,6 +438,7 @@ Logger y = Logger.getLogger("wombat");
             <td class="big-green">YES</td>
             <td class="big-red">NO</td>
             <td class="big-red">NO</td>
+            <td class="big-red">NO</td>
           </tr>
           <tr>
             <th>ERROR</th>
@@ -442,6 +448,7 @@ Logger y = Logger.getLogger("wombat");
             <td class="big-green">YES</td>
             <td class="big-green">YES</td>
             <td class="big-red">NO</td>
+            <td class="big-red">NO</td>
           </tr>
           <tr>
             <th>FATAL</th>
@@ -451,15 +458,17 @@ Logger y = Logger.getLogger("wombat");
             <td class="big-green">YES</td>
             <td class="big-green">YES</td>
             <td class="big-green">YES</td>
+            <td class="big-red">NO</td>
           </tr>
           <tr>
             <th>OFF</th>
-            <td class="big-green">YES</td>
-            <td class="big-green">YES</td>
-            <td class="big-green">YES</td>
-            <td class="big-green">YES</td>
-            <td class="big-green">YES</td>
-            <td class="big-green">YES</td>
+            <td class="big-red">NO</td>
+            <td class="big-red">NO</td>
+            <td class="big-red">NO</td>
+            <td class="big-red">NO</td>
+            <td class="big-red">NO</td>
+            <td class="big-red">NO</td>
+            <td class="big-red">NO</td>
           </tr>
         </table>
 
@@ -623,8 +632,9 @@ Logger y = Logger.getLogger("wombat");
           </a>
           class and
           <a href="../log4j-core/apidocs/org/apache/logging/log4j/core/lookup/StrLookup.html">StrLookup</a>
-          interface were borrowed from Apache Commons Lang and then modified to support evaluating LogEvents. In
-          addition the
+          interface were borrowed from 
+          <a href="https://commons.apache.org/proper/commons-lang/">Apache Commons Lang</a> and then modified 
+          to support evaluating LogEvents. In addition the
           <a href="../log4j-core/apidocs/org/apache/logging/log4j/core/lookup/Interpolator.html">Interpolator</a>
           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