[jboss-cvs] JBossAS SVN: r90065 - in trunk/testsuite/src/resources/cluster: partition and 1 other directory.

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

Author: bstansberry at jboss.com
Date: 2009-06-10 16:00:45 -0400 (Wed, 10 Jun 2009)
New Revision: 90065

Modified:
   trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml
   trunk/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml
Log:
Fix the thread pool configs

Modified: trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml	2009-06-10 19:59:29 UTC (rev 90064)
+++ trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml	2009-06-10 20:00:45 UTC (rev 90065)
@@ -5,19 +5,18 @@
    <!-- Don't inject the real AS thread pool, as it has a classloader
          leak and we don't want to leak this classloader to it
     -->
-    <bean name="PassExpThreadPool" class="org.jboss.util.threadpool.BasicThreadPool">
-        <constructor>
-           <parameter>PassExpThreadPool</parameter>
-           <parameter>
-              <bean name="PassExpThreadGroup" class="java.lang.ThreadGroup">
-                 <constructor>
-                    <parameter>PassExpThreadGroup</parameter>
-                 </constructor>
-              </bean>
-           </parameter>
-        </constructor>
-    </bean>
+   <threads xmlns="urn:jboss:threads:1.0">
+        <thread-group name="PassExpThreadFactoryGroup" group-name="PassExp Threads"/>
+        <thread-factory name="PassExpThreadFactory" group="PassExpThreadFactoryGroup"/>
 
+        <thread-pool-executor name="PassExpThreadPool" thread-factory="PassExpThreadFactory" queue-length="1000">
+            <core-pool-size count="2" per-cpu="2"/>
+            <max-pool-size count="5" per-cpu="3"/>
+            <keepalive-time time="1" unit="seconds"/>
+            <reject-policy name="block"/>
+        </thread-pool-executor>
+    </threads>
+
    <!-- Add a stack with JGroups message bundling disabled to the app server's standard JChannelFactory -->
    <bean name="PassExpStackInjector" class="java.lang.Object">      
       <install bean="JChannelFactory" method="setMultiplexerConfig">

Modified: trunk/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml	2009-06-10 19:59:29 UTC (rev 90064)
+++ trunk/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml	2009-06-10 20:00:45 UTC (rev 90065)
@@ -5,18 +5,17 @@
    <!-- Don't inject the real AS thread pool, as it has a classloader
          leak and we don't want to leak this classloader to it
     -->
-    <bean name="RestartPartitionThreadPool" class="org.jboss.util.threadpool.BasicThreadPool">
-              <constructor>
-                 <parameter>RestartPartitionThreadPool</parameter>
-                 <parameter>
-                    <bean name="RestartPartitionThreadGroup" class="java.lang.ThreadGroup">
-                       <constructor>
-                          <parameter>RestartPartitionThreadGroup</parameter>
-                       </constructor>
-                    </bean>
-                 </parameter>
-              </constructor>
-    </bean>
+   <threads xmlns="urn:jboss:threads:1.0">
+        <thread-group name="RestartPartitionThreadFactoryGroup" group-name="RestartPartition Threads"/>
+        <thread-factory name="RestartPartitionThreadFactory" group="RestartPartitionThreadFactoryGroup"/>
+
+        <thread-pool-executor name="RestartPartitionThreadPool" thread-factory="RestartPartitionThreadFactory" queue-length="1000">
+            <core-pool-size count="2" per-cpu="2"/>
+            <max-pool-size count="5" per-cpu="3"/>
+            <keepalive-time time="1" unit="seconds"/>
+            <reject-policy name="block"/>
+        </thread-pool-executor>
+    </threads>
    
    <!-- 
         The HAPartitionCache instance defined here is shared by JBoss cluster services that