This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository jackrabbit.
commit b90399d411112adc4bea20e97865928b55226950 Author: Markus Koschany <a...@debian.org> Date: Sun Sep 18 03:30:27 2016 +0200 Drop all patches. --- debian/patches/series | 2 - debian/patches/servlet-API-3.1.patch | 216 ----------------------------------- debian/patches/servlet_api_25.diff | 53 --------- 3 files changed, 271 deletions(-) diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 2cce724..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -servlet_api_25.diff -servlet-API-3.1.patch diff --git a/debian/patches/servlet-API-3.1.patch b/debian/patches/servlet-API-3.1.patch deleted file mode 100644 index c8e4236..0000000 --- a/debian/patches/servlet-API-3.1.patch +++ /dev/null @@ -1,216 +0,0 @@ -From: Markus Koschany <a...@debian.org> -Date: Fri, 15 Jul 2016 07:10:56 +0200 -Subject: servlet API 3.1 - ---- - .../jackrabbit/webdav/WebdavRequestImpl.java | 85 ++++++++++++++++++++-- - .../jackrabbit/webdav/WebdavResponseImpl.java | 30 ++++++++ - 2 files changed, 109 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 05dafa5..11a5e27 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 -@@ -21,21 +21,32 @@ import java.io.BufferedReader; - import java.io.IOException; - import java.io.InputStream; - import java.io.UnsupportedEncodingException; -+import java.lang.IllegalStateException; - import java.net.URI; - import java.net.URISyntaxException; - import java.security.Principal; - import java.util.ArrayList; -+import java.util.Collection; - import java.util.Enumeration; - import java.util.Iterator; - import java.util.List; - 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.HttpUpgradeHandler; - import javax.servlet.http.HttpSession; -+import javax.servlet.http.Part; - import javax.xml.parsers.ParserConfigurationException; - - import org.apache.jackrabbit.webdav.bind.BindInfo; -@@ -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(); - } - -@@ -1022,4 +1033,66 @@ public class WebdavRequestImpl implements WebdavRequest, DavConstants { - 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 23e6a66..e004f23 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 -@@ -32,6 +32,7 @@ import org.slf4j.LoggerFactory; - import org.w3c.dom.Document; - import org.xml.sax.SAXException; - -+import javax.servlet.ServletException; - import javax.servlet.ServletOutputStream; - import javax.servlet.http.Cookie; - import javax.servlet.http.HttpServletResponse; -@@ -42,6 +43,7 @@ import java.io.IOException; - import java.io.OutputStreamWriter; - import java.io.PrintWriter; - import java.io.Writer; -+import java.util.Collection; - import java.util.Locale; - - /** -@@ -319,4 +321,32 @@ public class WebdavResponseImpl implements WebdavResponse { - 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."); -+ } -+ -+ -+ - } diff --git a/debian/patches/servlet_api_25.diff b/debian/patches/servlet_api_25.diff deleted file mode 100644 index 443c421..0000000 --- a/debian/patches/servlet_api_25.diff +++ /dev/null @@ -1,53 +0,0 @@ -From: Debian Java Maintainers <pkg-java-maintain...@lists.alioth.debian.org> -Date: Fri, 15 Jul 2016 07:08:57 +0200 -Subject: servlet_api_25 - ---- - .../org/apache/jackrabbit/webdav/WebdavRequestImpl.java | 17 +++++++++++++++++ - .../apache/jackrabbit/webdav/WebdavResponseImpl.java | 9 +++++++++ - 2 files changed, 26 insertions(+) - -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 12b961d..05dafa5 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 -@@ -1005,4 +1005,21 @@ 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(); -+ } - } -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 771d00b..23e6a66 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 -@@ -310,4 +310,13 @@ 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(); -+ } - } -- 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