ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/types/resolver ApacheCatalogResolver.java
Date Fri, 24 Oct 2003 08:59:58 GMT
bodewig     2003/10/24 01:59:58

  Modified:    docs/manual tasksoverview.html
               docs/manual/CoreTasks subant.html xmlproperty.html
               docs/manual/CoreTypes zipfileset.html
               src/main/org/apache/tools/ant AntClassLoader.java
               src/main/org/apache/tools/ant/types/resolver
                        ApacheCatalogResolver.java
  Log:
  Some typo fixes
  well formed != valid
  better debug support in ApacheCatalogResolver
  
  PRs: 24059, 24060, 24069, 24070, 24074
  Submitted by:	Jesse Glick <jglick at netbeans dot org>
  
  Revision  Changes    Path
  1.25      +1 -1      ant/docs/manual/tasksoverview.html
  
  Index: tasksoverview.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/tasksoverview.html,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- tasksoverview.html	14 Oct 2003 10:51:47 -0000	1.24
  +++ tasksoverview.html	24 Oct 2003 08:59:58 -0000	1.25
  @@ -1048,7 +1048,7 @@
   
     <tr valign="top">
       <td nowrap><a href="CoreTasks/xmlproperty.html">XmlProperty</a></td>
  -    <td><p>Loads property values from a valid XML file.</p></td>
  +    <td><p>Loads property values from a well-formed XML file.</p></td>
     </tr>
   </table>
   
  
  
  
  1.9       +1 -1      ant/docs/manual/CoreTasks/subant.html
  
  Index: subant.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/subant.html,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- subant.html	25 Sep 2003 13:59:01 -0000	1.8
  +++ subant.html	24 Oct 2003 08:59:58 -0000	1.9
  @@ -50,7 +50,7 @@
           of ant for bulk project execution.
   
           <strong>This task must no be used outside of a
  -        <code>target</code> if it invoces the same build file it is
  +        <code>target</code> if it invokes the same build file it is
           part of.</strong>
   
           </p>
  
  
  
  1.5       +6 -7      ant/docs/manual/CoreTasks/xmlproperty.html
  
  Index: xmlproperty.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/xmlproperty.html,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- xmlproperty.html	6 Nov 2002 08:43:45 -0000	1.4
  +++ xmlproperty.html	24 Oct 2003 08:59:58 -0000	1.5
  @@ -8,7 +8,7 @@
   <h2><a name="xmlproperty">XmlProperty</a></h2>
   <h3>Description</h3>
   <p>
  -Loads property values from a valid xml file.  This XML property file:
  +Loads property values from a well-formed xml file.  This XML property file:
   <pre>
     &lt;root&gt;
       &lt;properties&gt;
  @@ -16,7 +16,7 @@
       &lt;/properties&gt;
     &lt;/root&gt;
   </pre>
  -is roughly equivalent to this java property file:
  +is roughly equivalent to this Java property file:
   <pre>
     root.properties.foo = bar
   </pre>
  @@ -25,7 +25,7 @@
   By default, this load
   does <em>no</em> processing of the input.  In particular, unlike the
   <a href="property.html">Property task</a>, property references
  -(i.e., ${foo}) are not resolved.
  +(i.e., <samp>${foo}</samp>) are not resolved.
   <p>
   <a name="semanticAttributes">
   <h3>Semantic Attributes</h3>
  @@ -98,7 +98,7 @@
     </tr>  
     <tr>
       <td valign="top">validate</td>
  -    <td valign="top">Validate the input file.</td>
  +    <td valign="top">Validate the input file (e.g. by a DTD). Otherwise the XML must
only be well-formed.</td>
       <td valign="top" align="center">No, default is <i>false</i>.</td>
     </tr>
     <tr>
  @@ -250,11 +250,10 @@
     &lt;/classpath&gt;
   </pre>
   
  -<hr/>
  +<hr>
   
  -<p align="center">Copyright &copy; 2002 Apache Software Foundation. All rights
  +<p align="center">Copyright &copy; 2002-2003 Apache Software Foundation. All
rights
   Reserved.</p>
   
   </body>
   </html>
  -
  
  
  
  1.3       +1 -1      ant/docs/manual/CoreTypes/zipfileset.html
  
  Index: zipfileset.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/CoreTypes/zipfileset.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- zipfileset.html	13 Sep 2003 12:37:04 -0000	1.2
  +++ zipfileset.html	24 Oct 2003 08:59:58 -0000	1.3
  @@ -21,7 +21,7 @@
     </li>
   </ul>
   <p><code>&lt;zipfileset&gt;</code> supports all attributes of
<code>&lt;<a
  - href="file:///C:/dev/gnu/ant/docs/manual/CoreTypes/fileset.html">fileset</a>&gt;</code>
  + href="fileset.html">fileset</a>&gt;</code>
   in addition to those listed below.<br>
   </p>
   <p>Since Ant 1.6, a zipfileset can be defined with the <span
  
  
  
  1.77      +1 -1      ant/src/main/org/apache/tools/ant/AntClassLoader.java
  
  Index: AntClassLoader.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/AntClassLoader.java,v
  retrieving revision 1.76
  retrieving revision 1.77
  diff -u -r1.76 -r1.77
  --- AntClassLoader.java	9 Sep 2003 16:52:03 -0000	1.76
  +++ AntClassLoader.java	24 Oct 2003 08:59:58 -0000	1.77
  @@ -80,7 +80,7 @@
    * class will then use this loader rather than the system class loader.
    *
    * @author Conor MacNeill
  - * @author <a href="mailto:Jesse.Glick@netbeans.com">Jesse Glick</a>
  + * @author <a href="mailto:jglick@netbeans.org">Jesse Glick</a>
    * @author Magesh Umasankar
    */
   public class AntClassLoader extends ClassLoader implements BuildListener {
  
  
  
  1.13      +8 -3      ant/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java
  
  Index: ApacheCatalogResolver.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ApacheCatalogResolver.java	21 Sep 2003 20:20:02 -0000	1.12
  +++ ApacheCatalogResolver.java	24 Oct 2003 08:59:58 -0000	1.13
  @@ -64,6 +64,7 @@
   import org.apache.tools.ant.types.XMLCatalog;
   import org.apache.tools.ant.types.ResourceLocation;
   
  +import org.apache.xml.resolver.Catalog;
   import org.apache.xml.resolver.CatalogManager;
   
   import org.apache.xml.resolver.tools.CatalogResolver;
  @@ -124,7 +125,7 @@
           CatalogManager.getStaticManager().setUseStaticCatalog(false);
   
           // debug
  -        // System.setProperty("xml.catalog.verbosity", "4");
  +        // CatalogManager.getStaticManager().setVerbosity(4);
       }
   
       /** Set the XMLCatalog object to callback. */
  @@ -138,7 +139,11 @@
        */
       public void parseCatalog(String file) {
   
  -        ApacheCatalog catalog = (ApacheCatalog) getCatalog();
  +        Catalog _catalog = getCatalog();
  +        if (!(_catalog instanceof ApacheCatalog)) {
  +            throw new BuildException("Wrong catalog type found: " + _catalog.getClass().getName());
  +        }
  +        ApacheCatalog catalog = (ApacheCatalog) _catalog;
   
           // Pass in reference to ourselves so we can be called back.
           catalog.setResolver(this);
  
  
  

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


Mime
View raw message