[jboss-cvs] JBossAS SVN: r73694 - projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/thread.

[jboss-cvs-commits at lists.jboss.org]

Author: ALRubinger
Date: 2008-05-27 00:24:26 -0400 (Tue, 27 May 2008)
New Revision: 73694

Modified:
   projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/thread/RedirectProcessOutputThread.java
   projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/thread/RedirectProcessOutputToSystemOutThread.java
Log:
[EJBTHREE-1382] Allow for any PrintStream to be used by Process Output redirection

Modified: projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/thread/RedirectProcessOutputThread.java
===================================================================
--- projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/thread/RedirectProcessOutputThread.java	2008-05-27 04:21:38 UTC (rev 73693)
+++ projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/thread/RedirectProcessOutputThread.java	2008-05-27 04:24:26 UTC (rev 73694)
@@ -34,7 +34,7 @@
  * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
  * @version $Revision: $
  */
-public abstract class RedirectProcessOutputThread extends Thread implements Runnable
+public class RedirectProcessOutputThread extends Thread implements Runnable
 {
 
    // --------------------------------------------------------------------------------||
@@ -46,6 +46,11 @@
     */
    private Process process;
 
+   /**
+    * The PrintStream to redirect to
+    */
+   private PrintStream printStream;
+
    // --------------------------------------------------------------------------------||
    // Constructor --------------------------------------------------------------------||
    // --------------------------------------------------------------------------------||
@@ -55,9 +60,10 @@
     * 
     * @param process The Process whose output to capture
     */
-   public RedirectProcessOutputThread(Process process)
+   public RedirectProcessOutputThread(Process process, PrintStream printStream)
    {
-      this.process = process;
+      this.setProcess(process);
+      this.setPrintStream(printStream);
    }
 
    // --------------------------------------------------------------------------------||
@@ -92,12 +98,27 @@
    }
 
    // --------------------------------------------------------------------------------||
-   // Contracts ----------------------------------------------------------------------||
+   // Accessors / Mutators -----------------------------------------------------------||
    // --------------------------------------------------------------------------------||
 
-   /**
-    * Obtains the PrintStream to which output should be
-    * redirected
-    */
-   protected abstract PrintStream getPrintStream();
+   public Process getProcess()
+   {
+      return process;
+   }
+
+   public void setProcess(Process process)
+   {
+      this.process = process;
+   }
+
+   public PrintStream getPrintStream()
+   {
+      return printStream;
+   }
+
+   public void setPrintStream(PrintStream printStream)
+   {
+      this.printStream = printStream;
+   }
+
 }

Modified: projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/thread/RedirectProcessOutputToSystemOutThread.java
===================================================================
--- projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/thread/RedirectProcessOutputToSystemOutThread.java	2008-05-27 04:21:38 UTC (rev 73693)
+++ projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/thread/RedirectProcessOutputToSystemOutThread.java	2008-05-27 04:24:26 UTC (rev 73694)
@@ -21,8 +21,6 @@
  */
 package org.jboss.ejb3.common.thread;
 
-import java.io.PrintStream;
-
 /**
  * RedirectProcessOutputToSystemOutThread
  * 
@@ -46,21 +44,7 @@
     */
    public RedirectProcessOutputToSystemOutThread(Process process)
    {
-      super(process);
+      super(process, System.out);
    }
 
-   // --------------------------------------------------------------------------------||
-   // Required Implementations -------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   /**
-    * Obtains the PrintStream to which output should be
-    * redirected
-    */
-   @Override
-   protected PrintStream getPrintStream()
-   {
-      return System.out;
-   }
-
 }