[jboss-cvs] JBossAS SVN: r86770 - in branches/Branch_5_x: varia/src/resources/xnio and 1 other directory.

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

Author: david.lloyd at jboss.com
Date: 2009-04-03 18:41:10 -0400 (Fri, 03 Apr 2009)
New Revision: 86770

Modified:
   branches/Branch_5_x/component-matrix/pom.xml
   branches/Branch_5_x/varia/src/resources/xnio/xnio-jboss-beans.xml
Log:
Update to XNIO 1.2.1.GA (JBAS-6726)

Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml	2009-04-03 22:30:28 UTC (rev 86769)
+++ branches/Branch_5_x/component-matrix/pom.xml	2009-04-03 22:41:10 UTC (rev 86770)
@@ -84,7 +84,7 @@
     <version.org.jboss.threads>1.0.0.CR2</version.org.jboss.threads>
     <version.org.jboss.vfs>2.1.0.GA</version.org.jboss.vfs>
     <version.org.jboss.xnio.metadata>1.0.0.CR1</version.org.jboss.xnio.metadata>
-    <version.org.jboss.xnio>1.2.0.GA</version.org.jboss.xnio>
+    <version.org.jboss.xnio>1.2.1.GA</version.org.jboss.xnio>
     <version.org.springframework>2.5.5</version.org.springframework>
     <version.oswego-concurrent.concurrent>1.3.4-jboss-update1</version.oswego-concurrent.concurrent>
     <version.seam.integration>5.0.2.GA</version.seam.integration>

Modified: branches/Branch_5_x/varia/src/resources/xnio/xnio-jboss-beans.xml
===================================================================
--- branches/Branch_5_x/varia/src/resources/xnio/xnio-jboss-beans.xml	2009-04-03 22:30:28 UTC (rev 86769)
+++ branches/Branch_5_x/varia/src/resources/xnio/xnio-jboss-beans.xml	2009-04-03 22:41:10 UTC (rev 86770)
@@ -2,27 +2,35 @@
 
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
-<threads xmlns="urn:jboss:threads:1.0">
+   <threads xmlns="urn:jboss:threads:1.0">
       <thread-group name="XnioThreadGroup" group-name="xnio"/>
-
       <thread-group name="XnioSelectorThreadGroup" group-name="selector" parent="XnioThreadGroup"/>
-
       <thread-factory name="XnioThreadFactory" group="XnioThreadGroup" thread-name-pattern="xnio-pool%f-%t"/>
-
       <direct-executor name="XnioHandlerExecutor"/>
    </threads>
 
    <bean mode="On Demand" name="XnioProvider" class="org.jboss.xnio.Xnio">
       <constructor factoryClass="org.jboss.xnio.nio.NioXnio" factoryMethod="create">
-         <parameter class="java.util.concurrent.Executor">
-            <inject bean="XnioHandlerExecutor"/>
+         <parameter class="org.jboss.xnio.nio.NioXnioConfiguration">
+            <bean mode="On Demand" name="XnioProviderConfiguration" class="org.jboss.xnio.nio.NioXnioConfiguration">
+               <property name="name">XnioProvider</property>
+               <property name="MBeanServers">
+                  <list>
+                     <inject bean="JMXKernel" property="mbeanServer"/>
+                  </list>
+               </property>
+               <property name="executor">
+                  <inject bean="XnioHandlerExecutor"/>
+               </property>
+               <property name="selectorThreadFactory">
+                  <inject bean="XnioThreadFactory"/>
+               </property>
+               <property name="connectSelectorThreads">1</property>
+               <property name="readSelectorThreads">3</property>
+               <property name="writeSelectorThreads">1</property>
+               <property name="selectorCacheSize">25</property>
+            </bean>
          </parameter>
-         <parameter class="java.util.concurrent.ThreadFactory">
-            <inject bean="XnioThreadFactory"/>
-         </parameter>
-         <parameter class="int">3</parameter>
-         <parameter class="int">1</parameter>
-         <parameter class="int">1</parameter>
       </constructor>
    </bean>
 </deployment>