ceki 2003/02/19 06:24:06
Modified: src/java/org/apache/log4j/jdbc Tag: v1_2-branch
JDBCAppender.java
src/java/org/apache/log4j/xml Tag: v1_2-branch
DOMConfigurator.java
Log:
Revision Changes Path
No revision
No revision
1.6.2.4 +0 -2 jakarta-log4j/src/java/org/apache/log4j/jdbc/JDBCAppender.java
Index: JDBCAppender.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/jdbc/JDBCAppender.java,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -u -r1.6.2.3 -r1.6.2.4
--- JDBCAppender.java 19 Feb 2003 04:55:56 -0000 1.6.2.3
+++ JDBCAppender.java 19 Feb 2003 14:24:05 -0000 1.6.2.4
@@ -246,8 +246,6 @@
// clear the buffer of reported events
removes.clear();
-
- //buffer.clear();
}
No revision
No revision
1.49.2.4 +15 -15 jakarta-log4j/src/java/org/apache/log4j/xml/DOMConfigurator.java
Index: DOMConfigurator.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/xml/DOMConfigurator.java,v
retrieving revision 1.49.2.3
retrieving revision 1.49.2.4
diff -u -r1.49.2.3 -r1.49.2.4
--- DOMConfigurator.java 22 Oct 2002 17:44:54 -0000 1.49.2.3
+++ DOMConfigurator.java 19 Feb 2003 14:24:06 -0000 1.49.2.4
@@ -651,16 +651,16 @@
}
try {
- // This makes ID/IDREF attributes to have a meaning. Don't ask
- // me why.
dbf.setValidating(true);
- //dbf.setNamespaceAware(true);
-
DocumentBuilder docBuilder = dbf.newDocumentBuilder();
- docBuilder.setErrorHandler(new SAXErrorHandler());
-
- docBuilder.setEntityResolver(new Log4jEntityResolver());
- Document doc = docBuilder.parse(inputSource);
+ docBuilder.setErrorHandler(new SAXErrorHandler());
+ docBuilder.setEntityResolver(new Log4jEntityResolver());
+ // we change the system ID to a valid URI so that Crimson won't
+ // complain. Indeed, "log4j.dtd" alone is not a valid URI which
+ // causes Crimson to barf. The Log4jEntityResolver only cares
+ // about the "log4j.dtd" ending.
+ inputSource.setSystemId("dummy://log4j.dtd");
+ Document doc = docBuilder.parse(inputSource);
parse(doc.getDocumentElement());
} catch (Exception e) {
// I know this is miserable...
@@ -668,13 +668,13 @@
}
}
- /**
- Configure by taking in an DOM element.
- */
- public void doConfigure(Element element, LoggerRepository repository) {
- this.repository = repository;
- parse(element);
- }
+ /**
+ Configure by taking in an DOM element.
+ */
+ public void doConfigure(Element element, LoggerRepository repository) {
+ this.repository = repository;
+ parse(element);
+ }
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
