[xmlrpc3] Fix compiler errors for webserver classes that implement HttpServerResponse and HttpServerRequest
Jeff Johnston
jjohnstn at fedoraproject.org
Tue Jul 24 22:32:44 UTC 2012
commit 4fc03ed132c048eb263da26f67f0b21eea315db2
Author: Jeff Johnston <jjohnstn at redhat.com>
Date: Tue Jul 24 18:31:49 2012 -0400
Fix compiler errors for webserver classes that implement HttpServerResponse and HttpServerRequest
xmlrpc3-javax-methods.patch | 128 +++++++++++++++++++++++++++++++++++++++++++
xmlrpc3.spec | 7 ++-
2 files changed, 134 insertions(+), 1 deletions(-)
---
diff --git a/xmlrpc3-javax-methods.patch b/xmlrpc3-javax-methods.patch
new file mode 100644
index 0000000..2a99d9f
--- /dev/null
+++ b/xmlrpc3-javax-methods.patch
@@ -0,0 +1,128 @@
+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
+@@ -31,6 +31,7 @@ import java.net.URLDecoder;
+ import java.security.Principal;
+ import java.util.ArrayList;
+ import java.util.Collections;
++import java.util.Collection;
+ import java.util.Enumeration;
+ import java.util.HashMap;
+ import java.util.Iterator;
+@@ -41,8 +42,15 @@ import java.util.StringTokenizer;
+
+ import javax.servlet.RequestDispatcher;
+ import javax.servlet.ServletInputStream;
++import javax.servlet.DispatcherType;
++import javax.servlet.AsyncContext;
++import javax.servlet.ServletContext;
++import javax.servlet.ServletRequest;
++import javax.servlet.ServletResponse;
+ import javax.servlet.http.Cookie;
++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
+ private String queryString;
+ private String httpVersion;
+ private final Map headers = new HashMap();
++ private final Map parts = new HashMap();
+ private final Map attributes = new HashMap();
+ private Map parameters;
+ private String characterEncoding;
+@@ -227,6 +236,12 @@ public class HttpServletRequestImpl impl
+ return Collections.enumeration(list);
+ }
+
++ public Part getPart(String name) { throw new IllegalStateException("Not implemented"); }
++
++ public Collection getParts() { throw new IllegalStateException("Not implemented"); }
++
++ public boolean authenticate (HttpServletResponse response) { throw new IllegalStateException("Not implemented"); }
++
+ public int getIntHeader(String pHeader) {
+ String s = getHeader(pHeader);
+ return s == null ? -1 : Integer.parseInt(s);
+@@ -242,6 +257,10 @@ public class HttpServletRequestImpl impl
+
+ public String getRemoteUser() { throw new IllegalStateException("Not implemented"); }
+
++ public void login(String username, String password) { throw new IllegalStateException("Not implemented"); }
++
++ public void logout() { throw new IllegalStateException("Not implemented"); }
++
+ public String getRequestURI() { return uri; }
+
+ public StringBuffer getRequestURL() {
+@@ -280,6 +299,20 @@ public class HttpServletRequestImpl impl
+ return sb;
+ }
+
++ public AsyncContext getAsyncContext() { throw new IllegalStateException("Not implemented"); }
++
++ public boolean isAsyncSupported() { return false; }
++
++ public boolean isAsyncStarted() { return false; }
++
++ public ServletContext getServletContext() { throw new IllegalStateException("Not implemented"); }
++
++ public AsyncContext startAsync(ServletRequest req, ServletResponse resp) { throw new IllegalStateException("Not implemented"); }
++
++ public AsyncContext startAsync() { throw new IllegalStateException("Not implemented"); }
++
++ public DispatcherType getDispatcherType() { throw new IllegalStateException("Not implemented"); }
++
+ 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
+@@ -29,6 +29,8 @@ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Locale;
+ import java.util.Map;
++import java.util.Collection;
++import java.util.Collections;
+ import java.util.StringTokenizer;
+
+ import javax.servlet.ServletOutputStream;
+@@ -84,7 +86,7 @@ public class HttpServletResponseImpl imp
+ }
+ }
+
+- private String getHeader(String pHeader) {
++ public String getHeader(String pHeader) {
+ String key = pHeader.toLowerCase();
+ Object o = headers.get(key);
+ if (o == null) {
+@@ -101,6 +103,26 @@ public class HttpServletResponseImpl imp
+ }
+ }
+
++ public Collection getHeaderNames() {
++ return headers.keySet();
++ }
++
++ public Collection getHeaders(String pHeader) {
++ String key = pHeader.toLowerCase();
++ Object o = headers.get(key);
++ List list;
++ if (o instanceof List) {
++ list = (List) o;
++ } else {
++ list = Collections.singletonList(o);
++ }
++ return list;
++ }
++
++ public int getStatus() {
++ return status;
++ }
++
+ public void addIntHeader(String pHeader, int pValue) {
+ addHeader(pHeader, Integer.toString(pValue));
+ }
diff --git a/xmlrpc3.spec b/xmlrpc3.spec
index 2ea67c7..bd4a2f3 100644
--- a/xmlrpc3.spec
+++ b/xmlrpc3.spec
@@ -32,7 +32,7 @@
Name: xmlrpc3
Version: 3.1.3
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: Java XML-RPC implementation
License: ASL 2.0
Group: Development/Libraries
@@ -42,6 +42,7 @@ Source1: %{name}-jpp-depmap.xml
# Add OSGi MANIFEST information
Patch1: %{name}-client-addosgimanifest.patch
Patch2: %{name}-common-addosgimanifest.patch
+Patch3: %{name}-javax-methods.patch
BuildRequires: maven
BuildRequires: maven-resources-plugin
@@ -113,6 +114,7 @@ Obsoletes: %{name}-server-devel <= %{version}
%prep
%setup -q -n apache-%{mainname}-%{version}-src
+%patch3 -b .sav
pushd client
%patch1 -b .sav
popd
@@ -183,6 +185,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%{_javadir}/%{name}-server.jar
%changelog
+* Tue Jul 24 2012 Jeff Johnston <jjohnstn at redhat.com> - 3.1.3-12
+- Fix compiler errors for webserver classes that implement HttpServerResponse and HttpServerRequest
+
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.3-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list