[jboss-cvs] JBossAS SVN: r89191 - in trunk/testsuite/src/resources/naming: services and 1 other directory.

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

Author: david.lloyd at jboss.com
Date: 2009-05-20 10:49:14 -0400 (Wed, 20 May 2009)
New Revision: 89191

Modified:
   trunk/testsuite/src/resources/naming/restart/naming-restart-jboss-beans.xml
   trunk/testsuite/src/resources/naming/services/jboss-service.xml
   trunk/testsuite/src/resources/naming/services/naming-xmbean.xml
Log:
Fix naming restart test (JBAS-6947)

Modified: trunk/testsuite/src/resources/naming/restart/naming-restart-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/naming/restart/naming-restart-jboss-beans.xml	2009-05-20 14:23:56 UTC (rev 89190)
+++ trunk/testsuite/src/resources/naming/restart/naming-restart-jboss-beans.xml	2009-05-20 14:49:14 UTC (rev 89191)
@@ -5,18 +5,15 @@
     <!-- 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="RestartNamingThreadPool" class="org.jboss.util.threadpool.BasicThreadPool">
-              <constructor>
-                 <parameter>RestartNamingThreadPool</parameter>
-                 <parameter>
-                    <bean name="RestartNamingThreadGroup" class="java.lang.ThreadGroup">
-                       <constructor>
-                          <parameter>RestartNamingThreadGroup</parameter>
-                       </constructor>
-                    </bean>
-                 </parameter>
-              </constructor>
-    </bean>
+    <threads xmlns="urn:jboss:threads:1.0">
+       <thread-group name="RestartNamingThreadGroup" group-name="RestartNamingThreadGroup"/>
+       <thread-factory name="RestartNamingThreadFactory" group="RestartNamingThreadGroup"/>
+       <thread-pool-executor name="RestartNamingThreadPool" thread-factory="RestartNamingThreadFactory">
+          <core-pool-size count="5"/>
+          <max-pool-size count="20"/>
+          <reject-policy name="block"/>
+       </thread-pool-executor>
+    </threads>
    
    <bean name="RestartNamingBean" class="org.jnp.server.NamingBeanImpl">
    
@@ -48,7 +45,7 @@
    <bean name="RestartHAJNDI" class="org.jboss.test.naming.restart.RestartHANamingService">
    	
    	<depends>HAPartition</depends>
-      	       
+
       <property name="HAPartition"><inject bean="HAPartition"/></property>
       
       <!-- Handler for the replicated tree -->

Modified: trunk/testsuite/src/resources/naming/services/jboss-service.xml
===================================================================
--- trunk/testsuite/src/resources/naming/services/jboss-service.xml	2009-05-20 14:23:56 UTC (rev 89190)
+++ trunk/testsuite/src/resources/naming/services/jboss-service.xml	2009-05-20 14:49:14 UTC (rev 89191)
@@ -146,7 +146,7 @@
          <attribute access="write-only" setMethod="setLookupPool">
             <description>The thread pool service used to control the bootstrap lookups</description>
             <name>LookupPool</name>
-            <type>org.jboss.util.threadpool.BasicThreadPoolMBean</type>
+            <type>java.util.concurrent.Executor</type>
          </attribute>
          <attribute access="write-only" setMethod="setInvokerProxyFactory">
             <description>The detached invoker proxy factory to use for the naming

Modified: trunk/testsuite/src/resources/naming/services/naming-xmbean.xml
===================================================================
--- trunk/testsuite/src/resources/naming/services/naming-xmbean.xml	2009-05-20 14:23:56 UTC (rev 89190)
+++ trunk/testsuite/src/resources/naming/services/naming-xmbean.xml	2009-05-20 14:49:14 UTC (rev 89191)
@@ -112,9 +112,9 @@
       <type>boolean</type>
    </attribute>
    <attribute access="write-only" setMethod="setLookupPool">
-      <description>The thread pool service used to control the bootstrap lookups</description>
+      <description>The executor used to control the bootstrap lookups</description>
       <name>LookupPool</name>
-      <type>org.jboss.util.threadpool.BasicThreadPoolMBean</type>
+      <type>java.util.concurrent.Executor</type>
    </attribute>
    <attribute access="write-only" setMethod="setInvokerProxyFactory">
       <description>The detached invoker proxy factory to use for the naming