cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs Ant.java CallTarget.java

[conor]

conor       01/07/22 08:29:10

  Modified:    src/main/org/apache/tools/ant/taskdefs Ant.java
                        CallTarget.java
  Log:
  Route log messages to the subproject in <ant> and <antcall> situations
  
  Revision  Changes    Path
  1.24      +18 -0     
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.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- Ant.java  2001/07/06 11:57:29     1.23
  +++ Ant.java  2001/07/22 15:29:10     1.24
  @@ -179,6 +179,24 @@
           }
       }
   
  +    protected void handleOutput(String line) {
  +        if (p1 != null) {
  +            p1.demuxOutput(line, false);
  +        }
  +        else {
  +            super.handleOutput(line);
  +        }
  +    }
  +    
  +    protected void handleErrorOutput(String line) {
  +        if (p1 != null) {
  +            p1.demuxOutput(line, true);
  +        }
  +        else {
  +            super.handleErrorOutput(line);
  +        }
  +    }
  +    
       /**
        * Do the execution.
        */
  
  
  
  1.9       +19 -0     
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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- CallTarget.java   2001/07/20 10:07:35     1.8
  +++ CallTarget.java   2001/07/22 15:29:10     1.9
  @@ -127,4 +127,23 @@
       public void setTarget(String target) {
           subTarget = target;
       }
  +
  +    protected void handleOutput(String line) {
  +        if (callee != null) {
  +            callee.handleOutput(line);
  +        }
  +        else {
  +            super.handleOutput(line);
  +        }
  +    }
  +    
  +    protected void handleErrorOutput(String line) {
  +        if (callee != null) {
  +            callee.handleErrorOutput(line);
  +        }
  +        else {
  +            super.handleErrorOutput(line);
  +        }
  +    }
  +    
   }