cvs commit: jakarta-ant/src/main/org/apache/tools/ant Main.java Project.java ProjectHelper.java

[conor]

conor       01/08/02 05:21:09

  Modified:    src/main/org/apache/tools/ant Main.java Project.java
                        ProjectHelper.java
  Log:
  Actually set the exception on task level messages
  
  PR:   2942
  
  Revision  Changes    Path
  1.42      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/Main.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- Main.java 2001/07/23 14:50:49     1.41
  +++ Main.java 2001/08/02 12:21:09     1.42
  @@ -458,7 +458,7 @@
                   System.setErr(err);
               }
               if (projectHelp) {
  -                    printTargets(project);
  +                printTargets(project);
               }
           }
           catch(RuntimeException exc) {
  
  
  
  1.67      +1 -0      jakarta-ant/src/main/org/apache/tools/ant/Project.java
  
  Index: Project.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/Project.java,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- Project.java      2001/07/24 14:55:48     1.66
  +++ Project.java      2001/08/02 12:21:09     1.67
  @@ -1099,6 +1099,7 @@
           System.out.flush();
           System.err.flush();
           BuildEvent event = new BuildEvent(task);
  +        event.setException(exception);
           for (int i = 0; i < listeners.size(); i++) {
               BuildListener listener = (BuildListener) listeners.elementAt(i);
               listener.taskFinished(event);
  
  
  
  1.60      +1 -1      
jakarta-ant/src/main/org/apache/tools/ant/ProjectHelper.java
  
  Index: ProjectHelper.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/ProjectHelper.java,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- ProjectHelper.java        2001/08/02 11:42:55     1.59
  +++ ProjectHelper.java        2001/08/02 12:21:09     1.60
  @@ -703,7 +703,7 @@
        *
        * @param value the string to be scanned for property references.
        */
  -    public static String replaceProperties(Project project, String value, 
Hashtable keys)
  +     public static String replaceProperties(Project project, String value, 
Hashtable keys)
               throws BuildException {
           if (value == null) {
               return null;