343083 Set nested dispatch type

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

5 files changed, 70 insertions, 3 deletions

diff --git a/test-jetty-nested/pom.xml b/test-jetty-nested/pom.xml
index 1554c5116d..291f1e4efd 100644
--- a/test-jetty-nested/pom.xml
+++ b/test-jetty-nested/pom.xml
@@ -21,6 +21,11 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlets</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-webapp</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/test-jetty-nested/src/main/java/org/eclipse/jetty/nested/NestedJettyServlet.java b/test-jetty-nested/src/main/java/org/eclipse/jetty/nested/NestedJettyServlet.java
index e954b5893b..4395e863db 100644
--- a/test-jetty-nested/src/main/java/org/eclipse/jetty/nested/NestedJettyServlet.java
+++ b/test-jetty-nested/src/main/java/org/eclipse/jetty/nested/NestedJettyServlet.java
@@ -14,6 +14,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.jetty.server.LocalConnector;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.bio.SocketConnector;
 import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.thread.ThreadPool;
 import org.eclipse.jetty.webapp.WebAppContext;
@@ -68,6 +69,10 @@ public class NestedJettyServlet implements Servlet
             else
                 _connector=(NestedConnector)_server.getConnectors()[0];
             
+            SocketConnector socket = new SocketConnector();
+            socket.setPort(0);
+            _server.addConnector(socket);
+            
             WebAppContext webapp = new WebAppContext();
             
             webapp.setContextPath(_context.getContextPath());
@@ -84,6 +89,7 @@ public class NestedJettyServlet implements Servlet
 
             _server.start();
             _context.log("Started Jetty/"+_server.getVersion()+" for "+webapp.getWar()+" nested in "+_context.getServerInfo());
+            webapp.setAttribute("socket",socket.toString());
         }
         catch(Exception e)
         {
diff --git a/test-jetty-nested/src/main/webapp/WEB-INF/web.xml b/test-jetty-nested/src/main/webapp/WEB-INF/web.xml
index 9b542ac427..e9374e418a 100644
--- a/test-jetty-nested/src/main/webapp/WEB-INF/web.xml
+++ b/test-jetty-nested/src/main/webapp/WEB-INF/web.xml
@@ -8,7 +8,7 @@
   <display-name>Nested WebApp</display-name>
   
   <servlet>
-    <servlet-name>jetty</servlet-name>
+    <servlet-name>nestedJetty</servlet-name>
     <servlet-class>org.eclipse.jetty.nested.NestedJettyServlet</servlet-class>
     <init-param>
       <param-name>debug</param-name>
@@ -25,9 +25,10 @@
     <load-on-startup>0</load-on-startup>
   </servlet>
   <servlet-mapping>
-    <servlet-name>jetty</servlet-name>
+    <servlet-name>nestedJetty</servlet-name>
     <url-pattern>/*</url-pattern>  
   </servlet-mapping>
-</web-app>
+  
+  </web-app>
 
 
diff --git a/test-jetty-nested/src/main/webapp/nested/WEB-INF/web.xml b/test-jetty-nested/src/main/webapp/nested/WEB-INF/web.xml
index 8ab4e16a2d..64467ac396 100644
--- a/test-jetty-nested/src/main/webapp/nested/WEB-INF/web.xml
+++ b/test-jetty-nested/src/main/webapp/nested/WEB-INF/web.xml
@@ -7,6 +7,19 @@
 
   <display-name>Nested WebApp</display-name>
   
+  <filter>
+    <filter-name>MultiPart</filter-name>
+    <filter-class>org.eclipse.jetty.servlets.MultiPartFilter</filter-class>
+    <init-param>
+      <param-name>deleteFiles</param-name>
+      <param-value>true</param-value>
+    </init-param>
+  </filter>
+  <filter-mapping>
+    <filter-name>MultiPart</filter-name>
+    <url-pattern>/dump/*</url-pattern>
+  </filter-mapping>
+  
   <servlet>
     <servlet-name>dump</servlet-name>
     <servlet-class>org.eclipse.jetty.nested.Dump</servlet-class>
diff --git a/test-jetty-nested/src/test/java/org/eclipse/jetty/nested/NestedServer.java b/test-jetty-nested/src/test/java/org/eclipse/jetty/nested/NestedServer.java
new file mode 100644
index 0000000000..2e6c950060
--- /dev/null
+++ b/test-jetty-nested/src/test/java/org/eclipse/jetty/nested/NestedServer.java
@@ -0,0 +1,42 @@
+// ========================================================================
+// Copyright (c) 2006-2009 Mort Bay Consulting Pty. Ltd.
+// ------------------------------------------------------------------------
+// All rights reserved. This program and the accompanying materials
+// are made available under the terms of the Eclipse Public License v1.0
+// and Apache License v2.0 which accompanies this distribution.
+// The Eclipse Public License is available at 
+// http://www.eclipse.org/legal/epl-v10.html
+// The Apache License v2.0 is available at
+// http://www.opensource.org/licenses/apache2.0.php
+// You may elect to redistribute this code under either of these licenses. 
+// ========================================================================
+
+package org.eclipse.jetty.nested;
+
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
+import org.eclipse.jetty.webapp.WebAppContext;
+
+public class NestedServer
+{
+    public static void main(String[] args) throws Exception
+    {
+        Server server = new Server();
+
+        Connector connector = new SelectChannelConnector();
+        connector.setPort(Integer.getInteger("jetty.port",8080).intValue());
+        server.setConnectors(new Connector[]
+        { connector });
+        
+        
+        WebAppContext webapp = new WebAppContext();
+        webapp.setContextPath("/");
+        webapp.setWar("src/main/webapp");
+        webapp.setParentLoaderPriority(true);
+        server.setHandler(webapp);
+
+        server.start();
+        server.join();
+    }
+}