[jboss-cvs] JBossAS SVN: r106530 - in projects/jboss-jca/trunk: sjc/src/main/resources/bootstrap and 1 other directory.

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

Author: jesper.pedersen
Date: 2010-07-09 14:13:32 -0400 (Fri, 09 Jul 2010)
New Revision: 106530

Modified:
   projects/jboss-jca/trunk/embedded/src/main/resources/jca.xml
   projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/jca.xml
Log:
[JBJCA-377] Use QueueExecutor for WorkManager thread management

Modified: projects/jboss-jca/trunk/embedded/src/main/resources/jca.xml
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/resources/jca.xml	2010-07-09 18:12:27 UTC (rev 106529)
+++ projects/jboss-jca/trunk/embedded/src/main/resources/jca.xml	2010-07-09 18:13:32 UTC (rev 106530)
@@ -29,19 +29,60 @@
     </constructor>
   </bean>
 
+  <!-- Rejecting executor -->
+  <bean name="RejectingExecutor">
+    <constructor factoryMethod="rejectingExecutor" 
+                 factoryClass="org.jboss.threads.JBossExecutors">
+    </constructor>
+  </bean>
+
+  <!-- TimeUnit -->
+  <bean name="KeepAliveTimeUnit">
+    <constructor factoryMethod="valueOf" 
+                 factoryClass="java.util.concurrent.TimeUnit">
+      <parameter>SECONDS</parameter>
+    </constructor>
+  </bean>
+
   <!-- Short running thread pool -->
-  <bean name="ShortRunningThreadPool">
-    <constructor factoryMethod="threadFactoryExecutor" 
-                 factoryClass="org.jboss.threads.JBossExecutors">
+  <bean name="ShortRunningThreadPool" class="org.jboss.threads.QueueExecutor">
+    <constructor>
+      <!-- Core threads -->
+      <parameter>20</parameter>
+      <!-- Max threads -->
+      <parameter>100</parameter>
+      <!-- 60 seconds keepalive -->
+      <parameter>60</parameter>
+      <parameter><inject bean="KeepAliveTimeUnit"/></parameter>
+      <!-- Queue size -->
+      <parameter>1024</parameter>
+      <!-- Thread factory -->
       <parameter><inject bean="ThreadFactory"/></parameter>
+      <!-- Blocking -->
+      <parameter>true</parameter>
+      <!-- Handoff executor -->
+      <parameter><inject bean="RejectingExecutor"/></parameter>
     </constructor>
   </bean>
 
   <!-- Long running thread pool -->
-  <bean name="LongRunningThreadPool">
-    <constructor factoryMethod="threadFactoryExecutor" 
-                 factoryClass="org.jboss.threads.JBossExecutors">
+  <bean name="LongRunningThreadPool" class="org.jboss.threads.QueueExecutor">
+    <constructor>
+      <!-- Core threads -->
+      <parameter>20</parameter>
+      <!-- Max threads -->
+      <parameter>100</parameter>
+      <!-- 60 seconds keepalive -->
+      <parameter>60</parameter>
+      <parameter><inject bean="KeepAliveTimeUnit"/></parameter>
+      <!-- Queue size -->
+      <parameter>1024</parameter>
+      <!-- Thread factory -->
       <parameter><inject bean="ThreadFactory"/></parameter>
+      <!-- Blocking -->
+      <parameter>true</parameter>
+      <!-- Handoff executor -->
+      <parameter><inject bean="RejectingExecutor"/></parameter>
     </constructor>
   </bean>
 

Modified: projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/jca.xml
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/jca.xml	2010-07-09 18:12:27 UTC (rev 106529)
+++ projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/jca.xml	2010-07-09 18:13:32 UTC (rev 106530)
@@ -29,19 +29,60 @@
     </constructor>
   </bean>
 
+  <!-- Rejecting executor -->
+  <bean name="RejectingExecutor">
+    <constructor factoryMethod="rejectingExecutor" 
+                 factoryClass="org.jboss.threads.JBossExecutors">
+    </constructor>
+  </bean>
+
+  <!-- TimeUnit -->
+  <bean name="KeepAliveTimeUnit">
+    <constructor factoryMethod="valueOf" 
+                 factoryClass="java.util.concurrent.TimeUnit">
+      <parameter>SECONDS</parameter>
+    </constructor>
+  </bean>
+
   <!-- Short running thread pool -->
-  <bean name="ShortRunningThreadPool">
-    <constructor factoryMethod="threadFactoryExecutor" 
-                 factoryClass="org.jboss.threads.JBossExecutors">
+  <bean name="ShortRunningThreadPool" class="org.jboss.threads.QueueExecutor">
+    <constructor>
+      <!-- Core threads -->
+      <parameter>20</parameter>
+      <!-- Max threads -->
+      <parameter>100</parameter>
+      <!-- 60 seconds keepalive -->
+      <parameter>60</parameter>
+      <parameter><inject bean="KeepAliveTimeUnit"/></parameter>
+      <!-- Queue size -->
+      <parameter>1024</parameter>
+      <!-- Thread factory -->
       <parameter><inject bean="ThreadFactory"/></parameter>
+      <!-- Blocking -->
+      <parameter>true</parameter>
+      <!-- Handoff executor -->
+      <parameter><inject bean="RejectingExecutor"/></parameter>
     </constructor>
   </bean>
 
   <!-- Long running thread pool -->
-  <bean name="LongRunningThreadPool">
-    <constructor factoryMethod="threadFactoryExecutor" 
-                 factoryClass="org.jboss.threads.JBossExecutors">
+  <bean name="LongRunningThreadPool" class="org.jboss.threads.QueueExecutor">
+    <constructor>
+      <!-- Core threads -->
+      <parameter>20</parameter>
+      <!-- Max threads -->
+      <parameter>100</parameter>
+      <!-- 60 seconds keepalive -->
+      <parameter>60</parameter>
+      <parameter><inject bean="KeepAliveTimeUnit"/></parameter>
+      <!-- Queue size -->
+      <parameter>1024</parameter>
+      <!-- Thread factory -->
       <parameter><inject bean="ThreadFactory"/></parameter>
+      <!-- Blocking -->
+      <parameter>true</parameter>
+      <!-- Handoff executor -->
+      <parameter><inject bean="RejectingExecutor"/></parameter>
     </constructor>
   </bean>