ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss MSVSS.java MSVSSADD.java MSVSSCHECKIN.java MSVSSCHECKOUT.java MSVSSCP.java MSVSSCREATE.java MSVSSGET.java MSVSSHISTORY.java MSVSSLABEL.java
Date Tue, 23 Jul 2002 08:39:59 GMT
donaldp     2002/07/23 01:39:59

  Modified:    src/main/org/apache/tools/ant Task.java UnknownElement.java
               src/main/org/apache/tools/ant/taskdefs AbstractCvsTask.java
                        Ant.java AntStructure.java Available.java
                        BUnzip2.java BZip2.java Basename.java
                        CallTarget.java Checksum.java Chmod.java Copy.java
                        Copydir.java Copyfile.java Definer.java Delete.java
                        Deltree.java Dirname.java Ear.java Echo.java
                        Exec.java ExecTask.java ExecuteOn.java Expand.java
                        Filter.java FixCRLF.java GUnzip.java GZip.java
                        Get.java JDBCTask.java Java.java Javac.java
                        Javadoc.java LoadFile.java LoadProperties.java
                        ManifestTask.java Mkdir.java Move.java Pack.java
                        Patch.java Property.java Rename.java Replace.java
                        Rmic.java SQLExec.java Tar.java Touch.java
                        Tstamp.java Unpack.java Untar.java UpToDate.java
                        War.java XSLTProcess.java Zip.java
               src/main/org/apache/tools/ant/taskdefs/optional ANTLR.java
                        EchoProperties.java IContract.java Javah.java
                        Native2Ascii.java PropertyFile.java
                        RenameExtensions.java Rpm.java
               src/main/org/apache/tools/ant/taskdefs/optional/ccm
                        CCMCheck.java CCMCreateTask.java
                        CCMReconfigure.java Continuus.java
               src/main/org/apache/tools/ant/taskdefs/optional/clearcase
                        CCCheckin.java CCCheckout.java CCUnCheckout.java
                        CCUpdate.java ClearCase.java
               src/main/org/apache/tools/ant/taskdefs/optional/depend
                        Depend.java
               src/main/org/apache/tools/ant/taskdefs/optional/ejb
                        IPlanetEjbcTask.java
               src/main/org/apache/tools/ant/taskdefs/optional/i18n
                        Translate.java
               src/main/org/apache/tools/ant/taskdefs/optional/jdepend
                        JDependTask.java
               src/main/org/apache/tools/ant/taskdefs/optional/jlink
                        JlinkTask.java
               src/main/org/apache/tools/ant/taskdefs/optional/jsp
                        JspC.java WLJspc.java
               src/main/org/apache/tools/ant/taskdefs/optional/junit
                        JUnitTask.java
               src/main/org/apache/tools/ant/taskdefs/optional/pvcs
                        Pvcs.java
               src/main/org/apache/tools/ant/taskdefs/optional/sos SOS.java
                        SOSCheckin.java SOSCheckout.java SOSGet.java
                        SOSLabel.java
               src/main/org/apache/tools/ant/taskdefs/optional/vss
                        MSVSS.java MSVSSADD.java MSVSSCHECKIN.java
                        MSVSSCHECKOUT.java MSVSSCP.java MSVSSCREATE.java
                        MSVSSGET.java MSVSSHISTORY.java MSVSSLABEL.java
  Log:
  Encapsulate some fields in Task and add some deprecation warnings to coresponding fields.
  
  Revision  Changes    Path
  1.34      +45 -8     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.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- Task.java	23 Jul 2002 07:57:30 -0000	1.33
  +++ Task.java	23 Jul 2002 08:39:52 -0000	1.34
  @@ -65,12 +65,26 @@
    * @see Project#createTask
    */
   public abstract class Task extends ProjectComponent {
  -    /** Target this task belongs to, if any. */
  +    /**
  +     * Target this task belongs to, if any.
  +     * @deprecated You should not be accessing this variable directly.
  +     *   Please use the {@link #getOwningTarget()} method.
  +     */
       protected Target target;
  -    /** Description of this task, if any. */
  +
  +    /**
  +     * Description of this task, if any.
  +     * @deprecated You should not be accessing this variable directly.
  +     */
       protected String description;
  -    /** Location within the build file of this task definition. */
  +
  +    /**
  +     * Location within the build file of this task definition.
  +     * @deprecated You should not be accessing this variable directly.
  +     *   Please use the {@link #getLocation()} method.
  +     */
       protected Location location = Location.UNKNOWN_LOCATION;
  +
       /**
        * Name of this task to be used for logging purposes.
        * This defaults to the same as the type, but may be
  @@ -78,18 +92,33 @@
        * isn't terribly descriptive for a task used within
        * another task - the outer task code can probably
        * provide a better one.
  +     * @deprecated You should not be accessing this variable directly.
  +     *   Please use the {@link #getTaskName()} method.
  +     */
  +    protected String taskName;
  +
  +    /**
  +     * Type of this task.
  +     *
  +     * @deprecated You should not be accessing this variable directly.
  +     *   Please use the {@link #getTaskType()} method.
  +     */
  +    protected String taskType;
  +
  +    /**
  +     * Wrapper for this object, used to configure it at runtime.
  +     *
  +     * @deprecated You should not be accessing this variable directly.
  +     *   Please use the {@link #getWrapper()} method.
        */
  -    protected String taskName = null;
  -    /** Type of this task. */
  -    protected String taskType = null;
  -    /** Wrapper for this object, used to configure it at runtime. */
       protected RuntimeConfigurable wrapper;
  +
       /**
        * Whether or not this task is invalid. A task becomes invalid
        * if a conflicting class is specified as the implementation for
        * its type.
        */
  -    private boolean invalid = false;
  +    private boolean invalid;
   
       /** Sole constructor. */
       public Task() {
  @@ -400,5 +429,13 @@
               childWrapper.setProxy(childElement);
               replaceChildren(childWrapper, childElement);
           }
  +    }
  +
  +    protected String getTaskType() {
  +        return taskType;
  +    }
  +
  +    protected RuntimeConfigurable getWrapper() {
  +        return wrapper;
       }
   }
  
  
  
  1.29      +8 -8      jakarta-ant/src/main/org/apache/tools/ant/UnknownElement.java
  
  Index: UnknownElement.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/UnknownElement.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- UnknownElement.java	23 Jul 2002 07:54:47 -0000	1.28
  +++ UnknownElement.java	23 Jul 2002 08:39:52 -0000	1.29
  @@ -112,16 +112,16 @@
        * @exception BuildException if the configuration fails
        */
       public void maybeConfigure() throws BuildException {
  -        realThing = makeObject(this, wrapper);
  +        realThing = makeObject(this, getWrapper());
   
  -        wrapper.setProxy(realThing);
  +        getWrapper().setProxy(realThing);
           if (realThing instanceof Task) {
  -            ((Task) realThing).setRuntimeConfigurableWrapper(wrapper);
  +            ((Task) realThing).setRuntimeConfigurableWrapper(getWrapper());
           }
   
  -        handleChildren(realThing, wrapper);
  +        handleChildren(realThing, getWrapper());
   
  -        wrapper.maybeConfigure(getProject());
  +        getWrapper().maybeConfigure(getProject());
       }
   
       /**
  @@ -159,7 +159,7 @@
               // plain impossible to get here, maybeConfigure should
               // have thrown an exception.
               throw new BuildException("Could not create task of type: "
  -                                     + elementName, location);
  +                                     + elementName, getLocation());
           }
   
           if (realThing instanceof Task) {
  @@ -271,7 +271,7 @@
           if (task != null) {
               task.setLocation(getLocation());
               // UnknownElement always has an associated target
  -            task.setOwningTarget(target);
  +            task.setOwningTarget(getOwningTarget());
               task.init();
           }
           return task;
  @@ -325,7 +325,7 @@
               + "as this is not an Ant bug.";
   
   
  -        return new BuildException(msg, location);
  +        return new BuildException(msg, getLocation());
       }
   
       /**
  
  
  
  1.16      +5 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
  
  Index: AbstractCvsTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- AbstractCvsTask.java	23 Jul 2002 07:54:47 -0000	1.15
  +++ AbstractCvsTask.java	23 Jul 2002 08:39:52 -0000	1.16
  @@ -214,7 +214,7 @@
                                                                    .getPath(), 
                                                                    append))));
                   } catch (IOException e) {
  -                    throw new BuildException(e, location);
  +                    throw new BuildException(e, getLocation());
                   }
               } else {
                   setOutputStream(new LogOutputStream(this, Project.MSG_INFO));
  @@ -241,7 +241,7 @@
                                              new FileOutputStream(error.getPath(),
                                                                   append))));
                   } catch (IOException e) {
  -                    throw new BuildException(e, location);
  +                    throw new BuildException(e, getLocation());
                   }
               } else {
                   setErrorStream(new LogOutputStream(this, Project.MSG_WARN));
  @@ -333,11 +333,11 @@
                                            + retCode 
                                            + StringUtils.LINE_SEP
                                            + "Command line was ["
  -                                         + actualCommandLine + "]", location);
  +                                         + actualCommandLine + "]", getLocation());
               }
           } catch (IOException e) {
               if (failOnError) {
  -                throw new BuildException(e, location);
  +                throw new BuildException(e, getLocation());
               } else {
                   log("Caught exception: " + e.getMessage(), Project.MSG_WARN);
               }
  @@ -353,7 +353,7 @@
               }
           } catch (Exception e) {
               if (failOnError) {
  -                throw new BuildException(e, location);
  +                throw new BuildException(e, getLocation());
               } else {
                   log("Caught exception: " + e.getMessage(), Project.MSG_WARN);
               }
  
  
  
  1.64      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Ant.java
  
  Index: Ant.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Ant.java,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- Ant.java	23 Jul 2002 07:54:47 -0000	1.63
  +++ Ant.java	23 Jul 2002 08:39:52 -0000	1.64
  @@ -488,7 +488,7 @@
               } catch (Exception e2) {
                   String msg = "Error setting new project instance for "
                       + "reference with id " + oldKey;
  -                throw new BuildException(msg, e2, location);
  +                throw new BuildException(msg, e2, getLocation());
               }
           }
           newProject.addReference(newKey, copy);
  
  
  
  1.28      +6 -6      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.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- AntStructure.java	23 Jul 2002 07:54:47 -0000	1.27
  +++ AntStructure.java	23 Jul 2002 08:39:52 -0000	1.28
  @@ -110,7 +110,7 @@
       public void execute() throws BuildException {
   
           if (output == null) {
  -            throw new BuildException("output attribute is required", location);
  +            throw new BuildException("output attribute is required", getLocation());
           }
   
           PrintWriter out = null;
  @@ -147,8 +147,8 @@
               }
   
           } catch (IOException ioe) {
  -            throw new BuildException("Error writing " 
  -                + output.getAbsolutePath(), ioe, location);
  +            throw new BuildException("Error writing "
  +                + output.getAbsolutePath(), ioe, getLocation());
           } finally {
               if (out != null) {
                   out.close();
  @@ -349,8 +349,8 @@
           final int count = v.size();
           for (int i = 0; i < count; i++) {
               String nestedName = (String) v.elementAt(i);
  -            if (!"#PCDATA".equals(nestedName) 
  -                 && !TASKS.equals(nestedName) 
  +            if (!"#PCDATA".equals(nestedName)
  +                 && !TASKS.equals(nestedName)
                    && !TYPES.equals(nestedName)) {
                   printElementDecl(out, nestedName, ih.getElementType(nestedName));
               }
  
  
  
  1.48      +3 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Available.java
  
  Index: Available.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Available.java,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- Available.java	23 Jul 2002 07:54:47 -0000	1.47
  +++ Available.java	23 Jul 2002 08:39:52 -0000	1.48
  @@ -240,7 +240,7 @@
       public void execute() throws BuildException {
           if (property == null) {
               throw new BuildException("property attribute is required", 
  -                                     location);
  +                                     getLocation());
           }
   
           isTask = true;
  @@ -269,14 +269,14 @@
       public boolean eval() throws BuildException {
           if (classname == null && file == null && resource == null) {
               throw new BuildException("At least one of (classname|file|"
  -                                     + "resource) is required", location);
  +                                     + "resource) is required", getLocation());
           }
   
           if (type != null) {
               if (file == null) {
                   throw new BuildException("The type attribute is only valid "
                                            + "when specifying the file "
  -                                         + "attribute.", location);
  +                                         + "attribute.", getLocation());
               }
           }
   
  
  
  
  1.9       +3 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java
  
  Index: BUnzip2.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- BUnzip2.java	15 Apr 2002 14:56:29 -0000	1.8
  +++ BUnzip2.java	23 Jul 2002 08:39:52 -0000	1.9
  @@ -97,11 +97,11 @@
                   bis = new BufferedInputStream(fis);
                   int b = bis.read();
                   if (b != 'B') {
  -                    throw new BuildException("Invalid bz2 file.", location);
  +                    throw new BuildException("Invalid bz2 file.", getLocation());
                   }
                   b = bis.read();
                   if (b != 'Z') {
  -                    throw new BuildException("Invalid bz2 file.", location);
  +                    throw new BuildException("Invalid bz2 file.", getLocation());
                   }
                   zIn = new CBZip2InputStream(bis);
                   byte[] buffer = new byte[8 * 1024];
  @@ -112,7 +112,7 @@
                   } while (count != -1);
               } catch (IOException ioe) {
                   String msg = "Problem expanding bzip2 " + ioe.getMessage();
  -                throw new BuildException(msg, ioe, location);
  +                throw new BuildException(msg, ioe, getLocation());
               } finally {
                   if (bis != null) {
                       try {
  
  
  
  1.10      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/BZip2.java
  
  Index: BZip2.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/BZip2.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- BZip2.java	22 Jun 2002 23:38:31 -0000	1.9
  +++ BZip2.java	23 Jul 2002 08:39:52 -0000	1.10
  @@ -84,7 +84,7 @@
               zipFile(source, zOut);
           } catch (IOException ioe) {
               String msg = "Problem creating bzip2 " + ioe.getMessage();
  -            throw new BuildException(msg, ioe, location);
  +            throw new BuildException(msg, ioe, getLocation());
           } finally {
               if (zOut != null) {
                   try {
  
  
  
  1.6       +3 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Basename.java
  
  Index: Basename.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Basename.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Basename.java	13 Jul 2002 09:44:57 -0000	1.5
  +++ Basename.java	23 Jul 2002 08:39:52 -0000	1.6
  @@ -119,10 +119,10 @@
     // The method executing the task
     public void execute() throws BuildException {
         if (property == null) {
  -          throw new BuildException("property attribute required", location);
  +          throw new BuildException("property attribute required", getLocation());
         }
         if (file == null) {
  -          throw new BuildException("file attribute required", location);
  +          throw new BuildException("file attribute required", getLocation());
         }
         String value = file.getName();
         if (suffix != null && value.endsWith(suffix)) {
  
  
  
  1.24      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/CallTarget.java
  
  Index: CallTarget.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/CallTarget.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- CallTarget.java	9 Jul 2002 21:05:58 -0000	1.23
  +++ CallTarget.java	23 Jul 2002 08:39:52 -0000	1.24
  @@ -133,7 +133,7 @@
           
           if (subTarget == null) {
               throw new BuildException("Attribute target is required.", 
  -                                     location);
  +                                     getLocation());
           }
           
           callee.setAntfile(getProject().getProperty("ant.file"));
  
  
  
  1.25      +6 -6      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Checksum.java
  
  Index: Checksum.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Checksum.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- Checksum.java	23 Jul 2002 07:54:47 -0000	1.24
  +++ Checksum.java	23 Jul 2002 08:39:52 -0000	1.25
  @@ -284,21 +284,21 @@
               try {
                   messageDigest = MessageDigest.getInstance(algorithm, provider);
               } catch (NoSuchAlgorithmException noalgo) {
  -                throw new BuildException(noalgo, location);
  +                throw new BuildException(noalgo, getLocation());
               } catch (NoSuchProviderException noprovider) {
  -                throw new BuildException(noprovider, location);
  +                throw new BuildException(noprovider, getLocation());
               }
           } else {
               try {
                   messageDigest = MessageDigest.getInstance(algorithm);
               } catch (NoSuchAlgorithmException noalgo) {
  -                throw new BuildException(noalgo, location);
  +                throw new BuildException(noalgo, getLocation());
               }
           }
   
           if (messageDigest == null) {
               throw new BuildException("Unable to create Message Digest",
  -                location);
  +                                     getLocation());
           }
   
           if (fileext == null) {
  @@ -354,7 +354,7 @@
                                    + file.getAbsolutePath()
                                    + " to generate checksum for.";
                   log(message);
  -                throw new BuildException(message, location);
  +                throw new BuildException(message, getLocation());
               }
           }
       }
  @@ -429,7 +429,7 @@
                   }
               }
           } catch (Exception e) {
  -            throw new BuildException(e, location);
  +            throw new BuildException(e, getLocation());
           } finally {
               if (fis != null) {
                   try {
  
  
  
  1.31      +8 -8      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Chmod.java
  
  Index: Chmod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Chmod.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- Chmod.java	23 Jul 2002 07:54:47 -0000	1.30
  +++ Chmod.java	23 Jul 2002 08:39:52 -0000	1.31
  @@ -190,7 +190,7 @@
       protected void checkConfiguration() {
           if (!havePerm) {
               throw new BuildException("Required attribute perm not set in chmod",
  -                    location);
  +                                     getLocation());
           }
   
           if (defaultSetDefined && defaultSet.getDir(getProject()) != null) {
  @@ -224,7 +224,7 @@
                   execute.setCommandline(cloned.getCommandline());
                   runExecute(execute);
               } catch (IOException e) {
  -                throw new BuildException("Execute failed: " + e, e, location);
  +                throw new BuildException("Execute failed: " + e, e, getLocation());
               } finally {
                   // close the output file if required
                   logFlush();
  @@ -236,24 +236,24 @@
        * @ant.attribute ignore="true"
        */
       public void setExecutable(String e) {
  -        throw new BuildException(taskType
  -            + " doesn\'t support the executable attribute", location);
  +        throw new BuildException(getTaskType()
  +            + " doesn\'t support the executable attribute", getLocation());
       }
   
       /**
        * @ant.attribute ignore="true"
        */
       public void setCommand(Commandline cmdl) {
  -        throw new BuildException(taskType
  -            + " doesn\'t support the command attribute", location);
  +        throw new BuildException(getTaskType()
  +            + " doesn\'t support the command attribute", getLocation());
       }
   
       /**
        * @ant.attribute ignore="true"
        */
       public void setSkipEmptyFilesets(boolean skip) {
  -        throw new BuildException(taskType
  -            + " doesn\'t support the skipemptyfileset attribute", location);
  +        throw new BuildException(getTaskType()
  +            + " doesn\'t support the skipemptyfileset attribute", getLocation());
       }
   
       protected boolean isValidOs() {
  
  
  
  1.46      +3 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Copy.java
  
  Index: Copy.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Copy.java,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- Copy.java	23 Jul 2002 07:54:47 -0000	1.45
  +++ Copy.java	23 Jul 2002 08:39:52 -0000	1.46
  @@ -280,7 +280,7 @@
       public Mapper createMapper() throws BuildException {
           if (mapperElement != null) {
               throw new BuildException("Cannot define more than one mapper",
  -                                     location);
  +                                     getLocation());
           }
           mapperElement = new Mapper(getProject());
           return mapperElement;
  @@ -531,7 +531,7 @@
                   } catch (IOException ioe) {
                       String msg = "Failed to copy " + fromFile + " to " + toFile
                           + " due to " + ioe.getMessage();
  -                    throw new BuildException(msg, ioe, location);
  +                    throw new BuildException(msg, ioe, getLocation());
                   }
               }
           }
  
  
  
  1.24      +4 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Copydir.java
  
  Index: Copydir.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Copydir.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- Copydir.java	23 Jul 2002 07:54:47 -0000	1.23
  +++ Copydir.java	23 Jul 2002 08:39:52 -0000	1.24
  @@ -106,17 +106,17 @@
   
           if (srcDir == null) {
               throw new BuildException("src attribute must be set!", 
  -                                     location);
  +                                     getLocation());
           }
   
           if (!srcDir.exists()) {
               throw new BuildException("srcdir " + srcDir.toString()
  -                                     + " does not exist!", location);
  +                                     + " does not exist!", getLocation());
           }
   
           if (destDir == null) {
               throw new BuildException("The dest attribute must be set.", 
  -                                     location);
  +                                     getLocation());
           }
   
           if (srcDir.equals(destDir)) {
  @@ -142,7 +142,7 @@
                       } catch (IOException ioe) {
                           String msg = "Failed to copy " + fromFile + " to " 
                               + toFile + " due to " + ioe.getMessage();
  -                        throw new BuildException(msg, ioe, location);
  +                        throw new BuildException(msg, ioe, getLocation());
                       }
                   }
               }
  
  
  
  1.15      +3 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Copyfile.java
  
  Index: Copyfile.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Copyfile.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Copyfile.java	23 Jul 2002 07:54:47 -0000	1.14
  +++ Copyfile.java	23 Jul 2002 08:39:52 -0000	1.15
  @@ -100,17 +100,17 @@
   
           if (srcFile == null) {
               throw new BuildException("The src attribute must be present.", 
  -                                     location);
  +                                     getLocation());
           }
           
           if (!srcFile.exists()) {
               throw new BuildException("src " + srcFile.toString()
  -                                     + " does not exist.", location);
  +                                     + " does not exist.", getLocation());
           }
   
           if (destFile == null) {
               throw new BuildException("The dest attribute must be present.", 
  -                                     location);
  +                                     getLocation());
           }
   
           if (srcFile.equals(destFile)) {
  
  
  
  1.19      +5 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Definer.java
  
  Index: Definer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Definer.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Definer.java	23 Jul 2002 07:54:47 -0000	1.18
  +++ Definer.java	23 Jul 2002 08:39:52 -0000	1.19
  @@ -168,13 +168,13 @@
                   if (name != null || value != null) {
                       String msg = "You must not specify name or value "
                           + "together with file or resource.";
  -                    throw new BuildException(msg, location);
  +                    throw new BuildException(msg, getLocation());
                   }
   
                   if (file != null && resource != null) {
                       String msg = "You must not specify both, file and "
                           + "resource.";
  -                    throw new BuildException(msg, location);
  +                    throw new BuildException(msg, getLocation());
                   }
   
   
  @@ -209,7 +209,7 @@
                       }
                   }
               } catch (IOException ex) {
  -                throw new BuildException(ex, location);
  +                throw new BuildException(ex, getLocation());
               } finally {
                   if (is != null) {
                       try {
  @@ -233,11 +233,11 @@
           } catch (ClassNotFoundException cnfe) {
               String msg = getTaskName() + " class " + value
                   + " cannot be found";
  -            throw new BuildException(msg, cnfe, location);
  +            throw new BuildException(msg, cnfe, getLocation());
           } catch (NoClassDefFoundError ncdfe) {
               String msg = getTaskName() + " class " + value
                   + " cannot be found";
  -            throw new BuildException(msg, ncdfe, location);
  +            throw new BuildException(msg, ncdfe, getLocation());
           }
       }
   
  
  
  
  1.34      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Delete.java
  
  Index: Delete.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Delete.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- Delete.java	23 Jul 2002 07:54:47 -0000	1.33
  +++ Delete.java	23 Jul 2002 08:39:52 -0000	1.34
  @@ -279,7 +279,7 @@
   
           if (quiet && failonerror) {
               throw new BuildException("quiet and failonerror cannot both be "
  -                                     + "set to true", location);
  +                                     + "set to true", getLocation());
           }
           
   
  
  
  
  1.15      +3 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Deltree.java
  
  Index: Deltree.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Deltree.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Deltree.java	16 Apr 2002 10:36:25 -0000	1.14
  +++ Deltree.java	23 Jul 2002 08:39:52 -0000	1.15
  @@ -94,7 +94,7 @@
               + "Use delete instead.");
   
           if (dir == null) {
  -            throw new BuildException("dir attribute must be set!", location);
  +            throw new BuildException("dir attribute must be set!", getLocation());
           }
   
           if (dir.exists()) {
  @@ -102,7 +102,7 @@
                   if (!dir.delete()) {
                       throw new BuildException("Unable to delete directory "
                                                + dir.getAbsolutePath(),
  -                                             location);
  +                                             getLocation());
                   }
                   return;
               }
  @@ -113,7 +113,7 @@
                   removeDir(dir);
               } catch (IOException ioe) {
                   String msg = "Unable to delete " + dir.getAbsolutePath();
  -                throw new BuildException(msg, location);
  +                throw new BuildException(msg, getLocation());
               }
           }
       }
  
  
  
  1.5       +3 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Dirname.java
  
  Index: Dirname.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Dirname.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Dirname.java	9 Jul 2002 21:05:58 -0000	1.4
  +++ Dirname.java	23 Jul 2002 08:39:52 -0000	1.5
  @@ -107,10 +107,10 @@
       // The method executing the task
       public void execute() throws BuildException {
           if (property == null) {
  -            throw new BuildException("property attribute required", location);
  +            throw new BuildException("property attribute required", getLocation());
           }
           if (file == null) {
  -            throw new BuildException("file attribute required", location);
  +            throw new BuildException("file attribute required", getLocation());
           } else {
               String value = file.getParent();
               getProject().setNewProperty(property, value);
  
  
  
  1.17      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Ear.java
  
  Index: Ear.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Ear.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Ear.java	22 Jun 2002 23:38:31 -0000	1.16
  +++ Ear.java	23 Jul 2002 08:39:52 -0000	1.17
  @@ -129,7 +129,7 @@
           throws IOException, BuildException {
           // If no webxml file is specified, it's an error.
           if (deploymentDescriptor == null && !isInUpdateMode()) {
  -            throw new BuildException("appxml attribute is required", location);
  +            throw new BuildException("appxml attribute is required", getLocation());
           }
   
           super.initZipOutputStream(zOut);
  
  
  
  1.24      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Echo.java
  
  Index: Echo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Echo.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- Echo.java	23 Jul 2002 07:54:47 -0000	1.23
  +++ Echo.java	23 Jul 2002 08:39:52 -0000	1.24
  @@ -93,7 +93,7 @@
                   out = new FileWriter(file.getAbsolutePath(), append);
                   out.write(message, 0, message.length());
               } catch (IOException ioe) {
  -                throw new BuildException(ioe, location);
  +                throw new BuildException(ioe, getLocation());
               } finally {
                   if (out != null) {
                       try {
  
  
  
  1.31      +5 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Exec.java
  
  Index: Exec.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Exec.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- Exec.java	23 Jul 2002 07:54:47 -0000	1.30
  +++ Exec.java	23 Jul 2002 08:39:52 -0000	1.31
  @@ -125,7 +125,7 @@
                       String ant = getProject().getProperty("ant.home");
                       if (ant == null) {
                           throw new BuildException("Property 'ant.home' not " 
  -                            + "found", location);
  +                            + "found", getLocation());
                       }
                   
                       String antRun = getProject().resolveFile(ant + "/bin/antRun.bat").toString();
  @@ -135,8 +135,8 @@
           } else {
               String ant = getProject().getProperty("ant.home");
               if (ant == null) {
  -              throw new BuildException("Property 'ant.home' not found", 
  -                location);
  +              throw new BuildException("Property 'ant.home' not found",
  +                                       getLocation());
               }
               String antRun = getProject().resolveFile(ant + "/bin/antRun").toString();
   
  @@ -178,13 +178,13 @@
               err = proc.exitValue();
               if (err != 0) {
                   if (failOnError) {
  -                    throw new BuildException("Exec returned: " + err, location);
  +                    throw new BuildException("Exec returned: " + err, getLocation());
                   } else {
                       log("Result: " + err, Project.MSG_ERR);
                   }
               }
           } catch (IOException ioe) {
  -            throw new BuildException("Error exec: " + command, ioe, location);
  +            throw new BuildException("Error exec: " + command, ioe, getLocation());
           } catch (InterruptedException ex) {}
   
           return err;
  
  
  
  1.41      +6 -6      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
  
  Index: ExecTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- ExecTask.java	23 Jul 2002 07:54:47 -0000	1.40
  +++ ExecTask.java	23 Jul 2002 08:39:52 -0000	1.41
  @@ -259,7 +259,7 @@
        */
       protected void checkConfiguration() throws BuildException {
           if (cmdl.getExecutable() == null) {
  -            throw new BuildException("no executable specified", location);
  +            throw new BuildException("no executable specified", getLocation());
           }
           if (dir != null && !dir.exists()) {
               throw new BuildException("The directory you specified does not "
  @@ -334,8 +334,8 @@
           maybeSetResultPropertyValue(err);
           if (err != 0) {
               if (failOnError) {
  -                throw new BuildException(taskType + " returned: " + err,
  -                                         location);
  +                throw new BuildException(getTaskType() + " returned: " + err,
  +                                         getLocation());
               } else {
                   log("Result: " + err, Project.MSG_ERR);
               }
  @@ -369,7 +369,7 @@
           } catch (IOException e) {
               if (failIfExecFails) {
                   throw new BuildException("Execute failed: " + e.toString(), e,
  -                                         location);
  +                                         getLocation());
               } else {
                   log("Execute failed: " + e.toString(), Project.MSG_ERR);
               }
  @@ -390,10 +390,10 @@
                   return new PumpStreamHandler(fos);
               } catch (FileNotFoundException fne) {
                   throw new BuildException("Cannot write to " + out, fne,
  -                                         location);
  +                                         getLocation());
               } catch (IOException ioe) {
                   throw new BuildException("Cannot write to " + out, ioe,
  -                                         location);
  +                                         getLocation());
               }
           } else if (outputprop != null) {
               baos = new ByteArrayOutputStream();
  
  
  
  1.34      +10 -10    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
  
  Index: ExecuteOn.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- ExecuteOn.java	23 Jul 2002 07:54:47 -0000	1.33
  +++ ExecuteOn.java	23 Jul 2002 08:39:52 -0000	1.34
  @@ -151,8 +151,8 @@
        */
       public Commandline.Marker createSrcfile() {
           if (srcFilePos != null) {
  -            throw new BuildException(taskType + " doesn\'t support multiple "
  -                                     + "srcfile elements.", location);
  +            throw new BuildException(getTaskType() + " doesn\'t support multiple "
  +                                     + "srcfile elements.", getLocation());
           }
           srcFilePos = cmdl.createMarker();
           return srcFilePos;
  @@ -164,8 +164,8 @@
        */
       public Commandline.Marker createTargetfile() {
           if (targetFilePos != null) {
  -            throw new BuildException(taskType + " doesn\'t support multiple "
  -                                     + "targetfile elements.", location);
  +            throw new BuildException(getTaskType() + " doesn\'t support multiple "
  +                                     + "targetfile elements.", getLocation());
           }
           targetFilePos = cmdl.createMarker();
           srcIsFirst = (srcFilePos != null);
  @@ -178,7 +178,7 @@
       public Mapper createMapper() throws BuildException {
           if (mapperElement != null) {
               throw new BuildException("Cannot define more than one mapper",
  -                                     location);
  +                                     getLocation());
           }
           mapperElement = new Mapper(getProject());
           return mapperElement;
  @@ -189,24 +189,24 @@
        *       this should probably be modified to use the classname instead.
        */
       protected void checkConfiguration() {
  -        if ("execon".equals(taskName)) {
  +        if ("execon".equals(getTaskName())) {
               log("!! execon is deprecated. Use apply instead. !!");
           }
           
           super.checkConfiguration();
           if (filesets.size() == 0) {
  -            throw new BuildException("no filesets specified", location);
  +            throw new BuildException("no filesets specified", getLocation());
           }
   
           if (targetFilePos != null || mapperElement != null 
               || destDir != null) {
   
               if (mapperElement == null) {
  -                throw new BuildException("no mapper specified", location);
  +                throw new BuildException("no mapper specified", getLocation());
               }
               if (destDir == null) {
                   throw new BuildException("no dest attribute specified", 
  -                                         location);
  +                                         getLocation());
               }
               mapper = mapperElement.getImplementation();
           }
  @@ -271,7 +271,7 @@
               }
   
           } catch (IOException e) {
  -            throw new BuildException("Execute failed: " + e, e, location);
  +            throw new BuildException("Execute failed: " + e, e, getLocation());
           } finally {
               // close the output file if required
               logFlush();
  
  
  
  1.33      +3 -3      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.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- Expand.java	23 Jul 2002 07:54:47 -0000	1.32
  +++ Expand.java	23 Jul 2002 08:39:52 -0000	1.33
  @@ -99,7 +99,7 @@
        * @exception BuildException Thrown in unrecoverable error.
        */
       public void execute() throws BuildException {
  -        if ("expand".equals(taskType)) {
  +        if ("expand".equals(getTaskType())) {
               log("!! expand is deprecated. Use unzip instead. !!");
           }
   
  @@ -114,7 +114,7 @@
           }
   
           if (dest.exists() && !dest.isDirectory()) {
  -            throw new BuildException("Dest must be a directory.", location);
  +            throw new BuildException("Dest must be a directory.", getLocation());
           }
   
           FileUtils fileUtils = FileUtils.newFileUtils();
  @@ -122,7 +122,7 @@
           if (source != null) {
               if (source.isDirectory()) {
                   throw new BuildException("Src must not be a directory." +
  -                    " Use nested filesets instead.", location);
  +                    " Use nested filesets instead.", getLocation());
               } else {
                   expandFile(fileUtils, source, dest);
               }
  
  
  
  1.20      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Filter.java
  
  Index: Filter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Filter.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Filter.java	23 Jul 2002 07:54:47 -0000	1.19
  +++ Filter.java	23 Jul 2002 08:39:52 -0000	1.20
  @@ -115,7 +115,7 @@
           if (!isFiltersFromFile && !isSingleFilter) {
               throw new BuildException("both token and value parameters, or "
                                        + "only a filtersFile parameter is "
  -                                     + "required", location);
  +                                     + "required", getLocation());
           }
   
           if (isSingleFilter) {
  
  
  
  1.40      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
  
  Index: FixCRLF.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- FixCRLF.java	9 Jul 2002 21:05:58 -0000	1.39
  +++ FixCRLF.java	23 Jul 2002 08:39:52 -0000	1.40
  @@ -299,7 +299,7 @@
       public void setTablength(int tlength) throws BuildException {
           if (tlength < 2 || tlength > 80) {
               throw new BuildException("tablength must be between 2 and 80",
  -                                     location);
  +                                     getLocation());
           }
           tablength = tlength;
           StringBuffer sp = new StringBuffer();
  
  
  
  1.15      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/GUnzip.java
  
  Index: GUnzip.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/GUnzip.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- GUnzip.java	15 Apr 2002 14:56:29 -0000	1.14
  +++ GUnzip.java	23 Jul 2002 08:39:52 -0000	1.15
  @@ -102,7 +102,7 @@
                   } while (count != -1);
               } catch (IOException ioe) {
                   String msg = "Problem expanding gzip " + ioe.getMessage();
  -                throw new BuildException(msg, ioe, location);
  +                throw new BuildException(msg, ioe, getLocation());
               } finally {
                   if (fis != null) {
                       try {
  
  
  
  1.21      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/GZip.java
  
  Index: GZip.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/GZip.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- GZip.java	15 Apr 2002 13:36:17 -0000	1.20
  +++ GZip.java	23 Jul 2002 08:39:52 -0000	1.21
  @@ -81,7 +81,7 @@
               zipFile(source, zOut);
           } catch (IOException ioe) {
               String msg = "Problem creating gzip " + ioe.getMessage();
  -            throw new BuildException(msg, ioe, location);
  +            throw new BuildException(msg, ioe, getLocation());
           } finally {
               if (zOut != null) {
                   try {
  
  
  
  1.29      +6 -6      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Get.java
  
  Index: Get.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Get.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- Get.java	9 Jul 2002 21:05:58 -0000	1.28
  +++ Get.java	23 Jul 2002 08:39:52 -0000	1.29
  @@ -98,21 +98,21 @@
        */
       public void execute() throws BuildException {
           if (source == null) {
  -            throw new BuildException("src attribute is required", location);
  +            throw new BuildException("src attribute is required", getLocation());
           }
   
           if (dest == null) {
  -            throw new BuildException("dest attribute is required", location);
  +            throw new BuildException("dest attribute is required", getLocation());
           }
   
           if (dest.exists() && dest.isDirectory()) {
               throw new BuildException("The specified destination is a directory",
  -                                     location);
  +                                     getLocation());
           }
   
           if (dest.exists() && !dest.canWrite()) {
               throw new BuildException("Can't write to " + dest.getAbsolutePath(),
  -                                     location);
  +                                     getLocation());
           }
   
           try {
  @@ -209,7 +209,7 @@
                       return;
                   }
                   throw new BuildException("Can't get " + source + " to " + dest,
  -                                          location);
  +                                         getLocation());
               }
   
               FileOutputStream fos = new FileOutputStream(dest);
  @@ -263,7 +263,7 @@
               if (ignoreErrors) {
                   return;
               }
  -            throw new BuildException(ioe, location);
  +            throw new BuildException(ioe, getLocation());
           }
       }
   
  
  
  
  1.6       +8 -8      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java
  
  Index: JDBCTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- JDBCTask.java	23 Jul 2002 07:54:48 -0000	1.5
  +++ JDBCTask.java	23 Jul 2002 08:39:52 -0000	1.6
  @@ -325,13 +325,13 @@
        */
       protected Connection getConnection() throws BuildException {
           if (userId == null) {
  -            throw new BuildException("User Id attribute must be set!", location);
  +            throw new BuildException("User Id attribute must be set!", getLocation());
           }
           if (password == null) {
  -            throw new BuildException("Password attribute must be set!", location);
  +            throw new BuildException("Password attribute must be set!", getLocation());
           }
           if (url == null) {
  -            throw new BuildException("Url attribute must be set!", location);
  +            throw new BuildException("Url attribute must be set!", getLocation());
           }
           try {
   
  @@ -349,7 +349,7 @@
               conn.setAutoCommit(autocommit);
               return conn;
           } catch (SQLException e) {
  -            throw new BuildException(e, location);
  +            throw new BuildException(e, getLocation());
           }
   
       }
  @@ -362,7 +362,7 @@
        */
       private Driver getDriver() throws BuildException {
           if (driver == null) {
  -            throw new BuildException("Driver attribute must be set!", location);
  +            throw new BuildException("Driver attribute must be set!", getLocation());
           }
   
           Driver driverInstance = null;
  @@ -402,15 +402,15 @@
           } catch (ClassNotFoundException e) {
               throw new BuildException(
                       "Class Not Found: JDBC driver " + driver + " could not be loaded",
  -                    location);
  +                    getLocation());
           } catch (IllegalAccessException e) {
               throw new BuildException(
                       "Illegal Access: JDBC driver " + driver + " could not be loaded",
  -                    location);
  +                    getLocation());
           } catch (InstantiationException e) {
               throw new BuildException(
                       "Instantiation Exception: JDBC driver " + driver + " could not be loaded",
  -                    location);
  +                    getLocation());
           }
           return driverInstance;
       }
  
  
  
  1.49      +5 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Java.java
  
  Index: Java.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Java.java,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- Java.java	23 Jul 2002 07:54:48 -0000	1.48
  +++ Java.java	23 Jul 2002 08:39:52 -0000	1.49
  @@ -107,7 +107,7 @@
           try {
               if ((err = executeJava()) != 0) { 
                   if (failOnError) {
  -                    throw new BuildException("Java returned: " + err, location);
  +                    throw new BuildException("Java returned: " + err, getLocation());
                   } else {
                       log("Java Result: " + err, Project.MSG_ERR);
                   }
  @@ -405,7 +405,7 @@
                                                            append));
                   exe.execute(getProject());
               } catch (IOException io) {
  -                throw new BuildException(io, location);
  +                throw new BuildException(io, getLocation());
               } finally {
                   if (outStream != null) {
                       outStream.close();
  @@ -440,7 +440,7 @@
               } else if (!dir.exists() || !dir.isDirectory()) {
                   throw new BuildException(dir.getAbsolutePath()
                                            + " is not a valid directory",
  -                                         location);
  +                                         getLocation());
               }
               
               exe.setWorkingDirectory(dir);
  @@ -463,10 +463,10 @@
                   }
                   return rc;
               } catch (IOException e) {
  -                throw new BuildException(e, location);
  +                throw new BuildException(e, getLocation());
               }
           } catch (IOException io) {
  -            throw new BuildException(io, location);
  +            throw new BuildException(io, getLocation());
           } finally {
               if (fos != null) {
                   try {fos.close();} catch (IOException io) {}
  
  
  
  1.106     +6 -6      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javac.java
  
  Index: Javac.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javac.java,v
  retrieving revision 1.105
  retrieving revision 1.106
  diff -u -r1.105 -r1.106
  --- Javac.java	23 Jul 2002 07:54:48 -0000	1.105
  +++ Javac.java	23 Jul 2002 08:39:53 -0000	1.106
  @@ -670,7 +670,7 @@
               if (!srcDir.exists()) {
                   throw new BuildException("srcdir \""
                                            + srcDir.getPath()
  -                                         + "\" does not exist!", location);
  +                                         + "\" does not exist!", getLocation());
               }
   
               DirectoryScanner ds = this.getDirectoryScanner(srcDir);
  @@ -794,18 +794,18 @@
       protected void checkParameters() throws BuildException {
           if (src == null) {
               throw new BuildException("srcdir attribute must be set!",
  -                                     location);
  +                                     getLocation());
           }
           if (src.size() == 0) {
               throw new BuildException("srcdir attribute must be set!",
  -                                     location);
  +                                     getLocation());
           }
   
           if (destDir != null && !destDir.isDirectory()) {
               throw new BuildException("destination directory \""
                                        + destDir
                                        + "\" does not exist "
  -                                     + "or is not a directory", location);
  +                                     + "or is not a directory", getLocation());
           }
       }
   
  @@ -839,7 +839,7 @@
               // finally, lets execute the compiler!!
               if (!adapter.execute()) {
                   if (failOnError) {
  -                    throw new BuildException(FAIL_MSG, location);
  +                    throw new BuildException(FAIL_MSG, getLocation());
                   } else {
                       log(FAIL_MSG, Project.MSG_ERR);
                   }
  
  
  
  1.101     +5 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
  
  Index: Javadoc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
  retrieving revision 1.100
  retrieving revision 1.101
  diff -u -r1.100 -r1.101
  --- Javadoc.java	23 Jul 2002 07:54:48 -0000	1.100
  +++ Javadoc.java	23 Jul 2002 08:39:53 -0000	1.101
  @@ -1498,7 +1498,7 @@
       }
   
       public void execute() throws BuildException {
  -        if ("javadoc2".equals(taskType)) {
  +        if ("javadoc2".equals(getTaskType())) {
               log("!! javadoc2 is deprecated. Use javadoc instead. !!");
           }
   
  @@ -1598,7 +1598,7 @@
               if (doclet != null) {
                   if (doclet.getName() == null) {
                       throw new BuildException("The doclet name must be "
  -                                             + "specified.", location);
  +                                             + "specified.", getLocation());
                   } else {
                       toExecute.createArgument().setValue("-doclet");
                       toExecute.createArgument().setValue(doclet.getName());
  @@ -1806,7 +1806,7 @@
           } catch (IOException e) {
               tmpList.delete();
               throw new BuildException("Error creating temporary file",
  -                                     e, location);
  +                                     e, getLocation());
           } finally {
               if (srcListWriter != null) {
                   srcListWriter.close();
  @@ -1836,10 +1836,10 @@
               exe.setCommandline(toExecute.getCommandline());
               int ret = exe.execute();
               if (ret != 0 && failOnError) {
  -                throw new BuildException("Javadoc returned " + ret, location);
  +                throw new BuildException("Javadoc returned " + ret, getLocation());
               }
           } catch (IOException e) {
  -            throw new BuildException("Javadoc failed: " + e, e, location);
  +            throw new BuildException("Javadoc failed: " + e, e, getLocation());
           } finally {
               if (tmpList != null) {
                   tmpList.delete();
  
  
  
  1.21      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/LoadFile.java
  
  Index: LoadFile.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/LoadFile.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- LoadFile.java	23 Jul 2002 07:54:48 -0000	1.20
  +++ LoadFile.java	23 Jul 2002 08:39:53 -0000	1.21
  @@ -206,7 +206,7 @@
           } catch (final IOException ioe) {
               final String message = "Unable to load file: " + ioe.toString();
               if (failOnError) {
  -                throw new BuildException(message, ioe, location);
  +                throw new BuildException(message, ioe, getLocation());
               } else {
                   log(message, Project.MSG_ERR);
               }
  
  
  
  1.10      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java
  
  Index: LoadProperties.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- LoadProperties.java	23 Jul 2002 07:54:48 -0000	1.9
  +++ LoadProperties.java	23 Jul 2002 08:39:53 -0000	1.10
  @@ -190,7 +190,7 @@
   
           } catch (final IOException ioe) {
               final String message = "Unable to load file: " + ioe.toString();
  -            throw new BuildException(message, ioe, location);
  +            throw new BuildException(message, ioe, getLocation());
           } catch (final BuildException be) {
               throw be;
           } finally {
  
  
  
  1.3       +4 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java
  
  Index: ManifestTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ManifestTask.java	9 Jul 2002 21:05:59 -0000	1.2
  +++ ManifestTask.java	23 Jul 2002 08:39:53 -0000	1.3
  @@ -176,10 +176,10 @@
                   current = new Manifest(f);
               } catch (ManifestException m) {
                   error = new BuildException("Existing manifest " + manifestFile
  -                                           + " is invalid", m, location);
  +                                           + " is invalid", m, getLocation());
               } catch (IOException e) {
                   error = new BuildException("Failed to read " + manifestFile,
  -                                           e, location);
  +                                           e, getLocation());
               } finally {
                   if (f != null) {
                       try {
  @@ -200,7 +200,7 @@
   
               toWrite.merge(nestedManifest);
           } catch (ManifestException m) {
  -            throw new BuildException("Manifest is invalid", m, location);
  +            throw new BuildException("Manifest is invalid", m, getLocation());
           }
   
           if (toWrite.equals(current)) {
  @@ -215,7 +215,7 @@
               toWrite.write(w);
           } catch (IOException e) {
               throw new BuildException("Failed to write " + manifestFile,
  -                                     e, location);
  +                                     e, getLocation());
           } finally {
               if (w != null) {
                   w.close();
  
  
  
  1.20      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Mkdir.java
  
  Index: Mkdir.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Mkdir.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Mkdir.java	22 Jun 2002 23:38:32 -0000	1.19
  +++ Mkdir.java	23 Jul 2002 08:39:53 -0000	1.20
  @@ -82,7 +82,7 @@
        */
       public void execute() throws BuildException {
           if (dir == null) {
  -            throw new BuildException("dir attribute is required", location);
  +            throw new BuildException("dir attribute is required", getLocation());
           }
   
           if (dir.isFile()) {
  @@ -96,7 +96,7 @@
               if (!result) {
                   String msg = "Directory " + dir.getAbsolutePath() 
                       + " creation was not successful for an unknown reason";
  -                throw new BuildException(msg, location);
  +                throw new BuildException(msg, getLocation());
               }
               log("Created dir: " + dir.getAbsolutePath());
           }
  
  
  
  1.29      +4 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Move.java
  
  Index: Move.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Move.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- Move.java	23 Jul 2002 07:54:48 -0000	1.28
  +++ Move.java	23 Jul 2002 08:39:53 -0000	1.29
  @@ -116,7 +116,7 @@
                       String msg = "Failed to rename dir " + fromDir
                           + " to " + toDir
                           + " due to " + ioe.getMessage();
  -                    throw new BuildException(msg, ioe, location);
  +                    throw new BuildException(msg, ioe, getLocation());
                   }
               }
           }
  @@ -148,7 +148,7 @@
                           String msg = "Failed to rename " + fromFile
                               + " to " + toFile
                               + " due to " + ioe.getMessage();
  -                        throw new BuildException(msg, ioe, location);
  +                        throw new BuildException(msg, ioe, getLocation());
                       }
   
                       if (!moved) {
  @@ -185,7 +185,7 @@
                               String msg = "Failed to copy " + fromFile + " to "
                                   + toFile
                                   + " due to " + ioe.getMessage();
  -                            throw new BuildException(msg, ioe, location);
  +                            throw new BuildException(msg, ioe, getLocation());
                           }
                       }
                   }
  
  
  
  1.10      +4 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Pack.java
  
  Index: Pack.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Pack.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Pack.java	22 Jun 2002 23:38:32 -0000	1.9
  +++ Pack.java	23 Jul 2002 08:39:53 -0000	1.10
  @@ -99,21 +99,21 @@
        */
       private void validate() throws BuildException {
           if (zipFile == null) {
  -            throw new BuildException("zipfile attribute is required", location);
  +            throw new BuildException("zipfile attribute is required", getLocation());
           }
   
           if (zipFile.isDirectory()) {
               throw new BuildException("zipfile attribute must not " +
  -                                     "represent a directory!", location);
  +                                     "represent a directory!", getLocation());
           }
   
           if (source == null) {
  -            throw new BuildException("src attribute is required", location);
  +            throw new BuildException("src attribute is required", getLocation());
           }
   
           if (source.isDirectory()) {
               throw new BuildException("Src attribute must not " +
  -                                     "represent a directory!", location);
  +                                     "represent a directory!", getLocation());
           }
       }
   
  
  
  
  1.18      +6 -6      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Patch.java
  
  Index: Patch.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Patch.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Patch.java	22 Jun 2002 23:38:32 -0000	1.17
  +++ Patch.java	23 Jul 2002 08:39:53 -0000	1.18
  @@ -91,7 +91,7 @@
       public void setPatchfile(File file) {
           if (!file.exists()) {
               throw new BuildException("patchfile " + file + " doesn\'t exist", 
  -                                     location);
  +                                     getLocation());
           }
           cmd.createArgument().setValue("-i");
           cmd.createArgument().setFile(file);
  @@ -125,7 +125,7 @@
        */
       public void setStrip(int num) throws BuildException {
           if (num < 0) {
  -            throw new BuildException("strip has to be >= 0", location);
  +            throw new BuildException("strip has to be >= 0", getLocation());
           }
           cmd.createArgument().setValue("-p" + num);
       }
  @@ -166,7 +166,7 @@
       public void execute() throws BuildException {
           if (!havePatchfile) {
               throw new BuildException("patchfile argument is required", 
  -                                     location);
  +                                     getLocation());
           } 
           Commandline toExecute = (Commandline) cmd.clone();
           toExecute.setExecutable("patch");
  @@ -185,10 +185,10 @@
                   exe.setWorkingDirectory(directory);
               } else if (!directory.isDirectory()) {
                   throw new BuildException(directory + " is not a directory.",
  -                                         location);
  +                                         getLocation());
               } else {
                   throw new BuildException("directory " + directory
  -                                         + " doesn\'t exist", location);
  +                                         + " doesn\'t exist", getLocation());
               }
           } else {
               exe.setWorkingDirectory(getProject().getBaseDir());
  @@ -198,7 +198,7 @@
           try {
               exe.execute();
           } catch (IOException e) {
  -            throw new BuildException(e, location);
  +            throw new BuildException(e, getLocation());
           }
       }
   
  
  
  
  1.53      +5 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Property.java
  
  Index: Property.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Property.java,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- Property.java	23 Jul 2002 07:54:48 -0000	1.52
  +++ Property.java	23 Jul 2002 08:39:53 -0000	1.53
  @@ -323,19 +323,19 @@
               if (value == null && ref == null) {
                   throw new BuildException("You must specify value, location or "
                                            + "refid with the name attribute",
  -                                         location);
  +                                         getLocation());
               }
           } else {
               if (file == null && resource == null && env == null) {
                   throw new BuildException("You must specify file, resource or "
                                            + "environment when not using the "
  -                                         + "name attribute", location);
  +                                         + "name attribute", getLocation());
               }
           }
   
           if (file == null && resource == null && prefix != null) {
               throw new BuildException("Prefix is only valid when loading from "
  -                                     + "a file or resource", location);
  +                                     + "a file or resource", getLocation());
           }
   
           if ((name != null) && (value != null)) {
  @@ -392,7 +392,7 @@
                       Project.MSG_VERBOSE);
               }
           } catch (IOException ex) {
  -            throw new BuildException(ex, location);
  +            throw new BuildException(ex, getLocation());
           }
       }
   
  @@ -426,7 +426,7 @@
                   log("Unable to find resource " + name, Project.MSG_WARN);
               }
           } catch (IOException ex) {
  -            throw new BuildException(ex, location);
  +            throw new BuildException(ex, getLocation());
           } finally {
               if (is != null) {
                   try {
  
  
  
  1.11      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Rename.java
  
  Index: Rename.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Rename.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Rename.java	12 Apr 2002 10:17:53 -0000	1.10
  +++ Rename.java	23 Jul 2002 08:39:53 -0000	1.11
  @@ -109,11 +109,11 @@
           log("DEPRECATED - The rename task is deprecated.  Use move instead.");
   
           if (dest == null) {
  -            throw new BuildException("dest attribute is required", location);
  +            throw new BuildException("dest attribute is required", getLocation());
           }
   
           if (src == null) {
  -            throw new BuildException("src attribute is required", location);
  +            throw new BuildException("src attribute is required", getLocation());
           }
   
           if (replace && dest.exists()) {
  
  
  
  1.33      +6 -6      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Replace.java
  
  Index: Replace.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Replace.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- Replace.java	22 Jun 2002 23:38:32 -0000	1.32
  +++ Replace.java	23 Jul 2002 08:39:53 -0000	1.33
  @@ -318,21 +318,21 @@
           if (src == null && dir == null) {
               String message = "Either the file or the dir attribute " 
                   + "must be specified";
  -            throw new BuildException(message, location);
  +            throw new BuildException(message, getLocation());
           }
           if (propertyFile != null && !propertyFile.exists()) {
               String message = "Property file " + propertyFile.getPath() 
                   + " does not exist.";
  -            throw new BuildException(message, location);
  +            throw new BuildException(message, getLocation());
           }
           if (token == null && replacefilters.size() == 0) {
               String message = "Either token or a nested replacefilter "
                   + "must be specified";
  -            throw new BuildException(message, location);
  +            throw new BuildException(message, getLocation());
           }
           if (token != null && "".equals(token.getText())) {
               String message = "The token attribute must not be an empty string.";
  -            throw new BuildException(message, location);
  +            throw new BuildException(message, getLocation());
           }
       }
   
  @@ -387,7 +387,7 @@
       private void processFile(File src) throws BuildException {
           if (!src.exists()) {
               throw new BuildException("Replace: source file " + src.getPath() 
  -                                     + " doesn't exist", location);
  +                                     + " doesn't exist", getLocation());
           }
   
           File temp = fileUtils.createTempFile("rep", ".tmp", 
  @@ -474,7 +474,7 @@
           } catch (IOException ioe) {
               throw new BuildException("IOException in " + src + " - " + 
                                        ioe.getClass().getName() + ":" 
  -                                     + ioe.getMessage(), ioe, location);
  +                                     + ioe.getMessage(), ioe, getLocation());
           } finally {
               if (reader != null) {
                   try {
  
  
  
  1.40      +4 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Rmic.java
  
  Index: Rmic.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Rmic.java,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- Rmic.java	23 Jul 2002 07:54:48 -0000	1.39
  +++ Rmic.java	23 Jul 2002 08:39:53 -0000	1.40
  @@ -477,10 +477,10 @@
        */
       public void execute() throws BuildException {
           if (baseDir == null) {
  -            throw new BuildException("base attribute must be set!", location);
  +            throw new BuildException("base attribute must be set!", getLocation());
           }
           if (!baseDir.exists()) {
  -            throw new BuildException("base does not exist!", location);
  +            throw new BuildException("base does not exist!", getLocation());
           }
   
           if (verify) {
  @@ -519,7 +519,7 @@
                   
                   // finally, lets execute the compiler!!
                   if (!adapter.execute()) {
  -                    throw new BuildException(FAIL_MSG, location);
  +                    throw new BuildException(FAIL_MSG, getLocation());
                   }
               }
               
  @@ -594,7 +594,7 @@
               } catch (IOException ioe) {
                   String msg = "Failed to copy " + oldFile + " to " +
                       newFile + " due to " + ioe.getMessage();
  -                throw new BuildException(msg, ioe, location);
  +                throw new BuildException(msg, ioe, getLocation());
               }
           }
       }
  
  
  
  1.46      +4 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
  
  Index: SQLExec.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/SQLExec.java,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- SQLExec.java	23 Jul 2002 07:54:48 -0000	1.45
  +++ SQLExec.java	23 Jul 2002 08:39:53 -0000	1.46
  @@ -327,12 +327,12 @@
                   if (transactions.size() == 0) {
                       throw new BuildException("Source file or fileset, "
                                                + "transactions or sql statement "
  -                                             + "must be set!", location);
  +                                             + "must be set!", getLocation());
                   }
               }
   
               if (srcFile != null && !srcFile.exists()) {
  -                throw new BuildException("Source file does not exist!", location);
  +                throw new BuildException("Source file does not exist!", getLocation());
               }
   
               // deal with the filesets
  @@ -395,14 +395,14 @@
                           conn.rollback();
                       } catch (SQLException ex) {}
                   }
  -                throw new BuildException(e, location);
  +                throw new BuildException(e, getLocation());
               } catch (SQLException e){
                   if (!isAutocommit() && conn != null && onError.equals("abort")) {
                       try {
                           conn.rollback();
                       } catch (SQLException ex) {}
                   }
  -                throw new BuildException(e, location);
  +                throw new BuildException(e, getLocation());
               } finally {
                   try {
                       if (statement != null) {
  
  
  
  1.35      +8 -8      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tar.java
  
  Index: Tar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tar.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- Tar.java	23 Jul 2002 07:54:48 -0000	1.34
  +++ Tar.java	23 Jul 2002 08:39:53 -0000	1.35
  @@ -227,17 +227,17 @@
       public void execute() throws BuildException {
           if (tarFile == null) {
               throw new BuildException("tarfile attribute must be set!",
  -                                     location);
  +                                     getLocation());
           }
   
           if (tarFile.exists() && tarFile.isDirectory()) {
               throw new BuildException("tarfile is a directory!",
  -                                     location);
  +                                     getLocation());
           }
   
           if (tarFile.exists() && !tarFile.canWrite()) {
               throw new BuildException("Can not write to the specified tarfile!",
  -                                     location);
  +                                     getLocation());
           }
   
           Vector savedFileSets = (Vector) filesets.clone();
  @@ -245,7 +245,7 @@
               if (baseDir != null) {
                   if (!baseDir.exists()) {
                       throw new BuildException("basedir does not exist!",
  -                                             location);
  +                                             getLocation());
                   }
   
                   // add the main fileset to the list of filesets to process.
  @@ -257,7 +257,7 @@
               if (filesets.size() == 0) {
                   throw new BuildException("You must supply either a basedir "
                                            + "attribute or some nested filesets.",
  -                                         location);
  +                                         getLocation());
               }
   
               // check if tar is out of date with respect to each
  @@ -275,7 +275,7 @@
                       if (tarFile.equals(new File(fs.getDir(getProject()),
                                                   files[i]))) {
                           throw new BuildException("A tar file cannot include "
  -                                                 + "itself", location);
  +                                                 + "itself", getLocation());
                       }
                   }
               }
  @@ -324,7 +324,7 @@
                   }
               } catch (IOException ioe) {
                   String msg = "Problem creating TAR: " + ioe.getMessage();
  -                throw new BuildException(msg, ioe, location);
  +                throw new BuildException(msg, ioe, getLocation());
               } finally {
                   if (tOut != null) {
                       try {
  @@ -394,7 +394,7 @@
                   } else if (longFileMode.isFailMode()) {
                       throw new BuildException(
                           "Entry: " + vPath + " longer than " +
  -                        TarConstants.NAMELEN + "characters.", location);
  +                        TarConstants.NAMELEN + "characters.", getLocation());
                   }
               }
   
  
  
  
  1.27      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Touch.java
  
  Index: Touch.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Touch.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- Touch.java	23 Jul 2002 07:54:48 -0000	1.26
  +++ Touch.java	23 Jul 2002 08:39:53 -0000	1.27
  @@ -164,7 +164,7 @@
                                                    + "00:00:00 GMT).");
                       }
                   } catch (ParseException pe) {
  -                    throw new BuildException(pe.getMessage(), pe, location);
  +                    throw new BuildException(pe.getMessage(), pe, getLocation());
                   }
               }
   
  @@ -185,7 +185,7 @@
                       fileUtils.createNewFile(file);
                   } catch (IOException ioe) {
                       throw new BuildException("Could not create " + file, ioe, 
  -                                             location);
  +                                             getLocation());
                   }
               }
           }
  
  
  
  1.31      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
  
  Index: Tstamp.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tstamp.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- Tstamp.java	23 Jul 2002 07:54:48 -0000	1.30
  +++ Tstamp.java	23 Jul 2002 08:39:53 -0000	1.31
  @@ -112,7 +112,7 @@
               Enumeration i = customFormats.elements();
               while (i.hasMoreElements()) {
                   CustomFormat cts = (CustomFormat) i.nextElement();
  -                cts.execute(getProject(), d, location);
  +                cts.execute(getProject(), d, getLocation());
               }
   
               SimpleDateFormat dstamp = new SimpleDateFormat ("yyyyMMdd");
  
  
  
  1.14      +3 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Unpack.java
  
  Index: Unpack.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Unpack.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Unpack.java	23 Jul 2002 07:54:48 -0000	1.13
  +++ Unpack.java	23 Jul 2002 08:39:53 -0000	1.14
  @@ -116,15 +116,15 @@
   
       private void validate() throws BuildException {
           if (source == null) {
  -            throw new BuildException("No Src specified", location);
  +            throw new BuildException("No Src specified", getLocation());
           }
   
           if (!source.exists()) {
  -            throw new BuildException("Src doesn't exist", location);
  +            throw new BuildException("Src doesn't exist", getLocation());
           }
   
           if (source.isDirectory()) {
  -            throw new BuildException("Cannot expand a directory", location);
  +            throw new BuildException("Cannot expand a directory", getLocation());
           }
   
           if (dest == null) {
  
  
  
  1.28      +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.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- Untar.java	22 Jun 2002 23:38:32 -0000	1.27
  +++ Untar.java	23 Jul 2002 08:39:53 -0000	1.28
  @@ -130,7 +130,7 @@
   
           } catch (IOException ioe) {
               throw new BuildException("Error while expanding " + srcF.getPath(),
  -                                     ioe, location);
  +                                     ioe, getLocation());
           } finally {
               if (tis != null) {
                   try {
  
  
  
  1.23      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
  
  Index: UpToDate.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/UpToDate.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- UpToDate.java	23 Jul 2002 07:54:48 -0000	1.22
  +++ UpToDate.java	23 Jul 2002 08:39:53 -0000	1.23
  @@ -154,7 +154,7 @@
       public Mapper createMapper() throws BuildException {
           if (mapperElement != null) {
               throw new BuildException("Cannot define more than one mapper",
  -                                     location);
  +                                     getLocation());
           }
           mapperElement = new Mapper(getProject());
           return mapperElement;
  @@ -225,7 +225,7 @@
       public void execute() throws BuildException {
           if (_property == null) {
               throw new BuildException("property attribute is required.", 
  -                                     location);
  +                                     getLocation());
           }
           boolean upToDate = eval();
           if (upToDate) {
  
  
  
  1.26      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/War.java
  
  Index: War.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/War.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- War.java	9 Jul 2002 21:05:59 -0000	1.25
  +++ War.java	23 Jul 2002 08:39:53 -0000	1.26
  @@ -164,7 +164,7 @@
           throws IOException, BuildException {
           // If no webxml file is specified, it's an error.
           if (deploymentDescriptor == null && !isInUpdateMode()) {
  -            throw new BuildException("webxml attribute is required", location);
  +            throw new BuildException("webxml attribute is required", getLocation());
           }
   
           super.initZipOutputStream(zOut);
  
  
  
  1.50      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
  
  Index: XSLTProcess.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- XSLTProcess.java	23 Jul 2002 07:54:48 -0000	1.49
  +++ XSLTProcess.java	23 Jul 2002 08:39:53 -0000	1.50
  @@ -188,7 +188,7 @@
           String[]         dirs;
   
           if (xslFile == null) {
  -            throw new BuildException("no stylesheet specified", location);
  +            throw new BuildException("no stylesheet specified", getLocation());
           }
   
           try {
  
  
  
  1.82      +5 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
  
  Index: Zip.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
  retrieving revision 1.81
  retrieving revision 1.82
  diff -u -r1.81 -r1.82
  --- Zip.java	23 Jul 2002 07:54:48 -0000	1.81
  +++ Zip.java	23 Jul 2002 08:39:53 -0000	1.82
  @@ -433,7 +433,7 @@
                   }
               }
   
  -            throw new BuildException(msg, ioe, location);
  +            throw new BuildException(msg, ioe, getLocation());
           } finally {
               cleanUp();
           }
  @@ -586,7 +586,7 @@
           } catch (IOException ioe) {
               throw new BuildException("Could not create empty ZIP archive "
                                        + "(" + ioe.getMessage() + ")", ioe,
  -                                     location);
  +                                     getLocation());
           } finally {
               if (os != null) {
                   try {
  @@ -620,7 +620,7 @@
               } else if (emptyBehavior.equals("fail")) {
                   throw new BuildException("Cannot create " + archiveType
                                            + " archive " + zipFile +
  -                                         ": no files were included.", location);
  +                                         ": no files were included.", getLocation());
               } else {
                   // Create.
                   return createEmptyZip(zipFile);
  @@ -629,7 +629,7 @@
               for (int i = 0; i < files.length; ++i) {
                   if (files[i].equals(zipFile)) {
                       throw new BuildException("A zip file cannot include "
  -                        + "itself", location);
  +                        + "itself", getLocation());
                   }
               }
   
  @@ -793,7 +793,7 @@
           throws IOException {
           if (file.equals(zipFile)) {
               throw new BuildException("A zip file cannot include itself",
  -                                     location);
  +                                     getLocation());
           }
   
           FileInputStream fIn = new FileInputStream(file);
  
  
  
  1.14      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
  
  Index: ANTLR.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ANTLR.java	23 Jul 2002 07:54:50 -0000	1.13
  +++ ANTLR.java	23 Jul 2002 08:39:56 -0000	1.14
  @@ -273,7 +273,7 @@
               log(commandline.describeCommand(), Project.MSG_VERBOSE);
               int err = run(commandline.getCommandline());
               if (err == 1) {
  -                throw new BuildException("ANTLR returned: " + err, location);
  +                throw new BuildException("ANTLR returned: " + err, getLocation());
               }
           } else {
               log("Skipped grammar file. Generated file is newer.", Project.MSG_VERBOSE);
  @@ -364,7 +364,7 @@
           try {
               return exe.execute();
           } catch (IOException e) {
  -            throw new BuildException(e, location);
  +            throw new BuildException(e, getLocation());
           }
       }
   }
  
  
  
  1.14      +7 -7      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
  
  Index: EchoProperties.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- EchoProperties.java	23 Jul 2002 07:54:51 -0000	1.13
  +++ EchoProperties.java	23 Jul 2002 08:39:56 -0000	1.14
  @@ -248,7 +248,7 @@
               if (inFile.exists() && inFile.isDirectory()) {
                   String message = "srcfile is a directory!";
                   if (failonerror) {
  -                    throw new BuildException(message, location);
  +                    throw new BuildException(message, getLocation());
                   } else {
                       log(message, Project.MSG_ERR);
                   }
  @@ -258,7 +258,7 @@
               if (inFile.exists() && !inFile.canRead()) {
                   String message = "Can not read from the specified srcfile!";
                   if (failonerror) {
  -                    throw new BuildException( message, location );
  +                    throw new BuildException( message, getLocation() );
                   } else {
                       log( message, Project.MSG_ERR );
                   }
  @@ -275,7 +275,7 @@
                   String message =
                       "Could not find file " + inFile.getAbsolutePath();
                   if (failonerror) {
  -                    throw new BuildException(message, fnfe, location);
  +                    throw new BuildException(message, fnfe, getLocation());
                   } else {
                       log( message, Project.MSG_WARN );
                   }
  @@ -284,7 +284,7 @@
                   String message =
                       "Could not read file " + inFile.getAbsolutePath();
                   if (failonerror) {
  -                    throw new BuildException(message, ioe, location);
  +                    throw new BuildException(message, ioe, getLocation());
                   } else {
                       log( message, Project.MSG_WARN );
                   }
  @@ -308,7 +308,7 @@
                   if (destfile.exists() && destfile.isDirectory()) {
                       String message = "destfile is a directory!";
                       if (failonerror) {
  -                        throw new BuildException(message, location);
  +                        throw new BuildException(message, getLocation());
                       } else {
                           log(message, Project.MSG_ERR);
                       }
  @@ -319,7 +319,7 @@
                       String message =
                           "Can not write to the specified destfile!";
                       if (failonerror) {
  -                        throw new BuildException(message, location);
  +                        throw new BuildException(message, getLocation());
                       } else {
                           log(message, Project.MSG_ERR);
                       }
  @@ -330,7 +330,7 @@
               }
           } catch (IOException ioe) {
               if (failonerror) {
  -                throw new BuildException(ioe, location);
  +                throw new BuildException(ioe, getLocation());
               } else {
                   log(ioe.getMessage(), Project.MSG_INFO);
               }
  
  
  
  1.12      +6 -6      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java
  
  Index: IContract.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- IContract.java	23 Jul 2002 07:54:51 -0000	1.11
  +++ IContract.java	23 Jul 2002 08:39:56 -0000	1.12
  @@ -654,22 +654,22 @@
       /** Checks that the required attributes are set.  */
       private void preconditions() throws BuildException {
           if (srcDir == null) {
  -            throw new BuildException("srcdir attribute must be set!", location);
  +            throw new BuildException("srcdir attribute must be set!", getLocation());
           }
           if (!srcDir.exists()) {
  -            throw new BuildException("srcdir \"" + srcDir.getPath() + "\" does not exist!", location);
  +            throw new BuildException("srcdir \"" + srcDir.getPath() + "\" does not exist!", getLocation());
           }
           if (instrumentDir == null) {
  -            throw new BuildException("instrumentdir attribute must be set!", location);
  +            throw new BuildException("instrumentdir attribute must be set!", getLocation());
           }
           if (repositoryDir == null) {
  -            throw new BuildException("repositorydir attribute must be set!", location);
  +            throw new BuildException("repositorydir attribute must be set!", getLocation());
           }
           if (updateIcontrol == true && classDir == null) {
  -            throw new BuildException("classdir attribute must be specified when updateicontrol=true!", location);
  +            throw new BuildException("classdir attribute must be specified when updateicontrol=true!", getLocation());
           }
           if (updateIcontrol == true && controlFile == null) {
  -            throw new BuildException("controlfile attribute must be specified when updateicontrol=true!", location);
  +            throw new BuildException("controlfile attribute must be specified when updateicontrol=true!", getLocation());
           }
       }
   
  
  
  
  1.18      +6 -6      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
  
  Index: Javah.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Javah.java	23 Jul 2002 07:54:51 -0000	1.17
  +++ Javah.java	23 Jul 2002 08:39:56 -0000	1.18
  @@ -283,19 +283,19 @@
           // first off, make sure that we've got a srcdir
   
           if ((cls == null) && (classes.size() == 0)) {
  -            throw new BuildException("class attribute must be set!", location);
  +            throw new BuildException("class attribute must be set!", getLocation());
           }
   
           if ((cls != null) && (classes.size() > 0)) {
  -            throw new BuildException("set class attribute or class element, not both.", location);
  +            throw new BuildException("set class attribute or class element, not both.", getLocation());
           }
   
           if (destDir != null) {
               if (!destDir.isDirectory()) {
  -                throw new BuildException("destination directory \"" + destDir + "\" does not exist or is not a directory", location);
  +                throw new BuildException("destination directory \"" + destDir + "\" does not exist or is not a directory", getLocation());
               }
               if (outputFile != null) {
  -                throw new BuildException("destdir and outputFile are mutually exclusive", location);
  +                throw new BuildException("destdir and outputFile are mutually exclusive", getLocation());
               }
           }
   
  @@ -350,7 +350,7 @@
               if (ex instanceof BuildException) {
                   throw (BuildException) ex;
               } else {
  -                throw new BuildException("Error starting javah: " + ex, ex, location);
  +                throw new BuildException("Error starting javah: " + ex, ex, getLocation());
               }
           }
       }
  @@ -396,7 +396,7 @@
   
           if (stubs) {
               if (!old) {
  -                throw new BuildException("stubs only available in old mode.", location);
  +                throw new BuildException("stubs only available in old mode.", getLocation());
               }
               cmd.createArgument().setValue("-stubs");
           }
  
  
  
  1.11      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
  
  Index: Native2Ascii.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Native2Ascii.java	23 Jul 2002 07:54:51 -0000	1.10
  +++ Native2Ascii.java	23 Jul 2002 08:39:56 -0000	1.11
  @@ -140,7 +140,7 @@
       public Mapper createMapper() throws BuildException {
           if (mapper != null) {
               throw new BuildException("Cannot define more than one mapper",
  -                                     location);
  +                                     getLocation());
           }
           mapper = new Mapper(getProject());
           return mapper;
  
  
  
  1.24      +4 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
  
  Index: PropertyFile.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- PropertyFile.java	9 Jul 2002 21:06:02 -0000	1.23
  +++ PropertyFile.java	23 Jul 2002 08:39:56 -0000	1.24
  @@ -235,7 +235,7 @@
   
       private void checkParameters() throws BuildException {
           if (!checkParam(propertyfile)) {
  -            throw new BuildException("file token must not be null.", location);
  +            throw new BuildException("file token must not be null.", getLocation());
           }
       }
   
  @@ -270,12 +270,12 @@
               properties.save(bos, comment);
           } catch (InvocationTargetException ite) {
               Throwable t = ite.getTargetException();
  -            throw new BuildException(t, location);
  +            throw new BuildException(t, getLocation());
           } catch (IllegalAccessException iae) {
               // impossible
  -            throw new BuildException(iae, location);
  +            throw new BuildException(iae, getLocation());
           } catch (IOException ioe) {
  -            throw new BuildException(ioe, location);
  +            throw new BuildException(ioe, getLocation());
           } finally {
               if (bos != null) {
                   try {
  
  
  
  1.18      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/RenameExtensions.java
  
  Index: RenameExtensions.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/RenameExtensions.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- RenameExtensions.java	23 Jul 2002 07:54:51 -0000	1.17
  +++ RenameExtensions.java	23 Jul 2002 08:39:56 -0000	1.18
  @@ -152,7 +152,7 @@
               Project.MSG_INFO);
   
           Move move = (Move) getProject().createTask("move");
  -        move.setOwningTarget(target);
  +        move.setOwningTarget(getOwningTarget());
           move.setTaskName(getTaskName());
           move.setLocation(getLocation());
           move.setTodir(srcDir);
  
  
  
  1.11      +4 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
  
  Index: Rpm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Rpm.java	23 Jul 2002 07:54:51 -0000	1.10
  +++ Rpm.java	23 Jul 2002 08:39:56 -0000	1.11
  @@ -150,7 +150,7 @@
                   try {
                       outputstream = new PrintStream(new BufferedOutputStream(new FileOutputStream(output)));
                   } catch (IOException e) {
  -                    throw new BuildException(e, location);
  +                    throw new BuildException(e, getLocation());
                   }
               } else {
                   outputstream = new LogOutputStream(this, Project.MSG_INFO);
  @@ -159,7 +159,7 @@
                   try {
                       errorstream = new PrintStream(new BufferedOutputStream(new FileOutputStream(error)));
                   }  catch (IOException e) {
  -                    throw new BuildException(e, location);
  +                    throw new BuildException(e, getLocation());
                   }
               } else {
                   errorstream = new LogOutputStream(this, Project.MSG_WARN);
  @@ -180,7 +180,7 @@
               exe.execute();
               log("Building the RPM based on the " + specFile + " file");
           } catch (IOException e) {
  -            throw new BuildException(e, location);
  +            throw new BuildException(e, getLocation());
           } finally {
               if (output != null) {
                   try {
  @@ -218,7 +218,7 @@
        */
       public void setSpecFile(String sf) {
           if ((sf == null) || (sf.trim().equals(""))) {
  -            throw new BuildException("You must specify a spec file", location);
  +            throw new BuildException("You must specify a spec file", getLocation());
           }
           this.specFile = sf;
       }
  
  
  
  1.7       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java
  
  Index: CCMCheck.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- CCMCheck.java	22 Jun 2002 23:38:35 -0000	1.6
  +++ CCMCheck.java	23 Jul 2002 08:39:56 -0000	1.7
  @@ -149,7 +149,7 @@
           result = run(commandLine);
           if (result != 0) {
               String msg = "Failed executing: " + commandLine.toString();
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
       }
   
  
  
  
  1.11      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java
  
  Index: CCMCreateTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- CCMCreateTask.java	22 Jun 2002 23:38:35 -0000	1.10
  +++ CCMCreateTask.java	23 Jul 2002 08:39:56 -0000	1.11
  @@ -110,7 +110,7 @@
           result = run(commandLine, this);
           if (result != 0) {
               String msg = "Failed executing: " + commandLine.toString();
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
   
           //create task ok, set this task as the default one
  @@ -124,7 +124,7 @@
           result = run(commandLine2);
           if (result != 0) {
               String msg = "Failed executing: " + commandLine2.toString();
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
   
       }
  
  
  
  1.7       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java
  
  Index: CCMReconfigure.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- CCMReconfigure.java	22 Jun 2002 23:38:35 -0000	1.6
  +++ CCMReconfigure.java	23 Jul 2002 08:39:56 -0000	1.7
  @@ -98,7 +98,7 @@
           result = run(commandLine);
           if (result != 0) {
               String msg = "Failed executing: " + commandLine.toString();
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
       }
   
  
  
  
  1.9       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java
  
  Index: Continuus.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Continuus.java	23 Jul 2002 07:54:52 -0000	1.8
  +++ Continuus.java	23 Jul 2002 08:39:56 -0000	1.9
  @@ -130,7 +130,7 @@
               exe.setCommandline(cmd.getCommandline());
               return exe.execute();
           } catch (java.io.IOException e) {
  -            throw new BuildException(e, location);
  +            throw new BuildException(e, getLocation());
           }
       }
   
  
  
  
  1.7       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java
  
  Index: CCCheckin.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- CCCheckin.java	22 Jun 2002 23:38:35 -0000	1.6
  +++ CCCheckin.java	23 Jul 2002 08:39:56 -0000	1.7
  @@ -146,7 +146,7 @@
           result = run(commandLine);
           if (result != 0) {
               String msg = "Failed executing: " + commandLine.toString();
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
       }
   
  
  
  
  1.7       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java
  
  Index: CCCheckout.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- CCCheckout.java	22 Jun 2002 23:38:35 -0000	1.6
  +++ CCCheckout.java	23 Jul 2002 08:39:56 -0000	1.7
  @@ -158,7 +158,7 @@
           result = run(commandLine);
           if (result != 0) {
               String msg = "Failed executing: " + commandLine.toString();
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
       }
   
  
  
  
  1.7       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java
  
  Index: CCUnCheckout.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- CCUnCheckout.java	22 Jun 2002 23:38:35 -0000	1.6
  +++ CCUnCheckout.java	23 Jul 2002 08:39:56 -0000	1.7
  @@ -116,7 +116,7 @@
           result = run(commandLine);
           if (result != 0) {
               String msg = "Failed executing: " + commandLine.toString();
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
       }
   
  
  
  
  1.8       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java
  
  Index: CCUpdate.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- CCUpdate.java	22 Jun 2002 23:38:35 -0000	1.7
  +++ CCUpdate.java	23 Jul 2002 08:39:56 -0000	1.8
  @@ -151,7 +151,7 @@
           result = run(commandLine);
           if (result != 0) {
               String msg = "Failed executing: " + commandLine.toString();
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
       }
   
  
  
  
  1.9       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
  
  Index: ClearCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ClearCase.java	23 Jul 2002 07:54:52 -0000	1.8
  +++ ClearCase.java	23 Jul 2002 08:39:56 -0000	1.9
  @@ -134,7 +134,7 @@
               exe.setCommandline(cmd.getCommandline());
               return exe.execute();
           } catch (java.io.IOException e) {
  -            throw new BuildException(e, location);
  +            throw new BuildException(e, getLocation());
           }
       }
   
  
  
  
  1.31      +4 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
  
  Index: Depend.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- Depend.java	23 Jul 2002 07:54:52 -0000	1.30
  +++ Depend.java	23 Jul 2002 08:39:57 -0000	1.31
  @@ -638,14 +638,14 @@
           try {
               long start = System.currentTimeMillis();
               if (srcPath == null) {
  -                throw new BuildException("srcdir attribute must be set", 
  -                    location);
  +                throw new BuildException("srcdir attribute must be set",
  +                                         getLocation());
               }
   
               srcPathList = srcPath.list();
               if (srcPathList.length == 0) {
  -                throw new BuildException("srcdir attribute must be non-empty", 
  -                    location);
  +                throw new BuildException("srcdir attribute must be non-empty",
  +                                         getLocation());
               }
   
               if (destPath == null) {
  
  
  
  1.9       +11 -11    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java
  
  Index: IPlanetEjbcTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- IPlanetEjbcTask.java	23 Jul 2002 07:54:52 -0000	1.8
  +++ IPlanetEjbcTask.java	23 Jul 2002 08:39:57 -0000	1.9
  @@ -239,34 +239,34 @@
           if (ejbdescriptor == null) {
               String msg = "The standard EJB descriptor must be specified using "
                               + "the \"ejbdescriptor\" attribute.";
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
           if ((!ejbdescriptor.exists()) || (!ejbdescriptor.isFile())) {
               String msg = "The standard EJB descriptor (" + ejbdescriptor
                               + ") was not found or isn't a file.";
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
   
           if (iasdescriptor == null) {
               String msg = "The iAS-speific XML descriptor must be specified using"
                               + " the \"iasdescriptor\" attribute.";
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
           if ((!iasdescriptor.exists()) || (!iasdescriptor.isFile())) {
               String msg = "The iAS-specific XML descriptor (" + iasdescriptor
                               + ") was not found or isn't a file.";
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
   
           if (dest == null) {
               String msg = "The destination directory must be specified using "
                               + "the \"dest\" attribute.";
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
           if ((!dest.exists()) || (!dest.isDirectory())) {
               String msg = "The destination directory (" + dest + ") was not "
                               + "found or isn't a directory.";
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
   
           if ((iashome != null) && (!iashome.isDirectory())) {
  @@ -291,10 +291,10 @@
               saxParser = saxParserFactory.newSAXParser();
           } catch (SAXException e) {
               String msg = "Unable to create a SAXParser: " + e.getMessage();
  -            throw new BuildException(msg, e, location);
  +            throw new BuildException(msg, e, getLocation());
           } catch (ParserConfigurationException e) {
               String msg = "Unable to create a SAXParser: " + e.getMessage();
  -            throw new BuildException(msg, e, location);
  +            throw new BuildException(msg, e, getLocation());
           }
   
           return saxParser;
  @@ -325,15 +325,15 @@
           } catch (IOException e) {
               String msg = "An IOException occurred while trying to read the XML "
                               + "descriptor file: " + e.getMessage();
  -            throw new BuildException(msg, e, location);
  +            throw new BuildException(msg, e, getLocation());
           } catch (SAXException e) {
               String msg = "A SAXException occurred while trying to read the XML "
                               + "descriptor file: " + e.getMessage();
  -            throw new BuildException(msg, e, location);
  +            throw new BuildException(msg, e, getLocation());
           } catch (IPlanetEjbc.EjbcException e) {
               String msg = "An exception occurred while trying to run the ejbc "
                               + "utility: " + e.getMessage();
  -            throw new BuildException(msg, e, location);
  +            throw new BuildException(msg, e, getLocation());
           }
       }
   
  
  
  
  1.15      +9 -9      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
  
  Index: Translate.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Translate.java	23 Jul 2002 07:54:53 -0000	1.14
  +++ Translate.java	23 Jul 2002 08:39:57 -0000	1.15
  @@ -248,29 +248,29 @@
       public void execute() throws BuildException {
           if (bundle == null) {
               throw new BuildException("The bundle attribute must be set.",
  -                                     location);
  +                                     getLocation());
           }
   
           if (startToken == null) {
               throw new BuildException("The starttoken attribute must be set.",
  -                                     location);
  +                                     getLocation());
           }
   
           if (startToken.length() != 1) {
               throw new BuildException(
                   "The starttoken attribute must be a single character.",
  -                                         location);
  +                getLocation());
           }
   
           if (endToken == null) {
               throw new BuildException("The endtoken attribute must be set.",
  -                                     location);
  +                                     getLocation());
           }
   
           if (endToken.length() != 1) {
               throw new BuildException(
                   "The endtoken attribute must be a single character.",
  -                                         location);
  +                getLocation());
           }
   
           if (bundleLanguage == null) {
  @@ -289,7 +289,7 @@
   
           if (toDir == null) {
               throw new BuildException("The todir attribute must be set.",
  -                                     location);
  +                                     getLocation());
           }
   
           if (!toDir.exists()) {
  @@ -405,7 +405,7 @@
               //have been scanned for and still not able to
               //find a single resrouce file, throw exception
               if (!loaded && checkLoaded) {
  -                throw new BuildException(ioe.getMessage(), location);
  +                throw new BuildException(ioe.getMessage(), getLocation());
               }
           }
       }
  @@ -463,7 +463,7 @@
                   in.close();
               }
           } catch (IOException ioe) {
  -            throw new BuildException(ioe.getMessage(), location);
  +            throw new BuildException(ioe.getMessage(), getLocation());
           }
       }
   
  @@ -579,7 +579,7 @@
                               Project.MSG_VERBOSE);
                       }
                   } catch (IOException ioe) {
  -                    throw new BuildException(ioe.getMessage(), location);
  +                    throw new BuildException(ioe.getMessage(), getLocation());
                   }
               }
           }
  
  
  
  1.15      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
  
  Index: JDependTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- JDependTask.java	23 Jul 2002 07:54:53 -0000	1.14
  +++ JDependTask.java	23 Jul 2002 08:39:57 -0000	1.15
  @@ -303,7 +303,7 @@
           if (errorOccurred) {
               if  (getHaltonerror()) {
                   throw new BuildException("JDepend failed",
  -                                         location);
  +                                         getLocation());
               } else {
                   log("JDepend FAILED", Project.MSG_ERR);
               }
  @@ -426,7 +426,7 @@
           try {
               return execute.execute();
           } catch (IOException e) {
  -            throw new BuildException("Process fork failed.", e, location);
  +            throw new BuildException("Process fork failed.", e, getLocation());
           }
       }
   
  
  
  
  1.10      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java
  
  Index: JlinkTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- JlinkTask.java	9 Jul 2002 21:06:07 -0000	1.9
  +++ JlinkTask.java	23 Jul 2002 08:39:57 -0000	1.10
  @@ -177,7 +177,7 @@
           try  {
               linker.link();
           } catch (Exception ex) {
  -            throw new BuildException(ex, location);
  +            throw new BuildException(ex, getLocation());
           }
       }
   
  
  
  
  1.22      +5 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
  
  Index: JspC.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- JspC.java	23 Jul 2002 07:54:54 -0000	1.21
  +++ JspC.java	23 Jul 2002 08:39:57 -0000	1.22
  @@ -402,19 +402,19 @@
           // first off, make sure that we've got a srcdir
           if (src == null) {
               throw new BuildException("srcdir attribute must be set!",
  -                                     location);
  +                                     getLocation());
           }
           String [] list = src.list();
           if (list.length == 0) {
               throw new BuildException("srcdir attribute must be set!",
  -                                     location);
  +                                     getLocation());
           }
   
           if (destDir != null && !destDir.isDirectory()) {
               throw new
                   BuildException("destination directory \"" + destDir +
                                  "\" does not exist or is not a directory",
  -                               location);
  +                               getLocation());
           }
   
           File dest = getActualDestDir();
  @@ -441,7 +441,7 @@
               File srcDir = (File) getProject().resolveFile(list[i]);
               if (!srcDir.exists()) {
                   throw new BuildException("srcdir \"" + srcDir.getPath() +
  -                                         "\" does not exist!", location);
  +                                         "\" does not exist!", getLocation());
               }
               DirectoryScanner ds = this.getDirectoryScanner(srcDir);
               String[] files = ds.getIncludedFiles();
  @@ -497,7 +497,7 @@
           // finally, lets execute the compiler!!
           if (!compiler.execute()) {
               if (failOnError) {
  -                throw new BuildException(FAIL_MSG, location);
  +                throw new BuildException(FAIL_MSG, getLocation());
               } else {
                   log(FAIL_MSG, Project.MSG_ERR);
               }
  
  
  
  1.11      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
  
  Index: WLJspc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- WLJspc.java	23 Jul 2002 07:54:54 -0000	1.10
  +++ WLJspc.java	23 Jul 2002 08:39:57 -0000	1.11
  @@ -139,7 +139,7 @@
           }
   
           if (destinationPackage == null) {
  -            throw new BuildException("package attribute must be present.", location);
  +            throw new BuildException("package attribute must be present.", getLocation());
           }
           
           
  
  
  
  1.47      +4 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
  
  Index: JUnitTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- JUnitTask.java	23 Jul 2002 07:54:54 -0000	1.46
  +++ JUnitTask.java	23 Jul 2002 08:39:57 -0000	1.47
  @@ -566,7 +566,7 @@
               if ((errorOccurredHere && test.getHaltonerror())
                   || (failureOccurredHere && test.getHaltonfailure())) {
                   throw new BuildException("Test " + test.getName() + " failed"
  -                    + (wasKilled ? " (timeout)" : ""), location);
  +                    + (wasKilled ? " (timeout)" : ""), getLocation());
               } else {
                   log("TEST " + test.getName() + " FAILED"
                       + (wasKilled ? " (timeout)" : ""), Project.MSG_ERR);
  @@ -651,7 +651,7 @@
           } catch (java.io.IOException e) {
               propsFile.delete();
               throw new BuildException("Error creating temporary properties "
  -                                     + "file.", e, location);
  +                                     + "file.", e, getLocation());
           }
   
           Execute execute = new Execute(new LogStreamHandler(this, 
  @@ -679,7 +679,7 @@
           try {
               retVal = execute.execute();
           } catch (IOException e) {
  -            throw new BuildException("Process fork failed.", e, location);
  +            throw new BuildException("Process fork failed.", e, getLocation());
           } finally {
               if (!propsFile.delete()) {
                   throw new BuildException("Could not delete temporary "
  
  
  
  1.17      +6 -6      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
  
  Index: Pvcs.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Pvcs.java	9 Jul 2002 21:06:10 -0000	1.16
  +++ Pvcs.java	23 Jul 2002 08:39:58 -0000	1.17
  @@ -144,7 +144,7 @@
           } catch (java.io.IOException e) {
               String msg = "Failed executing: " + cmd.toString() 
                   + ". Exception: " + e.getMessage();
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
       }
   
  @@ -231,7 +231,7 @@
               
               if (result != 0 && !ignorerc) {
                   String msg = "Failed executing: " + commandLine.toString();
  -                throw new BuildException(msg, location);
  +                throw new BuildException(msg, getLocation());
               }
   
               if (!tmp.exists()) {
  @@ -278,21 +278,21 @@
               if (result != 0 && !ignorerc) {
                   String msg = "Failed executing: " + commandLine.toString() 
                       + ". Return code was " + result;
  -                throw new BuildException(msg, location);
  +                throw new BuildException(msg, getLocation());
               }
   
           } catch (FileNotFoundException e) {
               String msg = "Failed executing: " + commandLine.toString() 
                   + ". Exception: " + e.getMessage();
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           } catch (IOException e) {
               String msg = "Failed executing: " + commandLine.toString() 
                   + ". Exception: " + e.getMessage();
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           } catch (ParseException e) {
               String msg = "Failed executing: " + commandLine.toString() 
                   + ". Exception: " + e.getMessage();
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           } finally {
               if (tmp != null) {
                   tmp.delete();
  
  
  
  1.8       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOS.java
  
  Index: SOS.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOS.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- SOS.java	23 Jul 2002 07:54:55 -0000	1.7
  +++ SOS.java	23 Jul 2002 08:39:58 -0000	1.8
  @@ -464,7 +464,7 @@
                   if (!done) {
                       String msg = "Directory " + localPath + " creation was not " +
                               "successful for an unknown reason";
  -                    throw new BuildException(msg, location);
  +                    throw new BuildException(msg, getLocation());
                   }
                   getProject().log("Created dir: " + dir.getAbsolutePath());
               }
  @@ -491,7 +491,7 @@
               exe.setCommandline(cmd.getCommandline());
               return exe.execute();
           } catch (java.io.IOException e) {
  -            throw new BuildException(e, location);
  +            throw new BuildException(e, getLocation());
           }
       }
   }
  
  
  
  1.6       +5 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckin.java
  
  Index: SOSCheckin.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckin.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SOSCheckin.java	9 Jul 2002 21:06:12 -0000	1.5
  +++ SOSCheckin.java	23 Jul 2002 08:39:58 -0000	1.6
  @@ -161,7 +161,7 @@
           if (result == 255) {
               // This is the exit status
               String msg = "Failed executing: " + commandLine.toString();
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
       }
   
  @@ -200,13 +200,13 @@
           }
           // SOS server address is required
           if (getSosServerPath() == null) {
  -            throw new BuildException("sosserverpath attribute must be set!", location);
  +            throw new BuildException("sosserverpath attribute must be set!", getLocation());
           }
           commandLine.createArgument().setValue(SOSCmd.FLAG_SOS_SERVER);
           commandLine.createArgument().setValue(getSosServerPath());
           // Login info is required
           if (getUsername() == null) {
  -            throw new BuildException("username attribute must be set!", location);
  +            throw new BuildException("username attribute must be set!", getLocation());
           }
           commandLine.createArgument().setValue(SOSCmd.FLAG_USERNAME);
           commandLine.createArgument().setValue(getUsername());
  @@ -216,13 +216,13 @@
           commandLine.createArgument().setValue(getPassword());
           // VSS Info is required
           if (getVssServerPath() == null) {
  -            throw new BuildException("vssserverpath attribute must be set!", location);
  +            throw new BuildException("vssserverpath attribute must be set!", getLocation());
           }
           commandLine.createArgument().setValue(SOSCmd.FLAG_VSS_SERVER);
           commandLine.createArgument().setValue(getVssServerPath());
           // VSS project is required
           if (getProjectPath() == null) {
  -            throw new BuildException("projectpath attribute must be set!", location);
  +            throw new BuildException("projectpath attribute must be set!", getLocation());
           }
           commandLine.createArgument().setValue(SOSCmd.FLAG_PROJECT);
           commandLine.createArgument().setValue(getProjectPath());
  
  
  
  1.6       +5 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckout.java
  
  Index: SOSCheckout.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckout.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SOSCheckout.java	9 Jul 2002 21:06:12 -0000	1.5
  +++ SOSCheckout.java	23 Jul 2002 08:39:58 -0000	1.6
  @@ -157,7 +157,7 @@
           if (result == 255) {
               // This is the exit status
               String msg = "Failed executing: " + commandLine.toString();
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
       }
   
  @@ -195,13 +195,13 @@
           }
           // SOS server address is required
           if (getSosServerPath() == null) {
  -            throw new BuildException("sosserverpath attribute must be set!", location);
  +            throw new BuildException("sosserverpath attribute must be set!", getLocation());
           }
           commandLine.createArgument().setValue(SOSCmd.FLAG_SOS_SERVER);
           commandLine.createArgument().setValue(getSosServerPath());
           // Login info is required
           if (getUsername() == null) {
  -            throw new BuildException("username attribute must be set!", location);
  +            throw new BuildException("username attribute must be set!", getLocation());
           }
           commandLine.createArgument().setValue(SOSCmd.FLAG_USERNAME);
           commandLine.createArgument().setValue(getUsername());
  @@ -211,13 +211,13 @@
           commandLine.createArgument().setValue(getPassword());
           // VSS Info is required
           if (getVssServerPath() == null) {
  -            throw new BuildException("vssserverpath attribute must be set!", location);
  +            throw new BuildException("vssserverpath attribute must be set!", getLocation());
           }
           commandLine.createArgument().setValue(SOSCmd.FLAG_VSS_SERVER);
           commandLine.createArgument().setValue(getVssServerPath());
           // VSS project is required
           if (getProjectPath() == null) {
  -            throw new BuildException("projectpath attribute must be set!", location);
  +            throw new BuildException("projectpath attribute must be set!", getLocation());
           }
           commandLine.createArgument().setValue(SOSCmd.FLAG_PROJECT);
           commandLine.createArgument().setValue(getProjectPath());
  
  
  
  1.6       +5 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSGet.java
  
  Index: SOSGet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSGet.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SOSGet.java	9 Jul 2002 21:06:12 -0000	1.5
  +++ SOSGet.java	23 Jul 2002 08:39:58 -0000	1.6
  @@ -168,7 +168,7 @@
           if (result == 255) {
               // This is the exit status
               String msg = "Failed executing: " + commandLine.toString();
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
       }
   
  @@ -217,13 +217,13 @@
           }
           // SOS server address is required
           if (getSosServerPath() == null) {
  -            throw new BuildException("sosserverpath attribute must be set!", location);
  +            throw new BuildException("sosserverpath attribute must be set!", getLocation());
           }
           commandLine.createArgument().setValue(SOSCmd.FLAG_SOS_SERVER);
           commandLine.createArgument().setValue(getSosServerPath());
           // Login info is required
           if (getUsername() == null) {
  -            throw new BuildException("username attribute must be set!", location);
  +            throw new BuildException("username attribute must be set!", getLocation());
           }
           commandLine.createArgument().setValue(SOSCmd.FLAG_USERNAME);
           commandLine.createArgument().setValue(getUsername());
  @@ -233,13 +233,13 @@
           commandLine.createArgument().setValue(getPassword());
           // VSS Info is required
           if (getVssServerPath() == null) {
  -            throw new BuildException("vssserverpath attribute must be set!", location);
  +            throw new BuildException("vssserverpath attribute must be set!", getLocation());
           }
           commandLine.createArgument().setValue(SOSCmd.FLAG_VSS_SERVER);
           commandLine.createArgument().setValue(getVssServerPath());
           // SS project path is required
           if (getProjectPath() == null) {
  -            throw new BuildException("projectpath attribute must be set!", location);
  +            throw new BuildException("projectpath attribute must be set!", getLocation());
           }
           commandLine.createArgument().setValue(SOSCmd.FLAG_PROJECT);
           commandLine.createArgument().setValue(getProjectPath());
  
  
  
  1.6       +6 -6      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSLabel.java
  
  Index: SOSLabel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSLabel.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SOSLabel.java	9 Jul 2002 21:06:12 -0000	1.5
  +++ SOSLabel.java	23 Jul 2002 08:39:58 -0000	1.6
  @@ -135,7 +135,7 @@
           if (result == 255) {
               // This is the exit status
               String msg = "Failed executing: " + commandLine.toString();
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
       }
   
  @@ -156,13 +156,13 @@
           commandLine.createArgument().setValue(SOSCmd.COMMAND_LABEL);
           // SOS server address is required
           if (getSosServerPath() == null) {
  -            throw new BuildException("sosserverpath attribute must be set!", location);
  +            throw new BuildException("sosserverpath attribute must be set!", getLocation());
           }
           commandLine.createArgument().setValue(SOSCmd.FLAG_SOS_SERVER);
           commandLine.createArgument().setValue(getSosServerPath());
           // Login info is required
           if (getUsername() == null) {
  -            throw new BuildException("username attribute must be set!", location);
  +            throw new BuildException("username attribute must be set!", getLocation());
           }
           commandLine.createArgument().setValue(SOSCmd.FLAG_USERNAME);
           commandLine.createArgument().setValue(getUsername());
  @@ -172,19 +172,19 @@
           commandLine.createArgument().setValue(getPassword());
           // VSS Info is required
           if (getVssServerPath() == null) {
  -            throw new BuildException("vssserverpath attribute must be set!", location);
  +            throw new BuildException("vssserverpath attribute must be set!", getLocation());
           }
           commandLine.createArgument().setValue(SOSCmd.FLAG_VSS_SERVER);
           commandLine.createArgument().setValue(getVssServerPath());
           // SS project path is required
           if (getProjectPath() == null) {
  -            throw new BuildException("projectpath attribute must be set!", location);
  +            throw new BuildException("projectpath attribute must be set!", getLocation());
           }
           commandLine.createArgument().setValue(SOSCmd.FLAG_PROJECT);
           commandLine.createArgument().setValue(getProjectPath());
           // a label is required
           if (getLabel() == null) {
  -            throw new BuildException("label attribute must be set!", location);
  +            throw new BuildException("label attribute must be set!", getLocation());
           }
           commandLine.createArgument().setValue(SOSCmd.FLAG_LABEL);
           commandLine.createArgument().setValue(getLabel());
  
  
  
  1.22      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
  
  Index: MSVSS.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- MSVSS.java	23 Jul 2002 07:54:55 -0000	1.21
  +++ MSVSS.java	23 Jul 2002 08:39:58 -0000	1.22
  @@ -192,7 +192,7 @@
               exe.setCommandline(cmd.getCommandline());
               return exe.execute();
           } catch (java.io.IOException e) {
  -            throw new BuildException(e, location);
  +            throw new BuildException(e, getLocation());
           }
       }
   
  
  
  
  1.6       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSADD.java
  
  Index: MSVSSADD.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSADD.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MSVSSADD.java	9 Jul 2002 21:06:14 -0000	1.5
  +++ MSVSSADD.java	23 Jul 2002 08:39:58 -0000	1.6
  @@ -86,7 +86,7 @@
            // first off, make sure that we've got a command and a localPath ...
           if (getLocalPath() == null) {
               String msg = "localPath attribute must be set!";
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
   
           // now look for illegal combinations of things ...
  @@ -113,7 +113,7 @@
           result = run(commandLine);
           if (result != 0) {
               String msg = "Failed executing: " + commandLine.toString();
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
       }
   
  
  
  
  1.11      +3 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java
  
  Index: MSVSSCHECKIN.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- MSVSSCHECKIN.java	23 Jul 2002 07:54:55 -0000	1.10
  +++ MSVSSCHECKIN.java	23 Jul 2002 08:39:58 -0000	1.11
  @@ -88,7 +88,7 @@
           // first off, make sure that we've got a command and a vssdir ...
           if (getVsspath() == null) {
               String msg = "vsspath attribute must be set!";
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
   
           // now look for illegal combinations of things ...
  @@ -117,7 +117,7 @@
           result = run(commandLine);
           if (result != 0) {
               String msg = "Failed executing: " + commandLine.toString();
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
       }
   
  @@ -145,7 +145,7 @@
                       String msg = "Directory " + m_LocalPath 
                           + " creation was not " 
                           + "succesful for an unknown reason";
  -                    throw new BuildException(msg, location);
  +                    throw new BuildException(msg, getLocation());
                   }
                   getProject().log("Created dir: " + dir.getAbsolutePath());
               }
  
  
  
  1.11      +3 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java
  
  Index: MSVSSCHECKOUT.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- MSVSSCHECKOUT.java	23 Jul 2002 07:54:55 -0000	1.10
  +++ MSVSSCHECKOUT.java	23 Jul 2002 08:39:59 -0000	1.11
  @@ -90,7 +90,7 @@
           // first off, make sure that we've got a command and a vssdir ...
           if (getVsspath() == null) {
               String msg = "vsspath attribute must be set!";
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
   
           // now look for illegal combinations of things ...
  @@ -117,7 +117,7 @@
           result = run(commandLine);
           if (result != 0) {
               String msg = "Failed executing: " + commandLine.toString();
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
       }
   
  @@ -144,7 +144,7 @@
                   if (!done) {
                       String msg = "Directory " + m_LocalPath + " creation was not " +
                           "succesful for an unknown reason";
  -                    throw new BuildException(msg, location);
  +                    throw new BuildException(msg, getLocation());
                   }
                   getProject().log("Created dir: " + dir.getAbsolutePath());
               }
  
  
  
  1.5       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCP.java
  
  Index: MSVSSCP.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCP.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MSVSSCP.java	9 Jul 2002 21:06:14 -0000	1.4
  +++ MSVSSCP.java	23 Jul 2002 08:39:59 -0000	1.5
  @@ -83,7 +83,7 @@
           // first off, make sure that we've got a command and a vssdir ...
           if (getVsspath() == null) {
               String msg = "vsspath attribute must be set!";
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
   
           // now look for illegal combinations of things ...
  @@ -104,7 +104,7 @@
           result = run(commandLine);
           if (result != 0) {
               String msg = "Failed executing: " + commandLine.toString();
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
       }
   
  
  
  
  1.5       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCREATE.java
  
  Index: MSVSSCREATE.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCREATE.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MSVSSCREATE.java	9 Jul 2002 21:06:14 -0000	1.4
  +++ MSVSSCREATE.java	23 Jul 2002 08:39:59 -0000	1.5
  @@ -137,7 +137,7 @@
           // first off, make sure that we've got a command and a vssdir...
           if (getVsspath() == null) {
               String msg = "vsspath attribute must be set!";
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
   
           // now look for illegal combinations of things ...
  @@ -166,7 +166,7 @@
           result = run(commandLine);
           if (result != 0 && m_FailOnError) {
               String msg = "Failed executing: " + commandLine.toString();
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
   
       }
  
  
  
  1.20      +3 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java
  
  Index: MSVSSGET.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- MSVSSGET.java	23 Jul 2002 07:54:55 -0000	1.19
  +++ MSVSSGET.java	23 Jul 2002 08:39:59 -0000	1.20
  @@ -153,7 +153,7 @@
           // first off, make sure that we've got a command and a vssdir ...
           if (getVsspath() == null) {
               String msg = "vsspath attribute must be set!";
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
   
           // now look for illegal combinations of things ...
  @@ -184,7 +184,7 @@
           result = run(commandLine);
           if (result != 0) {
               String msg = "Failed executing: " + commandLine.toString();
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
       }
   
  @@ -211,7 +211,7 @@
                   if (!done) {
                       String msg = "Directory " + m_LocalPath + " creation was not " +
                           "successful for an unknown reason";
  -                    throw new BuildException(msg, location);
  +                    throw new BuildException(msg, getLocation());
                   }
                   getProject().log("Created dir: " + dir.getAbsolutePath());
               }
  
  
  
  1.11      +4 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java
  
  Index: MSVSSHISTORY.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- MSVSSHISTORY.java	9 Jul 2002 21:06:14 -0000	1.10
  +++ MSVSSHISTORY.java	23 Jul 2002 08:39:59 -0000	1.11
  @@ -107,7 +107,7 @@
           // first off, make sure that we've got a command and a vssdir and a label ...
           if (getVsspath() == null) {
               String msg = "vsspath attribute must be set!";
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
   
           // now look for illegal combinations of things ...
  @@ -150,7 +150,7 @@
           result = run(commandLine);
           if (result != 0) {
               String msg = "Failed executing: " + commandLine.toString();
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
   
       }
  @@ -252,7 +252,7 @@
                   startDate = calcDate(m_ToDate, m_NumDays);
               } catch (ParseException ex) {
                   String msg = "Error parsing date: " + m_ToDate;
  -                throw new BuildException(msg, location);
  +                throw new BuildException(msg, getLocation());
               }
               cmd.createArgument().setValue(FLAG_VERSION_DATE + m_ToDate + VALUE_FROMDATE + startDate);
           } else if (m_FromDate != null && m_NumDays != Integer.MIN_VALUE) {
  @@ -261,7 +261,7 @@
                   endDate = calcDate(m_FromDate, m_NumDays);
               } catch (ParseException ex) {
                   String msg = "Error parsing date: " + m_FromDate;
  -                throw new BuildException(msg, location);
  +                throw new BuildException(msg, getLocation());
               }
               cmd.createArgument().setValue(FLAG_VERSION_DATE + endDate + VALUE_FROMDATE + m_FromDate);
           } else {
  
  
  
  1.13      +3 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java
  
  Index: MSVSSLABEL.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- MSVSSLABEL.java	9 Jul 2002 21:06:14 -0000	1.12
  +++ MSVSSLABEL.java	23 Jul 2002 08:39:59 -0000	1.13
  @@ -133,11 +133,11 @@
           // first off, make sure that we've got a command and a vssdir and a label ...
           if (getVsspath() == null) {
               String msg = "vsspath attribute must be set!";
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
           if (getLabel() == null) {
               String msg = "label attribute must be set!";
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
   
           // now look for illegal combinations of things ...
  @@ -171,7 +171,7 @@
           result = run(commandLine);
           if (result != 0) {
               String msg = "Failed executing: " + commandLine.toString();
  -            throw new BuildException(msg, location);
  +            throw new BuildException(msg, getLocation());
           }
   
       }
  
  
  

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