[jboss-cvs] JBossAS SVN: r100221 - in trunk: component-matrix and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 1 15:20:02 EST 2010
Author: david.lloyd at jboss.com
Date: 2010-02-01 15:20:01 -0500 (Mon, 01 Feb 2010)
New Revision: 100221
Added:
trunk/server/src/etc/conf/all/bootstrap/stdio.xml
Modified:
trunk/build/build.xml
trunk/component-matrix/pom.xml
trunk/server/src/etc/conf/all/bootstrap.xml
trunk/server/src/etc/conf/minimal/bootstrap.xml
trunk/varia/src/resources/logging/logmanager-jboss-beans.xml
Log:
JBAS-7683: Move stdio to earlier in the bootstrap phase, update to CR2 to work around secmgr issue
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-02-01 20:10:57 UTC (rev 100220)
+++ trunk/build/build.xml 2010-02-01 20:20:01 UTC (rev 100221)
@@ -253,6 +253,7 @@
<fileset dir="${install.default.conf}">
<include name="jndi.properties"/>
<include name="jboss-log4j.xml"/>
+ <include name="bootstrap/stdio.xml"/>
<include name="bootstrap/classloader.xml"/>
<include name="bootstrap/aop.xml"/>
<include name="bootstrap/jmx.xml"/>
@@ -288,7 +289,6 @@
<include name="log4j.jar" />
<include name="jboss-logmanager-log4j.jar" />
<include name="jboss-threads.jar" />
- <include name="jboss-stdio.jar" />
</fileset>
</copy>
<copy file="${project.root}/server/target/jboss-as-server-jboss-minimal.jar"
@@ -1959,7 +1959,6 @@
<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"/>
@@ -2073,6 +2072,7 @@
<fileset refid="org.jboss.logging:jboss-logging-spi:jar"/>
<fileset refid="org.jboss.logging:jboss-logging-logmanager:jar"/>
<fileset refid="org.jboss.logmanager:jboss-logmanager:jar"/>
+ <fileset refid="org.jboss.stdio:jboss-stdio:jar"/>
<fileset refid="org.jboss.integration:jboss-classloading-spi:jar"/>
<fileset refid="org.jboss.integration:jboss-profileservice-spi:jar"/>
<fileset refid="org.jboss.classpool:jboss-classpool:jar"/>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-02-01 20:10:57 UTC (rev 100220)
+++ trunk/component-matrix/pom.xml 2010-02-01 20:20:01 UTC (rev 100221)
@@ -128,7 +128,7 @@
<version.org.jboss.security.negotiation>2.0.3.SP1</version.org.jboss.security.negotiation>
<version.org.jboss.service.binding>1.0.0.GA</version.org.jboss.service.binding>
<version.org.jboss.slf4j>1.0.2.GA</version.org.jboss.slf4j>
- <version.org.jboss.stdio>1.0.0.CR1</version.org.jboss.stdio>
+ <version.org.jboss.stdio>1.0.0.CR2</version.org.jboss.stdio>
<version.org.jboss.threads>2.0.0.CR2</version.org.jboss.threads>
<version.org.jboss.vfs>2.2.0.Alpha2</version.org.jboss.vfs>
<version.org.jboss.xnio>2.1.0.CR1</version.org.jboss.xnio>
Added: trunk/server/src/etc/conf/all/bootstrap/stdio.xml
===================================================================
--- trunk/server/src/etc/conf/all/bootstrap/stdio.xml (rev 0)
+++ trunk/server/src/etc/conf/all/bootstrap/stdio.xml 2010-02-01 20:20:01 UTC (rev 100221)
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <classloader><inject bean="stdio-classloader:0.0.0"/></classloader>
+
+ <classloader name="stdio-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
+ <root>${jboss.lib.url}jboss-stdio.jar</root>
+ </classloader>
+
+ <!--
+ ~ These three beans define the Input/OutputStreams required for handling stdio
+ -->
+ <bean name="JBossStdioSystemOutStream" class="org.jboss.stdio.LoggingOutputStream">
+ <constructor>
+ <parameter class="java.lang.String">STDOUT</parameter>
+ <parameter class="java.lang.String">INFO</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="JBossStdioSystemErrStream" class="org.jboss.stdio.LoggingOutputStream">
+ <constructor>
+ <parameter class="java.lang.String">STDERR</parameter>
+ <parameter class="java.lang.String">ERROR</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="JBossStdioSystemInStream" class="org.jboss.stdio.NullInputStream">
+ <constructor factoryMethod="getInstance"/>
+ </bean>
+
+ <!--
+ ~ These three 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>
+
+ <bean name="JBossStdioContextSelector" class="org.jboss.stdio.SimpleStdioContextSelector">
+ <constructor>
+ <parameter><inject bean="JBossStdioContext"/></parameter>
+ </constructor>
+ <start method="install"/>
+ </bean>
+</deployment>
\ No newline at end of file
Modified: trunk/server/src/etc/conf/all/bootstrap.xml
===================================================================
--- trunk/server/src/etc/conf/all/bootstrap.xml 2010-02-01 20:10:57 UTC (rev 100220)
+++ trunk/server/src/etc/conf/all/bootstrap.xml 2010-02-01 20:20:01 UTC (rev 100221)
@@ -7,6 +7,7 @@
<url>bootstrap/vfs.xml</url>
<url>bootstrap/classloader.xml</url>
+ <url>bootstrap/stdio.xml</url>
<url>bootstrap/kernel.xml</url>
<url>bootstrap/aop.xml</url>
<url>bootstrap/jmx.xml</url>
Modified: trunk/server/src/etc/conf/minimal/bootstrap.xml
===================================================================
--- trunk/server/src/etc/conf/minimal/bootstrap.xml 2010-02-01 20:10:57 UTC (rev 100220)
+++ trunk/server/src/etc/conf/minimal/bootstrap.xml 2010-02-01 20:20:01 UTC (rev 100221)
@@ -6,6 +6,7 @@
<bootstrap xmlns="urn:jboss:bootstrap:1.0">
<url>bootstrap/classloader.xml</url>
+ <url>bootstrap/stdio.xml</url>
<url>bootstrap/aop.xml</url>
<url>bootstrap/jmx.xml</url>
<url>bootstrap/deployers.xml</url>
Modified: trunk/varia/src/resources/logging/logmanager-jboss-beans.xml
===================================================================
--- trunk/varia/src/resources/logging/logmanager-jboss-beans.xml 2010-02-01 20:10:57 UTC (rev 100220)
+++ trunk/varia/src/resources/logging/logmanager-jboss-beans.xml 2010-02-01 20:20:01 UTC (rev 100221)
@@ -71,47 +71,4 @@
<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 three 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>
-
- <bean name="JBossStdioContextSelector" class="org.jboss.stdio.SimpleStdioContextSelector">
- <constructor>
- <parameter><inject bean="JBossStdioContext"/></parameter>
- </constructor>
- <start method="install"/>
- </bean>
</deployment>
More information about the jboss-cvs-commits
mailing list