ehatcher 02/05/24 12:57:02
Modified: src/main/org/apache/tools/ant/types Tag: ANT_15_BRANCH
XMLCatalog.java
Log:
final missing pieces from the first chunk of Craeg's patch.
Revision Changes Path
No revision
No revision
1.9.2.4 +20 -6
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.3
retrieving revision 1.9.2.4
diff -u -r1.9.2.3 -r1.9.2.4
--- XMLCatalog.java 24 May 2002 17:40:23 -0000 1.9.2.3
+++ XMLCatalog.java 24 May 2002 19:57:01 -0000 1.9.2.4
@@ -84,8 +84,23 @@
/**
- * This data type provides a catalog of DTD locations.
- * <p>
+ * <p>This data type provides a catalog of resource locations (such as
+ * DTDs and XML entities), based on the <a
+ * href="http://oasis-open.org/committees/entity/spec-2001-08-06.html";>
+ * OASIS "Open Catalog" standard</a>. The catalog entries are used
+ * both for Entity resolution and URI resolution, in accordance with
+ * the [EMAIL PROTECTED] org.xml.sax.EntityResolver EntityResolver} and
[EMAIL PROTECTED]
+ * javax.xml.transform.URIResolver URIResolver} interfaces as defined
+ * in the <a href="http://java.sun.com/xml/jaxp";>Java API for XML
+ * Processing Specification</a>.</p>
+ *
+ * <p>Currently, only <code><dtd></code> and
+ * <code><entity></code> elements may be specified inline; these
+ * correspond to OASIS catalog entry types <code>PUBLIC</code> and
+ * <code>URI</code> respectively.</p>
+ *
+ * <p>The following is a usage example:</p>
+ *
* <code>
* <xmlcatalog><br>
* <dtd publicId="" location="/path/to/file.jar" /><br>
@@ -123,7 +138,7 @@
* @author dIon Gillard
* @author Erik Hatcher
* @author <a href="mailto:[EMAIL PROTECTED]">Craeg Strong</a>
- * @version $Id: XMLCatalog.java,v 1.9.2.3 2002/05/24 17:40:23 ehatcher Exp $
+ * @version $Id: XMLCatalog.java,v 1.9.2.4 2002/05/24 19:57:01 ehatcher Exp $
*/
public class XMLCatalog extends DataType implements Cloneable,
EntityResolver, URIResolver {
/** File utilities instance */
@@ -146,8 +161,7 @@
}
/**
- * Returns the elements of the catalog - ResolverLocation and
- * FileSet objects.
+ * Returns the elements of the catalog - DTDLocation objects.
*
* @return the elements of the catalog - DTDLocation objects
*/
@@ -291,7 +305,7 @@
* Makes this instance in effect a reference to another XMLCatalog
* instance.
*
- * <p>You must not set another attribute or nest elements inside *
+ * <p>You must not set another attribute or nest elements inside
* this element if you make it a reference. That is, a catalog
* cannot both refer to another <em>and</em> contain elements or
* attributes.</p>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
