Author: ggregory
Date: Fri Jan 24 17:50:30 2014
New Revision: 1561091
URL: http://svn.apache.org/r1561091
Log:
[LOG4J2-508] Add new Levels: NOTICE, DIAG, VERBOSE. VETO by Remko Popma.
Reverse-merging r1560356 through r1560355.
Modified:
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/Level.java
logging/log4j/log4j2/trunk/src/changes/changes.xml
Modified:
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/Level.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/Level.java?rev=1561091&r1=1561090&r2=1561091&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/Level.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/Level.java
Fri Jan 24 17:50:30 2014
@@ -25,11 +25,8 @@ import java.util.Locale;
* <li>{@link #FATAL}</li>
* <li>{@link #ERROR}</li>
* <li>{@link #WARN}</li>
- * <li>{@link #NOTICE}</li>
* <li>{@link #INFO}</li>
- * <li>{@link #DIAG}</li>
* <li>{@link #DEBUG}</li>
- * <li>{@link #VERBOSE}</li>
* <li>{@link #TRACE}</li>
* <li>{@link #ALL} (least specific)</li>
* </ul>
@@ -61,34 +58,19 @@ public enum Level {
WARN(300),
/**
- * An event for normal, but significant, conditions.
+ * An event for informational purposes.
*/
- NOTICE(400),
+ INFO(400),
/**
- * An event for informational purposes, but not necessarily significant.
+ * A general debugging event.
*/
- INFO(500),
-
- /**
- * An event used by operations or users to diagnose problems in the system.
- */
- DIAG(600),
-
- /**
- * A general debugging event, used by developers for internal debugging.
- */
- DEBUG(700),
-
- /**
- * Used to log minute details of the system. As its dictionary definition
implies this is extremely chatty.
- */
- VERBOSE(800),
+ DEBUG(500),
/**
* A fine-grained debug message, typically capturing the flow through the
application.
*/
- TRACE(900),
+ TRACE(600),
/**
* All events should be logged.
Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1561091&r1=1561090&r2=1561091&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/changes.xml (original)
+++ logging/log4j/log4j2/trunk/src/changes/changes.xml Fri Jan 24 17:50:30 2014
@@ -20,10 +20,7 @@
<title>Changes</title>
</properties>
<body>
- <release version="2.0-RC1" date="2014-MM-DD" description="Bug fixes and
enhancements">
- <action issue="LOG4J2-508" dev="ggregory" type="add">
- Add new Levels: NOTICE, DIAG, VERBOSE.
- </action>
+ <release version="2.0-RC1" date="2014-MM-DD" description="Bug fixes and
enhancements">
<action issue="LOG4J2-507" dev="ggregory" type="update">
Space Level numbers by 100 instead of 1.
</action>