diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/AsyncSslHttpExchangeTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/AsyncSslHttpExchangeTest.java index cc9edfc5977..7ed394dac06 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/AsyncSslHttpExchangeTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/AsyncSslHttpExchangeTest.java @@ -15,7 +15,6 @@ package org.eclipse.jetty.client; public class AsyncSslHttpExchangeTest extends SslHttpExchangeTest { - @Override protected void setUp() throws Exception { @@ -27,9 +26,4 @@ public class AsyncSslHttpExchangeTest extends SslHttpExchangeTest _httpClient.start(); } - @Override - public void testSun() throws Exception - { - super.testSun(); - } } diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/ExternalKeyStoreAsyncSslHttpExchangeTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/ExternalKeyStoreAsyncSslHttpExchangeTest.java index 02d79867c16..d0356228aa2 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/ExternalKeyStoreAsyncSslHttpExchangeTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/ExternalKeyStoreAsyncSslHttpExchangeTest.java @@ -17,7 +17,6 @@ import java.io.File; public class ExternalKeyStoreAsyncSslHttpExchangeTest extends SslHttpExchangeTest { - @Override protected void setUp() throws Exception { @@ -36,8 +35,4 @@ public class ExternalKeyStoreAsyncSslHttpExchangeTest extends SslHttpExchangeTes _httpClient.start(); } - @Override - public void testSun() throws Exception - { - } } diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpExchangeTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpExchangeTest.java index 26da2ecc5f4..804c7d7ea3b 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpExchangeTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpExchangeTest.java @@ -257,20 +257,6 @@ public class HttpExchangeTest extends TestCase } } - public void testSun() throws Exception - { - ContentExchange httpExchange=new ContentExchange(); - httpExchange.setURL(_scheme+"www.sun.com/"); - httpExchange.setMethod(HttpMethods.GET); - _httpClient.send(httpExchange); - int status = httpExchange.waitForDone(); - String result=httpExchange.getResponseContent(); - assertTrue(result.indexOf("Sun Microsystems")>0); - assertEquals(HttpExchange.STATUS_COMPLETED, status); - assertEquals(HttpStatus.OK_200,httpExchange.getResponseStatus()); - - } - public void testProxy() throws Exception { if (_scheme.equals("https://")) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java index 3b13e494b53..1708c157cd6 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java @@ -246,7 +246,7 @@ public class Server extends HandlerWrapper implements Attributes } } if (Log.isDebugEnabled()) - Log.debug(dump()); + System.err.println(dump()); mex.ifExceptionThrow(); } diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/NoJspServlet.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/NoJspServlet.java index 29c5f782478..649ef6b7fc4 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/NoJspServlet.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/NoJspServlet.java @@ -22,13 +22,18 @@ import javax.servlet.http.HttpServletResponse; public class NoJspServlet extends HttpServlet { - + private boolean _warned; + /* ------------------------------------------------------------ */ /* * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) */ protected void doGet(HttpServletRequest req, HttpServletResponse response) throws ServletException, IOException { + if (!_warned) + getServletContext().log("No JSP support. Check that JSP jars are in lib/jsp and that the JSP option has been specified to start.jar"); + _warned=true; + response.sendError(500,"JSP support not configured"); }