Return-Path: <conor@locus.apache.org>
Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list ant-dev@jakarta.apache.org
Received: (qmail 17702 invoked by uid 500); 10 Jul 2000 11:04:24 -0000
Delivered-To: apmail-jakarta-ant-cvs@apache.org
Received: (qmail 17699 invoked by uid 1142); 10 Jul 2000 11:04:23 -0000
Date: 10 Jul 2000 11:04:23 -0000
Message-ID: <20000710110423.17698.qmail@locus.apache.org>
From: conor@locus.apache.org
To: jakarta-ant-cvs@apache.org
Subject: cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs
 Expand.java Untar.java

conor       00/07/10 04:04:23

  Modified:    src/main/org/apache/tools/ant ProjectHelper.java Task.java
               src/main/org/apache/tools/ant/taskdefs Expand.java
                        Untar.java
  Log:
  Avoid problems due to changes in JDK 1.3 introspection.
  This was discovered by Phil Hanna <author@philhanna.com>
  Similar to the problem with the old class attribute (changed to classname)
  
  Revision  Changes    Path
  1.17      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/ProjectHelper.java
  
  Index: ProjectHelper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/ProjectHelper.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ProjectHelper.java	2000/07/06 16:48:09	1.16
  +++ ProjectHelper.java	2000/07/10 11:04:17	1.17
  @@ -333,7 +333,7 @@
   
               // Top level tasks don't have associated targets
               if (target != null) {
  -                task.setTarget(target);
  +                task.setOwningTarget(target);
                   target.addTask(task);
               }
           }
  
  
  
  1.9       +1 -1      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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Task.java	2000/07/06 16:48:09	1.8
  +++ Task.java	2000/07/10 11:04:17	1.9
  @@ -91,7 +91,7 @@
        *
        * @param target Target in whose scope this task belongs.
        */
  -    public void setTarget(Target target) {
  +    public void setOwningTarget(Target target) {
           this.target = target;
       }
   
  
  
  
  1.7       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Expand.java
  
  Index: Expand.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Expand.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Expand.java	2000/07/08 02:58:38	1.6
  +++ Expand.java	2000/07/10 11:04:21	1.7
  @@ -75,7 +75,7 @@
       // XXX move it to util or tools
       public void execute() throws BuildException {
           Touch touch = (Touch) project.createTask("touch");
  -        touch.setTarget(target);
  +        touch.setOwningTarget(target);
           
           File srcF=project.resolveFile(source);
           File dir=project.resolveFile(dest);
  
  
  
  1.7       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Untar.java
  
  Index: Untar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Untar.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Untar.java	2000/07/10 07:29:26	1.6
  +++ Untar.java	2000/07/10 11:04:22	1.7
  @@ -77,7 +77,7 @@
       public void execute() throws BuildException {
   
           Touch touch = (Touch) project.createTask("touch");
  -        touch.setTarget(target);
  +        touch.setOwningTarget(target);
                       
           File srcF=project.resolveFile(source);