ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs AntStructure.java
Date Wed, 10 Apr 2002 10:02:55 GMT
bodewig     02/04/10 03:02:55

  Modified:    docs/manual/CoreTasks ant.html antstructure.html
               src/main/org/apache/tools/ant/taskdefs AntStructure.java
  Log:
  Bug 7552 auditing of <antstructure> - reset cache of visited elements
  at the end of execute.
  
  Add typedef to the child elements of project.
  
  Fix some docs.
  
  Revision  Changes    Path
  1.14      +3 -1      jakarta-ant/docs/manual/CoreTasks/ant.html
  
  Index: ant.html
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/docs/manual/CoreTasks/ant.html,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ant.html	28 Feb 2002 12:39:58 -0000	1.13
  +++ ant.html	10 Apr 2002 10:02:54 -0000	1.14
  @@ -67,7 +67,9 @@
     </tr>
     <tr>
       <td valign="top">output</td>
  -    <td valign="top">Filename to write the ant output to.
  +    <td valign="top">Filename to write the ant output to.  This is
  +    relative to the value of the dir attribute if it has been set or
  +    to the base directory of the current project otherwise.
       </td>
       <td align="center" valign="top">No</td>
     </tr>
  
  
  
  1.6       +5 -4      jakarta-ant/docs/manual/CoreTasks/antstructure.html
  
  Index: antstructure.html
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/docs/manual/CoreTasks/antstructure.html,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- antstructure.html	3 Feb 2002 22:00:41 -0000	1.5
  +++ antstructure.html	10 Apr 2002 10:02:54 -0000	1.6
  @@ -13,9 +13,10 @@
   about all tasks currently known to Ant.</p> 
   <p>Note that the DTD generated by this task is incomplete, you can
   always add XML entities using <a
  -href="taskdef.html"><code>&lt;taskdef&gt;</code></a>. See
<a
  -href="http://www.sdv.fr/pages/casa/html/ant-dtd.en.html" target="_top">here</a>
for
  -a way to get around this problem.</p>
  +href="taskdef.html"><code>&lt;taskdef&gt;</code></a> or <a
  +href="typedef.html"><code>&lt;typedef&gt;</code></a>. See
<a
  +href="http://www.sdv.fr/pages/casa/html/ant-dtd.en.html"
  +target="_top">here</a> for a way to get around this problem.</p>
   <p>This task doesn't know about required attributes, all will be
   listed as <code>#IMPLIED</code>.</p>
   <h3>Parameters</h3>
  @@ -35,7 +36,7 @@
   <blockquote><pre>
   &lt;antstructure output=&quot;project.dtd&quot;/&gt;
   </pre></blockquote>
  -<hr><p align="center">Copyright &copy; 2001 Apache Software Foundation.
All rights
  +<hr><p align="center">Copyright &copy; 2001-2002 Apache Software Foundation.
All rights
   Reserved.</p>
   
   </body>
  
  
  
  1.22      +16 -2     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
  
  Index: AntStructure.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/AntStructure.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- AntStructure.java	3 Mar 2002 01:46:20 -0000	1.21
  +++ AntStructure.java	10 Apr 2002 10:02:54 -0000	1.22
  @@ -77,7 +77,7 @@
    *
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
    *
  - * @version $Revision: 1.21 $
  + * @version $Revision: 1.22 $
    *
    * @ant.task category="xml"
    */
  @@ -149,9 +149,16 @@
               if (out != null) {
                   out.close();
               }
  +            visited.clear();
           }
       }
   
  +    /**
  +     * Prints the header of the generated output.
  +     *
  +     * <p>Basically this prints the XML declaration, defines some
  +     * entities and the project element.</p>
  +     */
       private void printHead(PrintWriter out, Enumeration tasks,
                              Enumeration types) {
           out.println("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>");
  @@ -183,7 +190,8 @@
   
           out.println("");
   
  -        out.print("<!ELEMENT project (target | property | taskdef | ");
  +        out.print("<!ELEMENT project (target | property | taskdef");
  +        out.print(" | typedef | ");
           out.print(TYPES);
           out.println(")*>");
           out.println("<!ATTLIST project");
  @@ -193,6 +201,9 @@
           out.println("");
       }
   
  +    /**
  +     * Prints the definition for the target element.
  +     */
       private void printTargetDecl(PrintWriter out) {
           out.print("<!ELEMENT target (");
           out.print(TASKS);
  @@ -211,6 +222,9 @@
           out.println("");
       }
   
  +    /**
  +     * Print the definition for a given element.
  +     */
       private void printElementDecl(PrintWriter out, String name, Class element)
           throws BuildException {
   
  
  
  

--
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