Author: ceki
Date: Mon Nov 28 19:17:06 2005
New Revision: 439
Modified:
slf4j/trunk/build.properties
slf4j/trunk/build.xml
slf4j/trunk/src/java/org/slf4j/impl/JCLLoggerAdapter.java
slf4j/trunk/src/java/org/slf4j/impl/JDK14LoggerFactory.java
slf4j/trunk/src/java/org/slf4j/impl/Log4jLoggerAdapter.java
slf4j/trunk/tests/build.xml
Log:
- added slf4l-jcl binding
- minor javadoc fixes
- about to release rc2
Modified: slf4j/trunk/build.properties
==============================================================================
--- slf4j/trunk/build.properties (original)
+++ slf4j/trunk/build.properties Mon Nov 28 19:17:06 2005
@@ -2,7 +2,7 @@
# This properties file hold properties shared among several Ant
# scripts
-version=1.0-rc1
+version=1.0-rc2
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 Mon Nov 28 19:17:06 2005
@@ -13,7 +13,9 @@
<property name="dist.tmp" value="dist/tmp" />
<property name="deprecation" value="on" />
-
+ <property name="target" value="1.2" />
+ <property name="source" value="1.2" />
+
<property name="SLF4J_STEM" value="org/slf4j" />
<property name="JCL_STEM" value="org/apache/commons/logging" />
@@ -30,6 +32,7 @@
slf4j-log4j12.jar - build the jar file of the same name.
slf4j-log4j13.jar - build the jar file of the same name.
slf4j-jdk14.jar - build the jar file of the same name.
+ slf4j-jcl.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>
@@ -44,6 +47,13 @@
<path id="regular.classpath">
</path>
+
+ <path id="jcl.classpath">
+ <fileset dir="./lib">
+ <include name="commons-logging-1.0.4.jar" />
+ </fileset>
+ </path>
+
<path id="log4j12.classpath">
<fileset dir="./lib">
<include name="log4j-1.2*.jar" />
@@ -57,6 +67,12 @@
</fileset>
</path>
+ <path id="javadoc.classpath">
+ <path refid="jcl.classpath" />
+ <path refid="log4j12.classpath" />
+ </path>
+
+
<!-- =================================================================
-->
<!-- Remove all generated (compiled) class files.
-->
<!-- =================================================================
-->
@@ -139,16 +155,20 @@
</filterset>
</copy>
- <copy todir="${tmp.java.source.dir}">
- <fileset dir="src/java">
+ <copy todir="${tmp.java.source.dir}/${SLF4J_STEM}">
+ <fileset dir="./src/java/${SLF4J_STEM}">
<include name="**/*.java" />
</fileset>
</copy>
- <javac srcdir="${tmp.java.source.dir}"
destdir="${tmp.javac.dest}" deprecation="on" includes="${SLF4J_STEM}/*.java,
+ <javac srcdir="${tmp.java.source.dir}"
destdir="${tmp.javac.dest}"
+ deprecation="on"
+ target="${target}"
+ source="${source}"
+ includes="${SLF4J_STEM}/*.java,
${SLF4J_STEM}/impl/MessageFormatter.java,
${SLF4J_STEM}/impl/Util.java
- ${SLF4J_STEM}/impl/${impl}*.java
+ ${SLF4J_STEM}/impl/${IMPL}*.java
${SLF4J_STEM}/spi/*.java" debug="on">
<classpath refid="${IMPL.CLASSPATH}" />
</javac>
@@ -163,6 +183,7 @@
<antcall target="compile-IMPL">
<param name="IMPL" value="${IMPL}" />
+ <param name="IMPL.CLASSPATH" value="${IMPL.CLASSPATH}"
/>
</antcall>
<jar jarfile="${jar-name}" basedir="${tmp.javac.dest}"
includes="
@@ -251,6 +272,14 @@
</antcall>
</target>
+ <target name="slf4j-jcl.jar" depends="julCheck">
+ <antcall target="slf4j-IMPL.jar">
+ <param name="IMPL" value="JCL" />
+ <param name="jar-name" value="slf4j-jcl.jar" />
+ <param name="IMPL.CLASSPATH" value="jcl.classpath" />
+ </antcall>
+ </target>
+
<target name="jcl-over-slf4j.jar" depends="slf4j-nop.jar">
<antcall target="compile-IMPL">
@@ -258,7 +287,11 @@
<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 srcdir="${tmp.java.source.dir}"
destdir="${tmp.javac.dest}"
+ deprecation="on"
+ target="${target}"
+ source="${source}"
+ includes="${JCL_STEM}/**/*.java" debug="${debug}">
</javac>
<jar jarfile="${jcl.jar}" basedir="${tmp.javac.dest}"
includes="${JCL_STEM}/**/*.class">
@@ -275,7 +308,7 @@
<target name="jar" depends="compile.jar, test-compile.jar,
slf4j-nop.jar, jcl-over-slf4j.jar,
slf4j-log4j12.jar, slf4j-log4j13.jar,
- slf4j-simple.jar, slf4j-jdk14.jar" />
+ slf4j-simple.jar, slf4j-jdk14.jar,
slf4j-jcl.jar" />
<!-- Build Javadoc -->
<target name="javadoc" depends="init">
@@ -298,8 +331,8 @@
</filterset>
</copy>
- <copy todir="tmp/src">
- <fileset dir="src/java">
+ <copy todir="tmp/src/${SLF4J_STEM}">
+ <fileset dir="src/java/${SLF4J_STEM}">
<include name="**/*.java" />
<include name="**/*.html" />
</fileset>
@@ -307,10 +340,20 @@
<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="log4j12.classpath" />
-
+ <javadoc destdir="${javadoc.dest}"
+ packagenames="org.slf4j.*"
+ 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="javadoc.classpath" />
+
+ <link
href="http://jakarta.apache.org/commons/logging/apidocs/"/>
+ <link href="http://logging.apache.org/log4j/docs/api/"/>
+
<sourcepath>
<path path="${tmp.java.source.dir}" />
</sourcepath>
@@ -322,24 +365,16 @@
<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>
- <b>SLF4J ${version}</b><br/>
- </header>
- <footer>
+ <header><b>SLF4J
${version}</b><br/></header>
+
+ <footer>
Copyright 2004-2005
<a
href="http://www.slf4j.org"><b>SLF4J.ORG</b></a>
<br/>
-
</footer>
- <bottom>
- <small/>Jakarta Commons Logging is copyrighted by the
Apache Software Foundation<small/>.
+
+ <bottom>
+ <small/>SLF4J is hosted by <a
href="http://www.qos.ch">Qos.ch<a/> <small/>
</bottom>
</javadoc>
</target>
Modified: slf4j/trunk/src/java/org/slf4j/impl/JCLLoggerAdapter.java
==============================================================================
--- slf4j/trunk/src/java/org/slf4j/impl/JCLLoggerAdapter.java (original)
+++ slf4j/trunk/src/java/org/slf4j/impl/JCLLoggerAdapter.java Mon Nov 28
19:17:06 2005
@@ -44,14 +44,13 @@
* @author <a href="http://www.qos.ch/log4j/";>Ceki Gülcü</a>
*/
public final class JCLLoggerAdapter implements Logger {
- final Log logger;
+ final Log log;
final String name;
// WARN: JCLLoggerAdapter constructor should have only package access so
- // that
- // only JCLLoggerFactory be able to create one.
- JCLLoggerAdapter(Log logger, String name) {
- this.logger = logger;
+ // that only JCLLoggerFactory be able to create one.
+ JCLLoggerAdapter(Log log, String name) {
+ this.log = log;
this.name = name;
}
@@ -61,11 +60,10 @@
/**
* Delegates to the [EMAIL PROTECTED] Log#isDebugEnabled} method of the
underlying
- * [EMAIL PROTECTED] Log} instance.
- *
+ * [EMAIL PROTECTED] Log} instance.
*/
public boolean isDebugEnabled() {
- return logger.isDebugEnabled();
+ return log.isDebugEnabled();
}
//
@@ -77,7 +75,7 @@
* @param msg - the message object to be logged
*/
public void debug(String msg) {
- logger.debug(msg);
+ log.debug(msg);
}
/**
@@ -95,9 +93,9 @@
* the argument
*/
public void debug(String format, Object arg) {
- if (logger.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
String msgStr = MessageFormatter.format(format, arg);
- logger.debug(msgStr);
+ log.debug(msgStr);
}
}
@@ -118,9 +116,9 @@
* the second argument
*/
public void debug(String format, Object arg1, Object arg2) {
- if (logger.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
String msgStr = MessageFormatter.format(format, arg1, arg2);
- logger.debug(msgStr);
+ log.debug(msgStr);
}
}
@@ -134,85 +132,235 @@
* the exception (throwable) to log
*/
public void debug(String msg, Throwable t) {
- logger.debug(msg, t);
+ log.debug(msg, t);
}
+ /**
+ * Delegates to the [EMAIL PROTECTED] Log#isInfoEnabled} method of the
underlying
+ * [EMAIL PROTECTED] Log} instance.
+ */
public boolean isInfoEnabled() {
- return logger.isInfoEnabled();
+ return log.isInfoEnabled();
}
+ /**
+ * Delegates to the [EMAIL PROTECTED] Log#debug(java.lang.Object)} method of
the underlying
+ * [EMAIL PROTECTED] Log} instance.
+ *
+ * @param msg - the message object to be logged
+ */
public void info(String msg) {
- logger.info(msg);
+ log.info(msg);
}
+ /**
+ * Delegates to the [EMAIL PROTECTED] Log#info(java.lang.Object)} method of
the underlying
+ * [EMAIL PROTECTED] Log} instance.
+ *
+ * <p>
+ * However, this form avoids superfluous object creation when the logger is
disabled
+ * for level INFO.
+ * </p>
+ *
+ * @param format
+ * the format string
+ * @param arg
+ * the argument
+ */
+
public void info(String format, Object arg) {
- if (logger.isInfoEnabled()) {
+ if (log.isInfoEnabled()) {
String msgStr = MessageFormatter.format(format, arg);
- logger.info(msgStr);
+ log.info(msgStr);
}
}
-
+ /**
+ * Delegates to the [EMAIL PROTECTED] Log#info(java.lang.Object)} method of
the underlying
+ * [EMAIL PROTECTED] Log} instance.
+ *
+ * <p>
+ * However, this form avoids superfluous object creation when the logger is
disabled
+ * for level INFO.
+ * </p>
+ *
+ * @param format
+ * the format string
+ * @param arg1
+ * the first argument
+ * @param arg2
+ * the second argument
+ */
public void info(String format, Object arg1, Object arg2) {
- if (logger.isInfoEnabled()) {
+ if (log.isInfoEnabled()) {
String msgStr = MessageFormatter.format(format, arg1, arg2);
- logger.info(msgStr);
+ log.info(msgStr);
}
}
+ /**
+ * Delegates to the [EMAIL PROTECTED] Log#info(java.lang.Object,
java.lang.Throwable)} method of
+ * the underlying [EMAIL PROTECTED] Log} instance.
+ *
+ * @param msg
+ * the message accompanying the exception
+ * @param t
+ * the exception (throwable) to log
+ */
public void info(String msg, Throwable t) {
- logger.info(msg, t);
+ log.info(msg, t);
}
+ /**
+ * Delegates to the [EMAIL PROTECTED] Log#isWarnEnabled} method of the
underlying
+ * [EMAIL PROTECTED] Log} instance.
+ */
public boolean isWarnEnabled() {
- return logger.isWarnEnabled();
+ return log.isWarnEnabled();
}
+ /**
+ * Delegates to the [EMAIL PROTECTED] Log#warn(java.lang.Object)} method of
the underlying
+ * [EMAIL PROTECTED] Log} instance.
+ *
+ * @param msg - the message object to be logged
+ */
public void warn(String msg) {
- logger.warn(msg);
+ log.warn(msg);
}
+ /**
+ * Delegates to the [EMAIL PROTECTED] Log#warn(java.lang.Object)} method of
the underlying
+ * [EMAIL PROTECTED] Log} instance.
+ *
+ * <p>
+ * However, this form avoids superfluous object creation when the logger is
disabled
+ * for level WARN.
+ * </p>
+ *
+ * @param format
+ * the format string
+ * @param arg
+ * the argument
+ */
public void warn(String format, Object arg) {
- if (logger.isWarnEnabled()) {
+ if (log.isWarnEnabled()) {
String msgStr = MessageFormatter.format(format, arg);
- logger.warn(msgStr);
+ log.warn(msgStr);
}
}
-
+
+ /**
+ * Delegates to the [EMAIL PROTECTED] Log#warn(java.lang.Object)} method of
the underlying
+ * [EMAIL PROTECTED] Log} instance.
+ *
+ * <p>
+ * However, this form avoids superfluous object creation when the logger is
disabled
+ * for level WARN.
+ * </p>
+ *
+ * @param format
+ * the format string
+ * @param arg1
+ * the first argument
+ * @param arg2
+ * the second argument
+ */
public void warn(String format, Object arg1, Object arg2) {
- if (logger.isWarnEnabled()) {
+ if (log.isWarnEnabled()) {
String msgStr = MessageFormatter.format(format, arg1, arg2);
- logger.warn(msgStr);
+ log.warn(msgStr);
}
}
+ /**
+ * Delegates to the [EMAIL PROTECTED] Log#warn(java.lang.Object,
java.lang.Throwable)} method of
+ * the underlying [EMAIL PROTECTED] Log} instance.
+ *
+ * @param msg
+ * the message accompanying the exception
+ * @param t
+ * the exception (throwable) to log
+ */
+
public void warn(String msg, Throwable t) {
- logger.warn(msg, t);
+ log.warn(msg, t);
}
+
+ /**
+ * Delegates to the [EMAIL PROTECTED] Log#isErrorEnabled} method of the
underlying
+ * [EMAIL PROTECTED] Log} instance.
+ */
public boolean isErrorEnabled() {
- return logger.isErrorEnabled();
+ return log.isErrorEnabled();
}
+ /**
+ * Delegates to the [EMAIL PROTECTED] Log#error(java.lang.Object)} method of
the underlying
+ * [EMAIL PROTECTED] Log} instance.
+ *
+ * @param msg - the message object to be logged
+ */
public void error(String msg) {
- logger.error(msg);
+ log.error(msg);
}
+ /**
+ * Delegates to the [EMAIL PROTECTED] Log#error(java.lang.Object)} method of
the underlying
+ * [EMAIL PROTECTED] Log} instance.
+ *
+ * <p>
+ * However, this form avoids superfluous object creation when the logger is
disabled
+ * for level ERROR.
+ * </p>
+ *
+ * @param format
+ * the format string
+ * @param arg
+ * the argument
+ */
public void error(String format, Object arg) {
- if (logger.isErrorEnabled()) {
+ if (log.isErrorEnabled()) {
String msgStr = MessageFormatter.format(format, arg);
- logger.error(msgStr);
+ log.error(msgStr);
}
}
-
+
+ /**
+ * Delegates to the [EMAIL PROTECTED] Log#error(java.lang.Object)} method of
the underlying
+ * [EMAIL PROTECTED] Log} instance.
+ *
+ * <p>
+ * However, this form avoids superfluous object creation when the logger is
disabled
+ * for level ERROR.
+ * </p>
+ *
+ * @param format
+ * the format string
+ * @param arg1
+ * the first argument
+ * @param arg2
+ * the second argument
+ */
public void error(String format, Object arg1, Object arg2) {
- if (logger.isErrorEnabled()) {
+ if (log.isErrorEnabled()) {
String msgStr = MessageFormatter.format(format, arg1, arg2);
- logger.error(msgStr);
+ log.error(msgStr);
}
}
+ /**
+ * Delegates to the [EMAIL PROTECTED] Log#error(java.lang.Object,
java.lang.Throwable)} method of
+ * the underlying [EMAIL PROTECTED] Log} instance.
+ *
+ * @param msg
+ * the message accompanying the exception
+ * @param t
+ * the exception (throwable) to log
+ */
+
public void error(String msg, Throwable t) {
- logger.error(msg, t);
+ log.error(msg, t);
}
}
Modified: slf4j/trunk/src/java/org/slf4j/impl/JDK14LoggerFactory.java
==============================================================================
--- slf4j/trunk/src/java/org/slf4j/impl/JDK14LoggerFactory.java (original)
+++ slf4j/trunk/src/java/org/slf4j/impl/JDK14LoggerFactory.java Mon Nov 28
19:17:06 2005
@@ -41,7 +41,7 @@
/**
* JDK14LoggerFactory is an implementation of [EMAIL PROTECTED] ILoggerFactory}
- * returning the appropriate named [EMAIL PROTECTED] JDK14LoggerAdapter}
instance.
+ * returning the appropriately named [EMAIL PROTECTED] JDK14LoggerAdapter}
instance.
*
* @author <a href="http://www.qos.ch/log4j/";>Ceki Gülcü</a>
*/
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 Mon Nov 28
19:17:06 2005
@@ -42,7 +42,7 @@
* A wrapper over [EMAIL PROTECTED] org.apache.log4j.Logger
* org.apache.log4j.Logger} in conformance with the [EMAIL PROTECTED] Logger}
* interface. Note that the logging levels mentioned in this class
- * refer to those defined in the org.apache.log4j.Level class.
+ * refer to those defined in the [EMAIL PROTECTED] org.apache.log4j.Level}
class.
* @author <a href="http://www.qos.ch/log4j/";>Ceki Gülcü</a>
*/
Modified: slf4j/trunk/tests/build.xml
==============================================================================
--- slf4j/trunk/tests/build.xml (original)
+++ slf4j/trunk/tests/build.xml Mon Nov 28 19:17:06 2005
@@ -29,13 +29,19 @@
</path>
<path id="jcl.classpath">
+ <path refid="basic.classpath" />
+ <pathelement location="../slf4j-jcl.jar" />
+ <pathelement location="../lib/commons-logging-1.0.4.jar" />
+ </path>
+
+ <path id="jos-simple.classpath">
<path refid="simple.classpath" />
<fileset dir="../">
<include name="jcl104-over-slf4j.jar" />
</fileset>
</path>
- <path id="jcl-nop.classpath">
+ <path id="jos-nop.classpath">
<path refid="nop.classpath" />
<fileset dir="../">
<include name="jcl104-over-slf4j.jar" />
@@ -116,38 +122,11 @@
</delete>
</target>
- <target name="build" depends="init, slf4j-simple.jar">
+ <target name="build" depends="init">
<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-log4j12.jar">
- <ant dir=".." antfile="build.xml" target="slf4j-log4j12.jar" />
- </target>
-
-
- <target name="slf4j-log4j13.jar">
- <ant dir=".." antfile="build.xml" target="slf4j-log4j13.jar" />
- </target>
-
- <target name="jcl-over-slf4j.jar">
- <ant dir=".." antfile="build.xml" target="jcl-over-slf4j.jar" />
- </target>
<!-- =================================================================
-->
<!-- Run all tests
-->
@@ -158,11 +137,12 @@
InvokeNOP,
InvokeSimple,
InvokeJDK14,
+ InvokeJCL,
InvokeLog4j12x,
InvokeLog4j1212,
InvokeLog4j13alpha7,
InvokeNLOG4J12x,
- InvokeJCL,
+ InvokeJCLWithSimple,
InvokeJCLWithNOP" />
<target name="MessageFormatter" depends="build, cleanOutputDir">
@@ -173,7 +153,7 @@
</junit>
</target>
- <target name="InvokeNOP" depends="build, slf4j-nop.jar, cleanOutputDir">
+ <target name="InvokeNOP" depends="build, cleanOutputDir">
<junit printsummary="yes" fork="yes" haltonfailure="yes">
<classpath refid="nop.classpath" />
<formatter type="plain" usefile="false" />
@@ -181,7 +161,7 @@
</junit>
</target>
- <target name="InvokeSimple" depends="build, slf4j-simple.jar,
cleanOutputDir">
+ <target name="InvokeSimple" depends="build, cleanOutputDir">
<junit printsummary="yes" fork="yes" haltonfailure="yes">
<classpath refid="simple.classpath" />
<formatter type="plain" usefile="false" />
@@ -189,7 +169,7 @@
</junit>
</target>
- <target name="InvokeJDK14" depends="build, slf4j-jdk14.jar,
cleanOutputDir">
+ <target name="InvokeJDK14" depends="build, cleanOutputDir">
<junit printsummary="yes" fork="yes" haltonfailure="yes">
<classpath refid="jdk14.classpath" />
<formatter type="plain" usefile="false" />
@@ -197,8 +177,15 @@
</junit>
</target>
+ <target name="InvokeJCL" depends="build, cleanOutputDir">
+ <junit printsummary="yes" fork="yes"
haltonfailure="yes">
+ <classpath refid="jcl.classpath" />
+ <formatter type="plain" usefile="false" />
+ <test name="org.slf4j.InvokingSLF4J" />
+ </junit>
+ </target>
- <target name="InvokeLog4j12x" depends="build, slf4j-log4j12.jar,
cleanOutputDir">
+ <target name="InvokeLog4j12x" depends="build, cleanOutputDir">
<copy file="input/log4j/basic.xml"
tofile="${tests.javac.dest}/log4j.xml" />
<junit printsummary="yes" fork="yes" haltonfailure="yes">
<classpath refid="log4j12x.classpath" />
@@ -208,7 +195,7 @@
<delete file="${tests.javac.dest}/log4j.xml" />
</target>
- <target name="InvokeLog4j1212" depends="build, slf4j-log4j12.jar,
cleanOutputDir">
+ <target name="InvokeLog4j1212" depends="build, cleanOutputDir">
<copy file="input/log4j/basic.xml"
tofile="${tests.javac.dest}/log4j.xml" />
<junit printsummary="yes" fork="yes" haltonfailure="yes">
<classpath refid="log4j1212.classpath" />
@@ -219,7 +206,7 @@
</target>
- <target name="InvokeLog4j13alpha7" depends="build, slf4j-log4j13.jar,
cleanOutputDir">
+ <target name="InvokeLog4j13alpha7" depends="build, cleanOutputDir">
<copy file="input/log4j/basic.xml"
tofile="${tests.javac.dest}/log4j.xml" />
<junit printsummary="yes" fork="yes" haltonfailure="yes">
<classpath refid="log4j13alpha7.classpath" />
@@ -229,7 +216,7 @@
<delete file="${tests.javac.dest}/log4j.xml" />
</target>
- <target name="CompatibilityA" depends="build, slf4j-log4j13.jar,
cleanOutputDir">
+ <target name="CompatibilityA" depends="build, cleanOutputDir">
<junit printsummary="yes" fork="yes" haltonfailure="yes">
<classpath refid="compatA.classpath" />
<formatter type="plain" usefile="false" />
@@ -238,7 +225,7 @@
<delete file="${tests.javac.dest}/log4j.xml" />
</target>
- <target name="CompatibilityB" depends="build, slf4j-log4j12.jar,
cleanOutputDir">
+ <target name="CompatibilityB" depends="build, cleanOutputDir">
<junit printsummary="yes" fork="yes" haltonfailure="yes">
<classpath refid="compatB.classpath" />
<formatter type="plain" usefile="false" />
@@ -258,7 +245,7 @@
<delete file="${tests.javac.dest}/log4j.xml" />
</target>
- <target name="XLoggerBySystemProps" depends="build, slf4j-simple.jar,
cleanOutputDir">
+ <target name="XLoggerBySystemProps" depends="build, cleanOutputDir">
<junit printsummary="yes" fork="yes" haltonfailure="yes">
<classpath refid="simple.classpath" />
<formatter type="plain" usefile="false" />
@@ -266,17 +253,17 @@
</junit>
</target>
- <target name="InvokeJCL" depends="build, jcl-over-slf4j.jar,
cleanOutputDir">
+ <target name="InvokeJCLWithSimple" depends="build, cleanOutputDir">
<junit printsummary="yes" fork="yes" haltonfailure="yes">
- <classpath refid="jcl.classpath" />
+ <classpath refid="jos-simple.classpath" />
<formatter type="plain" usefile="false" />
<test name="org.apache.commons.logging.InvokeJCLTest" />
</junit>
</target>
- <target name="InvokeJCLWithNOP" depends="build, slf4j-simple.jar,
cleanOutputDir">
+ <target name="InvokeJCLWithNOP" depends="build, cleanOutputDir">
<junit printsummary="yes" fork="yes" haltonfailure="yes">
- <classpath refid="jcl-nop.classpath" />
+ <classpath refid="jos-nop.classpath" />
<formatter type="plain" usefile="false" />
<test
name="org.apache.commons.logging.InvokeJCLWithNOPTest" />
</junit>
_______________________________________________
dev mailing list
[email protected]
http://slf4j.org/mailman/listinfo/dev
