diff --git a/xmlrpc-javax-methods.patch b/xmlrpc-javax-methods.patch index 2a99d9f..0c66b6c 100644 --- a/xmlrpc-javax-methods.patch +++ b/xmlrpc-javax-methods.patch @@ -1,6 +1,75 @@ -diff -up ./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java.fix ./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java ---- ./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java.fix 2012-07-24 14:49:54.000000000 -0400 -+++ ./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java 2012-07-24 18:20:17.000000000 -0400 +From d6834da0b1556bb133a534d31bb94d08f38fa195 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Mon, 16 Jun 2014 10:03:35 +0200 +Subject: [PATCH] Use servlet 3.1.0 API + +--- + dist/pom.xml | 2 +- + pom.xml | 4 +- + server/pom.xml | 8 +++- + .../xmlrpc/webserver/HttpServletRequestImpl.java | 54 ++++++++++++++++++++++ + .../xmlrpc/webserver/HttpServletResponseImpl.java | 26 ++++++++++- + .../xmlrpc/webserver/ServletOutputStreamImpl.java | 5 ++ + 6 files changed, 94 insertions(+), 5 deletions(-) + +diff --git a/dist/pom.xml b/dist/pom.xml +index 67aded6..c18c2eb 100644 +--- a/dist/pom.xml ++++ b/dist/pom.xml +@@ -59,7 +59,7 @@ + + + javax.servlet +- servlet-api ++ javax.servlet-api + + + org.apache.xmlrpc +diff --git a/pom.xml b/pom.xml +index 3933da5..70c508e 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -344,8 +344,8 @@ + + + javax.servlet +- servlet-api +- 2.4 ++ javax.servlet-api ++ 3.1.0 + provided + + +diff --git a/server/pom.xml b/server/pom.xml +index 0d09544..01288c8 100644 +--- a/server/pom.xml ++++ b/server/pom.xml +@@ -67,6 +67,12 @@ + + commons-logging + commons-logging ++ ++ ++ javax.servlet ++ servlet-api ++ ++ + + + org.apache.xmlrpc +@@ -81,7 +87,7 @@ + + + javax.servlet +- servlet-api ++ javax.servlet-api + + + commons-httpclient +diff --git a/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java b/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java +index 3dc7e43..19b14a2 100644 +--- a/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java ++++ b/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java @@ -31,6 +31,7 @@ import java.net.URLDecoder; import java.security.Principal; import java.util.ArrayList; @@ -9,9 +78,13 @@ diff -up ./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestIm import java.util.Enumeration; import java.util.HashMap; import java.util.Iterator; -@@ -41,8 +42,15 @@ import java.util.StringTokenizer; +@@ -39,10 +40,20 @@ import java.util.Locale; + import java.util.Map; + import java.util.StringTokenizer; ++import javax.servlet.ReadListener; import javax.servlet.RequestDispatcher; ++import javax.servlet.ServletException; import javax.servlet.ServletInputStream; +import javax.servlet.DispatcherType; +import javax.servlet.AsyncContext; @@ -19,13 +92,14 @@ diff -up ./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestIm +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; import javax.servlet.http.Cookie; ++import javax.servlet.http.HttpUpgradeHandler; +import javax.servlet.http.Part; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.apache.xmlrpc.common.XmlRpcStreamConfig; -@@ -66,6 +74,7 @@ public class HttpServletRequestImpl impl +@@ -66,6 +77,7 @@ public class HttpServletRequestImpl implements HttpServletRequest { private String queryString; private String httpVersion; private final Map headers = new HashMap(); @@ -33,7 +107,26 @@ diff -up ./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestIm private final Map attributes = new HashMap(); private Map parameters; private String characterEncoding; -@@ -227,6 +236,12 @@ public class HttpServletRequestImpl impl +@@ -97,6 +109,18 @@ public class HttpServletRequestImpl implements HttpServletRequest { + } + return c; + } ++ ++ public boolean isFinished() { ++ return contentBytesRemaining == 0; ++ } ++ ++ public boolean isReady() { ++ return true; ++ } ++ ++ public void setReadListener(ReadListener arg0) { ++ throw new IllegalStateException("Not implemented."); ++ } + }; + } + +@@ -227,6 +251,12 @@ public class HttpServletRequestImpl implements HttpServletRequest { return Collections.enumeration(list); } @@ -46,7 +139,7 @@ diff -up ./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestIm public int getIntHeader(String pHeader) { String s = getHeader(pHeader); return s == null ? -1 : Integer.parseInt(s); -@@ -242,6 +257,10 @@ public class HttpServletRequestImpl impl +@@ -242,6 +272,10 @@ public class HttpServletRequestImpl implements HttpServletRequest { public String getRemoteUser() { throw new IllegalStateException("Not implemented"); } @@ -57,7 +150,7 @@ diff -up ./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestIm public String getRequestURI() { return uri; } public StringBuffer getRequestURL() { -@@ -280,6 +299,20 @@ public class HttpServletRequestImpl impl +@@ -280,6 +314,20 @@ public class HttpServletRequestImpl implements HttpServletRequest { return sb; } @@ -78,9 +171,21 @@ diff -up ./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestIm public String getRequestedSessionId() { throw new IllegalStateException("Not implemented"); } public String getServletPath() { return uri; } -diff -up ./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java.fix ./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java ---- ./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java.fix 2012-07-24 14:49:46.000000000 -0400 -+++ ./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java 2012-07-24 15:22:31.000000000 -0400 +@@ -544,4 +592,10 @@ public class HttpServletRequestImpl implements HttpServletRequest { + } + + protected String getHttpVersion() { return httpVersion; } ++ ++ public long getContentLengthLong() { throw new IllegalStateException("Not implemented."); } ++ ++ public String changeSessionId() { throw new IllegalStateException("Not implemented."); } ++ ++ public HttpUpgradeHandler upgrade(Class arg0) { throw new IllegalStateException("Not implemented."); } + } +diff --git a/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java b/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java +index 6ba7018..5319dcf 100644 +--- a/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java ++++ b/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java @@ -29,6 +29,8 @@ import java.util.Iterator; import java.util.List; import java.util.Locale; @@ -90,7 +195,7 @@ diff -up ./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseI import java.util.StringTokenizer; import javax.servlet.ServletOutputStream; -@@ -84,7 +86,7 @@ public class HttpServletResponseImpl imp +@@ -84,7 +86,7 @@ public class HttpServletResponseImpl implements HttpServletResponse { } } @@ -99,7 +204,7 @@ diff -up ./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseI String key = pHeader.toLowerCase(); Object o = headers.get(key); if (o == null) { -@@ -101,6 +103,26 @@ public class HttpServletResponseImpl imp +@@ -101,6 +103,26 @@ public class HttpServletResponseImpl implements HttpServletResponse { } } @@ -126,3 +231,34 @@ diff -up ./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseI public void addIntHeader(String pHeader, int pValue) { addHeader(pHeader, Integer.toString(pValue)); } +@@ -465,4 +487,6 @@ public class HttpServletResponseImpl implements HttpServletResponse { + sb.append("\r\n"); + return sb.toString(); + } ++ ++ public void setContentLengthLong(long arg0) { throw new IllegalStateException("Not implemented."); } + } +diff --git a/server/src/main/java/org/apache/xmlrpc/webserver/ServletOutputStreamImpl.java b/server/src/main/java/org/apache/xmlrpc/webserver/ServletOutputStreamImpl.java +index c2a53b1..86dbbb4 100644 +--- a/server/src/main/java/org/apache/xmlrpc/webserver/ServletOutputStreamImpl.java ++++ b/server/src/main/java/org/apache/xmlrpc/webserver/ServletOutputStreamImpl.java +@@ -22,6 +22,7 @@ import java.io.IOException; + import java.io.OutputStream; + + import javax.servlet.ServletOutputStream; ++import javax.servlet.WriteListener; + + + /** Default implementation of a servlet output stream. +@@ -99,4 +100,8 @@ class ServletOutputStreamImpl extends ServletOutputStream { + boolean isCommitted() { + return committed; + } ++ ++ public boolean isReady() { return true; } ++ ++ public void setWriteListener(WriteListener arg0) { throw new IllegalStateException("Not implemented."); } + } +-- +1.9.3 + diff --git a/xmlrpc.spec b/xmlrpc.spec index 1c027f9..258df85 100644 --- a/xmlrpc.spec +++ b/xmlrpc.spec @@ -1,6 +1,6 @@ Name: xmlrpc Version: 3.1.3 -Release: 9%{?dist} +Release: 10%{?dist} Epoch: 1 Summary: Java XML-RPC implementation License: ASL 2.0 @@ -13,7 +13,7 @@ Patch1: %{name}-common-addosgimanifest.patch Patch2: %{name}-javax-methods.patch BuildRequires: maven-local -BuildRequires: mvn(org.apache:apache) +BuildRequires: mvn(org.apache:apache:pom:) BuildRequires: mvn(commons-httpclient:commons-httpclient) BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(javax.servlet:servlet-api) @@ -61,7 +61,7 @@ Provides: %{name}3-server = 3.1.3-13 %prep %setup -q -n apache-%{name}-%{version}-src -%patch2 -b .sav +%patch2 -p1 pushd client %patch0 -b .sav popd @@ -94,6 +94,9 @@ sed -i 's/\r//' LICENSE.txt %doc LICENSE.txt NOTICE.txt %changelog +* Mon Jun 16 2014 Mikolaj Izdebski - 1:3.1.3-10 +- Use servlet 3.1.0 API + * Sun Jun 08 2014 Fedora Release Engineering - 1:3.1.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild