ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From co...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs/rmic KaffeRmic.java WLRmic.java
Date Sun, 22 Jul 2001 13:12:29 GMT
conor       01/07/22 06:12:29

  Modified:    src/main/org/apache/tools/ant Main.java Project.java
                        ProjectHelper.java Target.java Task.java
               src/main/org/apache/tools/ant/taskdefs ExecuteJava.java
                        Java.java defaults.properties
               src/main/org/apache/tools/ant/taskdefs/compilers
                        Javac13.java
               src/main/org/apache/tools/ant/taskdefs/optional Javah.java
               src/main/org/apache/tools/ant/taskdefs/optional/junit
                        JUnitTask.java JUnitTestRunner.java
               src/main/org/apache/tools/ant/taskdefs/rmic KaffeRmic.java
                        WLRmic.java
  Added:       src/main/org/apache/tools/ant DemuxOutputStream.java
                        TaskContainer.java
               src/main/org/apache/tools/ant/taskdefs Parallel.java
                        Sequential.java
  Log:
  This is a major change. :-)
  
  It introduces the concept of a TaskContainer to allow a task to contain
  other tasks. This allows Task composition
  It introduces a <parallel> task for multithreading support. There is
  also a <sequential> task.
  It reworks System.out management to handle all task generated output
  and route it through the Ant event system. This handles multithreaded
  output.
  
  This is a major rework to the patch originally submitted by Thomas. I
  have taken a different route for the output management, in particular.
  
  Based on patch by Thomas Christen <chr@active.ch>
  
  Revision  Changes    Path
  1.39      +52 -34    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.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- Main.java	2001/07/19 06:38:01	1.38
  +++ Main.java	2001/07/22 13:12:28	1.39
  @@ -267,7 +267,14 @@
                       System.out.println("Only one logger class may be specified.");
                       return;
                   }
  -                loggerClassname = args[++i];
  +                try {
  +                    loggerClassname = args[++i];
  +                } 
  +                catch (ArrayIndexOutOfBoundsException aioobe) {
  +                    System.out.println("You must specify a classname when " +
  +                                       "using the -logger argument");
  +                    return;
  +                }
               } else if (arg.equals("-emacs")) {
                   emacsMode = true;
               } else if (arg.equals("-projecthelp")) {
  @@ -402,44 +409,55 @@
   
           try {
               addBuildListeners(project);
  -
  -            project.fireBuildStarted();
  -            project.init();
  -            project.setUserProperty("ant.version", getAntVersion());
  -
  -            // set user-define properties
  -            Enumeration e = definedProps.keys();
  -            while (e.hasMoreElements()) {
  -                String arg = (String)e.nextElement();
  -                String value = (String)definedProps.get(arg);
  -                project.setUserProperty(arg, value);
  -            }
   
  -            project.setUserProperty("ant.file" , buildFile.getAbsolutePath() );
  -
  -            // first use the ProjectHelper to create the project object
  -            // from the given build file.
  +            PrintStream err = System.err;
  +            PrintStream out = System.out;
  +            
               try {
  -                Class.forName("javax.xml.parsers.SAXParserFactory");
  -                ProjectHelper.configureProject(project, buildFile);
  -            } catch (NoClassDefFoundError ncdfe) {
  -                throw new BuildException("No JAXP compliant XML parser found. See http://java.sun.com/xml for the\nreference implementation.", ncdfe);
  -            } catch (ClassNotFoundException cnfe) {
  -                throw new BuildException("No JAXP compliant XML parser found. See http://java.sun.com/xml for the\nreference implementation.", cnfe);
  -            } catch (NullPointerException npe) {
  -                throw new BuildException("No JAXP compliant XML parser found. See http://java.sun.com/xml for the\nreference implementation.", npe);
  +                System.setOut(new PrintStream(new DemuxOutputStream(project, false)));
  +                System.setErr(new PrintStream(new DemuxOutputStream(project, true)));
  +                project.fireBuildStarted();
  +                project.init();
  +                project.setUserProperty("ant.version", getAntVersion());
  +
  +                // set user-define properties
  +                Enumeration e = definedProps.keys();
  +                while (e.hasMoreElements()) {
  +                    String arg = (String)e.nextElement();
  +                    String value = (String)definedProps.get(arg);
  +                    project.setUserProperty(arg, value);
  +                }
  +                
  +                project.setUserProperty("ant.file" , buildFile.getAbsolutePath() );
  +                
  +                // first use the ProjectHelper to create the project object
  +                // from the given build file.
  +                try {
  +                    Class.forName("javax.xml.parsers.SAXParserFactory");
  +                    ProjectHelper.configureProject(project, buildFile);
  +                } catch (NoClassDefFoundError ncdfe) {
  +                    throw new BuildException("No JAXP compliant XML parser found. See http://java.sun.com/xml for the\nreference implementation.", ncdfe);
  +                } catch (ClassNotFoundException cnfe) {
  +                    throw new BuildException("No JAXP compliant XML parser found. See http://java.sun.com/xml for the\nreference implementation.", cnfe);
  +                } catch (NullPointerException npe) {
  +                    throw new BuildException("No JAXP compliant XML parser found. See http://java.sun.com/xml for the\nreference implementation.", npe);
  +                }
  +                
  +                // make sure that we have a target to execute
  +                if (targets.size() == 0) {
  +                    targets.addElement(project.getDefaultTarget());
  +                }
  +                
  +                if (!projectHelp) {
  +                    project.executeTargets(targets);
  +                }
               }
  -
  -            // make sure that we have a target to execute
  -            if (targets.size() == 0) {
  -                targets.addElement(project.getDefaultTarget());
  +            finally {
  +                System.setOut(out);
  +                System.setErr(err);
               }
  -
               if (projectHelp) {
  -                printTargets(project);
  -            } else {
  -                // actually do some work
  -                project.executeTargets(targets);
  +                    printTargets(project);
               }
           }
           catch(RuntimeException exc) {
  
  
  
  1.65      +24 -18    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.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- Project.java	2001/07/17 12:12:39	1.64
  +++ Project.java	2001/07/22 13:12:28	1.65
  @@ -113,6 +113,9 @@
   
       /** The system classloader - may be null */    
       private ClassLoader systemLoader = null;
  +
  +    /** Records the latest task on a thread */ 
  +    private Hashtable threadTasks = new Hashtable();
       
       static {
   
  @@ -525,6 +528,21 @@
           }
       }
   
  +    public void demuxOutput(String line, boolean isError) {
  +        Task task = (Task)threadTasks.get(Thread.currentThread());
  +        if (task == null) {
  +            fireMessageLogged(this, line, isError ? MSG_ERR : MSG_INFO);
  +        }
  +        else {
  +            if (isError) {
  +                task.handleOutput(line);
  +            }
  +            else {
  +                task.handleErrorOutput(line);
  +            }
  +        }
  +    }
  +    
       public void executeTarget(String targetName) throws BuildException {
   
           // sanity check ourselves, if we've been asked to build nothing
  @@ -547,7 +565,7 @@
   
           do {
               curtarget = (Target) sortedTargets.elementAt(curidx++);
  -            runTarget(curtarget);
  +            curtarget.performTasks();
           } while (!curtarget.getName().equals(targetName));
       }
   
  @@ -903,23 +921,6 @@
                   s.equalsIgnoreCase("yes"));
       }
   
  -    // Given a string defining a target name, and a Hashtable
  -    // containing the "name to Target" mapping, pick out the
  -    // Target and execute it.
  -    public void runTarget(Target target)
  -        throws BuildException {
  -
  -        try {
  -            fireTargetStarted(target);
  -            target.execute();
  -            fireTargetFinished(target, null);
  -        }
  -        catch(RuntimeException exc) {
  -            fireTargetFinished(target, exc);
  -            throw exc;
  -        }
  -    }
  -
       /**
        * Topologically sort a set of Targets.
        * @param root is the (String) name of the root Target. The sort is
  @@ -1084,6 +1085,8 @@
       }
   
       protected void fireTaskStarted(Task task) {
  +        // register this as the current task on the current thread.
  +        threadTasks.put(Thread.currentThread(), task);
           BuildEvent event = new BuildEvent(task);
           for (int i = 0; i < listeners.size(); i++) {
               BuildListener listener = (BuildListener) listeners.elementAt(i);
  @@ -1092,6 +1095,9 @@
       }
   
       protected void fireTaskFinished(Task task, Throwable exception) {
  +        threadTasks.remove(Thread.currentThread());
  +        System.out.flush();
  +        System.err.flush();
           BuildEvent event = new BuildEvent(task);
           for (int i = 0; i < listeners.size(); i++) {
               BuildListener listener = (BuildListener) listeners.elementAt(i);
  
  
  
  1.55      +37 -20    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.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- ProjectHelper.java	2001/07/11 09:58:09	1.54
  +++ ProjectHelper.java	2001/07/22 13:12:28	1.55
  @@ -348,11 +348,11 @@
           }
   
           private void handleTaskdef(String name, AttributeList attrs) throws SAXParseException {
  -            (new TaskHandler(this, null)).init(name, attrs);
  +            (new TaskHandler(this, null, null)).init(name, attrs);
           }
   
           private void handleProperty(String name, AttributeList attrs) throws SAXParseException {
  -            (new TaskHandler(this, null)).init(name, attrs);
  +            (new TaskHandler(this, null, null)).init(name, attrs);
           }
   
           private void handleTarget(String tag, AttributeList attrs) throws SAXParseException {
  @@ -433,7 +433,7 @@
               if (project.getDataTypeDefinitions().get(name) != null) {
                   new DataTypeHandler(this, target).init(name, attrs);
               } else {
  -                new TaskHandler(this, target).init(name, attrs);
  +                new TaskHandler(this, target, target).init(name, attrs);
               }
           }
       }
  @@ -443,12 +443,13 @@
        */
       private class TaskHandler extends AbstractHandler {
           private Target target;
  +        private TaskContainer container;
           private Task task;
           private RuntimeConfigurable wrapper = null;
   
  -        public TaskHandler(DocumentHandler parentHandler, Target target) {
  +        public TaskHandler(DocumentHandler parentHandler, TaskContainer container, Target target) {
               super(parentHandler);
  -
  +            this.container = container;
               this.target = target;
           }
   
  @@ -471,7 +472,7 @@
               // Top level tasks don't have associated targets
               if (target != null) {
                   task.setOwningTarget(target);
  -                target.addTask(task);
  +                container.addTask(task);
                   task.init();
                   wrapper = task.getRuntimeConfigurableWrapper();
                   wrapper.setAttributes(attrs);
  @@ -500,7 +501,13 @@
           }
   
           public void startElement(String name, AttributeList attrs) throws SAXParseException {
  -            new NestedElementHandler(this, task, wrapper).init(name, attrs);
  +            if (task instanceof TaskContainer) {
  +                // task can contain other tasks - no other nested elements possible
  +                new TaskHandler(this, (TaskContainer)task, target).init(name, attrs);
  +            }
  +            else {
  +                new NestedElementHandler(this, task, wrapper, target).init(name, attrs);
  +            }
           }
       }
   
  @@ -508,35 +515,38 @@
        * Handler for all nested properties.
        */
       private class NestedElementHandler extends AbstractHandler {
  -        private Object target;
  +        private Object parent;
           private Object child;
           private RuntimeConfigurable parentWrapper;
           private RuntimeConfigurable childWrapper = null;
  +        private Target target;
   
           public NestedElementHandler(DocumentHandler parentHandler, 
  -                                    Object target,
  -                                    RuntimeConfigurable parentWrapper) {
  +                                    Object parent,
  +                                    RuntimeConfigurable parentWrapper,
  +                                    Target target) {
               super(parentHandler);
   
  -            if (target instanceof TaskAdapter) {
  -                this.target = ((TaskAdapter) target).getProxy();
  +            if (parent instanceof TaskAdapter) {
  +                this.parent = ((TaskAdapter) parent).getProxy();
               } else {
  -                this.target = target;
  +                this.parent = parent;
               }
               this.parentWrapper = parentWrapper;
  +            this.target = target;
           }
   
           public void init(String propType, AttributeList attrs) throws SAXParseException {
  -            Class targetClass = target.getClass();
  +            Class parentClass = parent.getClass();
               IntrospectionHelper ih = 
  -                IntrospectionHelper.getHelper(targetClass);
  +                IntrospectionHelper.getHelper(parentClass);
   
               try {
  -                if (target instanceof UnknownElement) {
  +                if (parent instanceof UnknownElement) {
                       child = new UnknownElement(propType.toLowerCase());
  -                    ((UnknownElement) target).addChild((UnknownElement) child);
  +                    ((UnknownElement) parent).addChild((UnknownElement) child);
                   } else {
  -                    child = ih.createElement(project, target, propType.toLowerCase());
  +                    child = ih.createElement(project, parent, propType.toLowerCase());
                   }
   
                   configureId(child, attrs);
  @@ -566,7 +576,14 @@
           }
   
           public void startElement(String name, AttributeList attrs) throws SAXParseException {
  -            new NestedElementHandler(this, child, childWrapper).init(name, attrs);
  +            if (child instanceof TaskContainer) {
  +                // taskcontainer nested element can contain other tasks - no other 
  +                // nested elements possible
  +                new TaskHandler(this, (TaskContainer)child, target).init(name, attrs);
  +            }
  +            else {
  +                new NestedElementHandler(this, child, childWrapper, target).init(name, attrs);
  +            }
           }
       }
   
  @@ -616,7 +633,7 @@
           }
   
           public void startElement(String name, AttributeList attrs) throws SAXParseException {
  -            new NestedElementHandler(this, element, wrapper).init(name, attrs);
  +            new NestedElementHandler(this, element, wrapper, target).init(name, attrs);
           }
       }
   
  
  
  
  1.19      +14 -18    jakarta-ant/src/main/org/apache/tools/ant/Target.java
  
  Index: Target.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/Target.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Target.java	2001/06/08 10:11:28	1.18
  +++ Target.java	2001/07/22 13:12:28	1.19
  @@ -62,7 +62,7 @@
    * @author James Davidson <a href="mailto:duncan@x180.com">duncan@x180.com</a>
    */
   
  -public class Target {
  +public class Target implements TaskContainer {
   
       private String name;
       private String ifCondition = "";
  @@ -161,23 +161,7 @@
                   Object o = enum.nextElement();
                   if (o instanceof Task) {
                       Task task = (Task) o;
  -                    
  -                    try {
  -                        project.fireTaskStarted(task);
  -                        task.maybeConfigure();
  -                        task.execute();
  -                        project.fireTaskFinished(task, null);
  -                    }
  -                    catch(RuntimeException exc) {
  -                        if (exc instanceof BuildException) {
  -                            BuildException be = (BuildException) exc;
  -                            if (be.getLocation() == Location.UNKNOWN_LOCATION) {
  -                                be.setLocation(task.getLocation());
  -                            }
  -                        }
  -                        project.fireTaskFinished(task, exc);
  -                        throw exc;
  -                    }
  +                    task.perform();
                   } else {
                       RuntimeConfigurable r = (RuntimeConfigurable) o;
                       r.maybeConfigure(project);
  @@ -192,6 +176,18 @@
           }
       }
   
  +    public final void performTasks() {
  +        try {
  +            project.fireTargetStarted(this);
  +            execute();
  +            project.fireTargetFinished(this, null);
  +        }
  +        catch(RuntimeException exc) {
  +            project.fireTargetFinished(this, exc);
  +            throw exc;
  +        }
  +    }
  +    
       void replaceTask(UnknownElement el, Task t) {
           int index = -1;
           while ((index = children.indexOf(el)) >= 0) {
  
  
  
  1.19      +31 -0     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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Task.java	2001/06/06 06:07:27	1.18
  +++ Task.java	2001/07/22 13:12:28	1.19
  @@ -220,5 +220,36 @@
               wrapper.maybeConfigure(project);
           }
       }
  +
  +    protected void handleOutput(String line) {
  +        log(line, Project.MSG_INFO);
  +    }
  +    
  +    protected void handleErrorOutput(String line) {
  +        log(line, Project.MSG_ERR);
  +    }
  +    
  +    
  +    /**
  +     * Perform this task
  +     */
  +    public final void perform() {
  +        try {
  +            project.fireTaskStarted(this);
  +            maybeConfigure();
  +            execute();
  +            project.fireTaskFinished(this, null);
  +        }
  +        catch(RuntimeException exc) {
  +            if (exc instanceof BuildException) {
  +                BuildException be = (BuildException) exc;
  +                if (be.getLocation() == Location.UNKNOWN_LOCATION) {
  +                    be.setLocation(getLocation());
  +                }
  +            }
  +            project.fireTaskFinished(this, exc);
  +            throw exc;
  +        }
  +    }
   }
   
  
  
  
  1.1                  jakarta-ant/src/main/org/apache/tools/ant/DemuxOutputStream.java
  
  Index: DemuxOutputStream.java
  ===================================================================
  /*
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Ant", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.tools.ant;
  
  import java.io.*;
  import java.util.*;
  
  
  /**
   * Logs content written by a thread and forwards the buffers onto the
   * project object which will forward the content to the appropriate
   * task 
   *
   * @author Conor MacNeill
   */
  public class DemuxOutputStream extends OutputStream {
  
      static private final int MAX_SIZE = 1024;
      
      private Hashtable buffers = new Hashtable();
  //    private ByteArrayOutputStream buffer = new ByteArrayOutputStream();
      private boolean skip = false;
      private Project project;
      private boolean isErrorStream;
      
      /**
       * Creates a new instance of this class.
       *
       * @param task the task for whom to log
       * @param level loglevel used to log data written to this stream.
       */
      public DemuxOutputStream(Project project, boolean isErrorStream) {
          this.project = project;
          this.isErrorStream = isErrorStream;
      }
  
      private ByteArrayOutputStream getBuffer() {
          Thread current = Thread.currentThread();
          ByteArrayOutputStream buffer = (ByteArrayOutputStream)buffers.get(current);
          if (buffer == null) {
              buffer = new ByteArrayOutputStream();
              buffers.put(current, buffer);
          }
          return buffer;
      }
  
      private void resetBuffer() {    
          Thread current = Thread.currentThread();
          buffers.remove(current);
      }
      
      /**
       * Write the data to the buffer and flush the buffer, if a line
       * separator is detected.
       *
       * @param cc data to log (byte).
       */
      public void write(int cc) throws IOException {
          final byte c = (byte)cc;
          if ((c == '\n') || (c == '\r')) {
              if (!skip) {
                  processBuffer();
              }
          } else {
              ByteArrayOutputStream buffer = getBuffer();
              buffer.write(cc);
              if (buffer.size() > MAX_SIZE) {
                  processBuffer();
              }
          }
          skip = (c == '\r');
      }
  
  
      /**
       * Converts the buffer to a string and sends it to <code>processLine</code>
       */
      protected void processBuffer() {
          String output = getBuffer().toString();
          project.demuxOutput(output, isErrorStream);
          resetBuffer();
      }
  
      /**
       * Writes all remaining
       */
      public void close() throws IOException {
          flush();
      }
  
      /**
       * Writes all remaining
       */
      public void flush() throws IOException {
          if (getBuffer().size() > 0) {
              processBuffer();
          }
      }
  }
  
  
  
  1.1                  jakarta-ant/src/main/org/apache/tools/ant/TaskContainer.java
  
  Index: TaskContainer.java
  ===================================================================
  /*
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Ant", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.tools.ant;
  
  /**
   * Interface for objects which can contain tasks 
   *
   * @author <a href="mailto:conor@apache.org">Conor MacNeill</a>
   */
  public interface TaskContainer {
      /**
       * Add a task to this task container
       *
       * @param task the task to be added to this container
       */
      void addTask(Task task);
  }
  
  
  
  
  1.14      +2 -15     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
  
  Index: ExecuteJava.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ExecuteJava.java	2001/07/18 03:16:05	1.13
  +++ ExecuteJava.java	2001/07/22 13:12:29	1.14
  @@ -76,7 +76,6 @@
       private Commandline javaCommand = null;
       private Path classpath = null;
       private CommandlineJava.SysProperties sysProperties = null;
  -    private PrintStream out;
   
       public void setJavaCommand(Commandline javaCommand) {
           this.javaCommand = javaCommand;
  @@ -93,15 +92,13 @@
       /**
        * All output (System.out as well as System.err) will be written
        * to this Stream.
  +     *
  +     * @deprecated manage output at the task level
        */
       public void setOutput(PrintStream out) {
  -        this.out = out;
       }
   
       public void execute(Project project) throws BuildException{
  -        PrintStream sOut = System.out;
  -        PrintStream sErr = System.err;
  -
           final String classname = javaCommand.getExecutable();
           final Object[] argument = { javaCommand.getArguments() };
   
  @@ -111,11 +108,6 @@
                   sysProperties.setSystem();
               }
   
  -            if (out != null) {
  -                System.setErr(out);
  -                System.setOut(out);
  -            }
  -
               final Class[] param = { Class.forName("[Ljava.lang.String;") };
               Class target = null;
               if (classpath == null) {
  @@ -149,11 +141,6 @@
               }
               if (sysProperties != null) {
                   sysProperties.restoreSystem();
  -            }
  -            if (out != null) {
  -                System.setOut(sOut);
  -                System.setErr(sErr);
  -                out.close();
               }
           }
       }
  
  
  
  1.26      +29 -3     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.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- Java.java	2001/07/17 12:12:39	1.25
  +++ Java.java	2001/07/22 13:12:29	1.26
  @@ -76,6 +76,7 @@
       private boolean fork = false;
       private File dir = null;
       private File out;
  +    private PrintStream outStream = null;
       private boolean failOnError = false;
       
       /**
  @@ -239,6 +240,24 @@
           }
       }
   
  +    protected void handleOutput(String line) {
  +        if (outStream != null) {
  +            outStream.println(line);
  +        }
  +        else {
  +            super.handleOutput(line);
  +        }
  +    }
  +    
  +    protected void handleErrorOutput(String line) {
  +        if (outStream != null) {
  +            outStream.println(line);
  +        }
  +        else {
  +            super.handleErrorOutput(line);
  +        }
  +    }
  +    
       /**
        * Executes the given classname with the given arguments as it
        * was a command line application.
  @@ -250,13 +269,20 @@
           exe.setSystemProperties(command.getSystemProperties());
           if (out != null) {
               try {
  -                exe.setOutput(new PrintStream(new FileOutputStream(out)));
  +                outStream = new PrintStream(new FileOutputStream(out));
  +                exe.execute(project);
               } catch (IOException io) {
                   throw new BuildException(io, location);
               }
  +            finally {
  +                if (outStream != null) {
  +                    outStream.close();
  +                }
  +            }
           }
  -        
  -        exe.execute(project);
  +        else {
  +            exe.execute(project);
  +        }
       }
   
       /**
  
  
  
  1.83      +2 -0      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/defaults.properties
  
  Index: defaults.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/defaults.properties,v
  retrieving revision 1.82
  retrieving revision 1.83
  diff -u -r1.82 -r1.83
  --- defaults.properties	2001/07/11 16:29:03	1.82
  +++ defaults.properties	2001/07/22 13:12:29	1.83
  @@ -49,6 +49,8 @@
   sleep=org.apache.tools.ant.taskdefs.Sleep
   pathconvert=org.apache.tools.ant.taskdefs.PathConvert
   ear=org.apache.tools.ant.taskdefs.Ear
  +parallel=org.apache.tools.ant.taskdefs.Parallel
  +sequential=org.apache.tools.ant.taskdefs.Sequential
   
   # optional tasks
   script=org.apache.tools.ant.taskdefs.optional.Script
  
  
  
  1.1                  jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Parallel.java
  
  Index: Parallel.java
  ===================================================================
  /*
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Ant", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  package org.apache.tools.ant.taskdefs;
  
  import org.apache.tools.ant.*;
  import org.apache.tools.ant.types.*;
  import java.util.*;
  import java.text.*;
  import java.lang.RuntimeException;
  
  /**
   * Implements a multi threaded task execution.
   * <p>
   * @author Thomas Christen <a href="mailto:chr@active.ch">chr@active.ch</a>
   * @author <a href="mailto:conor@apache.org">Conor MacNeill </a>
   */
  public class Parallel extends Task
                        implements TaskContainer {
  
      /** Collection holding the nested tasks */
      private Vector nestedTasks = new Vector();
  
  
      /**
       * Add a nested task to execute parallel (asynchron).
       * <p>
       * @param nestedTask  Nested task to be executed in parallel
       */
      public void addTask(Task nestedTask) throws BuildException {
          nestedTasks.addElement(nestedTask);
      }
  
      /**
       * Block execution until the specified time or for a
       * specified amount of milliseconds and if defined,
       * execute the wait status.
       */
      public void execute() throws BuildException {
          TaskThread[] threads = new TaskThread[nestedTasks.size()];
          int threadNumber = 0;
          for (Enumeration e = nestedTasks.elements(); e.hasMoreElements(); threadNumber++) {
              Task nestedTask = (Task)e.nextElement();
              threads[threadNumber] = new TaskThread(threadNumber, nestedTask);
          }
  
          // now start all threads        
          for (int i = 0; i < threads.length; ++i) {
              threads[i].start();
          }
  
          // now join to all the threads 
          for (int i = 0; i < threads.length; ++i) {
              try {
                  threads[i].join();
              }
              catch (InterruptedException ie) {
                  // who would interrupt me at a time like this?
              }
          }
          
          // now did any of the threads throw an exception
          StringBuffer exceptionMessage = new StringBuffer();
          String lSep = System.getProperty("line.separator");
          int numExceptions = 0;
          Throwable firstException = null;
          Location firstLocation = Location.UNKNOWN_LOCATION;;
          for (int i = 0; i < threads.length; ++i) {
              Throwable t = threads[i].getException();
              if (t != null) {
                  numExceptions++;
                  if (firstException == null) {
                      firstException = t;
                  }
                  if (t instanceof BuildException && 
                          firstLocation == Location.UNKNOWN_LOCATION) {
                      firstLocation = ((BuildException)t).getLocation();
                  }
                  exceptionMessage.append(lSep);
                  exceptionMessage.append(t.getMessage());
              }
          }
          
          if (numExceptions == 1) {
              if (firstException instanceof BuildException) {
                  throw (BuildException)firstException;
              }
              else {
                  throw new BuildException(firstException);
              }
          }
          else if (numExceptions > 1) {
              throw new BuildException(exceptionMessage.toString(), firstLocation);
          }
      }
  
      class TaskThread extends Thread {
          private Throwable exception;
          private Task task;
          private int taskNumber;
  
          /**
           * Construct a new TaskThread<p>
           *
           * @param task the Task to be executed in a seperate thread
           */
          TaskThread(int taskNumber, Task task) {
              this.task = task;
              this.taskNumber = taskNumber;
          }
  
          /**
           * Executes the task within a thread and takes care about
           * Exceptions raised within the task.
           */
          public void run() {
              try {
                  task.perform();
              }
              catch (Throwable t) {
                  exception = t;
              }
          }
          
          public Throwable getException() { 
              return exception;
          }
      }
  }
  
  
  
  1.1                  jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Sequential.java
  
  Index: Sequential.java
  ===================================================================
  /*
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Ant", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  package org.apache.tools.ant.taskdefs;
  
  import org.apache.tools.ant.*;
  import org.apache.tools.ant.types.*;
  import java.util.*;
  import java.text.*;
  import java.lang.RuntimeException;
  
  /**
   * Implements a single threaded task execution.
   * <p>
   * @author Thomas Christen <a href="mailto:chr@active.ch">chr@active.ch</a>
   */
  public class Sequential extends Task
                          implements TaskContainer {
  
      /** Optional Vector holding the nested tasks */
      private Vector nestedTasks = new Vector();
  
      /**
       * Add a nested task to Sequential.
       * <p>
       * @param nestedTask  Nested task to execute Sequential
       * <p>
       */
      public void addTask(Task nestedTask) {
          nestedTasks.addElement(nestedTask);
      }
  
      /**
       * Execute all nestedTasks.
       */
      public void execute() throws BuildException {
          for (Enumeration e = nestedTasks.elements(); e.hasMoreElements();) {
              Task nestedTask = (Task)e.nextElement();
              nestedTask.perform();
          }
      }
  }
  
  
  
  1.3       +0 -11     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java
  
  Index: Javac13.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Javac13.java	2001/07/13 12:54:45	1.2
  +++ Javac13.java	2001/07/22 13:12:29	1.3
  @@ -83,15 +83,8 @@
           attributes.log("Using modern compiler", Project.MSG_VERBOSE);
           Commandline cmd = setupJavacCommand();
   
  -        PrintStream err = System.err;
  -        PrintStream out = System.out;
  -
  -        PrintStream logstr = 
  -            new PrintStream(new LogOutputStream(attributes, Project.MSG_WARN));
           // Use reflection to be able to build on all JDKs >= 1.1:
           try {
  -            System.setOut(logstr);
  -            System.setErr(logstr);
               Class c = Class.forName ("com.sun.tools.javac.Main");
               Object compiler = c.newInstance ();
               Method compile = c.getMethod ("compile",
  @@ -105,10 +98,6 @@
               } else {
                   throw new BuildException("Error starting modern compiler", ex, location);
               }
  -        } finally {
  -            System.setErr(err);
  -            System.setOut(out);
  -            logstr.close();
           }
       }
   }
  
  
  
  1.6       +0 -11     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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Javah.java	2001/07/13 12:55:00	1.5
  +++ Javah.java	2001/07/22 13:12:29	1.6
  @@ -308,19 +308,12 @@
               throw new BuildException("Compile failed");
           }
           */
  -        PrintStream err = System.err;
  -        PrintStream out = System.out;
  -
  -        PrintStream logstr = 
  -            new PrintStream(new LogOutputStream(this, Project.MSG_WARN));
           try {
               // Javac uses logstr to change the output stream and calls
               // the constructor's invoke method to create a compiler instance
               // dynamically. However, javah has a different interface and this
               // makes it harder, so here's a simple alternative.
               //------------------------------------------------------------------
  -            System.setOut(logstr);
  -            System.setErr(logstr);
               com.sun.tools.javah.Main main = new com.sun.tools.javah.Main( cmd.getArguments() );
               main.run();
           }
  @@ -335,10 +328,6 @@
               } else {
                   throw new BuildException("Error starting javah: ", ex, location);
               }
  -        } finally {
  -            System.setErr(err);
  -            System.setOut(out);
  -            logstr.close();
           }
       }
   
  
  
  
  1.24      +22 -2     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.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- JUnitTask.java	2001/07/17 12:12:39	1.23
  +++ JUnitTask.java	2001/07/22 13:12:29	1.24
  @@ -155,7 +155,8 @@
       private Integer timeout = null;
       private boolean summary = false;
       private String summaryValue = "";
  -
  +    private JUnitTestRunner runner = null;
  +    
       /**
        * Tells this task to halt when there is an error in a test.
        * this property is applied on all BatchTest (batchtest) and JUnitTest (test)
  @@ -509,6 +510,25 @@
       // whole build. IMHO this method should be avoided and it would be best
       // to remove it in future versions. TBD. (SBa)
           
  +
  +    protected void handleOutput(String line) {
  +        if (runner != null) {
  +            runner.handleOutput(line);
  +        }
  +        else {
  +            super.handleOutput(line);
  +        }
  +    }
  +    
  +    protected void handleErrorOutput(String line) {
  +        if (runner != null) {
  +            runner.handleErrorOutput(line);
  +        }
  +        else {
  +            super.handleErrorOutput(line);
  +        }
  +    }
  +    
       /**
        * Execute inside VM.
        */
  @@ -535,7 +555,7 @@
                   // will cause trouble in JDK 1.1 if omitted
                   cl.addSystemPackageRoot("org.apache.tools.ant");
               }
  -            JUnitTestRunner runner = new JUnitTestRunner(test, test.getHaltonerror(), test.getHaltonfailure(), cl);
  +            runner = new JUnitTestRunner(test, test.getHaltonerror(), test.getHaltonfailure(), cl);
   
               if (summary) {
                   log("Running " + test.getName(), Project.MSG_INFO);
  
  
  
  1.11      +24 -9     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
  
  Index: JUnitTestRunner.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- JUnitTestRunner.java	2001/07/11 09:29:51	1.10
  +++ JUnitTestRunner.java	2001/07/22 13:12:29	1.11
  @@ -138,6 +138,12 @@
        */
       private JUnitTest junitTest;
   
  +    /** output written during the test */
  +    private PrintStream systemError;
  +    
  +    /** Error output during the test */
  +    private PrintStream systemOut;    
  +    
       /**
        * Constructor for fork=true or when the user hasn't specified a
        * classpath.  
  @@ -212,22 +218,19 @@
           } else {
   
   
  -            PrintStream oldErr = System.err;
  -            PrintStream oldOut = System.out;
  -              
               ByteArrayOutputStream errStrm = new ByteArrayOutputStream();
  -            System.setErr(new PrintStream(errStrm));
  +            systemError = new PrintStream(errStrm);
               
               ByteArrayOutputStream outStrm = new ByteArrayOutputStream();
  -            System.setOut(new PrintStream(outStrm));
  +            systemOut = new PrintStream(outStrm);
   
               try {
                   suite.run(res);
               } finally {
  -                System.err.close();
  -                System.out.close();
  -                System.setErr(oldErr);
  -                System.setOut(oldOut);
  +                systemError.close();
  +                systemError = null;
  +                systemOut.close();
  +                systemOut = null;
                   sendOutAndErr(new String(outStrm.toByteArray()),
                                 new String(errStrm.toByteArray()));
   
  @@ -299,6 +302,18 @@
           }
       }
   
  +    protected void handleOutput(String line) {
  +        if (systemOut != null) {
  +            systemOut.println(line);
  +        }
  +    }
  +    
  +    protected void handleErrorOutput(String line) {
  +        if (systemError != null) {
  +            systemError.println(line);
  +        }
  +    }
  +    
       private void sendOutAndErr(String out, String err) {
           for (int i=0; i<formatters.size(); i++) {
               JUnitResultFormatter formatter = 
  
  
  
  1.3       +0 -12     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java
  
  Index: KaffeRmic.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- KaffeRmic.java	2001/07/13 13:06:14	1.2
  +++ KaffeRmic.java	2001/07/22 13:12:29	1.3
  @@ -74,15 +74,7 @@
           getRmic().log("Using Kaffe rmic", Project.MSG_VERBOSE);
           Commandline cmd = setupRmicCommand();
   
  -        PrintStream err = System.err;
  -        PrintStream out = System.out;
  -
  -        // the project log
  -        PrintStream logstr = 
  -            new PrintStream(new LogOutputStream(getRmic(), Project.MSG_WARN));
           try {
  -            System.setOut(logstr);
  -            System.setErr(logstr);
   
               Class c = Class.forName("kaffe.rmi.rmic.RMIC");
               Constructor cons = c.getConstructor(new Class[] { String[].class });
  @@ -103,10 +95,6 @@
               } else {
                   throw new BuildException("Error starting Kaffe rmic: ", ex, getRmic().getLocation());
               }
  -        } finally {
  -            System.setErr(err);
  -            System.setOut(out);
  -            logstr.close();
           }
       }
   }
  
  
  
  1.4       +0 -12     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java
  
  Index: WLRmic.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- WLRmic.java	2001/07/13 13:06:17	1.3
  +++ WLRmic.java	2001/07/22 13:12:29	1.4
  @@ -75,15 +75,7 @@
           getRmic().log("Using WebLogic rmic", Project.MSG_VERBOSE);
           Commandline cmd = setupRmicCommand(new String[] {"-noexit"});
   
  -        PrintStream err = System.err;
  -        PrintStream out = System.out;
  -
  -        PrintStream logstr = 
  -            new PrintStream(new LogOutputStream(getRmic(), Project.MSG_WARN));
           try {
  -            System.setOut(logstr);
  -            System.setErr(logstr);
  -
               // Create an instance of the rmic
               Class c = Class.forName("weblogic.rmic");
               Method doRmic = c.getMethod("main", 
  @@ -101,10 +93,6 @@
               } else {
                   throw new BuildException("Error starting WebLogic rmic: ", ex, getRmic().getLocation());
               }
  -        } finally {
  -            System.setErr(err);
  -            System.setOut(out);
  -            logstr.close();
           }
       }
   
  
  
  

Mime
View raw message