adjusted DelegatingServletContext to extended Servlet 3.0 ServletContext interface

java/com.sap.sailing.gwt.ui/.classpath

@@ -6,7 +6,6 @@
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/gwt-maps.jar"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/gwt-servlet.jar" sourcepath="/com.google.gwt.osgi/lib/gwt-user.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry exported="true" kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/DelegatingServletContext.java

@@ -4,13 +4,22 @@ import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Enumeration;
+import java.util.EventListener;
+import java.util.Map;
 import java.util.Set;
 import java.util.logging.Logger;
 
+import javax.servlet.Filter;
+import javax.servlet.FilterRegistration;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.Servlet;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
+import javax.servlet.ServletRegistration;
+import javax.servlet.ServletRegistration.Dynamic;
+import javax.servlet.SessionCookieConfig;
+import javax.servlet.SessionTrackingMode;
+import javax.servlet.descriptor.JspConfigDescriptor;
 
 public class DelegatingServletContext implements ServletContext {
     private static final Logger logger = Logger.getLogger(DelegatingServletContext.class.getName());
@@ -28,8 +37,9 @@ public class DelegatingServletContext implements ServletContext {
         return delegate.getAttribute(arg0);
     }
 
+    @SuppressWarnings({"unchecked", "rawtypes" }) // need to do this because the base implementation in javax.servlet 3.0 requires this
     @Override
-    public Enumeration<?> getAttributeNames() {
+    public Enumeration getAttributeNames() {
         return delegate.getAttributeNames();
     }
 
@@ -48,8 +58,9 @@ public class DelegatingServletContext implements ServletContext {
         return delegate.getInitParameter(arg0);
     }
 
+    @SuppressWarnings({"unchecked", "rawtypes" }) // need to do this because the base implementation in javax.servlet 3.0 requires this
     @Override
-    public Enumeration<?> getInitParameterNames() {
+    public Enumeration getInitParameterNames() {
         return delegate.getInitParameterNames();
     }
 
@@ -113,8 +124,9 @@ public class DelegatingServletContext implements ServletContext {
         return result;
     }
 
+    @SuppressWarnings({"unchecked", "rawtypes" }) // need to do this because the base implementation in javax.servlet 3.0 requires this
     @Override
-    public Set<?> getResourcePaths(String arg0) {
+    public Set getResourcePaths(String arg0) {
         return delegate.getResourcePaths(arg0);
     }
 
@@ -135,17 +147,17 @@ public class DelegatingServletContext implements ServletContext {
         return delegate.getServletContextName();
     }
 
-    @SuppressWarnings("deprecation")
+    @SuppressWarnings({ "deprecation", "rawtypes", "unchecked" }) // need to do this because the base implementation in javax.servlet 3.0 requires this
     // have to delegate; what can we do?
     @Override
-    public Enumeration<?> getServletNames() {
+    public Enumeration getServletNames() {
         return delegate.getServletNames();
     }
 
-    @SuppressWarnings("deprecation")
+    @SuppressWarnings({"deprecation", "rawtypes", "unchecked"}) // need to do this because the base implementation in javax.servlet 3.0 requires this
     // have to delegate; what can we do?
     @Override
-    public Enumeration<?> getServlets() {
+    public Enumeration getServlets() {
         return delegate.getServlets();
     }
 
@@ -175,4 +187,134 @@ public class DelegatingServletContext implements ServletContext {
     public void setAttribute(String arg0, Object arg1) {
         delegate.setAttribute(arg0, arg1);
     }
+
+    @Override
+    public int getEffectiveMajorVersion() {
+        return delegate.getEffectiveMajorVersion();
+    }
+
+    @Override
+    public int getEffectiveMinorVersion() {
+        return delegate.getEffectiveMinorVersion();
+    }
+
+    @Override
+    public boolean setInitParameter(String name, String value) {
+        return delegate.setInitParameter(name, value);
+    }
+
+    @Override
+    public Dynamic addServlet(String servletName, String className) {
+        return delegate.addServlet(servletName, className);
+    }
+
+    @Override
+    public Dynamic addServlet(String servletName, Servlet servlet) {
+        return delegate.addServlet(servletName, servlet);
+    }
+
+    @Override
+    public Dynamic addServlet(String servletName, Class<? extends Servlet> servletClass) {
+        return addServlet(servletName, servletClass);
+    }
+
+    @Override
+    public <T extends Servlet> T createServlet(Class<T> clazz) throws ServletException {
+        return delegate.createServlet(clazz);
+    }
+
+    @Override
+    public ServletRegistration getServletRegistration(String servletName) {
+        return delegate.getServletRegistration(servletName);
+    }
+
+    @Override
+    public Map<String, ? extends ServletRegistration> getServletRegistrations() {
+        return delegate.getServletRegistrations();
+    }
+
+    @Override
+    public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, String className) {
+        return delegate.addFilter(filterName, className);
+    }
+
+    @Override
+    public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Filter filter) {
+        return delegate.addFilter(filterName, filter);
+    }
+
+    @Override
+    public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Class<? extends Filter> filterClass) {
+        return delegate.addFilter(filterName, filterClass);
+    }
+
+    @Override
+    public <T extends Filter> T createFilter(Class<T> clazz) throws ServletException {
+        return delegate.createFilter(clazz);
+    }
+
+    @Override
+    public FilterRegistration getFilterRegistration(String filterName) {
+        return delegate.getFilterRegistration(filterName);
+    }
+
+    @Override
+    public Map<String, ? extends FilterRegistration> getFilterRegistrations() {
+        return delegate.getFilterRegistrations();
+    }
+
+    @Override
+    public SessionCookieConfig getSessionCookieConfig() {
+        return delegate.getSessionCookieConfig();
+    }
+
+    @Override
+    public void setSessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes) {
+        delegate.setSessionTrackingModes(sessionTrackingModes);
+    }
+
+    @Override
+    public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
+        return delegate.getDefaultSessionTrackingModes();
+    }
+
+    @Override
+    public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
+        return delegate.getEffectiveSessionTrackingModes();
+    }
+
+    @Override
+    public void addListener(String className) {
+        delegate.addListener(className);
+    }
+
+    @Override
+    public <T extends EventListener> void addListener(T t) {
+        delegate.addListener(t);
+    }
+
+    @Override
+    public void addListener(Class<? extends EventListener> listenerClass) {
+        delegate.addListener(listenerClass);
+    }
+
+    @Override
+    public <T extends EventListener> T createListener(Class<T> clazz) throws ServletException {
+        return delegate.createListener(clazz);
+    }
+
+    @Override
+    public JspConfigDescriptor getJspConfigDescriptor() {
+        return delegate.getJspConfigDescriptor();
+    }
+
+    @Override
+    public ClassLoader getClassLoader() {
+        return delegate.getClassLoader();
+    }
+
+    @Override
+    public void declareRoles(String... roleNames) {
+        delegate.declareRoles(roleNames);
+    }
 }