Author: ceki
Date: Tue Aug 16 21:30:43 2005
New Revision: 172
Modified:
nlog4j/trunk/build.xml
nlog4j/trunk/docs/download.html
nlog4j/trunk/src/java/org/apache/log4j/Category.java
nlog4j/trunk/src/xdocs/download.xml
nlog4j/trunk/tests/build.xml
Log:
Added printing methods taking Object as paramer to ensure compatibility with
code compiled with log4j.
Modified: nlog4j/trunk/build.xml
==============================================================================
--- nlog4j/trunk/build.xml (original)
+++ nlog4j/trunk/build.xml Tue Aug 16 21:30:43 2005
@@ -1,7 +1,6 @@
<project name="nlog4j" default="usage" basedir="." >
-
<!-- The build.properties file defines the parth to local jar files -->
<property file="build.properties"/>
@@ -10,7 +9,7 @@
<!-- prefixed with "env". -->
<property environment="env"/>
- <property name="version" value="1.2.15"/>
+ <property name="version" value="1.2.16"/>
<!-- The base directory relative to which most targets are built -->
<property name="base" value="."/>
@@ -420,22 +419,22 @@
<copy todir="${dist.tmp}/nlog4j-${version}">
<fileset dir="${base}"
includes="src/java/**,
- docs/**,
- examples/**,
- build/*,
- build.xml,
- build.properties.sample,
- manifest.mf,
- INSTALL,
- LICENSE.txt,
- nlog4j*.jar,
- classes/**"
+ docs/**,
+ examples/**,
+ build/*,
+ build.xml,
+ build.properties.sample,
+ manifest.mf,
+ INSTALL,
+ LICENSE.txt,
+ nlog4j*.jar,
+ classes/**"
excludes="make/make.loc,
- **/*.bak, **/goEnv.bat,
- **/Makefile, **/goEnv.bat,
- docs/pub-support/*,
- dist/classes/org/**,
- src/java/org/apache/log4j/test/**/*,
+ **/*.bak, **/goEnv.bat,
+ **/Makefile, **/goEnv.bat,
+ docs/pub-support/*,
+ dist/classes/org/**,
+ src/java/org/apache/log4j/test/**/*,
**/.#*"/>
</copy>
Modified: nlog4j/trunk/docs/download.html
==============================================================================
--- nlog4j/trunk/docs/download.html (original)
+++ nlog4j/trunk/docs/download.html Tue Aug 16 21:30:43 2005
@@ -49,13 +49,13 @@
<hr noshade="" size="1"/>
<h1>NLOG4J version
1.2.15</strong></h1>
- <p>You can download NLOG4J version 1.2.15,
with native SLF4J
+ <p>You can download NLOG4J version 1.2.16,
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.15.tar.gz";><b>nlog4j-1.2.15.tar.gz</b></a></li>
- <li><a
href="http://www.slf4j.org/dist/nlog4j-1.2.15.zip";><b>nlog4j-1.2.15.zip</b></a></li>
+ <li><a
href="http://www.slf4j.org/dist/nlog4j-1.2.16.tar.gz";><b>nlog4j-1.2.16.tar.gz</b></a></li>
+ <li><a
href="http://www.slf4j.org/dist/nlog4j-1.2.16.zip";><b>nlog4j-1.2.16.zip</b></a></li>
</ul>
<p>NLOG4J is a
production-quality log4j-replacement with
direct SLF4J API support. NLOG4J is maintained by Ceki
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 Tue Aug 16
21:30:43 2005
@@ -234,6 +234,13 @@
}
/**
+ * @deprecated Please use [EMAIL PROTECTED] #debug(String)} method instead.
+ */
+ public void debug(Object message) {
+ debug(message.toString());
+ }
+
+ /**
* Log a message at the <code>DEBUG</code> level with message
* formatting done according to the value of
* <code>format</code> and the <code>arg</code> parameters.
@@ -314,6 +321,13 @@
forcedLog(FQCN, Level.ERROR, message, null);
}
+ /**
+ * @deprecated Please use [EMAIL PROTECTED] #error(String)} method instead.
+ */
+ public void error(Object message) {
+ error(message.toString());
+ }
+
/**
* Log a message at the <code>ERROR</code> level with message
@@ -400,6 +414,14 @@
}
/**
+ * @deprecated Please use [EMAIL PROTECTED] #fatal(String)} method instead.
+ */
+ public void fatal(Object message) {
+ fatal(message.toString());
+ }
+
+
+ /**
* Log an exception (throwable) at the FATAL level with an
* accompanying message.
*
@@ -665,6 +687,13 @@
/**
+ * @deprecated Please use [EMAIL PROTECTED] #info(String)} method instead.
+ */
+ public void info(Object message) {
+ info(message.toString());
+ }
+
+ /**
* Log a message at the <code>INFO</code> level with message
* formatting done according to the value of
* <code>format</code> and the <code>arg</code> parameters.
@@ -1060,6 +1089,14 @@
forcedLog(FQCN, Level.WARN, message, null);
}
+
+ /**
+ * @deprecated Please use [EMAIL PROTECTED] #warn(String)} method instead.
+ */
+ public void warn(Object message) {
+ warn(message.toString());
+ }
+
/**
* Log a message at the <code>WARN</code> level with message
* formatting done according to the value of
Modified: nlog4j/trunk/src/xdocs/download.xml
==============================================================================
--- nlog4j/trunk/src/xdocs/download.xml (original)
+++ nlog4j/trunk/src/xdocs/download.xml Tue Aug 16 21:30:43 2005
@@ -11,14 +11,14 @@
<section name="NLOG4J version 1.2.15">
- <p>You can download NLOG4J version 1.2.15, with native SLF4J
+ <p>You can download NLOG4J version 1.2.16, 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.15.tar.gz";><b>nlog4j-1.2.15.tar.gz</b></a></li>
- <li><a
href="http://www.slf4j.org/dist/nlog4j-1.2.15.zip";><b>nlog4j-1.2.15.zip</b></a></li>
+ <li><a
href="http://www.slf4j.org/dist/nlog4j-1.2.16.tar.gz";><b>nlog4j-1.2.16.tar.gz</b></a></li>
+ <li><a
href="http://www.slf4j.org/dist/nlog4j-1.2.16.zip";><b>nlog4j-1.2.16.zip</b></a></li>
</ul>
Modified: nlog4j/trunk/tests/build.xml
==============================================================================
--- nlog4j/trunk/tests/build.xml (original)
+++ nlog4j/trunk/tests/build.xml Tue Aug 16 21:30:43 2005
@@ -1,11 +1,3 @@
-
-<!-- This file is an ANT build script. ANT is a Java based build tool. -->
-<!-- It is availale from http://jakarta.apache.org/ant/ -->
-
-
-<!-- ================================================================= -->
-<!-- NOTE: all directories are relative to jakarta-log4j/tests -->
-<!-- ================================================================= -->
<project name="log4j" default="usage" basedir="." >
<property file="build.properties"/>
@@ -33,6 +25,19 @@
<pathelement location="${jakarta.oro.jar}"/>
</path>
+ <path id="log4j.classpath">
+ <pathelement location="${tests.source.home}"/>
+ <pathelement location="./classes"/>
+ <pathelement location="./resources"/>
+ <fileset dir="lib"><include name="log4j*.jar"/></fileset>
+ </path>
+
+ <path id="nlog4j.classpath">
+ <pathelement location="${tests.source.home}"/>
+ <pathelement location="./classes"/>
+ <fileset dir="lib"><include name="nlog4j*.jar"/></fileset>
+ </path>
+
<!-- ================================================================= -->
<!-- TARGETS -->
<!-- ================================================================= -->
@@ -317,11 +322,48 @@
</junit>
</target>
- <!-- ================================================================= -->
+ <target name="Compatibility" depends="build">
+ <delete file="./classes/org/apache/log4j/CompatibilityTest.class"/>
+ <javac srcdir="${tests.source.home}"
+ destdir="./classes"
+ deprecation="${deprecation}"
+ debug="on">
+ <classpath refid="log4j.classpath"/>
+ <include name="org/apache/log4j/CompatibilityTest.java"/>
+ </javac>
+
+ <junit printsummary="yes" fork="yes" haltonfailure="yes">
+ <classpath refid="nlog4j.classpath"/>
+ <formatter type="plain" usefile="false"/>
+ <test name="org.apache.log4j.CompatibilityTest" />
+ </junit>
+ </target>
+
+ <target name="Compatibility2" depends="build">
+ <delete file="./classes/org/apache/log4j/CompatibilityTest.class"/>
+ <javac srcdir="${tests.source.home}"
+ destdir="./classes"
+ deprecation="${deprecation}"
+ debug="on">
+ <classpath refid="nlog4j.classpath"/>
+ <include name="org/apache/log4j/CompatibilityTest.java"/>
+ </javac>
+
+ <junit printsummary="yes" fork="yes" haltonfailure="yes">
+ <classpath refid="log4j.classpath"/>
+ <formatter type="plain" usefile="false"/>
+ <test name="org.apache.log4j.CompatibilityTest" />
+ </junit>
+
+ </target>
+
+ <!--
+ =================================================================
+ -->
<!-- ========================= Very long Tests ======================= -->
<!-- ================================================================= -->
- <!-- none yet, but StressCategory is a good candidate... -->
+
</project>
_______________________________________________
nlog4j-dev mailing list
[email protected]
http://slf4j.org/mailman/listinfo/nlog4j-dev
