Author: markt
Date: Wed Feb 3 06:31:38 2010
New Revision: 905911
URL: http://svn.apache.org/viewvc?rev=905911&view=rev
Log:
Servlet 3.0 plumbing
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=905911&r1=905910&r2=905911&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Wed Feb
3 06:31:38 2010
@@ -57,6 +57,7 @@
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 @@
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;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
