ceki 01/06/06 09:07:34
Modified: build siteBuild.sh
docs HISTORY manual.html
src/java/org/apache/log4j Hierarchy.java
src/java/org/apache/log4j/examples MyCategory.java
src/java/org/apache/log4j/helpers Loader.java
src/java/org/apache/log4j/spi LoggingEvent.java
src/java/org/apache/log4j/test Makefile
src/xdocs download.xml
Log:
Documentation changes.
Revision Changes Path
1.3 +3 -5 jakarta-log4j/build/siteBuild.sh
Index: siteBuild.sh
===================================================================
RCS file: /home/cvs/jakarta-log4j/build/siteBuild.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- siteBuild.sh 2001/02/14 12:53:17 1.2
+++ siteBuild.sh 2001/06/06 16:07:00 1.3
@@ -10,21 +10,19 @@
CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
fi
-# Add in your .jar files first
-for i in ./lib/*.jar
-do
- CLASSPATH=$CLASSPATH:"$i"
-done
# Add in the jakarta-site2 library files
for i in ../../jakarta-site2/lib/*.jar
do
CLASSPATH=$CLASSPATH:"$i"
done
+
# convert the unix path to windows
if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ] ; then
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
+
+echo "CLASSPATH=$CLASSPATH"
BUILDFILE=siteBuild.xml
1.51 +9 -4 jakarta-log4j/docs/HISTORY
Index: HISTORY
===================================================================
RCS file: /home/cvs/jakarta-log4j/docs/HISTORY,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- HISTORY 2001/06/02 09:49:41 1.50
+++ HISTORY 2001/06/06 16:07:04 1.51
@@ -11,12 +11,17 @@
- Corrected a problem with the static initializer of the Category
class which would use the wrong class loader to search for the
- log4j.properties file. [*]
+ log4j.properties file. The search algorithm has been also
+ simplified. The preferred method to specify the automatic
+ configuration file is setting the log4j.configration system
+ property. [*]
- - Documentation improvements.
+ - Documentation improvements. [*]
+
+ - Enhancements to the org.apache.log4j.examples.appserver package. [*]
-
- -
+ - Corrected a bug in the way the NTEventLogAppender printed
+ exceptions. [*]
May 20, 2001
1.19 +11 -7 jakarta-log4j/docs/manual.html
Index: manual.html
===================================================================
RCS file: /home/cvs/jakarta-log4j/docs/manual.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- manual.html 2001/05/31 22:23:02 1.18
+++ manual.html 2001/06/06 16:07:06 1.19
@@ -747,10 +747,15 @@
other than "false".
<p><li>Set the <code>resource</code> string variable to the value of
- the <b>log4j.configuration</b> system property. If the system
- property is not defined, then set <code>resource</code> to
- "log4j.properties".
+ the <b>log4j.configuration</b> system property. <em>The preferred
+ way to specify the default initialization file is thourough the
+ <b>log4j.configuration</b> system property.</em> In case the system
+ property is not defined, then set <code>resource</code> to the
+ default value "log4j.properties".
+
+
+
<p><li>Attempt to convert the <code>resource</code> variable to a
URL.
@@ -758,14 +763,13 @@
example due to a <code>MalformedURLException</code>, then search for
the <code>resource</code> from the classpath by calling
<code>org.apache.log4j.helpers.Loader.getResource(resource,
- Category.class)</code> which returns a URL. Note that
- "log4j.properties" is a malformed URL and hence it falls to this
+ Category.class)</code> which returns a URL. Note that the string
+ "log4j.properties" constitutes a malformed URL and falls into this
case.
<p>See <a
href="api/org/apache/log4j/helpers/Loader.html#getResource(java.lang.String,
java.lang.Class)">Loader.getResource(java.lang.String, java.lang.Class)</a>
- for the list of searched locations which is rather complex in
- itself..
+ for the list of searched locations.
<p><li>If no URL could not be found, abort default
initialization. Otherwise, configure log4j from the URL.
1.17 +5 -5 jakarta-log4j/src/java/org/apache/log4j/Hierarchy.java
Index: Hierarchy.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/Hierarchy.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Hierarchy.java 2001/06/04 06:20:56 1.16
+++ Hierarchy.java 2001/06/06 16:07:11 1.17
@@ -87,7 +87,7 @@
disable = DISABLE_OFF;
this.root.setHierarchy(this);
rendererMap = new RendererMap();
- defaultFactory = new DefaultCategoryFactory();
+ defaultFactory = new DefaultCategoryFactory();
}
/**
@@ -260,7 +260,7 @@
<p>If a category of that name already exists, then it will be
returned. Otherwise, a new category will be instantiated and
- lthen inked with its existing ancestors as well as children.
+ then linked with its existing ancestors as well as children.
@param name The name of the category to retrieve.
@@ -410,10 +410,10 @@
@since 1.1
*/
- public void setCategoryFactory(CategoryFactory factory)
- {
- if (factory != null)
+ public void setCategoryFactory(CategoryFactory factory) {
+ if (factory != null) {
defaultFactory = factory;
+ }
}
/**
1.8 +1 -1 jakarta-log4j/src/java/org/apache/log4j/examples/MyCategory.java
Index: MyCategory.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/examples/MyCategory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MyCategory.java 2001/05/20 15:03:07 1.7
+++ MyCategory.java 2001/06/06 16:07:16 1.8
@@ -66,7 +66,7 @@
try {
MyCategory c = (MyCategory) MyCategory.getInstance("some.cat");
c.trace("Hello");
- c.debug("World.");
+ c.debug("Hello");
} catch(ClassCastException e) {
LogLog.error("Did you forget to set the factory in the config file?", e);
}
1.9 +24 -27 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Loader.java 2001/05/31 22:23:05 1.8
+++ Loader.java 2001/06/06 16:07:20 1.9
@@ -28,17 +28,13 @@
<ol>
- <p><li>Search for <code>fully/qualified/clazz/name/resource</code>
- with the {@link ClassLoader} that loaded <code>clazz</code>.
+ <p><li>Search for <code>resource</code> with same the class
+ loader that loaded <code>clazz</code>.
- <p><li>Search for <code>fully/qualified/clazz/name/resource</code>
- with the <code>null</code> (bootstrap) class loader.
-
- <p><li>Search for <code>resource</code> with the class loader
- that loaded <code>clazz</code>.
-
<p><li>Try one last time with
- <code>ClassLoader.getSystemResource(resource)</code>.
+ <code>ClassLoader.getSystemResource(resource)</code>, that is is
+ using the system class loader in JDK 1.2 and virtual machine's
+ built-in class loader in JDK 1.1.
</ol>
@@ -53,25 +49,26 @@
// Is it under CLAZZ/resource somewhere in the classpath? CLAZZ
// stands for fully qualified name of "clazz" where dots have been
// changed to directory separators
- LogLog.debug("Trying to find ["+resource+"] using clazz.getResource().");
+ ///LogLog.debug("Trying to find ["+resource+"] using clazz.getResource().");
+ ///
+ ///try {
+ /// url = clazz.getResource(resource);
+ /// if(url != null)
+ /// return url;
+ ///} catch (Throwable t) {
+ /// LogLog.warn(TSTR,t);
+ ///}
+ ///
+ ///// attempt to get the resource under CLAZZ/resource from the
+ ///// system class path. The system class loader should not throw
+ ///// InvalidJarIndexExceptions
+ ///String fullyQualified = resolveName(resource, clazz);
+ ///LogLog.debug("Trying to find ["+fullyQualified+
+ /// "] using ClassLoader.getSystemResource().");
+ ///url = ClassLoader.getSystemResource(fullyQualified);
+ ///if(url != null)
+ /// return url;
- try {
- url = clazz.getResource(resource);
- if(url != null)
- return url;
- } catch (Throwable t) {
- LogLog.warn(TSTR,t);
- }
-
- // attempt to get the resource under CLAZZ/resource from the
- // system class path. The system class loader should not throw
- // InvalidJarIndexExceptions
- String fullyQualified = resolveName(resource, clazz);
- LogLog.debug("Trying to find ["+fullyQualified+
- "] using ClassLoader.getSystemResource().");
- url = ClassLoader.getSystemResource(fullyQualified);
- if(url != null)
- return url;
// Let the class loader of clazz and parents (by the delagation
// property) seearch for resource
1.12 +1 -1 jakarta-log4j/src/java/org/apache/log4j/spi/LoggingEvent.java
Index: LoggingEvent.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/spi/LoggingEvent.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- LoggingEvent.java 2001/04/11 22:01:19 1.11
+++ LoggingEvent.java 2001/06/06 16:07:23 1.12
@@ -90,7 +90,7 @@
/** Location information for the caller. */
private LocationInfo locationInfo;
- // Damn serialization
+ // Serialization
static final long serialVersionUID = -868428216207166145L;
static final Integer[] PARAM_ARRAY = new Integer[1];
1.13 +1 -0 jakarta-log4j/src/java/org/apache/log4j/test/Makefile
Index: Makefile
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/test/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Makefile 2001/05/20 13:21:57 1.12
+++ Makefile 2001/06/06 16:07:27 1.13
@@ -21,6 +21,7 @@
SysoutConfigurator.java\
UnitTestCategory.java\
UnitTestCyclicBuffer.java\
+ UnitTestOR.java\
UnitTestBoundedFIFO.java\
UnitTestOptionConverter.java\
SocketAppenderTest.java\
1.24 +6 -6 jakarta-log4j/src/xdocs/download.xml
Index: download.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/xdocs/download.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- download.xml 2001/05/20 15:03:07 1.23
+++ download.xml 2001/06/06 16:07:31 1.24
@@ -20,7 +20,7 @@
<tr>
<td>
<font color="666666">
- There is <a href="praise.html">mounting evidence</a> showing that
+ There is <a href="praise.html">mounting evidence</a> showing that
log4j is highly addictive. In clinical tests, starving programmers
have consistently preferred logging to pizza.
<p> Are you absolutely sure you want to use log4j? Because once
@@ -32,12 +32,12 @@
-->
-<section name="log4j version 1.1.1">
+<section name="log4j version 1.1.2">
-<p>Download version 1.1.1 including <i>full source code</i>, class files
+<p>Download version 1.1.2 including <i>full source code</i>, class files
and documentation in
-<a href="../jakarta-log4j-1.1.1.tar.gz"><b>TAR.GZ</b></a> format or in
-<a href="../jakarta-log4j-1.1.1.zip"><b>ZIP</b></a> format. You may
+<a href="../jakarta-log4j-1.1.2.tar.gz"><b>TAR.GZ</b></a> format or in
+<a href="../jakarta-log4j-1.1.2.zip"><b>ZIP</b></a> format. You may
elect to browse log4j <a
href="documentation.html"><b>documentation</b></a> online.
</p>
@@ -45,7 +45,7 @@
<p><a
href="http://www.javaworld.com/javaworld/jw-05-2001/jw-0504-finalists.html";><img
src="images/ecaward_finalist_logo.gif" align="right"
-border="0"/></a>Version 1.1.1 is the 21st major public release of
+border="0"/></a>Version 1.1.2 is the 21st major public release of
log4j. It is backward compatible with log4j version 1.0.x.</p>
<p>We also maintain a list of <a href="earlier.html">earlier
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
