Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 67872 invoked from network); 22 Jul 2010 21:10:31 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 22 Jul 2010 21:10:31 -0000 Received: (qmail 21712 invoked by uid 500); 22 Jul 2010 21:10:31 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 21660 invoked by uid 500); 22 Jul 2010 21:10:30 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 21653 invoked by uid 99); 22 Jul 2010 21:10:30 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Jul 2010 21:10:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Jul 2010 21:10:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0242623889E0; Thu, 22 Jul 2010 21:09:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r966858 - in /cxf/branches/servlet3jetty7: rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/ systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ systests/transports/src/test/java/org/apache/cxf/systest/http_... Date: Thu, 22 Jul 2010 21:09:36 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100722210937.0242623889E0@eris.apache.org> Author: dkulp Date: Thu Jul 22 21:09:36 2010 New Revision: 966858 URL: http://svn.apache.org/viewvc?rev=966858&view=rev Log: Get more tests working Modified: cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java cxf/branches/servlet3jetty7/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterNoWsdlTest.java cxf/branches/servlet3jetty7/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java cxf/branches/servlet3jetty7/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java cxf/branches/servlet3jetty7/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jetty-engine.xml cxf/branches/servlet3jetty7/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server.xml Modified: cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java?rev=966858&r1=966857&r2=966858&view=diff ============================================================================== --- cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java (original) +++ cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java Thu Jul 22 21:09:36 2010 @@ -53,6 +53,7 @@ import org.eclipse.jetty.server.ssl.SslS import org.eclipse.jetty.util.component.Container; import org.eclipse.jetty.util.thread.OldQueuedThreadPool; import org.eclipse.jetty.util.thread.QueuedThreadPool; +import org.eclipse.jetty.util.thread.ThreadPool; /** @@ -375,28 +376,8 @@ public class JettyHTTPServerEngine try { setReuseAddress(connector); + setupThreadPool(); server.start(); - - AbstractConnector aconn = (AbstractConnector) connector; - if (isSetThreadingParameters()) { - if (aconn.getThreadPool() instanceof OldQueuedThreadPool) { - OldQueuedThreadPool pool = (OldQueuedThreadPool)aconn.getThreadPool(); - if (getThreadingParameters().isSetMinThreads()) { - pool.setMinThreads(getThreadingParameters().getMinThreads()); - } - if (getThreadingParameters().isSetMaxThreads()) { - pool.setMaxThreads(getThreadingParameters().getMaxThreads()); - } - } else if (aconn.getThreadPool() instanceof QueuedThreadPool) { - QueuedThreadPool pool = (QueuedThreadPool)aconn.getThreadPool(); - if (getThreadingParameters().isSetMinThreads()) { - pool.setMinThreads(getThreadingParameters().getMinThreads()); - } - if (getThreadingParameters().isSetMaxThreads()) { - pool.setMaxThreads(getThreadingParameters().getMaxThreads()); - } - } - } } catch (Exception e) { LOG.log(Level.SEVERE, "START_UP_SERVER_FAILED_MSG", new Object[] {e.getMessage(), port}); //problem starting server @@ -449,6 +430,34 @@ public class JettyHTTPServerEngine ++servantCount; } + protected void setupThreadPool() { + AbstractConnector aconn = (AbstractConnector) connector; + if (isSetThreadingParameters()) { + ThreadPool pool = aconn.getThreadPool(); + if (pool == null) { + pool = new QueuedThreadPool(); + aconn.setThreadPool(pool); + } + if (pool instanceof OldQueuedThreadPool) { + OldQueuedThreadPool pl = (OldQueuedThreadPool)pool; + if (getThreadingParameters().isSetMinThreads()) { + pl.setMinThreads(getThreadingParameters().getMinThreads()); + } + if (getThreadingParameters().isSetMaxThreads()) { + pl.setMaxThreads(getThreadingParameters().getMaxThreads()); + } + } else if (pool instanceof QueuedThreadPool) { + QueuedThreadPool pl = (QueuedThreadPool)pool; + if (getThreadingParameters().isSetMinThreads()) { + pl.setMinThreads(getThreadingParameters().getMinThreads()); + } + if (getThreadingParameters().isSetMaxThreads()) { + pl.setMaxThreads(getThreadingParameters().getMaxThreads()); + } + } + } + } + private void setReuseAddress(Connector conn) throws IOException { if (conn instanceof AbstractConnector) { ((AbstractConnector)conn).setReuseAddress(isReuseAddress()); Modified: cxf/branches/servlet3jetty7/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterNoWsdlTest.java URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterNoWsdlTest.java?rev=966858&r1=966857&r2=966858&view=diff ============================================================================== --- cxf/branches/servlet3jetty7/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterNoWsdlTest.java (original) +++ cxf/branches/servlet3jetty7/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterNoWsdlTest.java Thu Jul 22 21:09:36 2010 @@ -79,7 +79,7 @@ public class ClientServerGreeterNoWsdlTe assertEquals(200, httpConnection.getResponseCode()); - assertEquals("text/xml; charset=utf-8", httpConnection.getContentType()); + assertEquals("text/xml;charset=utf-8", httpConnection.getContentType().toLowerCase()); assertEquals("OK", httpConnection.getResponseMessage()); InputStream in = httpConnection.getInputStream(); Modified: cxf/branches/servlet3jetty7/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java?rev=966858&r1=966857&r2=966858&view=diff ============================================================================== --- cxf/branches/servlet3jetty7/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java (original) +++ cxf/branches/servlet3jetty7/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java Thu Jul 22 21:09:36 2010 @@ -680,7 +680,7 @@ public class ClientServerTest extends Ab BindingProvider bp = (BindingProvider)greeter; Map responseContext = bp.getResponseContext(); String contentType = (String) responseContext.get(Message.CONTENT_TYPE); - assertEquals("text/xml; charset=utf-8", contentType); + assertEquals("text/xml;charset=utf-8", contentType.toLowerCase()); Integer responseCode = (Integer) responseContext.get(Message.RESPONSE_CODE); assertEquals(500, responseCode.intValue()); assertNotNull(brlf.getFaultInfo()); @@ -723,7 +723,7 @@ public class ClientServerTest extends Ab assertEquals(200, httpConnection.getResponseCode()); - assertEquals("text/xml; charset=utf-8", httpConnection.getContentType()); + assertEquals("text/xml;charset=utf-8", httpConnection.getContentType().toLowerCase()); assertEquals("OK", httpConnection.getResponseMessage()); InputStream in = httpConnection.getInputStream(); @@ -753,7 +753,7 @@ public class ClientServerTest extends Ab assertEquals(200, httpConnection.getResponseCode()); - assertEquals("text/xml; charset=utf-8", httpConnection.getContentType()); + assertEquals("text/xml;charset=utf-8", httpConnection.getContentType().toLowerCase()); assertEquals("OK", httpConnection.getResponseMessage()); InputStream in = httpConnection.getInputStream(); @@ -804,7 +804,7 @@ public class ClientServerTest extends Ab assertEquals(200, httpConnection.getResponseCode()); - assertEquals("text/xml; charset=utf-8", httpConnection.getContentType()); + assertEquals("text/xml;charset=utf-8", httpConnection.getContentType().toLowerCase()); assertEquals("OK", httpConnection.getResponseMessage()); InputStream in = httpConnection.getInputStream(); Modified: cxf/branches/servlet3jetty7/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java?rev=966858&r1=966857&r2=966858&view=diff ============================================================================== --- cxf/branches/servlet3jetty7/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java (original) +++ cxf/branches/servlet3jetty7/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java Thu Jul 22 21:09:36 2010 @@ -133,7 +133,7 @@ public class ClientServerXMLTest extends assertEquals(200, httpConnection.getResponseCode()); - assertEquals("text/xml; charset=utf-8", httpConnection.getContentType()); + assertEquals("text/xml;charset=utf-8", httpConnection.getContentType().toLowerCase()); assertEquals("OK", httpConnection.getResponseMessage()); InputStream in = httpConnection.getInputStream(); @@ -274,7 +274,7 @@ public class ClientServerXMLTest extends BindingProvider bp = (BindingProvider) greeter; Map responseContext = bp.getResponseContext(); String contentType = (String) responseContext.get(Message.CONTENT_TYPE); - assertEquals("text/xml; charset=utf-8", contentType); + assertEquals("text/xml;charset=utf-8", contentType.toLowerCase()); Integer responseCode = (Integer) responseContext.get(Message.RESPONSE_CODE); assertEquals(500, responseCode.intValue()); } Modified: cxf/branches/servlet3jetty7/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jetty-engine.xml URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jetty-engine.xml?rev=966858&r1=966857&r2=966858&view=diff ============================================================================== --- cxf/branches/servlet3jetty7/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jetty-engine.xml (original) +++ cxf/branches/servlet3jetty7/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jetty-engine.xml Thu Jul 22 21:09:36 2010 @@ -48,19 +48,19 @@ - + - + - + - + Modified: cxf/branches/servlet3jetty7/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server.xml URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server.xml?rev=966858&r1=966857&r2=966858&view=diff ============================================================================== --- cxf/branches/servlet3jetty7/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server.xml (original) +++ cxf/branches/servlet3jetty7/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server.xml Thu Jul 22 21:09:36 2010 @@ -26,7 +26,7 @@ http://www.springframework.org/schema/be - +