You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by bo...@locus.apache.org on 2000/07/12 13:51:32 UTC

cvs commit: jakarta-ant/src/main/org/apache/tools/ant IntrospectionHelper.java Project.java Task.java

bodewig     00/07/12 04:51:31

  Modified:    .        build.xml
               docs     index.html
               src/main/org/apache/tools/ant IntrospectionHelper.java
                        Project.java Task.java
  Log:
  Added a taskType attribute in addition to the taskName attribute to
  Task. Documented taskname.
  
  Revision  Changes    Path
  1.33      +2 -2      jakarta-ant/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/build.xml,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- build.xml	2000/07/11 14:15:26	1.32
  +++ build.xml	2000/07/12 11:51:28	1.33
  @@ -133,8 +133,8 @@
                version="true"
                windowtitle="${Name} API"
                doctitle="${Name}"
  -             bottom="Copyright © 2000 Apache Software Foundation. All Rights Reserved."
  -    />
  +             bottom="Copyright © 2000 Apache Software Foundation. All Rights Reserved.">
  +    </javadoc>
     </target>
   
     <!-- =================================================================== -->
  
  
  
  1.43      +16 -1     jakarta-ant/docs/index.html
  
  Index: index.html
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/docs/index.html,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- index.html	2000/07/11 11:28:24	1.42
  +++ index.html	2000/07/12 11:51:29	1.43
  @@ -23,7 +23,7 @@
     <li>Sam Ruby (<a href="mailto:rubys@us.ibm.com">rubys@us.ibm.com</a>)</li>
   </ul>
   
  -<p>Version 1.0.8.1 - 2000/06/28</p>
  +<p>Version 1.0.8.2 - 2000/07/12</p>
   
   <hr>
   <h2>Table of Contents</h2>
  @@ -40,6 +40,7 @@
     <li><a href="#optionaltasks">Optional Tasks</a>
     <li><a href="#buildevents">Build Events</a>
     <li><a href="#writingowntask">Writing your own task</a></li>
  +  <li><a href="#faq">FAQ, DTD, external resources</a>
     <li><a href="#license">License</a></li>
     <li><a href="#feedback">Feedback</a></li>
   </ul>
  @@ -325,6 +326,9 @@
   value-x the value of this attribute.</p>
   <p>There is a set of <a href="#tasks">built in tasks</a>, but it is also very
   easy to <a href="#writingowntask">write your own</a>.</p>
  +<p>All tasks share a <code>taskname</code> attribute. The value of
  +this attribute will be used in the logging messages generated by
  +Ant.</p>
   <h3>Properties</h3>
   <p>A project can have a set of properties. These might be set in the buildfile
   by the <a href="#property">property task</a>, or might be set outside Ant. A
  @@ -2100,6 +2104,7 @@
       <td valign="top">failonerror</td>
       <td valign="top">Stop the buildprocess if the command exits with a
         returncode other than 0.</td>
  +    <td align="center" valign="top">all</td>
       <td align="center" valign="top">No</td>
     </tr>
   </table>
  @@ -3217,6 +3222,16 @@
   implementing class name to the <code>default.properties</code> file in the <code>org.apache.tools.ant.taskdefs</code>
   package. Then you can use it as if it were a built in task.</p>
   <hr>
  +<h2><a name="faq">FAQ, DTD, external resources</a></h2>
  +<p>There is an online FAQ for Ant at <a
  +href="http://jakarta.apache.org/jyve-faq/Turbine/screen/DisplayTopics/action/SetAll/project_id/2/faq_id/16">jakarta.apache.org</a>. This
  +FAQ is interactive, which means you can ask and answer questions
  +online.</p>
  +<p>One of the questions poping up quite often is "Is there a DTD for
  +buildfiles?". Please refer to the FAQ for an answer.</p>
  +<p>The FAQ contains lists of known custom tasks that don't ship with
  +Ant and projects that use Ant. Feel free to add your own task or project
  +there.</p>
   <h2><a name="feedback">Feedback</a></h2>
   <p>To provide feedback on this software, please subscribe to the Ant Development
   Mail List <a href="mailto:(ant-dev-subscribe@jakarta.apache.org">(ant-dev-subscribe@jakarta.apache.org</a>)</p>
  
  
  
  1.3       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/IntrospectionHelper.java
  
  Index: IntrospectionHelper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/IntrospectionHelper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- IntrospectionHelper.java	2000/07/12 10:46:11	1.2
  +++ IntrospectionHelper.java	2000/07/12 11:51:29	1.3
  @@ -119,7 +119,7 @@
               // not really user settable properties
               if ("setLocation".equals(name) || 
                   "setDescription".equals(name) ||
  -                "setTaskName".equals(name)) {
  +                "setTaskType".equals(name)) {
                   continue;
               }
               
  
  
  
  1.31      +4 -0      jakarta-ant/src/main/org/apache/tools/ant/Project.java
  
  Index: Project.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/Project.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- Project.java	2000/07/12 10:46:11	1.30
  +++ Project.java	2000/07/12 11:51:29	1.31
  @@ -400,7 +400,11 @@
                   task=taskA;
               }
               task.setProject(this);
  +            task.setTaskType(taskType);
  +
  +            // set default value, can be changed by the user
               task.setTaskName(taskType);
  +
               String msg = "   +Task: " + taskType;
               log (msg, MSG_VERBOSE);
               return task;
  
  
  
  1.12      +14 -4     jakarta-ant/src/main/org/apache/tools/ant/Task.java
  
  Index: Task.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/Task.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Task.java	2000/07/12 10:46:11	1.11
  +++ Task.java	2000/07/12 11:51:30	1.12
  @@ -67,6 +67,7 @@
       protected String description=null;
       protected Location location = Location.UNKNOWN_LOCATION;
       protected String taskName = null;
  +    protected String taskType = null;
   
       /**
        * Sets the project object of this task. This method is used by
  @@ -108,21 +109,30 @@
       }
       
       /**
  -     * Set the name with which the task has been invoked.
  +     * Set the name to use in logging messages.
        *
  -     * @param name the name the task has been invoked as.
  +     * @param name the name to use in logging messages.
        */
       public void setTaskName(String name) {
           this.taskName = name;
       }
   
       /**
  -     * Get the name with which the task has been invoked.
  +     * Get the name to use in logging messages.
        *
  -     * @return the name the task has been invoked as.
  +     * @return the name to use in logging messages.
        */
       public String getTaskName() {
           return taskName;
  +    }
  +
  +    /**
  +     * Set the name with which the task has been invoked.
  +     *
  +     * @param type the name the task has been invoked as.
  +     */
  +    void setTaskType(String type) {
  +        this.taskType = type;
       }
   
       /**