[tiles] use servlet api 3.1

gil gil at fedoraproject.org
Wed Mar 4 16:40:38 UTC 2015


commit b15825ee858be3a4ddf3fe9c4f1c9db3815bf97c
Author: gil <puntogil at libero.it>
Date:   Wed Mar 4 17:40:15 2015 +0100

    use servlet api 3.1

 tiles-2.2.2-2-depmap                |  47 -----
 tiles-2.2.2-jsp-servlet30.patch     | 153 -----------------
 tiles-2.2.2-servlet-servlet30.patch | 170 ------------------
 tiles-2.2.2-servlet3.1.patch        | 332 ++++++++++++++++++++++++++++++++++++
 4 files changed, 332 insertions(+), 370 deletions(-)
---
diff --git a/tiles-2.2.2-servlet3.1.patch b/tiles-2.2.2-servlet3.1.patch
new file mode 100644
index 0000000..3127e82
--- /dev/null
+++ b/tiles-2.2.2-servlet3.1.patch
@@ -0,0 +1,332 @@
+diff -Nru tiles-2.2.2/src/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java tiles-2.2.2.servlet/src/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java
+--- tiles-2.2.2/src/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java	2010-06-17 20:31:46.000000000 +0200
++++ tiles-2.2.2.servlet/src/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java	2015-03-04 17:04:09.417787819 +0100
+@@ -22,17 +22,31 @@
+ package org.apache.tiles.jsp.taglib.definition;
+ 
+ import java.io.InputStream;
++import java.lang.Class;
++import java.lang.ClassLoader;
++import java.lang.IllegalArgumentException;
++import java.lang.IllegalStateException;
++import java.lang.UnsupportedOperationException;
+ import java.net.MalformedURLException;
+ import java.net.URL;
+ import java.util.Enumeration;
++import java.util.EventListener;
+ import java.util.Hashtable;
+ import java.util.Iterator;
++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;
+ 
+ import org.apache.tiles.ArrayStack;
+ import org.apache.tiles.AttributeContext;
+@@ -319,8 +333,8 @@
+          * @param name The name of the parameter.
+          * @param value The value of the parameter.
+          */
+-        public void setInitParameter(String name, String value) {
+-            initParameters.put(name, value);
++        public boolean setInitParameter(String name, String value) {
++            return true;
+         }
+ 
+         /**
+@@ -409,6 +423,110 @@
+                 return second.next();
+             }
+         }
++        
++        public JspConfigDescriptor getJspConfigDescriptor() {
++            // TODO
++            throw new UnsupportedOperationException("Not supported.");
++        }
++        public ClassLoader getClassLoader() {
++            // TODO
++            throw new UnsupportedOperationException("Not supported.");
++        }
++        public void declareRoles(String... roleNames) {
++            // TODO
++            throw new UnsupportedOperationException("Not supported.");
++        }
++        public <T extends EventListener> T createListener(java.lang.Class<T> c) throws ServletException {
++            // TODO
++            throw new UnsupportedOperationException("Not supported.");
++        }
++        public <T extends EventListener> void addListener(T t) {
++            // TODO
++            throw new UnsupportedOperationException("Not supported.");
++        }
++        public void addListener(String className) {
++            // TODO
++            throw new UnsupportedOperationException("Not supported.");
++        }
++        public void addListener(Class<? extends EventListener> listenerClass) {
++            // TODO
++            throw new UnsupportedOperationException("Not supported.");
++        }
++        public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
++            // TODO
++            throw new UnsupportedOperationException("Not supported.");
++        }
++        public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
++            // TODO
++            throw new UnsupportedOperationException("Not supported.");
++        }
++        public void setSessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes) throws IllegalStateException, IllegalArgumentException {
++            // TODO
++            throw new UnsupportedOperationException("Not supported.");
++        }
++        public SessionCookieConfig getSessionCookieConfig() {
++            // TODO
++            throw new UnsupportedOperationException("Not supported.");
++        }
++        public Map<String,? extends FilterRegistration> getFilterRegistrations() {
++            // TODO
++            throw new UnsupportedOperationException("Not supported.");
++        }
++        public FilterRegistration getFilterRegistration(String filterName) {
++            // TODO
++            throw new UnsupportedOperationException("Not supported.");
++        }
++        public <T extends Filter> T createFilter(Class<T> c) throws ServletException {
++            // TODO
++            throw new UnsupportedOperationException("Not supported.");
++        }
++        public FilterRegistration.Dynamic addFilter(String filterName, Class<? extends Filter> filterClass) {
++            // TODO
++            throw new UnsupportedOperationException("Not supported.");
++        }
++        public FilterRegistration.Dynamic addFilter(String filterName, Filter filter) {
++            // TODO
++            throw new UnsupportedOperationException("Not supported.");
++        }
++        public FilterRegistration.Dynamic addFilter(String filterName, String className) {
++            // TODO
++            throw new UnsupportedOperationException("Not supported.");
++        }
++        public Map<String,? extends ServletRegistration> getServletRegistrations() {
++            // TODO
++            throw new UnsupportedOperationException("Not supported.");
++        }
++        public ServletRegistration getServletRegistration(String servletName) {
++            // TODO
++            throw new UnsupportedOperationException("Not supported.");
++        }
++        public <T extends Servlet> T createServlet(Class<T> c) throws ServletException {
++            // TODO
++            throw new UnsupportedOperationException("Not supported.");
++        }
++        public ServletRegistration.Dynamic addServlet(String servletName, Servlet servlet) {
++            // TODO
++            throw new UnsupportedOperationException("Not supported.");
++        }
++        public ServletRegistration.Dynamic addServlet(String servletName, Class<? extends Servlet> servletClass) {
++            // TODO
++            throw new UnsupportedOperationException("Not supported.");
++        }
++        public ServletRegistration.Dynamic addServlet(String servletName, String className) {
++            // TODO
++            throw new UnsupportedOperationException("Not supported.");
++        }
++        public int getEffectiveMinorVersion() {
++            // TODO
++            throw new UnsupportedOperationException("Not supported.");
++        }
++        public int getEffectiveMajorVersion() {
++            // TODO
++            throw new UnsupportedOperationException("Not supported.");
++        }
++        public String getVirtualServerName() {
++            throw new UnsupportedOperationException("Not implemented yet");
++        }
+     }
+ 
+ }
+diff -Nru tiles-2.2.2/src/tiles-servlet/src/main/java/org/apache/tiles/web/util/ServletContextAdapter.java tiles-2.2.2.servlet/src/tiles-servlet/src/main/java/org/apache/tiles/web/util/ServletContextAdapter.java
+--- tiles-2.2.2/src/tiles-servlet/src/main/java/org/apache/tiles/web/util/ServletContextAdapter.java	2010-06-17 20:31:44.000000000 +0200
++++ tiles-2.2.2.servlet/src/tiles-servlet/src/main/java/org/apache/tiles/web/util/ServletContextAdapter.java	2015-03-04 16:58:47.622896826 +0100
+@@ -21,17 +21,31 @@
+ package org.apache.tiles.web.util;
+ 
+ import java.io.InputStream;
++import java.lang.Class;
++import java.lang.ClassLoader;
++import java.lang.IllegalArgumentException;
++import java.lang.IllegalStateException;
++import java.lang.UnsupportedOperationException;
+ import java.net.MalformedURLException;
+ import java.net.URL;
+ import java.util.Enumeration;
++import java.util.EventListener;
+ import java.util.Hashtable;
++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.ServletConfig;
+ 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;
+ 
+ /**
+  * Adapts a servlet config and a servlet context to become a unique servlet
+@@ -249,4 +263,139 @@
+             return second.nextElement();
+         }
+     }
++
++    public JspConfigDescriptor getJspConfigDescriptor() {
++        // TODO
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    public ClassLoader getClassLoader() {
++        // TODO
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    public void declareRoles(String... roleNames) {
++        // TODO
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    public <T extends EventListener> T createListener(Class<T> c) throws ServletException {
++        // TODO
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    public <T extends EventListener> void addListener(T t) {
++        // TODO
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    public void addListener(String className) {
++        // TODO
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    public void addListener(Class<? extends EventListener> listenerClass) {
++        // TODO
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
++        // TODO
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
++        // TODO
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    public void setSessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes) throws IllegalStateException, IllegalArgumentException {
++        // TODO
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    public SessionCookieConfig getSessionCookieConfig() {
++        // TODO
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    public Map<String,? extends FilterRegistration> getFilterRegistrations() {
++        // TODO
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    public FilterRegistration getFilterRegistration(String filterName) {
++        // TODO
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    public <T extends Filter> T createFilter(Class<T> c) throws ServletException {
++        // TODO
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    public FilterRegistration.Dynamic addFilter(String filterName, Class<? extends Filter> filterClass) {
++        // TODO
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    public FilterRegistration.Dynamic addFilter(String filterName, Filter filter) {
++        // TODO
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    public FilterRegistration.Dynamic addFilter(String filterName, String className) {
++        // TODO
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    public Map<String,? extends ServletRegistration> getServletRegistrations() {
++        // TODO
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    public ServletRegistration getServletRegistration(String servletName) {
++        // TODO
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    public <T extends Servlet> T createServlet(Class<T> c) throws ServletException {
++        // TODO
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    public ServletRegistration.Dynamic addServlet(String servletName, Servlet servlet) {
++        // TODO
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    public ServletRegistration.Dynamic addServlet(String servletName, Class<? extends Servlet> servletClass) {
++        // TODO
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    public ServletRegistration.Dynamic addServlet(String servletName, String className) {
++        // TODO
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    public boolean setInitParameter(String name, String value) {
++        // TODO
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    public int getEffectiveMinorVersion() {
++        // TODO
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    public int getEffectiveMajorVersion() {
++        // TODO
++        throw new UnsupportedOperationException("Not supported.");
++    }
++
++    public String getVirtualServerName() {
++        throw new UnsupportedOperationException("Not implemented yet");
++    }
++
+ }


More information about the scm-commits mailing list