ceki 2002/10/09 13:38:26
Modified: . Tag: v1_2-branch INSTALL build.xml
docs Tag: v1_2-branch HISTORY
src/java/org/apache/log4j Tag: v1_2-branch MDC.java
PropertyConfigurator.java
src/java/org/apache/log4j/helpers Tag: v1_2-branch
Loader.java
src/java/org/apache/log4j/xml Tag: v1_2-branch
DOMConfigurator.java log4j.dtd
src/xdocs Tag: v1_2-branch documentation.xml download.xml
Log:
Very minor changes. About to release 1.2.7.
Revision Changes Path
No revision
No revision
1.19.2.2 +1 -1 jakarta-log4j/INSTALL
Index: INSTALL
===================================================================
RCS file: /home/cvs/jakarta-log4j/INSTALL,v
retrieving revision 1.19.2.1
retrieving revision 1.19.2.2
diff -u -r1.19.2.1 -r1.19.2.2
--- INSTALL 13 May 2002 06:27:31 -0000 1.19.2.1
+++ INSTALL 9 Oct 2002 20:38:24 -0000 1.19.2.2
@@ -48,7 +48,7 @@
=========
The log4j distribution comes with one jar file: log4j-VERSION.jar
-under the $LOG4J_HOME/dist/lib/ directory.
+under the LOG4J_HOME/dist/lib/ directory.
This jar file contains all the class files of the log4j project,
except test cases and classes from the "examples" and
1.34.2.9 +1 -1 jakarta-log4j/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/build.xml,v
retrieving revision 1.34.2.8
retrieving revision 1.34.2.9
diff -u -r1.34.2.8 -r1.34.2.9
--- build.xml 31 Jul 2002 09:25:12 -0000 1.34.2.8
+++ build.xml 9 Oct 2002 20:38:24 -0000 1.34.2.9
@@ -17,7 +17,7 @@
<!-- prefixed with "env". -->
<property environment="env"/>
- <property name="version" value="1.2.6"/>
+ <property name="version" value="1.2.7"/>
<!-- The base directory relative to which most targets are built -->
<property name="base" value="."/>
No revision
No revision
1.97.2.14 +7 -0 jakarta-log4j/docs/HISTORY
Index: HISTORY
===================================================================
RCS file: /home/cvs/jakarta-log4j/docs/HISTORY,v
retrieving revision 1.97.2.13
retrieving revision 1.97.2.14
diff -u -r1.97.2.13 -r1.97.2.14
--- HISTORY 2 Aug 2002 20:47:04 -0000 1.97.2.13
+++ HISTORY 9 Oct 2002 20:38:25 -0000 1.97.2.14
@@ -6,6 +6,13 @@
[***] Changes requiring important modifications to existing client code.
+ October 9th, 2002
+
+ - Release of version 1.2.7
+
+ - Log4j now searches for the file log4j.xml as well as the file
+ log4j.properties during log4j initialization. [*]
+
July 31st, 2002
- Release of version 1.2.6
No revision
No revision
1.10.2.2 +4 -5 jakarta-log4j/src/java/org/apache/log4j/MDC.java
Index: MDC.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/MDC.java,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -r1.10.2.1 -r1.10.2.2
--- MDC.java 7 Jul 2002 06:45:46 -0000 1.10.2.1
+++ MDC.java 9 Oct 2002 20:38:25 -0000 1.10.2.2
@@ -88,11 +88,10 @@
/**
- Get the current thread's MDC as a hashtable.
- */
- public
- static
- Hashtable getContext() {
+ * Get the current thread's MDC as a hashtable. This method is
+ * intended to be used internally.
+ * */
+ public static Hashtable getContext() {
return mdc.getContext0();
}
1.54.2.4 +3 -3
jakarta-log4j/src/java/org/apache/log4j/PropertyConfigurator.java
Index: PropertyConfigurator.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/PropertyConfigurator.java,v
retrieving revision 1.54.2.3
retrieving revision 1.54.2.4
diff -u -r1.54.2.3 -r1.54.2.4
--- PropertyConfigurator.java 11 Jun 2002 13:21:58 -0000 1.54.2.3
+++ PropertyConfigurator.java 9 Oct 2002 20:38:25 -0000 1.54.2.4
@@ -33,8 +33,8 @@
import java.util.Hashtable;
/**
- Extends {@link BasicConfigurator} to provide configuration from an
- external file. See <b>{@link #doConfigure(String, LoggerRepository)}</b> for the
+ Allows the configuration of log4j from an external file. See
+ <b>{@link #doConfigure(String, LoggerRepository)}</b> for the
expected format.
<p>It is sometimes useful to see how log4j is reading configuration
@@ -100,7 +100,7 @@
/**
Read configuration from a file. <b>The existing configuration is
not cleared nor reset.</b> If you require a different behavior,
- then call {@link BasicConfigurator#resetConfiguration
+ then call {@link LogManager#resetConfiguration
resetConfiguration} method before calling
<code>doConfigure</code>.
No revision
No revision
1.17.2.4 +0 -4 jakarta-log4j/src/java/org/apache/log4j/helpers/Loader.java
Index: Loader.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/helpers/Loader.java,v
retrieving revision 1.17.2.3
retrieving revision 1.17.2.4
diff -u -r1.17.2.3 -r1.17.2.4
--- Loader.java 31 Jul 2002 09:25:13 -0000 1.17.2.3
+++ Loader.java 9 Oct 2002 20:38:25 -0000 1.17.2.4
@@ -46,9 +46,6 @@
}
}
- /* A cache for
- private static Method GET_TCL_METHOD;
-
/**
This method will search for <code>resource</code> in different
places. The rearch order is as follows:
@@ -67,7 +64,6 @@
built-in class loader in JDK 1.1.
</ol>
-
*/
static public URL getResource(String resource) {
ClassLoader classLoader = null;
No revision
No revision
1.49.2.2 +2 -2 jakarta-log4j/src/java/org/apache/log4j/xml/DOMConfigurator.java
Index: DOMConfigurator.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/xml/DOMConfigurator.java,v
retrieving revision 1.49.2.1
retrieving revision 1.49.2.2
diff -u -r1.49.2.1 -r1.49.2.2
--- DOMConfigurator.java 22 May 2002 17:15:20 -0000 1.49.2.1
+++ DOMConfigurator.java 9 Oct 2002 20:38:25 -0000 1.49.2.2
@@ -733,9 +733,9 @@
// "debug" attribute is returned as the empty string.
if(!debugAttrib.equals("") && !debugAttrib.equals("null")) {
LogLog.setInternalDebugging(OptionConverter.toBoolean(debugAttrib, true));
- }
- else
+ } else {
LogLog.debug("Ignoring " + INTERNAL_DEBUG_ATTR + " attribute.");
+ }
String confDebug = subst(element.getAttribute(CONFIG_DEBUG_ATTR));
1.18.2.3 +1 -1 jakarta-log4j/src/java/org/apache/log4j/xml/log4j.dtd
Index: log4j.dtd
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/xml/log4j.dtd,v
retrieving revision 1.18.2.2
retrieving revision 1.18.2.3
diff -u -r1.18.2.2 -r1.18.2.3
--- log4j.dtd 9 Oct 2002 20:07:37 -0000 1.18.2.2
+++ log4j.dtd 9 Oct 2002 20:38:25 -0000 1.18.2.3
@@ -23,7 +23,7 @@
<!-- attribute can be misleading. The threshold field of a repository -->
<!-- cannot be set to null. The "null" value for the threshold attribute -->
<!-- simply means don't touch the threshold field, the threshold field -->
-<!-- keeps its old value.
+<!-- keeps its old value. -->
<!ATTLIST log4j:configuration
xmlns:log4j CDATA #FIXED "http://jakarta.apache.org/log4j/";
No revision
No revision
1.15.2.5 +4 -0 jakarta-log4j/src/xdocs/documentation.xml
Index: documentation.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/xdocs/documentation.xml,v
retrieving revision 1.15.2.4
retrieving revision 1.15.2.5
diff -u -r1.15.2.4 -r1.15.2.5
--- documentation.xml 2 Oct 2002 16:29:08 -0000 1.15.2.4
+++ documentation.xml 9 Oct 2002 20:38:26 -0000 1.15.2.5
@@ -86,6 +86,10 @@
</li></p>
<p><li>
+ <a href="http://www.jguru.com/faq/Log4j";>log4j FAQ</a> at jGuru
+ </li></p>
+
+ <p><li>
<a href="http://qos.ch/logging/thinkAgain.html";>Think Again</a> by Ceki
Gülcü
</li></p>
1.53.2.12 +8 -6 jakarta-log4j/src/xdocs/download.xml
Index: download.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/xdocs/download.xml,v
retrieving revision 1.53.2.11
retrieving revision 1.53.2.12
diff -u -r1.53.2.11 -r1.53.2.12
--- download.xml 2 Oct 2002 16:29:08 -0000 1.53.2.11
+++ download.xml 9 Oct 2002 20:38:26 -0000 1.53.2.12
@@ -9,15 +9,17 @@
<meta name="keywords" content="java, logging, tracing, component, framework, API,
log4j"/>
<body>
- <section name="log4j version 1.2.6">
- <p>log4j 1.2.6 is available in <a
- href="../jakarta-log4j-1.2.6.tar.gz"><b>TAR.GZ</b></a> format
- or in <a href="../jakarta-log4j-1.2.6.zip"><b>ZIP</b></a>
+ <section name="log4j version 1.2.7">
+ <p>log4j 1.2.7 is available in <a
+ href="../jakarta-log4j-1.2.7.tar.gz"><b>TAR.GZ</b></a> format
+ or in <a href="../jakarta-log4j-1.2.7.zip"><b>ZIP</b></a>
format.
</p>
- <p>Release 1.2.6 fixes minor bugs. See the <a
- href="HISTORY">HISTORY</a> file for the exact details.
+ <p>As of release 1.2.7 log4j now searches for the file log4j.xml
+ as well as the file log4j.properties during
+ initialization. See the <a href="HISTORY">HISTORY</a> file for
+ the firther details.
</p>
<p>In addition to many performance improvements, bug fixes, and
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
