Thanks for committing the patch!  I checked it out, but one small
change remains:

jakarta-ant/src/testcases/org/apache/tools/ant/types/XMLCatalogBuildFileTest.java

commenting back in the two tests that now work. See details below..

That's it!

Stefan Bodewig wrote:
On Fri, 08 Nov 2002, Craeg K. Strong <[EMAIL PROTECTED]>
wrote:

We cannot remove DTDLocation, it has been part of 1.5's public API.
For the same reason I have reverted the patch to XMLValidateTask that
changed the return type of createDTD.

Oops! I forgot about that. I think the solution you committed is just fine: it correctly indicates that a DTDLocation is in fact just a special case of a ResourceLocation, while maintaining backward compatibility...

The rest is in and passes (with and without resolver.jar) on my
machine.

very good. You are running Win2K SP3, yes?


Stefan

Regards,

--Craeg

diff -u -r1.3 XMLCatalogBuildFileTest.java
--- XMLCatalogBuildFileTest.java        5 Nov 2002 16:20:03 -0000       1.3
+++ XMLCatalogBuildFileTest.java        8 Nov 2002 17:57:09 -0000
@@ -102,13 +102,11 @@
     // file, entity is listed in the XMLCatalog pointing to a
     // different file.  Stuff result into property: val2
     //
-    /*
     public void testEntityWithCatalog() {
         configureProject("src/etc/testcases/types/xmlcatalog.xml");
         expectPropertySet("testentitywithcatalog", "val2",
                           "No news is good news");
     }
-    */

     //
     // Ensure that an external entity resolves as expected with NO
@@ -133,11 +131,9 @@
     // The entity is listed in the XMLCatalog pointing to a different file.
     // Stuff result into the property: val4
     //
-    /*
     public void testDocumentWithCatalog() {
         configureProject("src/etc/testcases/types/xmlcatalog.xml");
         expectPropertySet("testdocumentwithcatalog", "val4",
                           "No news is good news");
     }
-    */
 }


-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>



Reply via email to