[tiles] 07/08: Transition to the Servlet API 3.1 (Closes: #801034)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon May 30 09:29:40 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tiles.
commit 64905a7c1f3260f68567c015b9f6bc7fe41fc11f
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon May 30 11:23:41 2016 +0200
Transition to the Servlet API 3.1 (Closes: #801034)
---
debian/changelog | 1 +
debian/control | 2 +-
debian/maven.rules | 6 +-
debian/patches/01-servlet-3.1-compatibility.patch | 168 ++++++++++++++++++++++
debian/patches/series | 1 +
5 files changed, 174 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 17cbcd5..90bce88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ tiles (3.0.5-1) UNRELEASED; urgency=medium
* New upstream release
- New dependencies on libtiles-autotag-java and libtiles-request-java
- No longer build the removed tiles-servlet-wildcard module
+ * Transition to the Servlet API 3.1 (Closes: #801034)
* Standards-Version updated to 3.9.8 (no changes)
* Converted debian/copyright to the Copyright Format 1.0
diff --git a/debian/control b/debian/control
index c829cb8..0510cb0 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends-Indep: libcommons-digester-java,
libmaven-javadoc-plugin-java,
libmvel-java,
libognl-java,
- libservlet2.5-java,
+ libservlet3.1-java,
libslf4j-java,
libspring-core-java,
libspring-web-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index 721026a..1da670f 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,6 +1,6 @@
junit junit jar s/3\..*/3.x/
org.springframework * * s/.*/3.x/
-javax.servlet servlet-api jar s/.*/2.5/
-javax.servlet.jsp jsp-api jar s/.*/2.1/
-javax.el el-api jar s/.*/2.1/
+javax.servlet s/servlet-api/javax.servlet-api/ jar s/.*/3.1/
+javax.servlet.jsp s/jsp-api/javax.servlet.jsp-api/ jar s/.*/2.3/
+javax.el s/el-api/javax.el-api/ jar s/.*/3.0/
org.apache.tomcat s/jasper-el/tomcat-jasper-el/ * s/.*/8.x/
diff --git a/debian/patches/01-servlet-3.1-compatibility.patch b/debian/patches/01-servlet-3.1-compatibility.patch
new file mode 100644
index 0000000..82bb302
--- /dev/null
+++ b/debian/patches/01-servlet-3.1-compatibility.patch
@@ -0,0 +1,168 @@
+Description: Fixes the compatibility with the Servlet API 3.1
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/src/tiles-servlet/src/main/java/org/apache/tiles/web/util/ServletContextAdapter.java
++++ b/src/tiles-servlet/src/main/java/org/apache/tiles/web/util/ServletContextAdapter.java
+@@ -24,14 +24,22 @@
+ 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.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
+@@ -206,4 +214,139 @@
+ public String getContextPath() {
+ return rootContext.getContextPath();
+ }
++
++ @Override
++ public int getEffectiveMajorVersion() {
++ return rootContext.getEffectiveMajorVersion();
++ }
++
++ @Override
++ public int getEffectiveMinorVersion() {
++ return rootContext.getEffectiveMinorVersion();
++ }
++
++ @Override
++ public boolean setInitParameter(String name, String value) {
++ return rootContext.setInitParameter(name, value);
++ }
++
++ @Override
++ public ServletRegistration.Dynamic addServlet(String servletName, String className) {
++ return rootContext.addServlet(servletName, className);
++ }
++
++ @Override
++ public ServletRegistration.Dynamic addServlet(String servletName, Servlet servlet) {
++ return rootContext.addServlet(servletName, servlet);
++ }
++
++ @Override
++ public ServletRegistration.Dynamic addServlet(String servletName, Class<? extends Servlet> servletClass) {
++ return rootContext.addServlet(servletName, servletClass);
++ }
++
++ @Override
++ public <T extends Servlet> T createServlet(Class<T> clazz) throws ServletException {
++ return rootContext.createServlet(clazz);
++ }
++
++ @Override
++ public ServletRegistration getServletRegistration(String servletName) {
++ return rootContext.getServletRegistration(servletName);
++ }
++
++ @Override
++ public Map<String, ? extends ServletRegistration> getServletRegistrations() {
++ return rootContext.getServletRegistrations();
++ }
++
++ @Override
++ public FilterRegistration.Dynamic addFilter(String filterName, String className) {
++ return rootContext.addFilter(filterName, className);
++ }
++
++ @Override
++ public FilterRegistration.Dynamic addFilter(String filterName, Filter filter) {
++ return rootContext.addFilter(filterName, filter);
++ }
++
++ @Override
++ public FilterRegistration.Dynamic addFilter(String filterName, Class<? extends Filter> filterClass) {
++ return rootContext.addFilter(filterName, filterClass);
++ }
++
++ @Override
++ public <T extends Filter> T createFilter(Class<T> clazz) throws ServletException {
++ return rootContext.createFilter(clazz);
++ }
++
++ @Override
++ public FilterRegistration getFilterRegistration(String filterName) {
++ return rootContext.getFilterRegistration(filterName);
++ }
++
++ @Override
++ public Map<String, ? extends FilterRegistration> getFilterRegistrations() {
++ return rootContext.getFilterRegistrations();
++ }
++
++ @Override
++ public SessionCookieConfig getSessionCookieConfig() {
++ return rootContext.getSessionCookieConfig();
++ }
++
++ @Override
++ public void setSessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes) {
++ rootContext.setSessionTrackingModes(sessionTrackingModes);
++ }
++
++ @Override
++ public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
++ return rootContext.getDefaultSessionTrackingModes();
++ }
++
++ @Override
++ public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
++ return rootContext.getEffectiveSessionTrackingModes();
++ }
++
++ @Override
++ public void addListener(String className) {
++ rootContext.addListener(className);
++ }
++
++ @Override
++ public <T extends EventListener> void addListener(T t) {
++ rootContext.addListener(t);
++ }
++
++ @Override
++ public void addListener(Class<? extends EventListener> listenerClass) {
++ rootContext.addListener(listenerClass);
++ }
++
++ @Override
++ public <T extends EventListener> T createListener(Class<T> clazz) throws ServletException {
++ return rootContext.createListener(clazz);
++ }
++
++ @Override
++ public JspConfigDescriptor getJspConfigDescriptor() {
++ return rootContext.getJspConfigDescriptor();
++ }
++
++ @Override
++ public ClassLoader getClassLoader() {
++ return rootContext.getClassLoader();
++ }
++
++ @Override
++ public void declareRoles(String... roleNames) {
++ rootContext.declareRoles(roleNames);
++ }
++
++ @Override
++ public String getVirtualServerName() {
++ return rootContext.getVirtualServerName();
++ }
+ }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b73d552
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-servlet-3.1-compatibility.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tiles.git
More information about the pkg-java-commits
mailing list