Servlet 3.0 plumbing

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@905911 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/core/ApplicationContext.java b/java/org/apache/catalina/core/ApplicationContext.java
index e8882ad..a1e90ab 100644 (file)
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -57,6 +57,7 @@ import javax.servlet.descriptor.JspConfigDescriptor;
 import javax.servlet.http.HttpSessionAttributeListener;
 import javax.servlet.http.HttpSessionListener;
 
+import org.apache.catalina.Container;
 import org.apache.catalina.Context;
 import org.apache.catalina.Engine;
 import org.apache.catalina.Host;
@@ -1386,9 +1387,12 @@ public class ApplicationContext
         Map<String, ApplicationServletRegistration > result =
             new HashMap<String, ApplicationServletRegistration>();
         
-        context.findChildren();
-        // TODO SERVLET3
-        return null;
+        Container[] wrappers = context.findChildren();
+        for (Container wrapper : wrappers) {
+            new ApplicationServletRegistration((Wrapper) wrapper, context);
+        }
+
+        return result;
     }