CVS Update: Barracuda
[email protected] Tue, 22 Oct 2002 17:27:45 ()
| Newsgroups | gmane.comp.java.enhydra.barracuda.cvs |
|---|---|
| Message-ID | <[email protected]> |
CVSROOT: /u/cvs
Module name: Barracuda
Repository: Projects/EnhydraOrg/toolsTech/Barracuda/src/org/enhydra/barracuda/contrib/dbroggisch/webapp/
Changes by: JacobK@frogger. 02/10/22 17:27:45
Modified files:
Projects/EnhydraOrg/toolsTech/Barracuda/WEB-INF/lib/: readme.txt
Projects/EnhydraOrg/toolsTech/Barracuda/src/org/enhydra/barracuda/contrib/dbroggisch/webapp/:
build.xml
Added files:
Projects/EnhydraOrg/toolsTech/Barracuda/WEB-INF/lib/:
log4j-1.2.7a.jar
Removed files:
Projects/EnhydraOrg/toolsTech/Barracuda/WEB-INF/lib/:
log4j-1.2.7.jar
Log message:
committing version of Log4j which includes updates to org.apache.log4j.xml.DOMConfigurator and adds an org.apache.log4j.xml.Log4jEntityResolver. These updates seem to fix the issue where after an install/remove cycle using the Tomcat Manager application, the log4j.jar was getting locked so that doing an "ant clean" was failing because it couldn't delete the locked jar file. These changes should be in the next official release of Log4j (I imagine 1.2.8) but this change is too important to wait for. I just replaced the classes. I also updated the WEB-INF/lib readme.txt file with info on the modified logj4-1.2.7a.jar and modified Diez' contrib build.xml to point to the newest version of Log4j. Maybe I should be defining jar versions in the build.properties or maybe a version.properties?
If you want to see the changes involved, check out the Apache Log4j CVSWeb:
http://cvs.apache.org/viewcvs/jakarta-log4j/src/java/org/apache/log4j/xml/DOMConfigurator.java?rev=1.49.2.3&only_with_tag=v1_2-branch&content-type=text/vnd.viewcvs-markup
http://cvs.apache.org/viewcvs/jakarta-log4j/src/java/org/apache/log4j/xml/Attic/Log4jEntityResolver.java?rev=1.1.2.1&only_with_tag=v1_2-branch&content-type=text/vnd.viewcvs-markup
Here is the DIFF:
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
That's it.
Jake
===================================================================
File: no file readme.txt Status: Unknown
Working revision: No entry for readme.txt
Repository revision: No revision control file
===================================================================
File: no file build.xml Status: Needs Checkout
Working revision: 1.24 Wed Oct 23 00:27:45 2002
Repository revision: 1.24 /u/cvs/Projects/EnhydraOrg/toolsTech/Barracuda/src/org/enhydra/barracuda/contrib/dbroggisch/webapp/build.xml,v
Existing Tags:
Barracuda_1_1_1 (revision: 1.14)
===================================================================
File: no file log4j-1.2.7a.jar Status: Unknown
Working revision: No entry for log4j-1.2.7a.jar
Repository revision: No revision control file
===================================================================
File: no file log4j-1.2.7.jar Status: Unknown
Working revision: No entry for log4j-1.2.7.jar
Repository revision: No revision control file