ceki 2002/10/22 10:44:54
Modified: src/java/org/apache/log4j/xml Tag: v1_2-branch
DOMConfigurator.java
Added: src/java/org/apache/log4j/xml Tag: v1_2-branch
Log4jEntityResolver.java
Log:
An apparently successful attempt at solving the log4j.jar locking problem.
Revision Changes Path
No revision
No revision
1.49.2.3 +1 -10 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.2
retrieving revision 1.49.2.3
diff -u -r1.49.2.2 -r1.49.2.3
--- DOMConfigurator.java 9 Oct 2002 20:38:25 -0000 1.49.2.2
+++ DOMConfigurator.java 22 Oct 2002 17:44:54 -0000 1.49.2.3
@@ -659,16 +659,7 @@
DocumentBuilder docBuilder = dbf.newDocumentBuilder();
docBuilder.setErrorHandler(new SAXErrorHandler());
- Class clazz = this.getClass();
- URL dtdURL = clazz.getResource("/org/apache/log4j/xml/log4j.dtd");
- if(dtdURL == null) {
- LogLog.error("Could not find [log4j.dtd]. Used ["+clazz.getClassLoader()+
- "] class loader in the search.");
- }
- else {
- LogLog.debug("URL to log4j.dtd is [" + dtdURL.toString()+"].");
- inputSource.setSystemId(dtdURL.toString());
- }
+ docBuilder.setEntityResolver(new Log4jEntityResolver());
Document doc = docBuilder.parse(inputSource);
parse(doc.getDocumentElement());
} catch (Exception e) {
No revision
No revision
1.1.2.1 +59 -0
jakarta-log4j/src/java/org/apache/log4j/xml/Attic/Log4jEntityResolver.java
--
To unsubscribe, e-mail: <mailto:log4j-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:log4j-dev-help@;jakarta.apache.org>
