拿掉 Servlet3.0 编译兼容性的支持，也删掉了 Servlet3Uploading

src/org/nutz/mock/servlet/MockHttpServletRequest.java

@@ -3,27 +3,21 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.security.Principal;
-import java.util.Collection;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Vector;
 import java.util.Map.Entry;
 
-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.Part;
 
 import org.nutz.castor.Castors;
 import org.nutz.lang.Lang;
@@ -278,8 +272,8 @@ public MockHttpServletRequest init() {
                 this.setCharacterEncoding(((MultipartInputStream) inputStream).getCharset());
                 try {
                     this.setHeader("content-length", inputStream.available());
-                    this.setHeader(    "content-type",
-                                    ((MultipartInputStream) inputStream).getContentType());
+                    this.setHeader("content-type",
+                                   ((MultipartInputStream) inputStream).getContentType());
                 }
                 catch (IOException e) {
                     throw Lang.wrapThrow(e);
@@ -413,15 +407,6 @@ public ServletContext getServletContext() {
         return this.session.getServletContext();
     }
 
-    public AsyncContext startAsync() throws IllegalStateException {
-        throw Lang.noImplement();
-    }
-
-    public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse)
-            throws IllegalStateException {
-        throw Lang.noImplement();
-    }
-
     public boolean isAsyncStarted() {
         throw Lang.noImplement();
     }
@@ -430,14 +415,6 @@ public boolean isAsyncSupported() {
         return false;
     }
 
-    public AsyncContext getAsyncContext() {
-        throw Lang.noImplement();
-    }
-
-    public DispatcherType getDispatcherType() {
-        throw Lang.noImplement();
-    }
-
     public boolean authenticate(HttpServletResponse response) throws IOException, ServletException {
         throw Lang.noImplement();
     }
@@ -450,12 +427,4 @@ public void logout() throws ServletException {
         throw Lang.noImplement();
     }
 
-    public Collection<Part> getParts() throws IOException, ServletException {
-        throw Lang.noImplement();
-    }
-
-    public Part getPart(String name) throws IOException, ServletException {
-        throw Lang.noImplement();
-    }
-
 }

src/org/nutz/mock/servlet/MockServletContext.java

@@ -14,16 +14,10 @@
 import java.util.Vector;
 
 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;
 
 import org.nutz.lang.Lang;
 import org.nutz.log.Log;
@@ -166,71 +160,14 @@ public boolean setInitParameter(String name, String value) {
         throw Lang.noImplement();
     }
 
-    public Dynamic addServlet(String servletName, String className) {
-        throw Lang.noImplement();
-    }
-
-    public Dynamic addServlet(String servletName, Servlet servlet) {
-        throw Lang.noImplement();
-    }
-
-    public Dynamic addServlet(String servletName, Class<? extends Servlet> servletClass) {
-        throw Lang.noImplement();
-    }
-
     public <T extends Servlet> T createServlet(Class<T> clazz) throws ServletException {
         throw Lang.noImplement();
     }
 
-    public ServletRegistration getServletRegistration(String servletName) {
-        throw Lang.noImplement();
-    }
-
-    public Map<String, ? extends ServletRegistration> getServletRegistrations() {
-        throw Lang.noImplement();
-    }
-
-    public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, String className) {
-        throw Lang.noImplement();
-    }
-
-    public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Filter filter) {
-        throw Lang.noImplement();
-    }
-
-    public javax.servlet.FilterRegistration.Dynamic addFilter(    String filterName,
-                                                                Class<? extends Filter> filterClass) {
-        throw Lang.noImplement();
-    }
-
     public <T extends Filter> T createFilter(Class<T> clazz) throws ServletException {
         throw Lang.noImplement();
     }
 
-    public FilterRegistration getFilterRegistration(String filterName) {
-        throw Lang.noImplement();
-    }
-
-    public Map<String, ? extends FilterRegistration> getFilterRegistrations() {
-        throw Lang.noImplement();
-    }
-
-    public SessionCookieConfig getSessionCookieConfig() {
-        throw Lang.noImplement();
-    }
-
-    public void setSessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes) {
-        throw Lang.noImplement();
-    }
-
-    public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
-        throw Lang.noImplement();
-    }
-
-    public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
-        throw Lang.noImplement();
-    }
-
     public void addListener(String className) {
         throw Lang.noImplement();
     }
@@ -247,10 +184,6 @@ public <T extends EventListener> T createListener(Class<T> clazz) throws Servlet
         throw Lang.noImplement();
     }
 
-    public JspConfigDescriptor getJspConfigDescriptor() {
-        throw Lang.noImplement();
-    }
-
     public ClassLoader getClassLoader() {
         throw Lang.noImplement();
     }

src/org/nutz/mvc/upload/UploadAdaptor.java

@@ -158,17 +158,6 @@ public Map<String, Object> getReferObject(ServletContext sc,
             if (contentType == null) {
                 throw Lang.makeThrow(IllegalArgumentException.class, "Content-Type is NULL!!");
             }
-            if (contentType.contains("multipart/form-data")) { // 普通表单上传
-                if (sc.getMajorVersion() == 3) { // Servlet 3 会自行解开上传流,暂不支持这种转换
-                    if (log.isDebugEnabled())
-                        log.debug("Select Servlet3 upload parser --> " + request.getRequestURI());
-                    return new Servlet3Uploading().parse(request, context);
-                }
-                if (log.isDebugEnabled())
-                    log.debug("Select Html4 Form upload parser --> " + request.getRequestURI());
-                Uploading ing = new FastUploading();
-                return ing.parse(request, context);
-            }
             if (contentType.contains("application/octet-stream")) { // Html5
                                                                     // 流式上传
                 if (log.isDebugEnabled())