[geronimo-jacc-1.1-spec] 09/11: Transition to the Servlet API 3.1 (Closes: #801030)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository geronimo-jacc-1.1-spec.

commit b54e705e80a02c5b4b8f512ad76d27ad5e1255c6
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon May 30 12:59:12 2016 +0200

    Transition to the Servlet API 3.1 (Closes: #801030)
---
 debian/changelog                                  |  1 +
 debian/control                                    |  2 +-
 debian/maven.rules                                |  2 +-
 debian/patches/02-servlet-3.1-compatibility.patch | 95 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 5 files changed, 99 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ce83e87..2950101 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ geronimo-jacc-1.1-spec (1.0.1-2) UNRELEASED; urgency=medium
 
   * Team upload.
   * Build with maven-debian-helper instead of ant
+  * Transition to the Servlet API 3.1 (Closes: #801030)
   * Package adopted by the Java Team
   * Standards-Version updated to 3.9.8 (no changes)
   * Removed the deprecated DM-Upload-Allowed field
diff --git a/debian/control b/debian/control
index 8ab102f..be826cd 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Chris Grzegorczyk <grze at eucalyptus.com>, Graziano Obertelli <graziano at eucalyptus.com>, Kyo Lee <kyo.lee at eucalyptus.com>
-Build-Depends: default-jdk, debhelper (>= 9), maven-debian-helper, libservlet2.5-java, junit
+Build-Depends: default-jdk, debhelper (>= 9), maven-debian-helper, libservlet3.1-java, junit
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/geronimo-jacc-1.1-spec.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/geronimo-jacc-1.1-spec.git
diff --git a/debian/maven.rules b/debian/maven.rules
index 6c74f24..081be70 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,2 +1,2 @@
-s/org.apache.geronimo.specs/javax.servlet/ s/geronimo-servlet_2.5_spec/servlet-api/ * s/.*/2.5/ * *
+s/org.apache.geronimo.specs/javax.servlet/ s/geronimo-servlet_2.5_spec/javax.servlet-api/ * s/.*/3.1/ * *
 junit junit * s/.*/3.x/ * * 
diff --git a/debian/patches/02-servlet-3.1-compatibility.patch b/debian/patches/02-servlet-3.1-compatibility.patch
new file mode 100644
index 0000000..1b8d192
--- /dev/null
+++ b/debian/patches/02-servlet-3.1-compatibility.patch
@@ -0,0 +1,95 @@
+Description: Fix the compatibility with the Servlet API 3.1
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/src/test/java/javax/security/jacc/MockHttpServletRequest.java
++++ b/src/test/java/javax/security/jacc/MockHttpServletRequest.java
+@@ -23,14 +23,24 @@
+ import java.io.IOException;
+ import java.io.UnsupportedEncodingException;
+ import java.security.Principal;
++import java.util.Collection;
+ import java.util.Enumeration;
+ 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;
+ 
+ /**
+  * @version $Rev: 614454 $ $Date: 2008-01-23 09:45:36 +0100 (Mi, 23 Jan 2008) $
+@@ -268,4 +278,64 @@
+     public int getLocalPort() {
+         return 0;
+     }
++
++    public String changeSessionId() {
++        return null;
++    }
++
++    public boolean authenticate(HttpServletResponse httpServletResponse) throws IOException, ServletException {
++        return false;
++    }
++
++    public void login(String s, String s1) throws ServletException {
++
++    }
++
++    public void logout() throws ServletException {
++
++    }
++
++    public Collection<Part> getParts() throws IOException, ServletException {
++        return null;
++    }
++
++    public Part getPart(String s) throws IOException, ServletException {
++        return null;
++    }
++
++    public <T extends HttpUpgradeHandler> T upgrade(Class<T> aClass) throws IOException, ServletException {
++        return null;
++    }
++
++    public long getContentLengthLong() {
++        return 0;
++    }
++
++    public ServletContext getServletContext() {
++        return null;
++    }
++
++    public AsyncContext startAsync() throws IllegalStateException {
++        return null;
++    }
++
++    public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse) throws IllegalStateException {
++        return null;
++    }
++
++    public boolean isAsyncStarted() {
++        return false;
++    }
++
++    public boolean isAsyncSupported() {
++        return false;
++    }
++
++    public AsyncContext getAsyncContext() {
++        return null;
++    }
++
++    public DispatcherType getDispatcherType() {
++        return null;
++    }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index f47db61..9ce78f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-missing-dependencies.patch
+02-servlet-3.1-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/geronimo-jacc-1.1-spec.git