[jboss-cvs] JBossAS SVN: r73691 - in projects/ejb3/trunk/installer: src/main/java/org/jboss/ejb3/installer and 1 other directory.

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

Author: ALRubinger
Date: 2008-05-26 18:45:48 -0400 (Mon, 26 May 2008)
New Revision: 73691

Modified:
   projects/ejb3/trunk/installer/pom.xml
   projects/ejb3/trunk/installer/src/main/java/org/jboss/ejb3/installer/Installer.java
Log:
[EJBTHREE-1382] Use Process Redirection from EJB3 Common

Modified: projects/ejb3/trunk/installer/pom.xml
===================================================================
--- projects/ejb3/trunk/installer/pom.xml	2008-05-26 22:45:06 UTC (rev 73690)
+++ projects/ejb3/trunk/installer/pom.xml	2008-05-26 22:45:48 UTC (rev 73691)
@@ -46,7 +46,14 @@
       <artifactId>ant-contrib</artifactId>
       <version>${version.ant-contrib:ant-contrib}</version>
     </dependency>
+
+    <!-- EJB3 Common -->
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-common</artifactId>
+      <version>0.1.1-SNAPSHOT</version>
+    </dependency>
     
   </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: projects/ejb3/trunk/installer/src/main/java/org/jboss/ejb3/installer/Installer.java
===================================================================
--- projects/ejb3/trunk/installer/src/main/java/org/jboss/ejb3/installer/Installer.java	2008-05-26 22:45:06 UTC (rev 73690)
+++ projects/ejb3/trunk/installer/src/main/java/org/jboss/ejb3/installer/Installer.java	2008-05-26 22:45:48 UTC (rev 73691)
@@ -34,6 +34,8 @@
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
+import org.jboss.ejb3.common.thread.RedirectProcessOutputToSystemOutThread;
+
 /**
  * JBoss AS EJB3 Plugin Installer
  * 
@@ -328,7 +330,7 @@
          Process antProcess = this.getAntProcess();
 
          // Capture the output
-         Thread captureProcess = new CaptureProcess(antProcess);
+         Thread captureProcess = new RedirectProcessOutputToSystemOutThread(antProcess);
          captureProcess.start();
 
          // Ensure proper completion, block until done
@@ -636,48 +638,4 @@
          getPrintStream().println("");
       }
    }
-
-   /**
-    * 
-    * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
-    * @version $Revision: $$
-    */
-   private class CaptureProcess extends Thread implements Runnable
-   {
-      // Instance Members
-      Process process;
-
-      // Constructors
-      public CaptureProcess(Process process)
-      {
-         this.process = process;
-      }
-
-      @Override
-      public void run()
-      {
-         // Call Super
-         super.run();
-
-         // Initialize
-         int bytesRead = 0;
-         byte[] buffer = new byte[1024];
-
-         // Obtain InputStream of process
-         InputStream in = this.process.getInputStream();
-
-         // Read in and direct PrintStream
-         try
-         {
-            while ((bytesRead = in.read(buffer)) != -1)
-            {
-               getPrintStream().write(buffer, 0, bytesRead);
-            }
-         }
-         catch (IOException ioe)
-         {
-            throw new RuntimeException(ioe);
-         }
-      }
-   }
 }