ceki 02/04/17 14:52:26
Modified: . build.xml
docs HISTORY manual.html
src/java/org/apache/log4j PropertyConfigurator.java
src/java/org/apache/log4j/test runAll shallow
Removed: src/java/org/apache/log4j/test minreg.pl shippedCodeFlag
Log:
Corrected build.xml by adding org.apache.log4j.org.jms package to jar and
javadoc targets.
Other misc and minor changes
Revision Changes Path
1.29 +3 -1 jakarta-log4j/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/build.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- build.xml 16 Apr 2002 08:52:33 -0000 1.28
+++ build.xml 17 Apr 2002 21:52:25 -0000 1.29
@@ -17,7 +17,7 @@
<!-- prefixed with "env". -->
<property environment="env"/>
- <property name="version" value="1.2rc1"/>
+ <property name="version" value="1.2"/>
<!-- The base directory relative to which most targets are built -->
<property name="base" value="."/>
@@ -331,6 +331,7 @@
${stem}/jmx/*.class,
${stem}/or/*.class,
${stem}/or/sax/*.class,
+ ${stem}/or/jms/*.class,
${stem}/config/*.class,
${stem}/gui/TextPaneAppender.class"
excludes="**/StressCategory*, **/UnitTest**"
@@ -357,6 +358,7 @@
org.apache.log4j.or,
org.apache.log4j.jdbc,
org.apache.log4j.or.sax,
+ org.apache.log4j.or.jms,
org.apache.log4j.performance,
org.apache.log4j.spi,
org.apache.log4j.varia,
1.91 +1 -1 jakarta-log4j/docs/HISTORY
Index: HISTORY
===================================================================
RCS file: /home/cvs/jakarta-log4j/docs/HISTORY,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- HISTORY 16 Apr 2002 08:52:34 -0000 1.90
+++ HISTORY 17 Apr 2002 21:52:25 -0000 1.91
@@ -5,7 +5,7 @@
client code.
[***] Changes requiring important modifications to existing client code.
- ??, 2002
+ April, 2002
- Release of version 1.2
1.32 +5 -4 jakarta-log4j/docs/manual.html
Index: manual.html
===================================================================
RCS file: /home/cvs/jakarta-log4j/docs/manual.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- manual.html 17 Apr 2002 21:38:51 -0000 1.31
+++ manual.html 17 Apr 2002 21:52:25 -0000 1.32
@@ -917,10 +917,11 @@
tells log4j to use the file <code>foobar.lcf</code> as the default
configuration file. This file should be place under the
<code>WEB-INF/classes</code> directory of your web-application. Due to
-the second system property, the file will be read using the
-<code>com.foo.BarConfigurator</code> custom configurator. Each
-web-application will use a different default configuration file
-because each file is relative to a web-application.
+the definition of the <b>log4j.configuratorClass</b> system property,
+the file will be read using the <code>com.foo.BarConfigurator</code>
+custom configurator. Each web-application will use a different
+default configuration file because each file is relative to a
+web-application.
<p><b>Example 4</b>
1.52 +5 -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.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- PropertyConfigurator.java 4 Apr 2002 14:46:02 -0000 1.51
+++ PropertyConfigurator.java 17 Apr 2002 21:52:25 -0000 1.52
@@ -398,10 +398,12 @@
LogLog.setInternalDebugging(OptionConverter.toBoolean(value, true));
}
- String thresholdStr = properties.getProperty(THRESHOLD_PREFIX);
+ String thresholdStr = OptionConverter.findAndSubst(THRESHOLD_PREFIX,
+ properties);
if(thresholdStr != null) {
- LogLog.debug("Parsing threshold string ["+thresholdStr+"]");
- hierarchy.setThreshold(thresholdStr);
+ hierarchy.setThreshold(OptionConverter.toLevel(thresholdStr,
+ (Level) Level.ALL));
+ LogLog.debug("Hierarchy threshold set to ["+hierarchy.getThreshold()+"].");
}
configureRootCategory(properties, hierarchy);
1.15 +0 -2 jakarta-log4j/src/java/org/apache/log4j/test/runAll
Index: runAll
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/test/runAll,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- runAll 22 Feb 2002 18:36:28 -0000 1.14
+++ runAll 17 Apr 2002 21:52:26 -0000 1.15
@@ -10,11 +10,9 @@
./propConfig || die "propConfig test FAILED."
./getOptions || die "getOptions test FAILED."
./domTest || die "domTest FAILED."
-./thresholdFlagTest || die "enableFlagTest test FAILED."
./multipleAppenders || die "multipleAppenders test FAILED."
./confParsing || die "confParsing test FAILED."
#./customCategory || die "customCategory test FAILED."
-./pattern || die "pattern test FAILED."
./mycat || die "mycat test FAILED."
./l7d || die "L7D test FAILED."
./fqcn || die "FQCN test FAILED."
1.10 +0 -51 jakarta-log4j/src/java/org/apache/log4j/test/shallow
Index: shallow
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/test/shallow,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- shallow 16 Apr 2002 14:37:33 -0000 1.9
+++ shallow 17 Apr 2002 21:52:26 -0000 1.10
@@ -134,55 +134,4 @@
testShallow DATE
fi
-# ===============================================================
-# Remote socket
-# ===============================================================
-TEST=1000
-if [ $TEST -ge $start ]; then
- rm $TEMP
- echo "log4j.rootCategory=DEBUG, A" > socket.lcf
- echo "log4j.category.org.apache.log4j.test.ShortSocketServer=WARN">> socket.lcf
- echo "log4j.category.org.apache.log4j.net.SocketNode=WARN">> socket.lcf
- echo "log4j.appender.A=org.apache.log4j.FileAppender">> socket.lcf
- echo "log4j.appender.A.file= $TEMP" >> socket.lcf
- echo "log4j.appender.A.Append=false" >> socket.lcf
- echo "log4j.appender.A.layout=org.apache.log4j.PatternLayout" >> socket.lcf
- echo "log4j.appender.A.layout.ConversionPattern=%5p %x [%t] %c %m%n" >> socket.lcf
- echo "log4j.debug=true" >> socket.lcf
-
- java org.apache.log4j.test.ShortSocketServer $PORT socket.lcf &
- sleep 3
- echo "log4j.rootLogger=DEBUG, A" > $LCF
- lecho "log4j.appender.A=org.apache.log4j.net.SocketAppender"
- lecho "log4j.appender.A.Port=$PORT"
- lecho "log4j.appender.A.RemoteHost=localhost"
- testSocket LINE_NUMBER
-fi
-
-TEST=1001
-if [ $TEST -ge $start ]; then
- rm $TEMP
- echo "log4j.rootCategory=DEBUG, A" > socket.lcf
- echo "log4j.configDebug=true" >> socket.lcf
- echo "log4j.category.org.apache.log4j.test.ShortSocketServer=WARN" >> socket.lcf
- echo "log4j.category.org.apache.log4j.net.SocketNode=WARN" >> socket.lcf
- echo "log4j.appender.A=org.apache.log4j.FileAppender" >> socket.lcf
- echo "log4j.appender.A.File= $TEMP " >> socket.lcf
- echo "log4j.appender.A.Append=false " >> socket.lcf
- echo "log4j.appender.A.layout=org.apache.log4j.PatternLayout" >> socket.lcf
- echo "log4j.appender.A.layout.ConversionPattern=%5p %x [%t] %C (%F:%L) %m%n" >>
socket.lcf
-
- java org.apache.log4j.test.ShortSocketServer $PORT socket.lcf &
- sleep 3
- echo "log4j.rootCategory=DEBUG, A" > $LCF
- lecho "log4j.appender.A=org.apache.log4j.net.SocketAppender"
- lecho "log4j.appender.A.Port=$PORT"
- lecho "log4j.configDebug=true"
- lecho "log4j.appender.A.RemoteHost=localhost"
- lecho "log4j.appender.A.LocationInfo=true"
- testSocket LINE_NUMBER
-fi
-
-
-
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
