Author: djencks
Date: Thu Dec 10 05:55:58 2009
New Revision: 889101
URL: http://svn.apache.org/viewvc?rev=889101&view=rev
Log:
fix some signature problems Ivan found
Modified:
geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletContext.java
Modified: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletContext.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletContext.java?rev=889101&r1=889100&r2=889101&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletContext.java
(original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletContext.java
Thu Dec 10 05:55:58 2009
@@ -26,6 +26,7 @@
import java.util.EventListener;
import java.util.Map;
import java.util.Set;
+import java.util.EnumSet;
import javax.servlet.descriptor.JspConfigDescriptor;
@@ -577,7 +578,7 @@
* @return Map of name to ServletRegistration for all registered servlets
* @since 3.0
*/
- Map<String, ServletRegistration> getServletRegistrations();
+ Map<String, ? extends ServletRegistration> getServletRegistrations();
/**
* Add a filter to this context
@@ -638,7 +639,7 @@
* @return FilterRegistration allowing configuration of filter
* @since 3.0
*/
- Map<String, FilterRegistration > getFilterRegistrations();
+ Map<String, ? extends FilterRegistration> getFilterRegistrations();
/**
* Add a listener created from the specified class
@@ -685,10 +686,10 @@
SessionCookieConfig getSessionCookieConfig();
/**
- * @param sessionTrackingModes set of SessionTrackingModes for this web app
+ * @param sessionTrackingModes enumset of SessionTrackingModes for this web app
* @since 3.0
*/
- void setSessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes);
+ void setSessionTrackingModes(EnumSet<SessionTrackingMode> sessionTrackingModes);
/**
* @return the default session tracking modes
|