You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-cvs@jakarta.apache.org by ce...@apache.org on 2001/01/24 17:15:28 UTC
cvs commit: jakarta-log4j/org/apache/log4j/test Makefile
ceki 01/01/24 08:15:28
Modified: . build.inc
doc HISTORY
org/apache/log4j/net SocketServer.java
org/apache/log4j/test Makefile
Log:
Corrected compile time incompatibility with Java 1.1 in SocketServer.java
Revision Changes Path
1.13 +4 -2 jakarta-log4j/build.inc
Index: build.inc
===================================================================
RCS file: /home/cvs/jakarta-log4j/build.inc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.inc 2001/01/18 07:49:36 1.12
+++ build.inc 2001/01/24 16:15:22 1.13
@@ -68,13 +68,13 @@
<echo message="JAVAMAIL is present."/>
</target>
+ <!-- <property name="build.compiler" value="jikes"/> -->
<target name="init">
<tstamp />
<property name="srcdir" value="." />
<property name="classes" value="classes" />
- <property name="stem" value="org/apache/log4j" />
- <property name="build.compiler" value="jikes"/>
+ <property name="stem" value="org/apache/log4j" />
<property name="version" value="1.1"/>
</target>
@@ -99,6 +99,7 @@
excludes="misc/*, **/UnitTest*.java,
**/doc-files/*,
${stem}/xml/**,
+ ${stem}/gui/**,
${stem}/net/SMTPAppender.java,
${stem}/net/JMS*.java,
${stem}/or/MessageRenderer.java,
@@ -213,6 +214,7 @@
org.apache.log4j.performance,
org.apache.log4j.xml,
org.apache.log4j.examples,
+ org.apache.log4j.examples.appserver,
org.apache.log4j.net,
org.apache.log4j.nt,
org.apache.log4j.varia,
1.11 +14 -7 jakarta-log4j/doc/HISTORY
Index: HISTORY
===================================================================
RCS file: /home/cvs/jakarta-log4j/doc/HISTORY,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- HISTORY 2001/01/24 10:24:02 1.10
+++ HISTORY 2001/01/24 16:15:24 1.11
@@ -11,10 +11,11 @@
- Release of version 1.1 (the 21st major release)
- Logging can now be disabled per Hierarchy. It can also be disabled
- using configuration files using the "disable" directive. The disableOverride
- directive takes precedence over the disable directive. As a result of this change
- the disable family of methods has moved from the BasicConfigurator
- class to the Hierarchy class. [**]
+ using configuration files using the "disable" directive. The
+ disableOverride directive takes precedence over the disable
+ directive. As a result of this change the disable family of
+ methods has moved from the BasicConfigurator class to the Hierarchy
+ class. [**]
- Changed the name of the configuration element to log4j:configuration in the
log4j.dtd. All configuration files written in XML need to be
@@ -36,9 +37,15 @@
the static initializer of Category class. Thanks to Calvin Chan for
supplying a better method. [*]
- - Updated the "Adding Conversion Characters to PatternLayout" document to reflect the
- latest changes to the code. Also added the org/apache/log4j/examples/appserver
- directory containing the associated example code. [*]
+ - Made the instanceFCQN an instance variable instead of a class
+ static in Category.java. In related move, the Category constructor
+ now takes an additional argument setting the instanceFCQN. This
+ makes life less miserable for Category subclasses. [*]
+
+ - Updated the "Adding Conversion Characters to PatternLayout"
+ document to reflect the latest changes to the code. Also added the
+ org/apache/log4j/examples/appserver directory containing the
+ associated example code. [*]
- Added the BufferSize option to the AsyncAppender. [*]
1.7 +3 -13 jakarta-log4j/org/apache/log4j/net/SocketServer.java
Index: SocketServer.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/net/SocketServer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SocketServer.java 2001/01/22 12:16:36 1.6
+++ SocketServer.java 2001/01/24 16:15:26 1.7
@@ -175,11 +175,8 @@
Hierarchy h = new Hierarchy(new RootCategory(Priority.DEBUG));
hierarchyMap.put(inetAddress, h);
- try {
- new PropertyConfigurator().doConfigure(configFile.toURL(), h);
- } catch(MalformedURLException e) {
- cat.error("Could not convert"+configFile+" to a URL.", e);
- }
+ new PropertyConfigurator().doConfigure(configFile.getAbsolutePath(), h);
+
return h;
} else {
cat.warn("Could not find config file ["+configFile+"].");
@@ -193,14 +190,7 @@
File f = new File(dir, GENERIC+CONFIG_FILE_EXT);
if(f.exists()) {
genericHierarchy = new Hierarchy(new RootCategory(Priority.DEBUG));
- try {
- new PropertyConfigurator().doConfigure(f.toURL(),
- genericHierarchy);
- } catch(MalformedURLException e) {
- cat.error("Could not convert"+f
- +" to a URL. Reverting to default hierarchy", e);
- genericHierarchy = Category.getDefaultHierarchy();
- }
+ new PropertyConfigurator().doConfigure(f.getAbsolutePath(), genericHierarchy);
} else {
cat.warn("Could not find config file ["+f+
"]. Will use the default hierarchy.");
1.6 +1 -1 jakarta-log4j/org/apache/log4j/test/Makefile
Index: Makefile
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/test/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile 2001/01/19 16:45:31 1.5
+++ Makefile 2001/01/24 16:15:27 1.6
@@ -19,12 +19,12 @@
ShortSocketServer.java\
DelayedLoop.java\
SysoutConfigurator.java\
- UnitTestOR.java\
UnitTestCategory.java\
UnitTestCyclicBuffer.java\
UnitTestBoundedFIFO.java\
UnitTestVarSubst.java\
SocketAppenderTest.java\
+ UnitTestOR.java\
SUBDIRS :=