This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository jackrabbit.
commit a9e847b46325c6e1a8b5cc400dad40f4944d4966
Author: Markus Koschany <a...@debian.org>
Date: Sun Sep 18 04:34:09 2016 +0200
Add servlet-api.patch
---
debian/patches/series | 1 +
debian/patches/servlet-api.patch | 213 +++++++++++++++++++++++++++++++++++++++
2 files changed, 214 insertions(+)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8a949c8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+servlet-api.patch
diff --git a/debian/patches/servlet-api.patch b/debian/patches/servlet-api.patch
new file mode 100644
index 0000000..8356495
--- /dev/null
+++ b/debian/patches/servlet-api.patch
@@ -0,0 +1,213 @@
+From: Markus Koschany <a...@debian.org>
+Date: Sun, 18 Sep 2016 10:34:00 +0200
+Subject: servlet api
+
+Fix FTBFS due to use of Debian's servlet API.
+
+Forwarded: no
+---
+ .../jackrabbit/webdav/WebdavRequestImpl.java | 98 ++++++++++++++++++++--
+ .../jackrabbit/webdav/WebdavResponseImpl.java | 33 ++++++++
+ 2 files changed, 125 insertions(+), 6 deletions(-)
+
+diff --git
a/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavRequestImpl.java
b/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavRequestImpl.java
+index 1121754..4cb6916 100644
+---
a/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavRequestImpl.java
++++
b/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavRequestImpl.java
+@@ -76,6 +76,17 @@ import org.slf4j.LoggerFactory;
+ import org.w3c.dom.Document;
+ import org.w3c.dom.Element;
+ import org.xml.sax.SAXException;
++import java.lang.IllegalStateException;
++import java.util.Collection;
++import javax.servlet.AsyncContext;
++import javax.servlet.DispatcherType;
++import javax.servlet.ServletContext;
++import javax.servlet.ServletException;
++import javax.servlet.ServletRequest;
++import javax.servlet.ServletResponse;
++import javax.servlet.http.HttpServletResponse;
++import javax.servlet.http.HttpUpgradeHandler;
++import javax.servlet.http.Part;
+
+ /**
+ * <code>WebdavRequestImpl</code>...
+@@ -822,11 +833,11 @@ public class WebdavRequestImpl implements WebdavRequest,
DavConstants {
+ return httpRequest.getHeader(s);
+ }
+
+- public Enumeration<?> getHeaders(String s) {
++ public Enumeration<String> getHeaders(String s) {
+ return httpRequest.getHeaders(s);
+ }
+
+- public Enumeration<?> getHeaderNames() {
++ public Enumeration<String> getHeaderNames() {
+ return httpRequest.getHeaderNames();
+ }
+
+@@ -910,7 +921,7 @@ public class WebdavRequestImpl implements WebdavRequest,
DavConstants {
+ return httpRequest.getAttribute(s);
+ }
+
+- public Enumeration<?> getAttributeNames() {
++ public Enumeration<String> getAttributeNames() {
+ return httpRequest.getAttributeNames();
+ }
+
+@@ -938,7 +949,7 @@ public class WebdavRequestImpl implements WebdavRequest,
DavConstants {
+ return httpRequest.getParameter(s);
+ }
+
+- public Enumeration<?> getParameterNames() {
++ public Enumeration<String> getParameterNames() {
+ return httpRequest.getParameterNames();
+ }
+
+@@ -946,7 +957,7 @@ public class WebdavRequestImpl implements WebdavRequest,
DavConstants {
+ return httpRequest.getParameterValues(s);
+ }
+
+- public Map<?,?> getParameterMap() {
++ public Map<String,String[]> getParameterMap() {
+ return httpRequest.getParameterMap();
+ }
+
+@@ -990,7 +1001,7 @@ public class WebdavRequestImpl implements WebdavRequest,
DavConstants {
+ return httpRequest.getLocale();
+ }
+
+- public Enumeration<?> getLocales() {
++ public Enumeration<Locale> getLocales() {
+ return httpRequest.getLocales();
+ }
+
+@@ -1005,4 +1016,79 @@ public class WebdavRequestImpl implements
WebdavRequest, DavConstants {
+ public String getRealPath(String s) {
+ return httpRequest.getRealPath(s);
+ }
++ // Compat Servlet 2.4
++ public int getRemotePort() {
++ return httpRequest.getRemotePort();
++ }
++ public int getLocalPort() {
++ return httpRequest.getLocalPort();
++ }
++
++ public String getLocalName() {
++ return httpRequest.getLocalName();
++ }
++
++ public String getLocalAddr() {
++ return httpRequest.getLocalAddr();
++ }
++ //---< servlet 3.1 >---
++ public Part getPart(String name) throws IOException,
IllegalStateException, ServletException {
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public Collection<Part> getParts() throws IOException,
IllegalStateException, ServletException {
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public void logout() throws ServletException {
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public void login(String username, String password) throws
ServletException {
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public boolean authenticate(HttpServletResponse response) throws
IOException, ServletException {
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public DispatcherType getDispatcherType() {
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public AsyncContext getAsyncContext() {
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public boolean isAsyncSupported() {
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public boolean isAsyncStarted() {
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public AsyncContext startAsync(ServletRequest servletRequest,
ServletResponse servletResponse) {
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public AsyncContext startAsync() {
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public ServletContext getServletContext() {
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public <T extends HttpUpgradeHandler> T upgrade(java.lang.Class<T>
httpUpgradeHandlerClass) throws java.io.IOException, ServletException {
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public String changeSessionId() {
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public long getContentLengthLong() {
++ throw new UnsupportedOperationException("Not supported.");
++ }
+ }
+diff --git
a/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavResponseImpl.java
b/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavResponseImpl.java
+index 4572520..1189ad0 100644
+---
a/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavResponseImpl.java
++++
b/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavResponseImpl.java
+@@ -43,6 +43,8 @@ import java.io.OutputStreamWriter;
+ import java.io.PrintWriter;
+ import java.io.Writer;
+ import java.util.Locale;
++import javax.servlet.ServletException;
++import java.util.Collection;
+
+ /**
+ * WebdavResponseImpl implements the <code>WebdavResponse</code> interface.
+@@ -310,4 +312,35 @@ public class WebdavResponseImpl implements WebdavResponse
{
+ public Locale getLocale() {
+ return httpResponse.getLocale();
+ }
++ // Compat Servlet 2.4
++ public void setCharacterEncoding(String env) {
++ httpResponse.setCharacterEncoding(env);
++ }
++ public String getContentType() {
++ return httpResponse.getContentType();
++ }
++ //---< servlet 3.0 >---
++ public Collection<String> getHeaderNames() {
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public String getHeader(String name) {
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public Collection<String> getHeaders(String name) {
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public void logout() throws ServletException {
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public int getStatus() {
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public void setContentLengthLong(long length) {
++ throw new UnsupportedOperationException("Not supported.");
++ }
+ }
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/jackrabbit.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
