[slf4j-dev] svn commit: r394 - in slf4j/trunk: . src/filtered-java/org/slf4j/impl src/java/org/slf4j src/java/org/slf4j/impl src/pom tests tests/input/log4j12x tests/input/nlog4j12x
ceki at slf4j.org
ceki at slf4j.org
Wed Oct 19 13:44:20 CEST 2005
Author: ceki
Date: Wed Oct 19 13:44:18 2005
New Revision: 394
Added:
slf4j/trunk/src/java/org/slf4j/MarkingLogger.java
slf4j/trunk/tests/input/log4j12x/
- copied from r266, slf4j/trunk/tests/input/nlog4j12x/
Removed:
slf4j/trunk/tests/input/nlog4j12x/
Modified:
slf4j/trunk/build.properties
slf4j/trunk/build.xml
slf4j/trunk/src/filtered-java/org/slf4j/impl/StaticBinder.java
slf4j/trunk/src/java/org/slf4j/Logger.java
slf4j/trunk/src/java/org/slf4j/impl/JDK14LoggerAdapter.java
slf4j/trunk/src/java/org/slf4j/impl/Log4jLoggerAdapter.java
slf4j/trunk/src/java/org/slf4j/impl/NOPLogger.java
slf4j/trunk/src/java/org/slf4j/impl/SimpleLogger.java
slf4j/trunk/src/pom/project-JCL-over-SLF4J.xml
slf4j/trunk/tests/build.xml
Log:
- Separated Logger into two interfaces: Logger and MarkingLogger. The latter interface
includes support for Marker. This separation has the advantage of reducing the weight
of the Logger interface.
Modified: slf4j/trunk/build.properties
==============================================================================
--- slf4j/trunk/build.properties (original)
+++ slf4j/trunk/build.properties Wed Oct 19 13:44:18 2005
@@ -2,7 +2,7 @@
# This properties file hold properties shared among several Ant
# scripts
-version=1.0-beta7
+version=1.0-beta8
jcl-version=104
jcl.jar=jcl${jcl-version}-over-slf4j.jar
\ No newline at end of file
Modified: slf4j/trunk/build.xml
==============================================================================
--- slf4j/trunk/build.xml (original)
+++ slf4j/trunk/build.xml Wed Oct 19 13:44:18 2005
@@ -1,308 +1,318 @@
-<project name="slf4j" default="usage" basedir="." >
+<project name="slf4j" default="usage" basedir=".">
- <!-- The build.properties file defines the path to local files -->
- <property file="build.properties"/>
+ <!-- The build.properties file defines the path to local files -->
+ <property file="build.properties" />
- <property file="local.properties"/>
-
- <property name="tmp.java.source.dir" value="./tmp/src"/>
- <property name="tmp.javac.dest" value="./tmp/classes"/>
-
- <property name="dist.images" value="dist/images"/>
- <property name="dist.tmp" value="dist/tmp"/>
-
- <property name="deprecation" value="on"/>
-
- <property name="SLF4J_STEM" value="org/slf4j"/>
- <property name="JCL_STEM" value="org/apache/commons/logging"/>
-
- <!-- ================================================================= -->
- <!-- Default target -->
- <!-- ================================================================= -->
- <target name="usage">
- <echo>
+ <property file="local.properties" />
+
+ <property name="tmp.java.source.dir" value="./tmp/src" />
+ <property name="tmp.javac.dest" value="./tmp/classes" />
+
+ <property name="dist.images" value="dist/images" />
+ <property name="dist.tmp" value="dist/tmp" />
+
+ <property name="deprecation" value="on" />
+
+ <property name="SLF4J_STEM" value="org/slf4j" />
+ <property name="JCL_STEM" value="org/apache/commons/logging" />
+
+ <!-- ================================================================= -->
+ <!-- Default target -->
+ <!-- ================================================================= -->
+ <target name="usage">
+ <echo>
These are some of the targets supported by this ANT build scpript:
slf4j-nop.jar - build the jar file of the same name.
slf4j-simple.jar - build the jar file of the same name.
- slf4j-jdk14.jar - build the jar file of the same name.
+ slf4j-log4j.jar - build the jar fil of the same name.
+ slf4j-jdk14.jar - build the jar file of the same name.
jcl-over-slf4j.jar - JCL 1.0.4 implemented over SLF4J
jar - all of the above jar files
</echo>
- </target>
+ </target>
- <target name="init">
- <mkdir dir="tmp"/>
- <mkdir dir="${tmp.java.source.dir}"/>
- <mkdir dir="${tmp.javac.dest}"/>
- </target>
-
- <!-- ================================================================= -->
- <!-- Remove all generated (compiled) class files. -->
- <!-- ================================================================= -->
- <target name="clean" description="Delete all compiled SLF4J files.">
- <delete dir="${javac.dest}/org/slf4j" />
- </target>
-
-
- <target name="julCheck">
- <available classname="java.util.logging.Logger" property="julPresent">
- </available>
+ <target name="init">
+ <mkdir dir="tmp" />
+ <mkdir dir="${tmp.java.source.dir}" />
+ <mkdir dir="${tmp.javac.dest}" />
+ </target>
+
+ <path id="regular.classpath">
+ </path>
+
+ <path id="log4j.classpath">
+ <fileset dir="./lib">
+ <include name="log4j*.jar" />
+ </fileset>
+ </path>
+
+ <!-- ================================================================= -->
+ <!-- Remove all generated (compiled) class files. -->
+ <!-- ================================================================= -->
+ <target name="clean" description="Delete all compiled SLF4J files.">
+ <delete dir="${javac.dest}/org/slf4j" />
+ </target>
+
+
+ <target name="julCheck">
+ <available classname="java.util.logging.Logger" property="julPresent">
+ </available>
- <fail unless="julPresent">
+ <fail unless="julPresent">
Building the SLF4J implementation for JDK 1.4 logging
requires the presence of JDK 1.4 or later.
</fail>
- </target>
+ </target>
-
- <!-- =================================================================== -->
- <!-- Generic target that can build NOP, Simple and JDK14 implementations -->
- <!-- as specified by the "jar-name" and "impl" parameters. -->
- <!-- =================================================================== -->
- <target name="compile-IMPL" depends="init">
- <!-- delete all previously existing files in tmp -->
- <delete><fileset dir="tmp/" includes="**/*"/></delete>
-
- <!-- copy a filtered version of slf4j to tmp/src -->
- <copy todir="${tmp.java.source.dir}">
- <fileset dir="src/filtered-java">
- <include name="**/*.java"/>
- </fileset>
- <filterset><filter token="IMPL" value="${IMPL}"/></filterset>
- </copy>
-
- <copy todir="${tmp.java.source.dir}">
- <fileset dir="src/java">
- <include name="**/*.java"/>
- </fileset>
- </copy>
-
- <javac srcdir="${tmp.java.source.dir}"
- destdir="${tmp.javac.dest}"
- deprecation="on"
- includes="${SLF4J_STEM}/*.java,
+ <target name="log4jCheck">
+ <available classname="org.apache.log4j.Logger" property="log4jPresent">
+ <classpath refid="log4j.classpath"/>
+ </available>
+
+ <fail unless="log4jPresent">
+ Building the SLF4J implementation for the log4j system
+ requires the presence of log4j 1.2.x or later.
+ </fail>
+ </target>
+
+
+ <!-- =================================================================== -->
+ <!-- Generic target that can build NOP, Simple and JDK14 implementations -->
+ <!-- as specified by the "jar-name" and "impl" parameters. -->
+ <!-- =================================================================== -->
+ <target name="compile-IMPL" depends="init">
+ <!-- delete all previously existing files in tmp -->
+ <delete>
+ <fileset dir="tmp/" includes="**/*" />
+ </delete>
+
+ <!-- copy a filtered version of slf4j to tmp/src -->
+ <copy todir="${tmp.java.source.dir}">
+ <fileset dir="src/filtered-java">
+ <include name="**/*.java" />
+ </fileset>
+ <filterset>
+ <filter token="IMPL" value="${IMPL}" />
+ </filterset>
+ </copy>
+
+ <copy todir="${tmp.java.source.dir}">
+ <fileset dir="src/java">
+ <include name="**/*.java" />
+ </fileset>
+ </copy>
+
+ <javac srcdir="${tmp.java.source.dir}" destdir="${tmp.javac.dest}" deprecation="on" includes="${SLF4J_STEM}/*.java,
${SLF4J_STEM}/impl/MessageFormatter.java,
${SLF4J_STEM}/impl/Util.java
${SLF4J_STEM}/impl/${impl}*.java
- ${SLF4J_STEM}/spi/*.java"
- debug="${debug}">
- </javac>
-
- </target>
-
- <!-- =================================================================== -->
- <!-- Generic target that can build NOP, Simple and JDK14 implementations -->
- <!-- as specified by the "jar-name" and "impl" parameters. -->
- <!-- =================================================================== -->
- <target name="slf4j-IMPL.jar" depends="init">
-
- <antcall target="compile-IMPL">
- <param name="IMPL" value="${IMPL}"/>
- </antcall>
-
- <jar jarfile="${jar-name}" basedir="${tmp.javac.dest}"
- includes="${SLF4J_STEM}/*.class,
+ ${SLF4J_STEM}/spi/*.java" debug="${debug}">
+ <classpath refid="${IMPL.CLASSPATH}"/>
+ </javac>
+
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Generic target that can build NOP, Simple and JDK14 implementations -->
+ <!-- as specified by the "jar-name" and "impl" parameters. -->
+ <!-- =================================================================== -->
+ <target name="slf4j-IMPL.jar" depends="init">
+
+ <antcall target="compile-IMPL">
+ <param name="IMPL" value="${IMPL}" />
+ </antcall>
+
+ <jar jarfile="${jar-name}" basedir="${tmp.javac.dest}" includes="${SLF4J_STEM}/*.class,
${SLF4J_STEM}/spi/*.class,
${SLF4J_STEM}/impl/MessageFormatter.class,
${SLF4J_STEM}/impl/Util.class,
${SLF4J_STEM}/impl/*Binder.class,
- ${SLF4J_STEM}/impl/${IMPL}*.class"
- >
- <manifest>
- <section name="org/slf4j/">
- <attribute name="Implementation-Title" value="${IMPL} implementation"/>
- <attribute name="Implementation-Version" value="${version}"/>
- <attribute name="Implementation-Vendor" value="SLF4J.ORG"/>
- </section>
- </manifest>
- </jar>
-
- </target>
-
-
- <target name="slf4j-nop.jar">
- <antcall target="slf4j-IMPL.jar">
- <param name="IMPL" value="NOP"/>
- <param name="jar-name" value="slf4j-nop.jar"/>
- </antcall>
- </target>
-
- <target name="slf4j-simple.jar">
- <antcall target="slf4j-IMPL.jar">
- <param name="IMPL" value="Simple"/>
- <param name="jar-name" value="slf4j-simple.jar"/>
- </antcall>
- </target>
-
- <target name="slf4j-jdk14.jar" depends="julCheck">
- <antcall target="slf4j-IMPL.jar">
- <param name="IMPL" value="JDK14"/>
- <param name="jar-name" value="slf4j-jdk14.jar"/>
- </antcall>
- </target>
-
- <target name="jcl-over-slf4j.jar" depends="slf4j-nop.jar">
-
- <antcall target="compile-IMPL">
- <param name="IMPL" value="NOP"/>
- </antcall>
-
- <javac srcdir="${tmp.java.source.dir}"
- destdir="${tmp.javac.dest}"
- deprecation="on"
- includes="${JCL_STEM}/**/*.java"
- debug="${debug}">
- </javac>
-
- <jar jarfile="${jcl.jar}" basedir="${tmp.javac.dest}"
- includes="${JCL_STEM}/**/*.class">
- <manifest>
- <section name="org/apache/commons/logging">
- <attribute name="Implementation-Title" value="JCL over SLF4J"/>
- <attribute name="Implementation-Version" value="${jcl-version}"/>
- <attribute name="Implementation-Vendor" value="SLF4J.ORG"/>
- </section>
- </manifest>
- </jar>
- </target>
-
-
- <target name="jar" depends="slf4j-nop.jar, jcl-over-slf4j.jar, slf4j-simple.jar, slf4j-jdk14.jar"/>
-
- <!-- Build Javadoc -->
- <target name="javadoc" depends="init">
-
- <!-- delete all previously existing files in tmp -->
- <delete><fileset dir="tmp/" includes="**/*"/></delete>
-
- <!-- copy a filtered version of slf4j to tmp/src -->
- <copy todir="tmp/src">
- <fileset dir="src/filtered-java">
- <include name="**/*.java"/>
- </fileset>
- <filterset><filter token="IMPL" value="NOP"/></filterset>
- <filterset><filter token="MARKER_FACTORY_IMPL_PREFIX"
- value="Basic"/>
- </filterset>
- </copy>
-
- <copy todir="tmp/src">
- <fileset dir="src/java">
- <include name="**/*.java"/>
- <include name="**/*.html"/>
- </fileset>
- </copy>
-
- <mkdir dir="${javadoc.dest}" />
-
- <javadoc destdir="${javadoc.dest}"
- packagenames="org.slf4j.*, org.apache.commons.logging.*"
- additionalparam="-breakiterator"
- version="true"
- protected="true"
- author="true"
- use="true"
- overview="src/docs/overview.html"
- doctitle="SLF4J version ${version}"
- windowtitle="SLF4J Version ${version}"
- >
-
- <sourcepath>
- <path path="${tmp.java.source.dir}"/>
- </sourcepath>
-
- <group>
- <title>SLF4J</title>
- <package name="org.slf4j"/>
- <package name="org.slf4j.impl"/>
- <package name="org.slf4j.spi"/>
- </group>
-
- <group>
- <title>Jakarta Commons Logging (implemented over SLF4J)</title>
- <package name="org.apache.commons.logging"/>
- <package name="org.apache.commons.logging.impl"/>
- </group>
+ ${SLF4J_STEM}/impl/${IMPL}*.class">
+ <manifest>
+ <section name="org/slf4j/">
+ <attribute name="Implementation-Title" value="${IMPL} implementation" />
+ <attribute name="Implementation-Version" value="${version}" />
+ <attribute name="Implementation-Vendor" value="SLF4J.ORG" />
+ </section>
+ </manifest>
+ </jar>
+
+ </target>
+
+
+ <target name="slf4j-nop.jar">
+ <antcall target="slf4j-IMPL.jar">
+ <param name="IMPL" value="NOP" />
+ <param name="jar-name" value="slf4j-nop.jar" />
+ <param name="IMPL.CLASSPATH" value="regular.classpath" />
+ </antcall>
+ </target>
+
+ <target name="slf4j-simple.jar">
+ <antcall target="slf4j-IMPL.jar">
+ <param name="IMPL" value="Simple" />
+ <param name="jar-name" value="slf4j-simple.jar" />
+ <param name="IMPL.CLASSPATH" value="regular.classpath" />
+ </antcall>
+ </target>
+
+ <target name="slf4j-log4j.jar" depends="log4jCheck">
+ <antcall target="slf4j-IMPL.jar">
+ <param name="IMPL" value="Log4j" />
+ <param name="jar-name" value="slf4j-log4j.jar" />
+ <param name="IMPL.CLASSPATH" value="log4j.classpath" />
+ </antcall>
+ </target>
+
+ <target name="slf4j-jdk14.jar" depends="julCheck">
+ <antcall target="slf4j-IMPL.jar">
+ <param name="IMPL" value="JDK14" />
+ <param name="jar-name" value="slf4j-jdk14.jar" />
+ <param name="IMPL.CLASSPATH" value="regular.classpath" />
+ </antcall>
+ </target>
+
+ <target name="jcl-over-slf4j.jar" depends="slf4j-nop.jar">
+
+ <antcall target="compile-IMPL">
+ <param name="IMPL" value="NOP" />
+ <param name="IMPL.CLASSPATH" value="regular.classpath" />
+ </antcall>
+
+ <javac srcdir="${tmp.java.source.dir}" destdir="${tmp.javac.dest}" deprecation="on" includes="${JCL_STEM}/**/*.java" debug="${debug}">
+ </javac>
+
+ <jar jarfile="${jcl.jar}" basedir="${tmp.javac.dest}" includes="${JCL_STEM}/**/*.class">
+ <manifest>
+ <section name="org/apache/commons/logging">
+ <attribute name="Implementation-Title" value="JCL over SLF4J" />
+ <attribute name="Implementation-Version" value="${jcl-version}" />
+ <attribute name="Implementation-Vendor" value="SLF4J.ORG" />
+ </section>
+ </manifest>
+ </jar>
+ </target>
+
+
+ <target name="jar" depends="slf4j-nop.jar, jcl-over-slf4j.jar, slf4j-simple.jar, slf4j-jdk14.jar" />
+
+ <!-- Build Javadoc -->
+ <target name="javadoc" depends="init">
+
+ <!-- delete all previously existing files in tmp -->
+ <delete>
+ <fileset dir="tmp/" includes="**/*" />
+ </delete>
+
+ <!-- copy a filtered version of slf4j to tmp/src -->
+ <copy todir="tmp/src">
+ <fileset dir="src/filtered-java">
+ <include name="**/*.java" />
+ </fileset>
+ <filterset>
+ <filter token="IMPL" value="NOP" />
+ </filterset>
+ <filterset>
+ <filter token="MARKER_FACTORY_IMPL_PREFIX" value="Basic" />
+ </filterset>
+ </copy>
+
+ <copy todir="tmp/src">
+ <fileset dir="src/java">
+ <include name="**/*.java" />
+ <include name="**/*.html" />
+ </fileset>
+ </copy>
+
+ <mkdir dir="${javadoc.dest}" />
+
+ <javadoc destdir="${javadoc.dest}" packagenames="org.slf4j.*, org.apache.commons.logging.*" additionalparam="-breakiterator" version="true" protected="true" author="true" use="true" overview="src/docs/overview.html" doctitle="SLF4J version ${version}" windowtitle="SLF4J Version ${version}">
+
+ <classpath refid="log4j.classpath"/>
+
+ <sourcepath>
+ <path path="${tmp.java.source.dir}" />
+ </sourcepath>
+
+ <group>
+ <title>SLF4J</title>
+ <package name="org.slf4j" />
+ <package name="org.slf4j.impl" />
+ <package name="org.slf4j.spi" />
+ </group>
+
+ <group>
+ <title>Jakarta Commons Logging (implemented over SLF4J)</title>
+ <package name="org.apache.commons.logging" />
+ <package name="org.apache.commons.logging.impl" />
+ </group>
-
- <header>
+
+ <header>
<b>SLF4J ${version}</b><br/>
</header>
- <footer>
+ <footer>
Copyright 2004-2005
<a href="http://www.slf4j.org"><b>SLF4J.ORG</b></a>
<br/>
</footer>
- <bottom>
+ <bottom>
<small/>Jakarta Commons Logging is copyrighted by the Apache Software Foundation<small/>.
</bottom>
- </javadoc>
- </target>
+ </javadoc>
+ </target>
+
+
+ <target name="site">
+ <ant dir="${slf4j-site}" antfile="build.xml" target="site" />
+ </target>
+
+ <!-- ================================================================= -->
+ <!-- Build a complete distribution. Results go to ${dist.images} -->
+ <!-- ================================================================= -->
+ <target name="dist" depends="init, clean, javadoc, jar, site">
+
+ <delete verbose="true">
+ <fileset dir=".">
+ <patternset>
+ <include name="**/*.bak" />
+ <include name="${BSTEM}/**/temp*" />
+ </patternset>
+ </fileset>
+ </delete>
+
+ <mkdir dir="${dist.images}" />
+
+ <mkdir dir="${dist.tmp}/slf4j-${version}" />
-
- <target name="site">
- <ant dir="${slf4j-site}" antfile="build.xml" target="site"/>
- </target>
-
- <!-- ================================================================= -->
- <!-- Build a complete distribution. Results go to ${dist.images} -->
- <!-- ================================================================= -->
- <target name="dist" depends="init, clean, javadoc, jar, site">
-
- <delete verbose="true">
- <fileset dir=".">
- <patternset>
- <include name="**/*.bak"/>
- <include name="${BSTEM}/**/temp*"/>
- </patternset>
- </fileset>
- </delete>
-
- <mkdir dir="${dist.images}" />
-
- <mkdir dir="${dist.tmp}/slf4j-${version}" />
-
- <copy todir="${dist.tmp}/slf4j-${version}">
- <fileset dir="./"
- includes="src/**,
+ <copy todir="${dist.tmp}/slf4j-${version}">
+ <fileset dir="./" includes="src/**,
build.xml,
build.properties,
local.properties.sample,
INSTALL.txt,
LICENSE.txt,
${jcl.jar},
- slf4j-*.jar"
+ slf4j-*.jar" excludes="**/*.bak,
+ **/.#*" />
+ </copy>
- excludes="**/*.bak,
- **/.#*"
- />
- </copy>
-
- <copy todir="${dist.tmp}/slf4j-${version}">
- <fileset dir="${slf4j-site}/"
- includes="docs/**"
-
- excludes="docs/dist/**,
+ <copy todir="${dist.tmp}/slf4j-${version}">
+ <fileset dir="${slf4j-site}/" includes="docs/**" excludes="docs/dist/**,
*.bak,
- **/.#*"
- />
- </copy>
-
- <tar tarfile="${dist.images}/slf4j-${version}.tar"
- basedir="${dist.tmp}"
- includes="slf4j-${version}/**" />
-
- <gzip src="${dist.images}/slf4j-${version}.tar"
- zipfile="${slf4j-site}/docs/dist/slf4j-${version}.tar.gz" />
-
- <zip zipfile="${slf4j-site}/docs/dist/slf4j-${version}.zip"
- basedir="${dist.tmp}"
- includes="slf4j-${version}/**" />
+ **/.#*" />
+ </copy>
+
+ <tar tarfile="${dist.images}/slf4j-${version}.tar" basedir="${dist.tmp}" includes="slf4j-${version}/**" />
+
+ <gzip src="${dist.images}/slf4j-${version}.tar" zipfile="${slf4j-site}/docs/dist/slf4j-${version}.tar.gz" />
+
+ <zip zipfile="${slf4j-site}/docs/dist/slf4j-${version}.zip" basedir="${dist.tmp}" includes="slf4j-${version}/**" />
- <delete dir="${dist.tmp}" />
- </target>
+ <delete dir="${dist.tmp}" />
+ </target>
</project>
Modified: slf4j/trunk/src/filtered-java/org/slf4j/impl/StaticBinder.java
==============================================================================
--- slf4j/trunk/src/filtered-java/org/slf4j/impl/StaticBinder.java (original)
+++ slf4j/trunk/src/filtered-java/org/slf4j/impl/StaticBinder.java Wed Oct 19 13:44:18 2005
@@ -56,16 +56,21 @@
* The unique instance of this class.
*/
public static final StaticBinder SINGLETON = new StaticBinder();
+ // Note: @IMPL@ gets substituted at build time by an appropriate Ant task
+ private static final String loggerFactoryClassStr ="org.slf4j.impl. at IMPL@LoggerFactory";
+
+ /** The ILoggerFactory instance returned by the {@link #getLoggerFactory} method
+ * should always be the same object
+ */
+ private final ILoggerFactory loggerFactory;
private StaticBinder() {
+// Note: @IMPL@ gets substituted at build time by an appropriate Ant task
+ loggerFactory = new org.slf4j.impl. at IMPL@LoggerFactory();
}
- // Note: @IMPL@ gets substituted at build time by an appropriate Ant task
- static final String loggerFactoryClassStr ="org.slf4j.impl. at IMPL@LoggerFactory";
-
public ILoggerFactory getLoggerFactory() {
- // Note: @IMPL@ gets substituted at build time by an appropriate Ant task
- return new org.slf4j.impl. at IMPL@LoggerFactory();
+ return loggerFactory;
}
public String getLoggerFactoryClassStr() {
Modified: slf4j/trunk/src/java/org/slf4j/Logger.java
==============================================================================
--- slf4j/trunk/src/java/org/slf4j/Logger.java (original)
+++ slf4j/trunk/src/java/org/slf4j/Logger.java Wed Oct 19 13:44:18 2005
@@ -53,14 +53,6 @@
* false otherwise.
*/
public boolean isDebugEnabled();
-
- /**
- * Similar to {@link #isDebugEnabled()} method except that the
- * marker data is also taken into account.
- *
- * @param marker The marker data to take into consideration
- */
- public boolean isDebugEnabled(Marker marker);
/**
* Log a message at the DEBUG level.
@@ -106,47 +98,6 @@
*/
public void debug(String msg, Throwable t);
- /**
- * Log a message with the specific Marker at the DEBUG level.
- *
- * @param marker the marker data specific to this log statement
- * @param msg the message string to be logged
- */
- public void debug(Marker marker, String msg);
-
- /**
- * This method is similar to {@link #debug(String, Object)} method except that the
- * marker data is also taken into consideration.
- *
- * @param marker the marker data specific to this log statement
- * @param format the format string
- * @param arg the argument
- */
- public void debug(Marker marker, String format, Object arg);
-
-
- /**
- * This method is similar to {@link #debug(String, Object, Object)}
- * method except that the marker data is also taken into
- * consideration.
- *
- * @param marker the marker data specific to this log statement
- * @param format the format string
- * @param arg1 the first argument
- * @param arg2 the second argument
- */
- public void debug(Marker marker, String format, Object arg1, Object arg2);
-
- /**
- * This method is similar to {@link #debug(String, Throwable)} method except that the
- * marker data is also taken into consideration.
- *
- * @param marker the marker data specific to this log statement
- * @param msg the message accompanying the exception
- * @param t the exception (throwable) to log
- */
- public void debug(Marker marker, String msg, Throwable t);
-
/**
* Is the logger instance enabled for the INFO level?
@@ -157,14 +108,6 @@
/**
- * Similar to {@link #isInfoEnabled()} method except that the marker
- * data is also taken into consideration.
- *
- * @param marker The marker data to take into consideration
- */
- public boolean isInfoEnabled(Marker marker);
-
- /**
* Log a message at the INFO level.
*
* @param msg the message string to be logged
@@ -208,47 +151,6 @@
public void info(String msg, Throwable t);
/**
- * Log a message with the specific Marker at the INFO level.
- *
- * @param marker The marker specific to this log statement
- * @param msg the message string to be logged
- */
- public void info(Marker marker, String msg);
-
- /**
- * This method is similar to {@link #info(String, Object)} method except that the
- * marker data is also taken into consideration.
- *
- * @param marker the marker data specific to this log statement
- * @param format the format string
- * @param arg the argument
- */
- public void info(Marker marker, String format, Object arg);
-
- /**
- * This method is similar to {@link #info(String, Object, Object)}
- * method except that the marker data is also taken into
- * consideration.
- *
- * @param marker the marker data specific to this log statement
- * @param format the format string
- * @param arg1 the first argument
- * @param arg2 the second argument
- */
- public void info(Marker marker, String format, Object arg1, Object arg2);
-
- /**
- * This method is similar to {@link #info(String, Throwable)} method
- * except that the marker data is also taken into consideration.
- *
- * @param marker the marker data for this log statement
- * @param msg the message accompanying the exception
- * @param t the exception (throwable) to log
- */
- public void info(Marker marker, String msg, Throwable t);
-
-
- /**
* Is the logger instance enabled for the WARN level?
* @return True if this Logger is enabled for the WARN level,
* false otherwise.
@@ -296,56 +198,6 @@
*/
public void warn(String msg, Throwable t);
- /**
- * Similar to {@link #isWarnEnabled()} method except that the marker
- * data is also taken into consideration.
- *
- * @param marker The marker data to take into consideration
- */
- public boolean isWarnEnabled(Marker marker);
-
- /**
- * Log a message with the specific Marker at the WARN level.
- *
- * @param marker The marker specific to this log statement
- * @param msg the message string to be logged
- */
- public void warn(Marker marker, String msg);
-
- /**
- * This method is similar to {@link #warn(String, Object)} method except that the
- * marker data is also taken into consideration.
- *
- * @param marker the marker data specific to this log statement
- * @param format the format string
- * @param arg the argument
- */
- public void warn(Marker marker, String format, Object arg);
-
- /**
- * This method is similar to {@link #warn(String, Object, Object)}
- * method except that the marker data is also taken into
- * consideration.
- *
- * @param marker the marker data specific to this log statement
- * @param format the format string
- * @param arg1 the first argument
- * @param arg2 the second argument
- */
- public void warn(Marker marker, String format, Object arg1, Object arg2);
-
-
- /**
- * This method is similar to {@link #warn(String, Throwable)} method
- * except that the marker data is also taken into consideration.
- *
- * @param marker the marker data for this log statement
- * @param msg the message accompanying the exception
- * @param t the exception (throwable) to log
- */
- public void warn(Marker marker, String msg, Throwable t);
-
-
/**
* Is the logger instance enabled for the ERROR level?
@@ -395,55 +247,4 @@
*/
public void error(String msg, Throwable t);
- /**
- * Similar to {@link #isErrorEnabled()} method except that the
- * marker data is also taken into consideration.
- *
- * @param marker The marker data to take into consideration
- */
- public boolean isErrorEnabled(Marker marker);
-
- /**
- * Log a message with the specific Marker at the ERROR level.
- *
- * @param marker The marker specific to this log statement
- * @param msg the message string to be logged
- */
- public void error(Marker marker, String msg);
-
- /**
- * This method is similar to {@link #error(String, Object)} method except that the
- * marker data is also taken into consideration.
- *
- * @param marker the marker data specific to this log statement
- * @param format the format string
- * @param arg the argument
- */
- public void error(Marker marker, String format, Object arg);
-
- /**
- * This method is similar to {@link #error(String, Object, Object)}
- * method except that the marker data is also taken into
- * consideration.
- *
- * @param marker the marker data specific to this log statement
- * @param format the format string
- * @param arg1 the first argument
- * @param arg2 the second argument
- */
- public void error(Marker marker, String format, Object arg1, Object arg2);
-
-
- /**
- * This method is similar to {@link #error(String, Throwable)}
- * method except that the marker data is also taken into
- * consideration.
- *
- * @param marker the marker data specific to this log statement
- * @param msg the message accompanying the exception
- * @param t the exception (throwable) to log
- */
- public void error(Marker marker, String msg, Throwable t);
-
-
}
Added: slf4j/trunk/src/java/org/slf4j/MarkingLogger.java
==============================================================================
--- (empty file)
+++ slf4j/trunk/src/java/org/slf4j/MarkingLogger.java Wed Oct 19 13:44:18 2005
@@ -0,0 +1,246 @@
+/*
+ * Copyright (c) 2004-2005 SLF4J.ORG
+ *
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, and/or sell copies of the Software, and to permit persons
+ * to whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY
+ * SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+ * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Except as contained in this notice, the name of a copyright holder
+ * shall not be used in advertising or otherwise to promote the sale, use
+ * or other dealings in this Software without prior written authorization
+ * of the copyright holder.
+ *
+ */
+
+package org.slf4j;
+
+/**
+ *
+ * The main user interface to logging. It is expected that logging
+ * takes place through concrete implementations of this interface.
+ *
+ * @author <a href="http://www.qos.ch/log4j/">Ceki Gülcü</a>
+ */
+public interface MarkingLogger extends Logger {
+
+
+
+ /**
+ * Similar to {@link #isDebugEnabled()} method except that the
+ * marker data is also taken into account.
+ *
+ * @param marker The marker data to take into consideration
+ */
+ public boolean isDebugEnabled(Marker marker);
+
+ /**
+ * Log a message with the specific Marker at the DEBUG level.
+ *
+ * @param marker the marker data specific to this log statement
+ * @param msg the message string to be logged
+ */
+ public void debug(Marker marker, String msg);
+
+ /**
+ * This method is similar to {@link #debug(String, Object)} method except that the
+ * marker data is also taken into consideration.
+ *
+ * @param marker the marker data specific to this log statement
+ * @param format the format string
+ * @param arg the argument
+ */
+ public void debug(Marker marker, String format, Object arg);
+
+
+ /**
+ * This method is similar to {@link #debug(String, Object, Object)}
+ * method except that the marker data is also taken into
+ * consideration.
+ *
+ * @param marker the marker data specific to this log statement
+ * @param format the format string
+ * @param arg1 the first argument
+ * @param arg2 the second argument
+ */
+ public void debug(Marker marker, String format, Object arg1, Object arg2);
+
+ /**
+ * This method is similar to {@link #debug(String, Throwable)} method except that the
+ * marker data is also taken into consideration.
+ *
+ * @param marker the marker data specific to this log statement
+ * @param msg the message accompanying the exception
+ * @param t the exception (throwable) to log
+ */
+ public void debug(Marker marker, String msg, Throwable t);
+
+
+ /**
+ * Similar to {@link #isInfoEnabled()} method except that the marker
+ * data is also taken into consideration.
+ *
+ * @param marker The marker data to take into consideration
+ */
+ public boolean isInfoEnabled(Marker marker);
+
+ /**
+ * Log a message with the specific Marker at the INFO level.
+ *
+ * @param marker The marker specific to this log statement
+ * @param msg the message string to be logged
+ */
+ public void info(Marker marker, String msg);
+
+ /**
+ * This method is similar to {@link #info(String, Object)} method except that the
+ * marker data is also taken into consideration.
+ *
+ * @param marker the marker data specific to this log statement
+ * @param format the format string
+ * @param arg the argument
+ */
+ public void info(Marker marker, String format, Object arg);
+
+ /**
+ * This method is similar to {@link #info(String, Object, Object)}
+ * method except that the marker data is also taken into
+ * consideration.
+ *
+ * @param marker the marker data specific to this log statement
+ * @param format the format string
+ * @param arg1 the first argument
+ * @param arg2 the second argument
+ */
+ public void info(Marker marker, String format, Object arg1, Object arg2);
+
+ /**
+ * This method is similar to {@link #info(String, Throwable)} method
+ * except that the marker data is also taken into consideration.
+ *
+ * @param marker the marker data for this log statement
+ * @param msg the message accompanying the exception
+ * @param t the exception (throwable) to log
+ */
+ public void info(Marker marker, String msg, Throwable t);
+
+ /**
+ * Similar to {@link #isWarnEnabled()} method except that the marker
+ * data is also taken into consideration.
+ *
+ * @param marker The marker data to take into consideration
+ */
+ public boolean isWarnEnabled(Marker marker);
+
+ /**
+ * Log a message with the specific Marker at the WARN level.
+ *
+ * @param marker The marker specific to this log statement
+ * @param msg the message string to be logged
+ */
+ public void warn(Marker marker, String msg);
+
+ /**
+ * This method is similar to {@link #warn(String, Object)} method except that the
+ * marker data is also taken into consideration.
+ *
+ * @param marker the marker data specific to this log statement
+ * @param format the format string
+ * @param arg the argument
+ */
+ public void warn(Marker marker, String format, Object arg);
+
+ /**
+ * This method is similar to {@link #warn(String, Object, Object)}
+ * method except that the marker data is also taken into
+ * consideration.
+ *
+ * @param marker the marker data specific to this log statement
+ * @param format the format string
+ * @param arg1 the first argument
+ * @param arg2 the second argument
+ */
+ public void warn(Marker marker, String format, Object arg1, Object arg2);
+
+
+ /**
+ * This method is similar to {@link #warn(String, Throwable)} method
+ * except that the marker data is also taken into consideration.
+ *
+ * @param marker the marker data for this log statement
+ * @param msg the message accompanying the exception
+ * @param t the exception (throwable) to log
+ */
+ public void warn(Marker marker, String msg, Throwable t);
+
+
+
+
+ /**
+ * Similar to {@link #isErrorEnabled()} method except that the
+ * marker data is also taken into consideration.
+ *
+ * @param marker The marker data to take into consideration
+ */
+ public boolean isErrorEnabled(Marker marker);
+
+ /**
+ * Log a message with the specific Marker at the ERROR level.
+ *
+ * @param marker The marker specific to this log statement
+ * @param msg the message string to be logged
+ */
+ public void error(Marker marker, String msg);
+
+ /**
+ * This method is similar to {@link #error(String, Object)} method except that the
+ * marker data is also taken into consideration.
+ *
+ * @param marker the marker data specific to this log statement
+ * @param format the format string
+ * @param arg the argument
+ */
+ public void error(Marker marker, String format, Object arg);
+
+ /**
+ * This method is similar to {@link #error(String, Object, Object)}
+ * method except that the marker data is also taken into
+ * consideration.
+ *
+ * @param marker the marker data specific to this log statement
+ * @param format the format string
+ * @param arg1 the first argument
+ * @param arg2 the second argument
+ */
+ public void error(Marker marker, String format, Object arg1, Object arg2);
+
+
+ /**
+ * This method is similar to {@link #error(String, Throwable)}
+ * method except that the marker data is also taken into
+ * consideration.
+ *
+ * @param marker the marker data specific to this log statement
+ * @param msg the message accompanying the exception
+ * @param t the exception (throwable) to log
+ */
+ public void error(Marker marker, String msg, Throwable t);
+
+}
Modified: slf4j/trunk/src/java/org/slf4j/impl/JDK14LoggerAdapter.java
==============================================================================
--- slf4j/trunk/src/java/org/slf4j/impl/JDK14LoggerAdapter.java (original)
+++ slf4j/trunk/src/java/org/slf4j/impl/JDK14LoggerAdapter.java Wed Oct 19 13:44:18 2005
@@ -34,8 +34,6 @@
package org.slf4j.impl;
import org.slf4j.Logger;
-import org.slf4j.Marker;
-
import java.util.logging.Level;
@@ -70,10 +68,6 @@
return logger.isLoggable(Level.FINE);
}
- public boolean isDebugEnabled(Marker marker) {
- return isDebugEnabled();
- }
-
//
/**
@@ -84,10 +78,6 @@
logger.fine(msg);
}
- public void debug(Marker marker, String msg) {
- debug(msg);
- }
-
/**
* Log a message at level FINE according to the specified format and
* argument.
@@ -105,10 +95,6 @@
}
}
- public void debug(Marker marker, String format, Object arg) {
- debug(format, arg);
- }
-
/**
* Log a message at level FINE according to the specified format and
* arguments.
@@ -127,11 +113,7 @@
}
}
- public void debug(Marker marker, String format, Object arg1, Object arg2) {
- debug(format, arg1, arg2);
- }
-
- /**
+ /**
* Log an exception (throwable) at level FINE with an
* accompanying message.
*
@@ -142,10 +124,6 @@
logger.log(Level.FINE, msg, t);
}
- public void debug(Marker marker, String msg, Throwable t) {
- debug(msg, t);
- }
-
/**
* Is this logger instance enabled for the INFO level?
*
@@ -156,9 +134,6 @@
return logger.isLoggable(Level.INFO);
}
- public final boolean isInfoEnabled(Marker marker) {
- return isInfoEnabled();
- }
/**
* Log a message object at the INFO level.
@@ -169,10 +144,6 @@
logger.info(msg);
}
- public void info(Marker marker, String msg) {
- logger.info(msg);
- }
-
/**
* Log a message at level INFO according to the specified format and
* argument.
@@ -218,18 +189,6 @@
public void info(String msg, Throwable t) {
logger.log(Level.INFO, msg, t);
}
-
- public void info(Marker marker, String format, Object arg) {
- info(format, arg);
- }
-
- public void info(Marker marker, String format, Object arg1, Object arg2) {
- info(format, arg1, arg2);
- }
-
- public void info(Marker marker, String msg, Throwable t) {
- info(msg, t);
- }
/**
* Is this logger instance enabled for the WARNING level?
@@ -241,10 +200,6 @@
return logger.isLoggable(Level.WARNING);
}
- public boolean isWarnEnabled(Marker marker) {
- return isWarnEnabled();
- }
-
/**
* Log a message object at the WARNING level.
*
@@ -300,22 +255,6 @@
logger.log(Level.WARNING, msg.toString(), t);
}
- public void warn(Marker marker, String msg) {
- warn(msg);
- }
-
- public void warn(Marker marker, String format, Object arg) {
- warn(format, arg);
- }
-
- public void warn(Marker marker, String format, Object arg1, Object arg2) {
- warn(format, arg1, arg2);
- }
-
- public void warn(Marker marker, String msg, Throwable t) {
- warn(msg, t);
- }
-
/**
* Is this logger instance enabled for level SEVERE?
*
@@ -326,10 +265,6 @@
return logger.isLoggable(Level.SEVERE);
}
- public boolean isErrorEnabled(Marker marker) {
- return isErrorEnabled();
- }
-
/**
* Log a message object at the SEVERE level.
*
@@ -385,19 +320,4 @@
logger.log(Level.SEVERE, msg, t);
}
- public void error(Marker marker, String msg) {
- error(msg);
- }
-
- public void error(Marker marker, String format, Object arg) {
- error(format, arg);
- }
-
- public void error(Marker marker, String format, Object arg1, Object arg2) {
- error(format, arg1, arg2);
- }
-
- public void error(Marker marker, String msg, Throwable t) {
- error(msg, t);
- }
}
Modified: slf4j/trunk/src/java/org/slf4j/impl/Log4jLoggerAdapter.java
==============================================================================
--- slf4j/trunk/src/java/org/slf4j/impl/Log4jLoggerAdapter.java (original)
+++ slf4j/trunk/src/java/org/slf4j/impl/Log4jLoggerAdapter.java Wed Oct 19 13:44:18 2005
@@ -43,7 +43,7 @@
* A wrapper over {@link org.apache.log4j.Logger
* org.apache.log4j.Logger} in conformance with the {@link Logger}
* interface. Note that the logging levels mentioned in this class
- * refer to those defined in the java.util.logging package.
+ * refer to those defined in the org.apache.log4j.Level class.
* @author Ceki Gülcü
*/
@@ -70,11 +70,6 @@
return logger.isDebugEnabled();
}
- public boolean isDebugEnabled(Marker marker) {
- return isDebugEnabled();
- }
-
- //
/**
* Log a message object at level FINE.
@@ -84,10 +79,6 @@
logger.debug(msg);
}
- public void debug(Marker marker, String msg) {
- debug(msg);
- }
-
/**
* Log a message at level FINE according to the specified format and
* argument.
@@ -105,10 +96,6 @@
}
}
- public void debug(Marker marker, String format, Object arg) {
- debug(format, arg);
- }
-
/**
* Log a message at level FINE according to the specified format and
* arguments.
@@ -127,10 +114,6 @@
}
}
- public void debug(Marker marker, String format, Object arg1, Object arg2) {
- debug(format, arg1, arg2);
- }
-
/**
* Log an exception (throwable) at level FINE with an
* accompanying message.
@@ -142,10 +125,6 @@
logger.debug(msg, t);
}
- public void debug(Marker marker, String msg, Throwable t) {
- debug(msg, t);
- }
-
/**
* Is this logger instance enabled for the INFO level?
*
@@ -169,10 +148,6 @@
logger.info(msg);
}
- public void info(Marker marker, String msg) {
- logger.info(msg);
- }
-
/**
* Log a message at level INFO according to the specified format and
* argument.
@@ -219,18 +194,6 @@
logger.info(msg, t);
}
- public void info(Marker marker, String format, Object arg) {
- info(format, arg);
- }
-
- public void info(Marker marker, String format, Object arg1, Object arg2) {
- info(format, arg1, arg2);
- }
-
- public void info(Marker marker, String msg, Throwable t) {
- info(msg, t);
- }
-
/**
* Is this logger instance enabled for the WARNING level?
*
@@ -241,10 +204,6 @@
return logger.isEnabledFor(Level.WARN);
}
- public boolean isWarnEnabled(Marker marker) {
- return isWarnEnabled();
- }
-
/**
* Log a message object at the WARNING level.
*
@@ -300,22 +259,6 @@
logger.warn(msg, t);
}
- public void warn(Marker marker, String msg) {
- warn(msg);
- }
-
- public void warn(Marker marker, String format, Object arg) {
- warn(format, arg);
- }
-
- public void warn(Marker marker, String format, Object arg1, Object arg2) {
- warn(format, arg1, arg2);
- }
-
- public void warn(Marker marker, String msg, Throwable t) {
- warn(msg, t);
- }
-
/**
* Is this logger instance enabled for level SEVERE?
*
@@ -326,10 +269,6 @@
return logger.isEnabledFor(Level.ERROR);
}
- public boolean isErrorEnabled(Marker marker) {
- return isErrorEnabled();
- }
-
/**
* Log a message object at the SEVERE level.
*
@@ -384,20 +323,4 @@
public void error(String msg, Throwable t) {
logger.error(msg, t);
}
-
- public void error(Marker marker, String msg) {
- error(msg);
- }
-
- public void error(Marker marker, String format, Object arg) {
- error(format, arg);
- }
-
- public void error(Marker marker, String format, Object arg1, Object arg2) {
- error(format, arg1, arg2);
- }
-
- public void error(Marker marker, String msg, Throwable t) {
- error(msg, t);
- }
}
Modified: slf4j/trunk/src/java/org/slf4j/impl/NOPLogger.java
==============================================================================
--- slf4j/trunk/src/java/org/slf4j/impl/NOPLogger.java (original)
+++ slf4j/trunk/src/java/org/slf4j/impl/NOPLogger.java Wed Oct 19 13:44:18 2005
@@ -35,6 +35,7 @@
import org.slf4j.Logger;
import org.slf4j.Marker;
+import org.slf4j.MarkingLogger;
/**
@@ -42,7 +43,7 @@
*
* @author <a href="http://www.qos.ch/log4j/">Ceki Gülcü</a>
*/
-public final class NOPLogger implements Logger {
+public final class NOPLogger implements MarkingLogger {
/**
* The unique instance of NOPLogger.
*/
Modified: slf4j/trunk/src/java/org/slf4j/impl/SimpleLogger.java
==============================================================================
--- slf4j/trunk/src/java/org/slf4j/impl/SimpleLogger.java (original)
+++ slf4j/trunk/src/java/org/slf4j/impl/SimpleLogger.java Wed Oct 19 13:44:18 2005
@@ -33,8 +33,8 @@
package org.slf4j.impl;
-import org.slf4j.Logger;
import org.slf4j.Marker;
+import org.slf4j.MarkingLogger;
/**
@@ -62,7 +62,7 @@
*
* @author <a href="http://www.qos.ch/log4j/">Ceki Gülcü</a>
*/
-public class SimpleLogger implements Logger {
+public class SimpleLogger implements MarkingLogger {
/**
* Mark the time when this class gets loaded into memory.
*/
Modified: slf4j/trunk/src/pom/project-JCL-over-SLF4J.xml
==============================================================================
--- slf4j/trunk/src/pom/project-JCL-over-SLF4J.xml (original)
+++ slf4j/trunk/src/pom/project-JCL-over-SLF4J.xml Wed Oct 19 13:44:18 2005
@@ -3,8 +3,7 @@
<id>jcl104-over-slf4j</id>
<groupId>org.slf4j</groupId>
<name>jcl104-over-slf4j</name>
- <currentVersion>@VERSION@</currentVersion>
- <package>/org/slf4j</package>
+ <currentVersion>@VERSION@</currentVersion>
<description>
See http://www.slf4j.org/manual.html#gradual for details
Modified: slf4j/trunk/tests/build.xml
==============================================================================
--- slf4j/trunk/tests/build.xml (original)
+++ slf4j/trunk/tests/build.xml Wed Oct 19 13:44:18 2005
@@ -1,59 +1,72 @@
-<project name="testing-SLF4J" default="usage" basedir="." >
+<project name="testing-SLF4J" default="usage" basedir=".">
- <property name="tests.source.home" value="./src/java/"/>
- <property name="tests.javac.dest" value="classes"/>
+ <property name="tests.source.home" value="./src/java/" />
+ <property name="tests.javac.dest" value="classes" />
- <property name="version" value="1.0"/>
- <property name="deprecation" value="on"/>
-
- <path id="basic.classpath">
- <pathelement location="${tests.source.home}"/>
- <pathelement location="${tests.javac.dest}"/>
- <pathelement location="${jakarta-oro.jar}"/>
- </path>
-
- <path id="compile.classpath">
- <path refid="basic.classpath"/>
- <pathelement location="../slf4j-simple.jar"/>
- </path>
-
- <path id="nop.classpath">
- <path refid="basic.classpath"/>
- <pathelement location="../slf4j-nop.jar"/>
- </path>
-
- <path id="simple.classpath">
- <path refid="basic.classpath"/>
- <pathelement location="../slf4j-simple.jar"/>
- </path>
-
- <path id="jcl.classpath">
- <path refid="simple.classpath"/>
- <fileset dir="../"><include name="jcl-over-slf4j*.jar"/></fileset>
- </path>
-
- <path id="jcl-nop.classpath">
- <path refid="nop.classpath"/>
- <fileset dir="../"><include name="jcl-over-slf4j*.jar"/></fileset>
- </path>
-
- <path id="jdk14.classpath">
- <path refid="basic.classpath"/>
- <pathelement location="../slf4j-jdk14.jar"/>
- </path>
-
- <path id="nlog4j12x.classpath">
- <path refid="basic.classpath"/>
- <fileset dir="./lib/"><include name="nlog4j*.jar"/></fileset>
- </path>
+ <property name="version" value="1.0" />
+ <property name="deprecation" value="on" />
-
-
- <!-- ================================================================= -->
- <!-- Default target -->
- <!-- ================================================================= -->
- <target name="usage">
- <echo>
+ <path id="basic.classpath">
+ <pathelement location="${tests.source.home}" />
+ <pathelement location="${tests.javac.dest}" />
+ <pathelement location="${jakarta-oro.jar}" />
+ </path>
+
+ <path id="compile.classpath">
+ <path refid="basic.classpath" />
+ <pathelement location="../slf4j-simple.jar" />
+ </path>
+
+ <path id="nop.classpath">
+ <path refid="basic.classpath" />
+ <pathelement location="../slf4j-nop.jar" />
+ </path>
+
+ <path id="simple.classpath">
+ <path refid="basic.classpath" />
+ <pathelement location="../slf4j-simple.jar" />
+ </path>
+
+ <path id="jcl.classpath">
+ <path refid="simple.classpath" />
+ <fileset dir="../">
+ <include name="jcl104-over-slf4j.jar" />
+ </fileset>
+ </path>
+
+ <path id="jcl-nop.classpath">
+ <path refid="nop.classpath" />
+ <fileset dir="../">
+ <include name="jcl104-over-slf4j.jar" />
+ </fileset>
+ </path>
+
+ <path id="jdk14.classpath">
+ <path refid="basic.classpath" />
+ <pathelement location="../slf4j-jdk14.jar" />
+ </path>
+
+ <path id="nlog4j12x.classpath">
+ <path refid="basic.classpath" />
+ <fileset dir="./lib/">
+ <include name="nlog4j*.jar" />
+ </fileset>
+ </path>
+
+ <path id="log4j12x.classpath">
+ <path refid="basic.classpath" />
+ <pathelement location="../slf4j-log4j.jar" />
+ <fileset dir="../lib/">
+ <include name="log4j*.jar" />
+ </fileset>
+ </path>
+
+
+ <!-- ================================================================= -->
+ <!-- Default target -->
+ <!-- ================================================================= -->
+ <target name="usage">
+ <echo>
These are some of the targets supported by this ANT build scpript:
build - compile all project files, if a certain library is missing,
@@ -62,132 +75,148 @@
runAll - run all available tests
</echo>
- </target>
+ </target>
+
+ <target name="init">
+ <mkdir dir="${tests.javac.dest}" />
+ <mkdir dir="output" />
+ </target>
+
+ <target name="clean">
+ <delete>
+ <fileset dir="${tests.javac.dest}" includes="**" />
+ </delete>
+ </target>
+
+ <target name="cleanOutputDir">
+ <delete>
+ <fileset dir="output" includes="**" />
+ </delete>
+ </target>
+
+ <target name="build" depends="init, slf4j-simple.jar">
+ <javac srcdir="${tests.source.home}" destdir="${tests.javac.dest}" includes="**/*.java" deprecation="${deprecation}" debug="on">
+ <classpath refid="compile.classpath" />
+ </javac>
+ </target>
+
+ <target name="slf4j-nop.jar">
+ <!-- Invoke build.xml located one directory up -->
+ <ant dir=".." antfile="build.xml" target="slf4j-nop.jar" />
+ </target>
+
+ <target name="slf4j-simple.jar">
+ <!-- Invoke build.xml located one directory up -->
+ <ant dir=".." antfile="build.xml" target="slf4j-simple.jar" />
+ </target>
+
+ <target name="slf4j-jdk14.jar">
+ <ant dir=".." antfile="build.xml" target="slf4j-jdk14.jar" />
+ </target>
+
+ <target name="slf4j-log4j.jar">
+ <ant dir=".." antfile="build.xml" target="slf4j-log4j.jar" />
+ </target>
+
+ <target name="jcl-over-slf4j.jar">
+ <ant dir=".." antfile="build.xml" target="jcl-over-slf4j.jar" />
+ </target>
+
+ <!-- ================================================================= -->
+ <!-- Run all tests -->
+ <!-- ================================================================= -->
+ <target name="runAll" depends="regression" />
- <target name="init">
- <mkdir dir="${tests.javac.dest}"/>
- <mkdir dir="output"/>
- </target>
-
- <target name="clean">
- <delete>
- <fileset dir="${tests.javac.dest}" includes="**"/>
- </delete>
- </target>
-
- <target name="cleanOutputDir">
- <delete>
- <fileset dir="output" includes="**"/>
- </delete>
- </target>
-
- <target name="build" depends="init, slf4j-simple.jar">
- <javac srcdir="${tests.source.home}"
- destdir="${tests.javac.dest}"
- includes="**/*.java"
- deprecation="${deprecation}"
- debug="on">
- <classpath refid="compile.classpath"/>
- </javac>
- </target>
-
- <target name="slf4j-nop.jar">
- <!-- Invoke build.xml located one directory up -->
- <ant dir=".." antfile="build.xml" target="slf4j-nop.jar"/>
- </target>
-
- <target name="slf4j-simple.jar">
- <!-- Invoke build.xml located one directory up -->
- <ant dir=".." antfile="build.xml" target="slf4j-simple.jar"/>
- </target>
-
- <target name="slf4j-jdk14.jar">
- <ant dir=".." antfile="build.xml" target="slf4j-jdk14.jar"/>
- </target>
-
- <!-- ================================================================= -->
- <!-- Run all tests -->
- <!-- ================================================================= -->
- <target name="runAll" depends="regression"/>
-
- <target name="regression" depends="MessageFormatter,
+ <target name="regression" depends="MessageFormatter,
InvokeNOP,
InvokeSimple,
InvokeJDK14,
+ InvokeLog4j12x,
InvokeNLOG4J12x,
XLoggerBySystemProps,
InvokeJCL,
- InvokeJCLWithNOP"
- />
+ InvokeJCLWithNOP" />
+
+ <target name="MessageFormatter" depends="build, cleanOutputDir">
+ <junit printsummary="yes" fork="yes" haltonfailure="yes">
+ <classpath refid="compile.classpath" />
+ <formatter type="plain" usefile="false" />
+ <test name="org.slf4j.impl.MessageFormatterTest" />
+ </junit>
+ </target>
+
+ <target name="InvokeNOP" depends="build, slf4j-nop.jar, cleanOutputDir">
+ <junit printsummary="yes" fork="yes" haltonfailure="yes">
+ <classpath refid="nop.classpath" />
+ <formatter type="plain" usefile="false" />
+ <test name="org.slf4j.InvokingSLF4J" />
+ </junit>
+ </target>
+
+ <target name="InvokeSimple" depends="build, slf4j-simple.jar, cleanOutputDir">
+ <junit printsummary="yes" fork="yes" haltonfailure="yes">
+ <classpath refid="simple.classpath" />
+ <formatter type="plain" usefile="false" />
+ <test name="org.slf4j.InvokingSLF4J" />
+ </junit>
+ </target>
+
+ <target name="InvokeJDK14" depends="build, slf4j-jdk14.jar, cleanOutputDir">
+ <junit printsummary="yes" fork="yes" haltonfailure="yes">
+ <classpath refid="jdk14.classpath" />
+ <formatter type="plain" usefile="false" />
+ <test name="org.slf4j.InvokingSLF4J" />
+ </junit>
+ </target>
+
+
+ <target name="InvokeLog4j12x" depends="build, cleanOutputDir">
+ <copy file="input/log4j12x/basic.xml" tofile="${tests.javac.dest}/log4j.xml" />
+ <junit printsummary="yes" fork="yes" haltonfailure="yes">
+ <classpath refid="log4j12x.classpath" />
+ <formatter type="plain" usefile="false" />
+ <test name="org.slf4j.InvokingSLF4J" />
+ </junit>
+
+ <delete file="${tests.javac.dest}/log4j.xml" />
+
+ </target>
+
+ <target name="InvokeNLOG4J12x" depends="build, cleanOutputDir">
+ <copy file="input/log4j12x/basic.xml" tofile="${tests.javac.dest}/log4j.xml" />
+ <junit printsummary="yes" fork="yes" haltonfailure="yes">
+ <classpath refid="nlog4j12x.classpath" />
+ <formatter type="plain" usefile="false" />
+ <test name="org.slf4j.InvokingSLF4J" />
+ </junit>
+
+ <delete file="${tests.javac.dest}/log4j.xml" />
+
+ </target>
+
+ <target name="XLoggerBySystemProps" depends="build, slf4j-simple.jar, cleanOutputDir">
+ <junit printsummary="yes" fork="yes" haltonfailure="yes">
+ <classpath refid="simple.classpath" />
+ <formatter type="plain" usefile="false" />
+ <test name="org.slf4j.XLoggerBySystemPropsTest" />
+ </junit>
+ </target>
+
+ <target name="InvokeJCL" depends="build, jcl-over-slf4j.jar, cleanOutputDir">
+ <junit printsummary="yes" fork="yes" haltonfailure="yes">
+ <classpath refid="jcl.classpath" />
+ <formatter type="plain" usefile="false" />
+ <test name="org.apache.commons.logging.InvokeJCLTest" />
+ </junit>
+ </target>
+
+ <target name="InvokeJCLWithNOP" depends="build, slf4j-simple.jar, cleanOutputDir">
+ <junit printsummary="yes" fork="yes" haltonfailure="yes">
+ <classpath refid="jcl-nop.classpath" />
+ <formatter type="plain" usefile="false" />
+ <test name="org.apache.commons.logging.InvokeJCLWithNOPTest" />
+ </junit>
+ </target>
- <target name="MessageFormatter" depends="build, cleanOutputDir">
- <junit printsummary="yes" fork="yes" haltonfailure="yes">
- <classpath refid="compile.classpath"/>
- <formatter type="plain" usefile="false"/>
- <test name="org.slf4j.impl.MessageFormatterTest" />
- </junit>
- </target>
-
- <target name="InvokeNOP" depends="build, slf4j-nop.jar, cleanOutputDir">
- <junit printsummary="yes" fork="yes" haltonfailure="yes">
- <classpath refid="nop.classpath"/>
- <formatter type="plain" usefile="false"/>
- <test name="org.slf4j.InvokingSLF4J" />
- </junit>
- </target>
-
- <target name="InvokeSimple" depends="build, slf4j-simple.jar, cleanOutputDir">
- <junit printsummary="yes" fork="yes" haltonfailure="yes">
- <classpath refid="simple.classpath"/>
- <formatter type="plain" usefile="false"/>
- <test name="org.slf4j.InvokingSLF4J" />
- </junit>
- </target>
-
- <target name="InvokeJDK14" depends="build, slf4j-jdk14.jar, cleanOutputDir">
- <junit printsummary="yes" fork="yes" haltonfailure="yes">
- <classpath refid="jdk14.classpath"/>
- <formatter type="plain" usefile="false"/>
- <test name="org.slf4j.InvokingSLF4J" />
- </junit>
- </target>
-
-
- <target name="InvokeNLOG4J12x" depends="build, cleanOutputDir">
- <copy file="input/nlog4j12x/basic.xml" tofile="${tests.javac.dest}/log4j.xml"/>
- <junit printsummary="yes" fork="yes" haltonfailure="yes">
- <classpath refid="nlog4j12x.classpath"/>
- <formatter type="plain" usefile="false"/>
- <test name="org.slf4j.InvokingSLF4J" />
- </junit>
-
- <delete file="${tests.javac.dest}/log4j.xml"/>
-
- </target>
-
- <target name="XLoggerBySystemProps" depends="build, slf4j-simple.jar, cleanOutputDir">
- <junit printsummary="yes" fork="yes" haltonfailure="yes">
- <classpath refid="simple.classpath"/>
- <formatter type="plain" usefile="false"/>
- <test name="org.slf4j.XLoggerBySystemPropsTest" />
- </junit>
- </target>
-
- <target name="InvokeJCL" depends="build, slf4j-simple.jar, cleanOutputDir">
- <junit printsummary="yes" fork="yes" haltonfailure="yes">
- <classpath refid="jcl.classpath"/>
- <formatter type="plain" usefile="false"/>
- <test name="org.apache.commons.logging.InvokeJCLTest" />
- </junit>
- </target>
-
- <target name="InvokeJCLWithNOP" depends="build, slf4j-simple.jar, cleanOutputDir">
- <junit printsummary="yes" fork="yes" haltonfailure="yes">
- <classpath refid="jcl-nop.classpath"/>
- <formatter type="plain" usefile="false"/>
- <test name="org.apache.commons.logging.InvokeJCLWithNOPTest" />
- </junit>
- </target>
-
</project>
More information about the slf4j-dev
mailing list