ceki 2002/10/16 06:58:22
Modified: . build.xml
tests/src/java/org/apache/log4j/filters
LevelMatchFilterTestCase.java
tests/src/java/org/apache/log4j/xml CustomLevelTestCase.java
DOMTestCase.java
Added: docs/images coverSmall.png
Log:
"usage" is no longer the default target in build.xml. "build" is now the default
target.
Other minor stuff.
Revision Changes Path
1.38 +5 -4 jakarta-log4j/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/build.xml,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- build.xml 9 Oct 2002 22:50:01 -0000 1.37
+++ build.xml 16 Oct 2002 13:58:21 -0000 1.38
@@ -7,7 +7,7 @@
<!-- NOTE: all directories are relative to jakarta-log4j/ -->
<!-- the parent of build/ -->
<!-- ================================================================= -->
-<project name="log4j" default="usage" basedir="." >
+<project name="log4j" default="build" basedir="." >
<!-- The build.properties file defines the parth to local jar files -->
@@ -167,8 +167,9 @@
<tstamp />
</target>
- <target name="build" depends="init, build.core, build.examples, build.xml,
- build.javamail, build.jms, build.jmx"/>
+ <target name="build" description="Compile all log4j components."
+ depends="init, build.core, build.examples, build.xml,
+ build.javamail, build.jms, build.jmx"/>
<target name="build.core" depends="init">
<mkdir dir="${javac.dest}" />
@@ -264,7 +265,7 @@
<!-- ================================================================= -->
<!-- Remove all generated (compiled) class files. -->
<!-- ================================================================= -->
- <target name="clean" depends="init">
+ <target name="clean" depends="init" description="Delete all compiled files.">
<delete dir="${javac.dest}/" />
</target>
1.1 jakarta-log4j/docs/images/coverSmall.png
<<Binary file>>
1.2 +2 -7
jakarta-log4j/tests/src/java/org/apache/log4j/filters/LevelMatchFilterTestCase.java
Index: LevelMatchFilterTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/tests/src/java/org/apache/log4j/filters/LevelMatchFilterTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LevelMatchFilterTestCase.java 12 Jun 2002 06:10:18 -0000 1.1
+++ LevelMatchFilterTestCase.java 16 Oct 2002 13:58:22 -0000 1.2
@@ -13,12 +13,7 @@
import junit.framework.TestSuite;
import junit.framework.Test;
-import org.apache.log4j.Logger;
-import org.apache.log4j.Level;
-import org.apache.log4j.Appender;
-import org.apache.log4j.FileAppender;
-import org.apache.log4j.Layout;
-import org.apache.log4j.SimpleLayout;
+import org.apache.log4j.*;
import org.apache.log4j.spi.Filter;
import org.apache.log4j.xml.DOMConfigurator;
import org.apache.log4j.filters.LevelMatchFilter;
@@ -66,7 +61,7 @@
}
public void tearDown() {
- root.getLoggerRepository().resetConfiguration();
+ root.getLoggerRepository().resetConfiguration();
}
/**
1.5 +4 -2
jakarta-log4j/tests/src/java/org/apache/log4j/xml/CustomLevelTestCase.java
Index: CustomLevelTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/tests/src/java/org/apache/log4j/xml/CustomLevelTestCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CustomLevelTestCase.java 12 Apr 2002 15:11:49 -0000 1.4
+++ CustomLevelTestCase.java 16 Oct 2002 13:58:22 -0000 1.5
@@ -5,8 +5,7 @@
import junit.framework.TestSuite;
import junit.framework.Test;
-import org.apache.log4j.Logger;
-import org.apache.log4j.Level;
+import org.apache.log4j.*;
import org.apache.log4j.util.Filter;
import org.apache.log4j.util.LineNumberFilter;
import org.apache.log4j.util.ControlFilter;
@@ -32,6 +31,9 @@
public void tearDown() {
root.getLoggerRepository().resetConfiguration();
+ Logger logger = LogManager.getLoggerRepository().getLogger("LOG4J");
+ logger.setAdditivity(false);
+ logger.addAppender(new ConsoleAppender(new PatternLayout("log4j: %-22c{2} -
%m%n")));
}
public void test1() throws Exception {
1.6 +1 -1
jakarta-log4j/tests/src/java/org/apache/log4j/xml/DOMTestCase.java
Index: DOMTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/tests/src/java/org/apache/log4j/xml/DOMTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DOMTestCase.java 12 Apr 2002 15:11:49 -0000 1.5
+++ DOMTestCase.java 16 Oct 2002 13:58:22 -0000 1.6
@@ -47,7 +47,7 @@
root = Logger.getRootLogger();
logger = Logger.getLogger(DOMTestCase.class);
}
-
+
public void tearDown() {
root.getLoggerRepository().resetConfiguration();
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
