Erik:
Thanks very much for committing my (jumbo) patch!
There was still a tiny bit missing from the header comment of XMLCatalog.java, plus I removed a typo or two (mine) in the rest. The attached patch should do it. The patch is _only_ to code comments. All of the source code looks fine.
The test failures, however, are really interesting! I will look into them in detail, but I need to know your configuration in order to reproduce the problem.
I am guessing you are using the following:
Windows 2000 Apache Xerces 2.0.1 (the one that comes bundled with Ant) Apache Xalan 2.3.1
Please let me know as soon as possible. I noted in your comments, the assert failures were all of the nature
Expected "file:/C:/ant1.5Beta/jakarta-ant/src.../doc.dtd" But Was: "file:C:/ant1.5Beta/jakarta-ant/src.../doc.dtd"
That is, the URL was being formed improperly-- missing the slash after "file:"
I will find the bug. Either it is an Ant issue, in which case I will submit a patch fix, or it is a Xalan issue, in which case I will submit a patch workaround.
Regards,
--Craeg
[EMAIL PROTECTED] wrote:
ehatcher 02/05/24 10:40:23
Modified: src/main/org/apache/tools/ant/types Tag: ANT_15_BRANCH
XMLCatalog.java
Log:
oops.... the patch I previously applied missed the first "chunk". i think i've got it all fixed now.
Revision Changes Path
No revision
No revision
1.9.2.3 +31 -4 jakarta-ant/src/main/org/apache/tools/ant/types/XMLCatalog.java
Index: XMLCatalog.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/XMLCatalog.java,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -r1.9.2.2 -r1.9.2.3
--- XMLCatalog.java 24 May 2002 15:47:56 -0000 1.9.2.2
+++ XMLCatalog.java 24 May 2002 17:40:23 -0000 1.9.2.3
@@ -101,14 +101,31 @@
* the XMLCatalog object and must be labeled <code>dtd</code> and
* <code>entity</code> respectively.</p>
*
- * <p>Possible future extension could allow a catalog file instead of nested
- * elements, or use Norman Walsh's entity resolver from xml-commons</p>
+ * <p>The following is a description of the resolution algorithm:
+ * entities/URIs/dtds are looked up in each of the following contexts,
+ * stopping when a valid and readable resource is found:
+ * <ol>
...
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
