[jboss-cvs] JBossAS SVN: r97338 - trunk/varia/src/resources/xnio.

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

Author: david.lloyd at jboss.com
Date: 2009-12-02 22:38:36 -0500 (Wed, 02 Dec 2009)
New Revision: 97338

Modified:
   trunk/varia/src/resources/xnio/xnio-deployer-jboss-beans.xml
   trunk/varia/src/resources/xnio/xnio-jboss-beans.xml
Log:
Undo accidental commit - sorry!

Modified: trunk/varia/src/resources/xnio/xnio-deployer-jboss-beans.xml
===================================================================
--- trunk/varia/src/resources/xnio/xnio-deployer-jboss-beans.xml	2009-12-03 03:33:38 UTC (rev 97337)
+++ trunk/varia/src/resources/xnio/xnio-deployer-jboss-beans.xml	2009-12-03 03:38:36 UTC (rev 97338)
@@ -1,27 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!--
-  ~ JBoss, Home of Professional Open Source.
-  ~ Copyright 2009, 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">
     <bean name="XnioMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataFactoryDeployer">
         <constructor>

Modified: trunk/varia/src/resources/xnio/xnio-jboss-beans.xml
===================================================================
--- trunk/varia/src/resources/xnio/xnio-jboss-beans.xml	2009-12-03 03:33:38 UTC (rev 97337)
+++ trunk/varia/src/resources/xnio/xnio-jboss-beans.xml	2009-12-03 03:38:36 UTC (rev 97338)
@@ -1,45 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!--
-  ~ JBoss, Home of Professional Open Source.
-  ~ Copyright 2009, 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">
 
-   <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>
 
-   <xnio-provider xmlns="urn:jboss:xnio:2.0" name="XnioProvider">
-      <executor name="XnioHandlerExecutor"/>
-      <mbean-server name="MBeanServer"/>
-      <options>
-         <option name="READ_THREADS" value="3"/>
-         <option name="WRITE_THREADS" value="1"/>
-         <option name="CONNECT_THREADS" value="2"/>
-      </options>
-      <thread-factory name="XnioThreadFactory"/>
-   </xnio-provider>
-
+   <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>
 </deployment>