You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ho...@apache.org on 2005/07/07 06:52:00 UTC
cvs commit: logging-log4j-sandbox/src/java/org/apache/log4j/filter LevelMatchFilter.java
hoju 2005/07/06 21:52:00
Modified: . build.properties.sample build.xml
src/java/org/apache/log4j/net IMAppender.java
src/java/org/apache/log4j/servlet ConfigurationServlet.java
Removed: src/java/org/apache/log4j/filter LevelMatchFilter.java
Log:
Make sure everything can compile against the logging-log4j HEAD. Get rid of LevelMatchFilter because it now exists in logging-log4j.
Revision Changes Path
1.9 +9 -7 logging-log4j-sandbox/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/logging-log4j-sandbox/build.properties.sample,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.properties.sample 28 Feb 2004 13:55:04 -0000 1.8
+++ build.properties.sample 7 Jul 2005 04:52:00 -0000 1.9
@@ -1,3 +1,5 @@
+build.lib.dir=/home/yoavs/.maven/repository
+
# This property file is used by build.xml to located resource needed to build
# the log4j-sandbox code. Duplicate this file and rename to "build.properties"
# and locate it in the same directory as the build.xml file. Then modify the
@@ -11,18 +13,18 @@
build.verbose=off
# log4j jar REQUIRED
-#log4j.jar=./build-libs/log4j-1.2.8.jar
-log4j.jar=/home/yoavs/.maven/repository/log4j/jars/log4j-1.2.7.jar
+#log4j.jar=${build.lib.dir}/log4j/jars/log4j-1.2.11.jar
+log4j.jar=${build.lib.dir}/log4j/jars/log4j-1.3alpha-7.jar
+log4j-smtp.jar=${build.lib.dir}/log4j/jars/log4j-smtp-1.3alpha-7.jar
# Servlet 2.3 OPTIONAL; required to build the org.apache.log4j.servlet package
-#servlet.jar=./build-libs/servlet.jar
-servlet.jar=/home/yoavs/.maven/repository/servletapi/jars/servletapi-2.3.jar
+servlet.jar=${build.lib.dir}/servletapi/jars/servletapi-2.3.jar
# Checkstyle jar OPTIONAL; required to execute checkstyle target
-checkstyle.jar=d:/development/code-opensource/other/checkstyle-3.1/checkstyle-all-3.1.jar
+checkstyle.jar=${build.lib.dir}/checkstyle/jars/checkstyle-all-4.0-beta2.jar
# Jalopy OPTIONAL; required to run the jalpoy targets
-jalopy.lib=d:/development/code-opensource/other/jalopy-b10/lib
+jalopy.lib=/jalopy/jalopy-ant-0.6.2/lib
# Smack jar OPTIONAL; required to build the org.apache.log4j.net.IMAppender
-smack.jar=../smack-1.2.0/smack.jar
+smack.jar=${build.lib.dir}/smack/jars/smack-1.3.0.jar
1.17 +1 -0 logging-log4j-sandbox/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4j-sandbox/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 15 Dec 2004 06:30:10 -0000 1.16
+++ build.xml 7 Jul 2005 04:52:00 -0000 1.17
@@ -45,6 +45,7 @@
<path id="compile.classpath">
<pathelement location="${build.home}/classes"/>
<pathelement location="${log4j.jar}"/>
+ <pathelement location="${log4j-smtp.jar}"/>
<pathelement location="${servlet.jar}"/>
<pathelement location="${smack.jar}"/>
</path>
1.3 +9 -9 logging-log4j-sandbox/src/java/org/apache/log4j/net/IMAppender.java
Index: IMAppender.java
===================================================================
RCS file: /home/cvs/logging-log4j-sandbox/src/java/org/apache/log4j/net/IMAppender.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IMAppender.java 28 Feb 2004 13:55:05 -0000 1.2
+++ IMAppender.java 7 Jul 2005 04:52:00 -0000 1.3
@@ -21,7 +21,7 @@
import org.apache.log4j.helpers.CyclicBuffer;
import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.helpers.OptionConverter;
-import org.apache.log4j.spi.ErrorCode;
+//import org.apache.log4j.spi.ErrorCode;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.spi.TriggeringEventEvaluator;
@@ -199,9 +199,9 @@
chat = con.createChat(recipient);
}
} catch (Exception e) {
- errorHandler.error(
- "Error while activating options" + " for appender named [" + name
- + "]", e, ErrorCode.GENERIC_FAILURE);
+ //errorHandler.error(
+ // "Error while activating options" + " for appender named [" + name
+ // + "]", e, ErrorCode.GENERIC_FAILURE);
}
}
@@ -281,9 +281,9 @@
chat.sendMessage(buf.toString());
}
} catch (Exception e) {
- errorHandler.error(
- "Could not send message in IMAppender [" + name + "]", e,
- ErrorCode.GENERIC_FAILURE);
+ //errorHandler.error(
+ // "Could not send message in IMAppender [" + name + "]", e,
+ // ErrorCode.GENERIC_FAILURE);
}
}
@@ -297,13 +297,13 @@
*/
protected boolean checkEntryConditions() {
if ((this.chat == null) && (this.groupchat == null)) {
- errorHandler.error("Chat object not configured");
+ //errorHandler.error("Chat object not configured");
return false;
}
if (this.layout == null) {
- errorHandler.error("No layout set for appender named [" + name + "]");
+ //errorHandler.error("No layout set for appender named [" + name + "]");
return false;
}
1.12 +3 -3 logging-log4j-sandbox/src/java/org/apache/log4j/servlet/ConfigurationServlet.java
Index: ConfigurationServlet.java
===================================================================
RCS file: /home/cvs/logging-log4j-sandbox/src/java/org/apache/log4j/servlet/ConfigurationServlet.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ConfigurationServlet.java 28 Feb 2004 13:55:05 -0000 1.11
+++ ConfigurationServlet.java 7 Jul 2005 04:52:00 -0000 1.12
@@ -252,13 +252,13 @@
@return List the list of sorted loggers. */
private List getSortedLoggers() {
Logger logger = null;
- Enumeration enum = LogManager.getCurrentLoggers();
+ Enumeration enumer = LogManager.getCurrentLoggers();
Comparator comp = new LoggerComparator();
List list = new ArrayList();
// Add all current loggers to the list
- while (enum.hasMoreElements()) {
- list.add(enum.nextElement());
+ while (enumer.hasMoreElements()) {
+ list.add(enumer.nextElement());
}
// sort the loggers
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org