[VIVO-1375] Upgrade to Servlet 3.0 spec

api/src/test/java/stubs/javax/servlet/ServletContextStub.java

@@ -9,14 +9,21 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Collections;
 import java.util.Enumeration;
+import java.util.EventListener;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
+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.SessionCookieConfig;
+import javax.servlet.SessionTrackingMode;
+import javax.servlet.descriptor.JspConfigDescriptor;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -150,6 +157,11 @@ public class ServletContextStub implements ServletContext {
 				"ServletContextStub.getInitParameterNames() not implemented.");
 	}
 
+	@Override
+	public boolean setInitParameter(String s, String s1) {
+		return false;
+	}
+
 	@Override
 	public int getMajorVersion() {
 		throw new RuntimeException(
@@ -168,6 +180,16 @@ public class ServletContextStub implements ServletContext {
 				"ServletContextStub.getMinorVersion() not implemented.");
 	}
 
+	@Override
+	public int getEffectiveMajorVersion() {
+		return 0;
+	}
+
+	@Override
+	public int getEffectiveMinorVersion() {
+		return 0;
+	}
+
 	@Override
 	public RequestDispatcher getNamedDispatcher(String arg0) {
 		throw new RuntimeException(
@@ -212,6 +234,126 @@ public class ServletContextStub implements ServletContext {
 				"ServletContextStub.getServletContextName() not implemented.");
 	}
 
+	@Override
+	public ServletRegistration.Dynamic addServlet(String s, String s1) {
+		return null;
+	}
+
+	@Override
+	public ServletRegistration.Dynamic addServlet(String s, Servlet servlet) {
+		return null;
+	}
+
+	@Override
+	public ServletRegistration.Dynamic addServlet(String s, Class<? extends Servlet> aClass) {
+		return null;
+	}
+
+	@Override
+	public <T extends Servlet> T createServlet(Class<T> aClass) throws ServletException {
+		return null;
+	}
+
+	@Override
+	public ServletRegistration getServletRegistration(String s) {
+		return null;
+	}
+
+	@Override
+	public Map<String, ? extends ServletRegistration> getServletRegistrations() {
+		return null;
+	}
+
+	@Override
+	public FilterRegistration.Dynamic addFilter(String s, String s1) {
+		return null;
+	}
+
+	@Override
+	public FilterRegistration.Dynamic addFilter(String s, Filter filter) {
+		return null;
+	}
+
+	@Override
+	public FilterRegistration.Dynamic addFilter(String s, Class<? extends Filter> aClass) {
+		return null;
+	}
+
+	@Override
+	public <T extends Filter> T createFilter(Class<T> aClass) throws ServletException {
+		return null;
+	}
+
+	@Override
+	public FilterRegistration getFilterRegistration(String s) {
+		return null;
+	}
+
+	@Override
+	public Map<String, ? extends FilterRegistration> getFilterRegistrations() {
+		return null;
+	}
+
+	@Override
+	public SessionCookieConfig getSessionCookieConfig() {
+		return null;
+	}
+
+	@Override
+	public void setSessionTrackingModes(Set<SessionTrackingMode> set) {
+
+	}
+
+	@Override
+	public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
+		return null;
+	}
+
+	@Override
+	public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
+		return null;
+	}
+
+	@Override
+	public void addListener(String s) {
+
+	}
+
+	@Override
+	public <T extends EventListener> void addListener(T t) {
+
+	}
+
+	@Override
+	public void addListener(Class<? extends EventListener> aClass) {
+
+	}
+
+	@Override
+	public <T extends EventListener> T createListener(Class<T> aClass) throws ServletException {
+		return null;
+	}
+
+	@Override
+	public JspConfigDescriptor getJspConfigDescriptor() {
+		return null;
+	}
+
+	@Override
+	public ClassLoader getClassLoader() {
+		return null;
+	}
+
+	@Override
+	public void declareRoles(String... strings) {
+
+	}
+
+	@Override
+	public String getVirtualServerName() {
+		return null;
+	}
+
 	@Override
 	@SuppressWarnings("rawtypes")
 	@Deprecated

api/src/test/java/stubs/javax/servlet/http/HttpServletRequestStub.java

@@ -8,6 +8,7 @@ import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.security.Principal;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -15,11 +16,20 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
+import javax.servlet.AsyncContext;
+import javax.servlet.DispatcherType;
 import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
 import javax.servlet.ServletInputStream;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpUpgradeHandler;
+import javax.servlet.http.Part;
 
 import edu.cornell.mannlib.vitro.webapp.web.URLEncoder;
 
@@ -156,6 +166,11 @@ public class HttpServletRequestStub implements HttpServletRequest {
 		return getSession(true);
 	}
 
+	@Override
+	public String changeSessionId() {
+		return null;
+	}
+
 	@Override
 	public HttpSession getSession(boolean create) {
 		if (create && (session == null)) {
@@ -369,6 +384,36 @@ public class HttpServletRequestStub implements HttpServletRequest {
 				"HttpServletRequestStub.isRequestedSessionIdFromUrl() not implemented.");
 	}
 
+	@Override
+	public boolean authenticate(HttpServletResponse httpServletResponse) throws IOException, ServletException {
+		return false;
+	}
+
+	@Override
+	public void login(String s, String s1) throws ServletException {
+
+	}
+
+	@Override
+	public void logout() throws ServletException {
+
+	}
+
+	@Override
+	public Collection<Part> getParts() throws IOException, ServletException {
+		return null;
+	}
+
+	@Override
+	public Part getPart(String s) throws IOException, ServletException {
+		return null;
+	}
+
+	@Override
+	public <T extends HttpUpgradeHandler> T upgrade(Class<T> aClass) throws IOException, ServletException {
+		return null;
+	}
+
 	@Override
 	public boolean isRequestedSessionIdValid() {
 		throw new RuntimeException(
@@ -393,6 +438,11 @@ public class HttpServletRequestStub implements HttpServletRequest {
 				"HttpServletRequestStub.getContentLength() not implemented.");
 	}
 
+	@Override
+	public long getContentLengthLong() {
+		return 0;
+	}
+
 	@Override
 	public String getContentType() {
 		throw new RuntimeException(
@@ -423,6 +473,41 @@ public class HttpServletRequestStub implements HttpServletRequest {
 				"HttpServletRequestStub.getLocalPort() not implemented.");
 	}
 
+	@Override
+	public ServletContext getServletContext() {
+		return null;
+	}
+
+	@Override
+	public AsyncContext startAsync() throws IllegalStateException {
+		return null;
+	}
+
+	@Override
+	public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse) throws IllegalStateException {
+		return null;
+	}
+
+	@Override
+	public boolean isAsyncStarted() {
+		return false;
+	}
+
+	@Override
+	public boolean isAsyncSupported() {
+		return false;
+	}
+
+	@Override
+	public AsyncContext getAsyncContext() {
+		return null;
+	}
+
+	@Override
+	public DispatcherType getDispatcherType() {
+		return null;
+	}
+
 	@Override
 	public Locale getLocale() {
 		throw new RuntimeException(

api/src/test/java/stubs/javax/servlet/http/HttpServletResponseStub.java

@@ -7,6 +7,7 @@ import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -14,6 +15,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import javax.servlet.ServletOutputStream;
+import javax.servlet.WriteListener;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletResponse;
 
@@ -62,6 +64,16 @@ public class HttpServletResponseStub implements HttpServletResponse {
 		return headers.get(name);
 	}
 
+	@Override
+	public Collection<String> getHeaders(String s) {
+		return null;
+	}
+
+	@Override
+	public Collection<String> getHeaderNames() {
+		return null;
+	}
+
 	// ----------------------------------------------------------------------
 	// Stub methods
 	// ----------------------------------------------------------------------
@@ -115,6 +127,16 @@ public class HttpServletResponseStub implements HttpServletResponse {
 		}
 
 		return new ServletOutputStream() {
+			@Override
+			public boolean isReady() {
+				return true;
+			}
+
+			@Override
+			public void setWriteListener(WriteListener writeListener) {
+
+			}
+
 			@Override
 			public void write(int thisChar) throws IOException {
 				outputStream.write(thisChar);
@@ -214,6 +236,11 @@ public class HttpServletResponseStub implements HttpServletResponse {
 				"HttpServletResponseStub.setContentLength() not implemented.");
 	}
 
+	@Override
+	public void setContentLengthLong(long l) {
+
+	}
+
 	@Override
 	public void setLocale(Locale arg0) {
 		throw new RuntimeException(