svn commit: r740244 - in /servicemix/components/bindings/servicemix-http/trunk/src: main/java/org/apache/servicemix/http/jetty/JettyContextManager.java test/java/org/apache/servicemix/http/ServerManagerTest.java

[cc...@apache.org]

Author: ccustine
Date: Tue Feb  3 08:24:42 2009
New Revision: 740244

URL: http://svn.apache.org/viewvc?rev=740244&view=rev
Log:
SM-1634 Update JettyContextManager to use QueuedThreadPool (BoundedThreadPool is deprecated)

Modified:
    servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java
    servicemix/components/bindings/servicemix-http/trunk/src/test/java/org/apache/servicemix/http/ServerManagerTest.java

Modified: servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java?rev=740244&r1=740243&r2=740244&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java (original)
+++ servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java Tue Feb  3 08:24:42 2009
@@ -60,7 +60,9 @@
 import org.mortbay.jetty.servlet.ServletHolder;
 import org.mortbay.jetty.servlet.ServletMapping;
 import org.mortbay.management.MBeanContainer;
-import org.mortbay.thread.BoundedThreadPool;
+
+import org.mortbay.thread.QueuedThreadPool;
+
 import org.mortbay.thread.ThreadPool;
 import org.mortbay.util.ByteArrayISO8859Writer;
 import org.mortbay.util.LazyList;
@@ -73,7 +75,7 @@
 
     private Map<String, Server> servers;
     private HttpConfiguration configuration;
-    private BoundedThreadPool threadPool;
+    private QueuedThreadPool threadPool;
     private Map<String, SslParameters> sslParams;
     private MBeanServer mBeanServer;
     private MBeanContainer mbeanContainer;
@@ -102,9 +104,9 @@
         }
         servers = new HashMap<String, Server>();
         sslParams = new HashMap<String, SslParameters>();
-        BoundedThreadPool btp = new BoundedThreadPool();
-        btp.setMaxThreads(this.configuration.getJettyThreadPoolSize());
-        threadPool = btp;
+        QueuedThreadPool qtp = new QueuedThreadPool();
+        qtp.setMaxThreads(this.configuration.getJettyThreadPoolSize());
+        threadPool = qtp;
     }
 
     public void shutDown() throws Exception {

Modified: servicemix/components/bindings/servicemix-http/trunk/src/test/java/org/apache/servicemix/http/ServerManagerTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-http/trunk/src/test/java/org/apache/servicemix/http/ServerManagerTest.java?rev=740244&r1=740243&r2=740244&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-http/trunk/src/test/java/org/apache/servicemix/http/ServerManagerTest.java (original)
+++ servicemix/components/bindings/servicemix-http/trunk/src/test/java/org/apache/servicemix/http/ServerManagerTest.java Tue Feb  3 08:24:42 2009
@@ -30,7 +30,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.components.http.InvalidStatusResponseException;
 import org.apache.servicemix.http.jetty.JettyContextManager;
-import org.mortbay.thread.BoundedThreadPool;
+import org.mortbay.thread.QueuedThreadPool;
 
 public class ServerManagerTest extends TestCase {
     private static transient Log log = LogFactory.getLog(ServerManagerTest.class);
@@ -110,8 +110,8 @@
         int maxThreads = 512;
         configuration.setJettyThreadPoolSize(maxThreads);
         server.init();
-        assertTrue(server.getThreadPool() instanceof BoundedThreadPool);
-        int threads = ((BoundedThreadPool) server.getThreadPool()).getMaxThreads();
+        assertTrue(server.getThreadPool() instanceof QueuedThreadPool);
+        int threads = ((QueuedThreadPool) server.getThreadPool()).getMaxThreads();
         assertEquals("The max number of threads is incorrect!", maxThreads, threads);
     }