[jboss-cvs] JBossAS SVN: r99129 - in trunk: component-matrix and 1 other directories.

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

Author: david.lloyd at jboss.com
Date: 2010-01-07 17:16:07 -0500 (Thu, 07 Jan 2010)
New Revision: 99129

Modified:
   trunk/build/build.xml
   trunk/build/pom.xml
   trunk/component-matrix/pom.xml
   trunk/varia/src/resources/logging/logmanager-jboss-beans.xml
Log:
JBAS-7603: integrate STDIO handling

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2010-01-07 21:23:28 UTC (rev 99128)
+++ trunk/build/build.xml	2010-01-07 22:16:07 UTC (rev 99129)
@@ -1963,6 +1963,7 @@
       <fileset refid="org.jboss.logging:jboss-logging-log4j:jar"/>
       <fileset refid="org.jboss.logging:jboss-logging-jdk:jar"/>
       <fileset refid="org.jboss.logmanager:jboss-logmanager-log4j:jar"/>
+      <fileset refid="org.jboss.stdio:jboss-stdio:jar"/>
       <fileset refid="quartz:quartz:jar"/>
       <fileset refid="jaxen:jaxen:jar"/>
       <fileset refid="org.jboss.cluster:jboss-ha-client:jar"/>

Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml	2010-01-07 21:23:28 UTC (rev 99128)
+++ trunk/build/pom.xml	2010-01-07 22:16:07 UTC (rev 99129)
@@ -549,6 +549,10 @@
       <optional>true</optional>
     </dependency>
     <dependency>
+      <groupId>org.jboss.stdio</groupId>
+      <artifactId>jboss-stdio</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.threads</groupId>
       <artifactId>jboss-threads</artifactId>
       <optional>true</optional>

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2010-01-07 21:23:28 UTC (rev 99128)
+++ trunk/component-matrix/pom.xml	2010-01-07 22:16:07 UTC (rev 99129)
@@ -119,6 +119,7 @@
     <version.org.jboss.remoting>2.5.2.SP1</version.org.jboss.remoting>
     <version.org.jboss.security>2.1.0.20091223</version.org.jboss.security>
     <version.org.jboss.service.binding>1.0.0.GA</version.org.jboss.service.binding>
+    <version.org.jboss.stdio>1.0.0.CR1</version.org.jboss.stdio>
     <version.org.jboss.threads>1.0.0.GA</version.org.jboss.threads>
     <version.org.jboss.vfs>2.2.0.Alpha1</version.org.jboss.vfs>
     <version.org.jboss.security.negotiation>2.0.3.SP1</version.org.jboss.security.negotiation>
@@ -2248,6 +2249,12 @@
       </dependency>
 
       <dependency>
+        <groupId>org.jboss.stdio</groupId>
+        <artifactId>jboss-stdio</artifactId>
+        <version>${version.org.jboss.stdio}</version>
+      </dependency>
+
+      <dependency>
         <groupId>org.jboss.security</groupId>
         <artifactId>jbosssx-client</artifactId>
         <version>${version.org.jboss.security}</version>

Modified: trunk/varia/src/resources/logging/logmanager-jboss-beans.xml
===================================================================
--- trunk/varia/src/resources/logging/logmanager-jboss-beans.xml	2010-01-07 21:23:28 UTC (rev 99128)
+++ trunk/varia/src/resources/logging/logmanager-jboss-beans.xml	2010-01-07 22:16:07 UTC (rev 99129)
@@ -71,4 +71,40 @@
          <inject bean="JBossLogManagerClassLoaderContextSelector"/>
       </property>
    </bean>
+
+   <!--
+     ~ These three beans define the Input/OutputStreams required for handling stdio
+     -->
+   <bean name="JBossStdioSystemOutStream" class="org.jboss.stdio.LoggingOutputStream">
+      <constructor>
+         <parameter>STDOUT</parameter>
+         <parameter>INFO</parameter>
+      </constructor>
+   </bean>
+
+   <bean name="JBossStdioSystemErrStream" class="org.jboss.stdio.LoggingOutputStream">
+      <constructor>
+         <parameter>STDERR</parameter>
+         <parameter>ERROR</parameter>
+      </constructor>
+   </bean>
+
+   <bean name="JBossStdioSystemInStream" class="org.jboss.stdio.NullInputStream">
+      <constructor factoryMethod="getInstance"/>
+   </bean>
+
+   <!--
+     ~ These two beans install the above streams into the system stdio fields.
+     -->
+   <bean name="JBossStdioContext" class="org.jboss.stdio.StdioContext">
+      <constructor factoryMethod="create">
+         <parameter><inject bean="JBossStdioSystemInStream"/></parameter>
+         <parameter class="java.io.OutputStream"><inject bean="JBossStdioSystemOutStream"/></parameter>
+         <parameter><inject bean="JBossStdioSystemErrStream"/></parameter>
+      </constructor>
+   </bean>
+
+   <bean name="JBossStdioService" class="org.jboss.stdio.StdioService">
+      <depends>JBossStdioContext</depends>
+   </bean>
 </deployment>