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

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

Author: bstansberry at jboss.com
Date: 2008-02-08 21:12:55 -0500 (Fri, 08 Feb 2008)
New Revision: 69743

Modified:
   trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-beans.xml
   trunk/testsuite/src/resources/cluster/partition/partition-restart-beans.xml
Log:
Use our own thread pool

Modified: trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-beans.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-beans.xml	2008-02-09 00:10:45 UTC (rev 69742)
+++ trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-beans.xml	2008-02-09 02:12:55 UTC (rev 69743)
@@ -1,6 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
+   
+   <!-- 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>
 
    <!-- Add a stack with JGroups message bundling disabled to the app server's standard JChannelFactory -->
    <bean name="PassExpStackInjector" class="java.lang.Object">      
@@ -182,7 +198,7 @@
       <property name="backlog">50</property>
       <!-- The thread pool service used to control the bootstrap and
       auto discovery lookups -->
-      <property name="lookupPool"><inject bean="jboss.system:service=ThreadPool"/></property>
+      <property name="lookupPool"><inject bean="PassExpThreadPool"/></property>
 
       <!-- A flag to disable the auto discovery via multicast -->
       <property name="discoveryDisabled">false</property>

Modified: trunk/testsuite/src/resources/cluster/partition/partition-restart-beans.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/partition/partition-restart-beans.xml	2008-02-09 00:10:45 UTC (rev 69742)
+++ trunk/testsuite/src/resources/cluster/partition/partition-restart-beans.xml	2008-02-09 02:12:55 UTC (rev 69743)
@@ -2,9 +2,21 @@
 
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
    
-   <!-- ==================================================================== -->
-   <!-- Shared cache for JBoss cluster services                              -->
-   <!-- ==================================================================== -->
+   <!-- 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>
    
    <!-- 
         The HAPartitionCache instance defined here is shared by JBoss cluster services that
@@ -175,7 +187,7 @@
       <property name="backlog">50</property>
       <!-- The thread pool service used to control the bootstrap and
       auto discovery lookups -->
-      <property name="lookupPool"><inject bean="jboss.system:service=ThreadPool"/></property>
+      <property name="lookupPool"><inject bean="RestartPartitionThreadPool"/></property>
 
       <!-- A flag to disable the auto discovery via multicast -->
       <property name="discoveryDisabled">false</property>