ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ehatc...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/types XMLCatalog.java
Date Fri, 24 May 2002 17:40:23 GMT
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>
  + * <li>In the local filesystem</li>
  + * <li>In the classpath</li>
  + * <li>In URL-space</li>
  + * </ol>
  + * </p>
  + *
  + * <p>See {@link
  + * org.apache.tools.ant.taskdefs.optional.XMLValidateTask
  + * XMLValidateTask} for an example of a task that has integrated
  + * support for XMLCatalogs.</p>
  + *
  + * <p>Possible future extension could provide for additional OASIS
  + * entry types to be specified inline, and external catalog files
  + * using the xml-commons resolver library</p>
    *
    * @author dIon Gillard
    * @author Erik Hatcher
  - * @version $Id: XMLCatalog.java,v 1.9.2.2 2002/05/24 15:47:56 ehatcher Exp $
  + * @author <a href="mailto:cstrong@arielpartners.com">Craeg Strong</a>
  + * @version $Id: XMLCatalog.java,v 1.9.2.3 2002/05/24 17:40:23 ehatcher Exp $
    */
  -public class XMLCatalog extends DataType implements Cloneable, EntityResolver {
  +public class XMLCatalog extends DataType implements Cloneable, EntityResolver, URIResolver
{
       /** File utilities instance */
       private FileUtils fileUtils = FileUtils.newFileUtils();
   
  @@ -117,11 +134,21 @@
       /** holds dtd/entity objects until needed */
       private Vector elements = new Vector();
   
  +    /**
  +     * Classpath in which to attempt to resolve resources.
  +     */
       private Path classpath;
   
       //-- Methods ---------------------------------------------------------------
   
  +    public XMLCatalog() {
  +        checked = false;
  +    }
  +
       /**
  +     * Returns the elements of the catalog - ResolverLocation and
  +     * FileSet objects.
  +     *
        * @return the elements of the catalog - DTDLocation objects
        */
       private Vector getElements() {
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message