[jboss-cvs] JBossAS SVN: r99697 - in trunk: varia/src/resources/xnio and 1 other directory.

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

Author: david.lloyd at jboss.com
Date: 2010-01-20 19:53:52 -0500 (Wed, 20 Jan 2010)
New Revision: 99697

Modified:
   trunk/component-matrix/pom.xml
   trunk/varia/src/resources/xnio/xnio-jboss-beans.xml
Log:
Threads metadata to 2.0.0.CR2, XNIO to 2.1.0.CR1

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2010-01-21 00:45:26 UTC (rev 99696)
+++ trunk/component-matrix/pom.xml	2010-01-21 00:53:52 UTC (rev 99697)
@@ -130,11 +130,12 @@
     <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>2.0.0.CR1</version.org.jboss.threads>
+    <version.org.jboss.threads.metadata>2.0.0.CR2</version.org.jboss.threads.metadata>
     <version.org.jboss.vfs>2.2.0.Alpha2</version.org.jboss.vfs>
     <version.org.jboss.security.negotiation>2.0.3.SP1</version.org.jboss.security.negotiation>
     <version.org.jboss.slf4j>1.0.2.GA</version.org.jboss.slf4j>
-    <version.org.jboss.xnio.metadata>1.0.1.GA</version.org.jboss.xnio.metadata>
-    <version.org.jboss.xnio>1.2.1.GA</version.org.jboss.xnio>
+    <version.org.jboss.xnio.metadata>2.1.0.CR1</version.org.jboss.xnio.metadata>
+    <version.org.jboss.xnio>2.1.0.CR1</version.org.jboss.xnio>
     <version.org.slf4j>1.5.6</version.org.slf4j>
     <version.org.springframework>2.5.6</version.org.springframework>
     <version.oswego-concurrent.concurrent>1.3.4-jboss-update1</version.oswego-concurrent.concurrent>
@@ -2454,7 +2455,7 @@
       <dependency>
         <groupId>org.jboss.threads</groupId>
         <artifactId>jboss-threads-metadata</artifactId>
-        <version>${version.org.jboss.threads}</version>
+        <version>${version.org.jboss.threads.metadata}</version>
         <exclusions>
           <exclusion>
             <groupId>org.jboss.microcontainer</groupId>

Modified: trunk/varia/src/resources/xnio/xnio-jboss-beans.xml
===================================================================
--- trunk/varia/src/resources/xnio/xnio-jboss-beans.xml	2010-01-21 00:45:26 UTC (rev 99696)
+++ trunk/varia/src/resources/xnio/xnio-jboss-beans.xml	2010-01-21 00:53:52 UTC (rev 99697)
@@ -2,7 +2,7 @@
 
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
-<threads xmlns="urn:jboss:threads:2.0">
+   <threads xmlns="urn:jboss:threads:2.0">
       <thread-group name="XnioThreadGroup" group-name="xnio">
          <parent-thread-group name="SystemThreadGroup"/>
       </thread-group>
@@ -14,21 +14,19 @@
       <thread-factory name="XnioThreadFactory" thread-name-pattern="xnio-pool%f-%t">
          <thread-group name="XnioSelectorThreadGroup"/>
       </thread-factory>
-
-      <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>
-         <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>
+   <xnio xmlns="urn:jboss:xnio:2.1" provider="XnioProvider">
+
+      <provider name="XnioProvider">
+         <thread-factory name="XnioThreadFactory"/>
+
+         <options>
+            <option name="READ_THREADS" value="3"/>
+            <option name="WRITE_THREADS" value="1"/>
+            <option name="CONNECT_THREADS" value="1"/>
+         </options>
+      </provider>
+   </xnio>
+
 </deployment>