Merge remote-tracking branch 'origin/jetty-8'

Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
	tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationTest.java

1 files changed, 30 insertions, 2 deletions

diff --git a/tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationTest.java b/tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationTest.java
index d0df8d5c55..2ca10a0a94 100644
--- a/tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationTest.java
+++ b/tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationTest.java
@@ -20,15 +20,24 @@ package org.eclipse.jetty.continuation;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.Assert;
 
 import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.RequestLog;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.server.handler.RequestLogHandler;
 import org.eclipse.jetty.servlet.FilterHolder;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.util.IO;
+import org.eclipse.jetty.util.component.AbstractLifeCycle;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -41,19 +50,27 @@ public class ContinuationTest extends ContinuationBase
     protected ServletHandler _servletHandler;
     protected ServerConnector _connector;
     FilterHolder _filter;
+    protected List<String> _log = new ArrayList<String>();
 
     @Before
     public void setUp() throws Exception
     {
         _connector = new ServerConnector(_server);
         _server.setConnectors(new Connector[]{ _connector });
+
+        _log.clear();
+        RequestLogHandler requestLogHandler = new RequestLogHandler();
+        requestLogHandler.setRequestLog(new Log());
+        _server.setHandler(requestLogHandler);
+        
         ServletContextHandler servletContext = new ServletContextHandler(ServletContextHandler.NO_SECURITY|ServletContextHandler.NO_SESSIONS);
-        _server.setHandler(servletContext);
+        requestLogHandler.setHandler(servletContext);
+        
         _servletHandler=servletContext.getServletHandler();
         ServletHolder holder=new ServletHolder(_servlet);
         holder.setAsyncSupported(true);
         _servletHandler.addServletWithMapping(holder,"/");
-
+        
         _server.start();
         _port=_connector.getLocalPort();
     }
@@ -61,6 +78,9 @@ public class ContinuationTest extends ContinuationBase
     @After
     public void tearDown() throws Exception
     {
+        Assert.assertEquals(1,_log.size());
+        Assert.assertTrue(_log.get(0).startsWith("200 "));
+        Assert.assertTrue(_log.get(0).endsWith(" /"));
         _server.stop();
     }
     
@@ -172,4 +192,12 @@ public class ContinuationTest extends ContinuationBase
         return IO.toString(in);
     }
     
+    class Log extends AbstractLifeCycle implements RequestLog
+    {
+        public void log(Request request, Response response)
+        {
+            _log.add(response.getStatus()+" "+response.getContentCount()+" "+request.getRequestURI());
+        }
+        
+    }
 }