319334 improved resource cache

Made the cache use concurrent data structures
Removed the dual NIO/BIO caches
Use the cache for streaming data
made DefaultServlet check for shared cache
some javadoc cleanups

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2085 7e9141cc-0065-0410-87d8-b60c137991c4

2 files changed, 24 insertions, 9 deletions

diff --git a/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml b/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml
index 9cb725596a..a696ab55d4 100644
--- a/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml
@@ -93,7 +93,7 @@
   </filter>
   <filter-mapping>
     <filter-name>GzipFilter</filter-name>
-    <url-pattern>/*</url-pattern>
+    <url-pattern>/dump/gzip/*</url-pattern>
   </filter-mapping>
   
   
diff --git a/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java b/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java
index 952752173b..432a6fe15f 100644
--- a/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java
+++ b/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java
@@ -22,6 +22,7 @@ import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.NCSARequestLog;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.bio.SocketConnector;
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
 import org.eclipse.jetty.server.handler.DefaultHandler;
 import org.eclipse.jetty.server.handler.HandlerCollection;
@@ -37,7 +38,7 @@ public class TestServer
 {
     public static void main(String[] args) throws Exception
     {
-        Log.getLog().setDebugEnabled(true);
+        Log.getLog().setDebugEnabled(false);
         ((StdErrLog)Log.getLog()).setSource(false);
         
         String jetty_root = "..";
@@ -50,7 +51,6 @@ public class TestServer
         server.getContainer().addEventListener(mbContainer);
         server.addBean(mbContainer);
         mbContainer.addBean(Log.getLog());
-
         
         // Setup Threadpool
         QueuedThreadPool threadPool = new QueuedThreadPool();
@@ -58,12 +58,27 @@ public class TestServer
         server.setThreadPool(threadPool);
 
         // Setup Connectors
-        SelectChannelConnector connector = new SelectChannelConnector();
-        connector.setPort(8080);
-        connector.setMaxIdleTime(30000);
-        connector.setConfidentialPort(8443);
-        server.setConnectors(new Connector[]
-        { connector });
+        SelectChannelConnector connector0 = new SelectChannelConnector();
+        connector0.setPort(8080);
+        connector0.setMaxIdleTime(30000);
+        connector0.setConfidentialPort(8443);
+        connector0.setUseDirectBuffers(true);
+        server.addConnector(connector0);
+        
+        // Setup Connectors
+        SelectChannelConnector connector1 = new SelectChannelConnector();
+        connector1.setPort(8081);
+        connector1.setMaxIdleTime(30000);
+        connector1.setConfidentialPort(8443);
+        connector1.setUseDirectBuffers(false);
+        server.addConnector(connector1);
+        
+        // Setup Connectors
+        SocketConnector connector2 = new SocketConnector();
+        connector2.setPort(8082);
+        connector2.setMaxIdleTime(30000);
+        connector2.setConfidentialPort(8443);
+        server.addConnector(connector2);
 
         SslSelectChannelConnector ssl_connector = new SslSelectChannelConnector();
         ssl_connector.setPort(8443);