Author: ceki
Date: Sat Feb 4 16:52:39 2006
New Revision: 534
Modified:
nlog4j/trunk/build.properties
nlog4j/trunk/docs/ (props changed)
nlog4j/trunk/slf4j.xml
nlog4j/trunk/src/java/org/apache/log4j/Category.java
nlog4j/trunk/src/java/org/apache/log4j/Logger.java
nlog4j/trunk/src/java/org/slf4j/ (props changed)
nlog4j/trunk/src/java/org/slf4j/impl/ (props changed)
nlog4j/trunk/src/java/org/slf4j/spi/ (props changed)
nlog4j/trunk/src/xdocs/changes.xml
nlog4j/trunk/src/xdocs/download.xml
Log:
- syncing with SLF4J RC6
- preparing 1.2.22
Modified: nlog4j/trunk/build.properties
==============================================================================
--- nlog4j/trunk/build.properties (original)
+++ nlog4j/trunk/build.properties Sat Feb 4 16:52:39 2006
@@ -1,2 +1,2 @@
-version=1.2.21
+version=1.2.22
\ No newline at end of file
Modified: nlog4j/trunk/slf4j.xml
==============================================================================
--- nlog4j/trunk/slf4j.xml (original)
+++ nlog4j/trunk/slf4j.xml Sat Feb 4 16:52:39 2006
@@ -39,15 +39,9 @@
<fileset dir="${tmp.slf4j}/">
<include name="**/*.java"/>
<exclude name="**/impl/impl/StaticLoggerBinder.java"/>
- <exclude name="Mark*.java"/>
- <exclude name="IMarkerFactory.java"/>
- <exclude name="**/impl/BasicMarker*.java"/>
<exclude name="**/impl/JCL*.java"/>
- <exclude name="**/impl/MNOP*.java"/>
- <exclude name="**/impl/MSimple*.java"/>
<exclude name="**/impl/JDK14*.java"/>
<exclude name="**/impl/Log4j*.java"/>
- <exclude name="**/spi/MarkerFactoryBinder.java"/>
</fileset>
</copy>
Modified: nlog4j/trunk/src/java/org/apache/log4j/Category.java
==============================================================================
--- nlog4j/trunk/src/java/org/apache/log4j/Category.java (original)
+++ nlog4j/trunk/src/java/org/apache/log4j/Category.java Sat Feb 4
16:52:39 2006
@@ -20,16 +20,16 @@
// Colin Sampaleanu <[EMAIL PROTECTED]>
package org.apache.log4j;
-import org.apache.log4j.spi.AppenderAttachable;
-import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.spi.LoggerRepository;
-import org.apache.log4j.helpers.NullEnumeration;
-import org.apache.log4j.helpers.AppenderAttachableImpl;
-
import java.util.Enumeration;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
+import org.apache.log4j.helpers.AppenderAttachableImpl;
+import org.apache.log4j.helpers.NullEnumeration;
+import org.apache.log4j.spi.AppenderAttachable;
+import org.apache.log4j.spi.LoggerRepository;
+import org.apache.log4j.spi.LoggingEvent;
+import org.slf4j.impl.MarkerIgnoringBase;
import org.slf4j.impl.MessageFormatter;
/**
@@ -77,7 +77,7 @@
* @author Ceki Gülcü
* @author Anders Kristensen
*/
-public class Category implements AppenderAttachable {
+public class Category extends MarkerIgnoringBase implements AppenderAttachable
{
/**
* The hierarchy where categories are attached to by default.
Modified: nlog4j/trunk/src/java/org/apache/log4j/Logger.java
==============================================================================
--- nlog4j/trunk/src/java/org/apache/log4j/Logger.java (original)
+++ nlog4j/trunk/src/java/org/apache/log4j/Logger.java Sat Feb 4 16:52:39 2006
@@ -18,64 +18,12 @@
@author Ceki Gülcü */
public class Logger extends Category implements org.slf4j.Logger {
- /**
- The fully qualified name of the Level class. See also the
- getFQCN method. */
- private static final String FQCN = Level.class.getName();
-
-
protected
Logger(String name) {
super(name);
}
/**
- Log a message object with the [EMAIL PROTECTED] Level#FINE FINE} level
which
- is just an alias for the [EMAIL PROTECTED] Level#DEBUG DEBUG} level.
-
- <p>This method first checks if this category is <code>DEBUG</code>
- enabled by comparing the level of this category with the [EMAIL PROTECTED]
- Level#DEBUG DEBUG} level. If this category is
- <code>DEBUG</code> enabled, then it converts the message object
- (passed as parameter) to a string by invoking the appropriate
- [EMAIL PROTECTED] org.apache.log4j.or.ObjectRenderer}. It then proceeds to
call all the
- registered appenders in this category and also higher in the
- hierarchy depending on the value of the additivity flag.
-
- <p><b>WARNING</b> Note that passing a [EMAIL PROTECTED] Throwable} to this
- method will print the name of the <code>Throwable</code> but no
- stack trace. To print a stack trace use the [EMAIL PROTECTED]
#debug(Object,
- Throwable)} form instead.
-
- @param message the message object to log. */
- //public
- //void fine(Object message) {
- // if(repository.isDisabled(Level.DEBUG_INT))
- // return;
- // if(Level.DEBUG.isGreaterOrEqual(this.getChainedLevel())) {
- // forcedLog(FQCN, Level.DEBUG, message, null);
- // }
- //}
-
-
- /**
- Log a message object with the <code>FINE</code> level including
- the stack trace of the [EMAIL PROTECTED] Throwable} <code>t</code> passed as
- parameter.
-
- <p>See [EMAIL PROTECTED] #fine(Object)} form for more detailed information.
-
- @param message the message object to log.
- @param t the exception to log, including its stack trace. */
- //public
- //void fine(Object message, Throwable t) {
- // if(repository.isDisabled(Level.DEBUG_INT))
- // return;
- // if(Level.DEBUG.isGreaterOrEqual(this.getChainedLevel()))
- // forcedLog(FQCN, Level.FINE, message, t);
- //}
-
- /**
* Retrieve a logger named according to the value of the
* <code>name</code> parameter. If the named logger already exists,
* then the existing instance will be returned. Otherwise, a new
Modified: nlog4j/trunk/src/xdocs/changes.xml
==============================================================================
--- nlog4j/trunk/src/xdocs/changes.xml (original)
+++ nlog4j/trunk/src/xdocs/changes.xml Sat Feb 4 16:52:39 2006
@@ -26,6 +26,14 @@
</section>
+ <section name="Changes in NLOG4J 1.2.22">
+ <p>NLOG4J 1.2.22 mirrors the merge of the
+ <code>MarkingLoggerof</code> interface into the
+ <code>org.slf4j.Logger</code> interface in SLF4J 1.0RC6.
+ </p>
+ </section>
+
+
<section name="Changes in NLOG4J 1.2.21">
<p>Maintenance release improving resilience to null input.</p>
</section>
Modified: nlog4j/trunk/src/xdocs/download.xml
==============================================================================
--- nlog4j/trunk/src/xdocs/download.xml (original)
+++ nlog4j/trunk/src/xdocs/download.xml Sat Feb 4 16:52:39 2006
@@ -8,17 +8,17 @@
<body>
- <section name="NLOG4J version 1.2.21">
+ <section name="NLOG4J version 1.2.22">
- <p>You can download NLOG4J version 1.2.21, with native SLF4J
+ <p>You can download NLOG4J version 1.2.22, with native SLF4J
support, including <i>full source code</i>, class files and
documentation as
</p>
<ul>
- <li><a
href="http://www.slf4j.org/dist/nlog4j-1.2.21.tar.gz";><b>nlog4j-1.2.21.tar.gz</b></a></li>
- <li><a
href="http://www.slf4j.org/dist/nlog4j-1.2.21.zip";><b>nlog4j-1.2.21.zip</b></a></li>
+ <li><a
href="http://www.slf4j.org/dist/nlog4j-1.2.22.tar.gz";><b>nlog4j-1.2.22.tar.gz</b></a></li>
+ <li><a
href="http://www.slf4j.org/dist/nlog4j-1.2.22.zip";><b>nlog4j-1.2.22.zip</b></a></li>
</ul>
_______________________________________________
nlog4j-dev mailing list
[email protected]
http://slf4j.org/mailman/listinfo/nlog4j-dev
