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

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

Author: bstansberry at jboss.com
Date: 2010-01-13 22:56:02 -0500 (Wed, 13 Jan 2010)
New Revision: 99380

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:
[JBAS-7610] Fix thread pool configs in clustering tests

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	2010-01-14 03:34:47 UTC (rev 99379)
+++ trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml	2010-01-14 03:56:02 UTC (rev 99380)
@@ -5,16 +5,21 @@
    <!-- 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
     -->
-   <threads xmlns="urn:jboss:threads:1.0">
+   <threads xmlns="urn:jboss:threads:2.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>
+        <thread-factory name="PassExpThreadFactory">
+          <thread-group name="PassExpThreadFactoryGroup"/>
+        </thread-factory>
+
+        <queueless-thread-pool-executor name="PassExpThreadPool" blocking="true">
+          <max-threads count="200" per-cpu="500"/>
+          <thread-factory name="PassExpThreadFactory"/>
+          <task-filter>
+             <clear-context-classloader/>
+             <clear-tls/>
+          </task-filter>
+        </queueless-thread-pool-executor>
     </threads>
 
    <!-- Add a stack with JGroups message bundling disabled to the app server's standard JChannelFactory -->

Modified: trunk/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml	2010-01-14 03:34:47 UTC (rev 99379)
+++ trunk/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml	2010-01-14 03:56:02 UTC (rev 99380)
@@ -5,16 +5,21 @@
    <!-- 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
     -->
-   <threads xmlns="urn:jboss:threads:1.0">
+   <threads xmlns="urn:jboss:threads:2.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>
+        <thread-factory name="RestartPartitionThreadFactory">
+          <thread-group name="RestartPartitionThreadFactoryGroup"/>
+       </thread-factory>
+
+      <queueless-thread-pool-executor name="RestartPartitionThreadPool" blocking="true">
+         <max-threads count="200" per-cpu="500"/>
+         <thread-factory name="RestartPartitionThreadFactory"/>
+         <task-filter>
+            <clear-context-classloader/>
+            <clear-tls/>
+         </task-filter>
+      </queueless-thread-pool-executor>
     </threads>
    
    <!--