You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2018/08/23 22:19:03 UTC

freemarker git commit: Revert "Added dummy methods to the test MockServletContext class up to Servlet 3.1, so that the suite can be ran on later Jetty versions."

Repository: freemarker
Updated Branches:
  refs/heads/2.3-gae 2c3d9aea5 -> f2602cee5


Revert "Added dummy methods to the test MockServletContext class up to Servlet 3.1, so that the suite can be ran on later Jetty versions."

This reverts commit 2c3d9aea5798bec309eb727d0e97cb91238188f3.


Project: http://git-wip-us.apache.org/repos/asf/freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/freemarker/commit/f2602cee
Tree: http://git-wip-us.apache.org/repos/asf/freemarker/tree/f2602cee
Diff: http://git-wip-us.apache.org/repos/asf/freemarker/diff/f2602cee

Branch: refs/heads/2.3-gae
Commit: f2602cee5fe4303f8e648ad5077d96263436be47
Parents: 2c3d9ae
Author: ddekany <dd...@apache.org>
Authored: Fri Aug 24 00:18:53 2018 +0200
Committer: ddekany <dd...@apache.org>
Committed: Fri Aug 24 00:18:53 2018 +0200

----------------------------------------------------------------------
 .../freemarker/template/MockServletContext.java | 117 -------------------
 1 file changed, 117 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/freemarker/blob/f2602cee/src/test/java/freemarker/template/MockServletContext.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/MockServletContext.java b/src/test/java/freemarker/template/MockServletContext.java
index 7a4da17..f833bec 100644
--- a/src/test/java/freemarker/template/MockServletContext.java
+++ b/src/test/java/freemarker/template/MockServletContext.java
@@ -22,21 +22,12 @@ 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 javax.servlet.Filter;
-import javax.servlet.FilterRegistration;
-import javax.servlet.FilterRegistration.Dynamic;
 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;
 
 public class MockServletContext implements ServletContext {
 
@@ -138,112 +129,4 @@ public class MockServletContext implements ServletContext {
     public void setAttribute(String arg0, Object arg1) {
     }
     
-    public String getVirtualServerName() {
-        return "dummy";
-    }
-    
-    public void declareRoles(java.lang.String... roleNames) {
-        //
-    }
-
-    public Dynamic addFilter(String arg0, String arg1) {
-        return null;
-    }
-
-    public Dynamic addFilter(String arg0, Filter arg1) {
-        return null;
-    }
-
-    public Dynamic addFilter(String arg0, Class<? extends Filter> arg1) {
-        return null;
-    }
-
-    public void addListener(String arg0) {
-
-    }
-
-    public <T extends EventListener> void addListener(T arg0) {
-        
-    }
-
-    public void addListener(Class<? extends EventListener> arg0) {
-        
-    }
-
-    public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0, String arg1) {
-        return null;
-    }
-
-    public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0, Servlet arg1) {
-        return null;
-    }
-
-    public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0, Class<? extends Servlet> arg1) {
-        return null;
-    }
-
-    public <T extends Filter> T createFilter(Class<T> arg0) throws ServletException {
-        return null;
-    }
-
-    public <T extends EventListener> T createListener(Class<T> arg0) throws ServletException {
-        return null;
-    }
-
-    public <T extends Servlet> T createServlet(Class<T> arg0) throws ServletException {
-        return null;
-    }
-
-    public ClassLoader getClassLoader() {
-        return null;
-    }
-
-    public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
-        return null;
-    }
-
-    public int getEffectiveMajorVersion() {
-        return 0;
-    }
-
-    public int getEffectiveMinorVersion() {
-        return 0;
-    }
-
-    public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
-        return null;
-    }
-
-    public FilterRegistration getFilterRegistration(String arg0) {
-        return null;
-    }
-
-    public Map<String, ? extends FilterRegistration> getFilterRegistrations() {
-        return null;
-    }
-
-    public JspConfigDescriptor getJspConfigDescriptor() {
-        return null;
-    }
-
-    public ServletRegistration getServletRegistration(String arg0) {
-        return null;
-    }
-
-    public Map<String, ? extends ServletRegistration> getServletRegistrations() {
-        return null;
-    }
-
-    public SessionCookieConfig getSessionCookieConfig() {
-        return null;
-    }
-
-    public boolean setInitParameter(String arg0, String arg1) {
-        return false;
-    }
-
-    public void setSessionTrackingModes(Set<SessionTrackingMode> arg0) {
-        
-    }
-    
 }
\ No newline at end of file