ceki 2005/01/20 09:55:36
Modified: docs HISTORY.txt
. build.xml INSTALL.txt
src/java/org/apache/log4j LogManager.java
examples/tiny-webapp INSTALL.txt
Removed: . INSTALL
Log:
- The lengthy system property "log4j.repositorySelectorClass" was renamed as
"log4j.repositorySelector".
- Other minor fixes
Revision Changes Path
1.26 +17 -2 logging-log4j/docs/HISTORY.txt
Index: HISTORY.txt
===================================================================
RCS file: /home/cvs/logging-log4j/docs/HISTORY.txt,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- HISTORY.txt 17 Dec 2004 19:58:15 -0000 1.25
+++ HISTORY.txt 20 Jan 2005 17:55:35 -0000 1.26
@@ -8,9 +8,24 @@
[D] Changes affect a method or property which was previously marked as
deprecated.
- December XX, 2004
- - Release of version 1.3alpha-4
+ January 20th, 2005
+ - Release of version 1.3alpha-6
+ - Fixed involuntary omission of DOMConfigrator (deprecated) in
log4j-VERSION.jar.
+ - Added missing files in log4-oro.jar.
+ - The lengthy system property "log4j.repositorySelectorClass" was renamed
as
+ "log4j.repositorySelector".
+
+ January 19th, 2005
+ - Release of version 1.3alpha-5
+
+ - Universal and Generic Logging Interface (UGLI) is now part of log4j.
+ UGLI allows variation in the logging API implementattion in a simple and
+ robust way. Log4j directly supports the interfaces defined by UGLI.
+ For more information see http://logging.apache.org/log4j/docs/ugli.html
[*]
+
+ - Log4j now ships with several jar files, one jar file per dependency.
[*/**]
+
- Fixed Bugzilla 15198: TelnetAppender: NullPointerException if
SocketHandler not initialized. [*]
1.147 +4 -6 logging-log4j/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4j/build.xml,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- build.xml 20 Jan 2005 15:18:07 -0000 1.146
+++ build.xml 20 Jan 2005 17:55:35 -0000 1.147
@@ -403,8 +403,8 @@
<target name="log4j-oro.jar" depends="init, oroCheck, build.oro">
<jar jarfile="log4j-oro.jar" basedir="${javac.dest}"
- includes="${stem}/varia/LogFilePatternReceiver*.java,
- ${stem}/rule/LikeRule.java"
+ includes="${stem}/varia/LogFilePatternReceiver*.class,
+ ${stem}/rule/LikeRule.class"
>
<manifest>
<section name="org/apache/log4j/">
@@ -432,7 +432,7 @@
<target name="log4j-jms.jar" depends="init, build.jms"
if="jms-present">
- <jar jarfile="log4j-jms-${version}.jar" basedir="${javac.dest}"
+ <jar jarfile="log4j-jms.jar" basedir="${javac.dest}"
includes="${stem}/net/JMSAppender.class,
${stem}/net/JMSSink.class,
${stem}/net/JMSReceiver.class,
@@ -695,8 +695,6 @@
<fileset dir=".">
<patternset>
<include name="**/*.bak"/>
- <include name="dist/velocity*.log"/>
- <include name="tests/output/*"/>
<include name="${BSTEM}/**/temp*"/>
<include name="${BSTEM}/performance/test"/>
<include name="${BSTEM}/test/current.*"/>
@@ -723,7 +721,7 @@
examples/**,
build.xml,
build.properties.sample,
- INSTALL,
+ INSTALL.txt,
LICENSE.txt,
ugli-*.jar,
log4j-*.jar"
1.2 +62 -16 logging-log4j/INSTALL.txt
Index: INSTALL.txt
===================================================================
RCS file: /home/cvs/logging-log4j/INSTALL.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- INSTALL.txt 20 Jan 2005 15:37:25 -0000 1.1
+++ INSTALL.txt 20 Jan 2005 17:55:36 -0000 1.2
@@ -7,12 +7,12 @@
2) Assuming you chose to extract the distribution in to the
PATH_OF_YOUR_CHOICE, untarring the distribution file should create
- a jakarta-log4j-VERSION directory, where VERSION is the log4j
+ a logging-log4j-VERSION directory, where VERSION is the log4j
version number, under PATH_OF_YOUR_CHOICE. We will refer to the
- directory PATH_OF_YOUR_CHOICE/jakarta-log4j-VERSION/ as $LOG4J_HOME/.
+ directory PATH_OF_YOUR_CHOICE/logging-log4j-VERSION/ as $LOG4J_HOME/.
-3) Assuming you are using log4j version 1.2, add
- $LOG4J_HOME/dist/lib/log4j-1.2.jar to your CLASSPATH,
+3) Assuming you are using log4j version 1.3, add
+ $LOG4J_HOME/log4j-1.3.jar to your CLASSPATH,
4) You can now test your installation by first compiling the following
simple program.
@@ -24,9 +24,7 @@
static Logger logger = Logger.getLogger(Hello.class);
- public
- static
- void main(String argv[]) {
+ public static void main(String argv[]) {
BasicConfigurator.configure();
logger.debug("Hello world.");
logger.info("What a beatiful day.");
@@ -47,18 +45,60 @@
JAR files
=========
-The log4j distribution comes with one jar file: log4j-VERSION.jar
-under the LOG4J_HOME/dist/lib/ directory.
+The log4j distribution comes with several jar files under the
+LOG4J_HOME/ directory.
+
+* log4j-VERSION.jar
+
+ Contains the core log4j classes. It also includes UGLI API hardwired
+ to use log4j.
+
+* log4j-smtp.jar
+
+ Contains SMTPAppender and associated classes.
+
+* log4j-oro.jar
+
+ Contains LogFilePatternReceiver and LikeRule classes which are
+ dependent on jakarta-oro.
+
+ SMTPAppender and associated classes.
+
+* log4j-xml.jar
+
+ Contains several optional classes from the org.apache.log4j.xml package.
+
+* log4j-optional.jar
+
+ Contains several optional appenders/receivers from the
+ org.apache.log4j.net package.
+
+* log4j-db.jar
+
+ Contains DBAppender/DBReceiver and associated classes.
+
+* log4j-jms.jar
+
+ Contains JMSAppender/JMSReceiver and associated classes.
+
+* ugli-nop.jar
+
+ UGLI hardwired to use the NOP implementation.
+
+* ugli-simple.jar
+
+ UGLI hardwired to use the SimpleLogger implementation.
+
+* ugli-jdk14.jar
+
+ UGLI hardwired to use the java.util.logger package.
-This jar file contains all the class files of the log4j project,
-except test cases and classes from the "examples" and
-"org.apache.log4j.performance" packages.
==================
log4j dependencies
==================
-Log4j is based on JDK 1.1 with the following additional requirements:
+Log4j is based on JDK 1.2 with the following additional requirements:
----------------------------
Package org.apache.log4j.xml
@@ -92,6 +132,12 @@
http://java.sun.com/beans/glasgow/jaf.html
+ ----------------------
+ DBAppender/DB Receiver
+ ----------------------
+
+ DBAppender/DB Receiver have a dependency on the JDBC API.
+
-----------
JMSAppender
-----------
@@ -116,14 +162,14 @@
==============
Like most java appilicatios today, log4j relies on ANT as its build
-tool. ANT is availale from "http://jakarta.apache.org/ant/";. ANT
+tool. ANT is availale from "http://logging.apache.org/ant/";. ANT
requires a build file called build.xml which is part of this
distribution. Required components from other projects are specified in
the build.properties and example of which is supplied in the
build.properties.sample file.
In case of problems send an e-mail note to
[EMAIL PROTECTED] Please do not directly e-mail any
-log4j developers. The answer to your question might be useful to other
[EMAIL PROTECTED] Please do not directly e-mail log4j
+developers. The answer to your question might be useful to other
users. Moreover, there are many knowledgeable users on the log4j-user
mailing lists who can quickly answer your questions.
1.40 +3 -3 logging-log4j/src/java/org/apache/log4j/LogManager.java
Index: LogManager.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/LogManager.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- LogManager.java 12 Jan 2005 18:04:40 -0000 1.39
+++ LogManager.java 20 Jan 2005 17:55:36 -0000 1.40
@@ -97,7 +97,7 @@
defaultLoggerRepository, configurationOptionStr,
configuratorClassName);
String repositorySelectorStr =
- OptionConverter.getSystemProperty("log4j.repositorySelectorClass",
null);
+ OptionConverter.getSystemProperty("log4j.repositorySelector", null);
if (repositorySelectorStr == null) {
// NOTHING TO DO, the default repository has been configured already
@@ -133,8 +133,8 @@
<em>guard</em> is passed as parameter.
<p>Initally the guard is null, unless the JVM is started with the
- log4j.repositorySelectorClass system property
- (-Dlog4j.repositorySelectorClass=[JNDI | <fully qualified class name>]).
+ log4j.repositorySelector system property
+ (-Dlog4j.repositorySelector=[JNDI | <fully qualified class name>]).
If the guard is
<code>null</code>, then invoking this method sets the logger
repository and the guard. Following invocations will throw a [EMAIL
PROTECTED]
1.7 +7 -4 logging-log4j/examples/tiny-webapp/INSTALL.txt
Index: INSTALL.txt
===================================================================
RCS file: /home/cvs/logging-log4j/examples/tiny-webapp/INSTALL.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- INSTALL.txt 20 Jan 2005 15:07:24 -0000 1.6
+++ INSTALL.txt 20 Jan 2005 17:55:36 -0000 1.7
@@ -16,16 +16,19 @@
Other Servlet containers such as Jetty also have folders for
shared jar files.
-- On the java command line launching your java web *server*, make sure to
- add te log4j.repositorySelectorClass system property. For the
+- On the java command line launching your java web *server*, make sure
+ to add te log4j.repositorySelector system property. For the
JNDIContextSelector the exact system property to add is:
-
-Dlog4j.repositorySelectorClass=org.apache.log4j.selector.ContextJNDISelector
+ -Dlog4j.repositorySelector=org.apache.log4j.selector.ContextJNDISelector
or in its equivalent but shorter form
- -Dlog4j.repositorySelectorClass=JNDI
+ -Dlog4j.repositorySelector=JNDI
+ For Tomcat, you can add this line directly in ./bin/catalina.sh or
+ ./bin/catalina.bat.
+
- You can now run the supplied web-applications hello.war and
tata.war.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
