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

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

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

Modified:
   trunk/component-matrix/pom.xml
   trunk/varia/src/resources/xnio/xnio-deployer-jboss-beans.xml
   trunk/varia/src/resources/xnio/xnio-jboss-beans.xml
Log:
JBAS-7427 - Update to logmanager 1.1.1.GA

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2009-12-03 02:29:18 UTC (rev 97336)
+++ trunk/component-matrix/pom.xml	2009-12-03 03:33:38 UTC (rev 97337)
@@ -93,7 +93,7 @@
     <version.org.jboss.jpa.impl>2.0.0</version.org.jboss.jpa.impl>
     <version.org.jboss.jpa.spi>1.0.0</version.org.jboss.jpa.spi>
     <version.org.jboss.logging>2.2.0.CR1</version.org.jboss.logging>
-    <version.org.jboss.logmanager>1.1.0.GA</version.org.jboss.logmanager>
+    <version.org.jboss.logmanager>1.1.1.GA</version.org.jboss.logmanager>
     <version.org.jboss.man>2.1.1.GA</version.org.jboss.man>
     <version.org.jboss.mc-int>2.2.0.Alpha2</version.org.jboss.mc-int>
     <version.org.jboss.mdr>2.0.2.GA</version.org.jboss.mdr>

Modified: trunk/varia/src/resources/xnio/xnio-deployer-jboss-beans.xml
===================================================================
--- trunk/varia/src/resources/xnio/xnio-deployer-jboss-beans.xml	2009-12-03 02:29:18 UTC (rev 97336)
+++ trunk/varia/src/resources/xnio/xnio-deployer-jboss-beans.xml	2009-12-03 03:33:38 UTC (rev 97337)
@@ -1,5 +1,27 @@
 <?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 02:29:18 UTC (rev 97336)
+++ trunk/varia/src/resources/xnio/xnio-jboss-beans.xml	2009-12-03 03:33:38 UTC (rev 97337)
@@ -1,28 +1,45 @@
 <?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>
 
-   <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-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>
+
 </deployment>