diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6de88cd --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +xmlrpc-2.0.1-src.tar.gz +/apache-xmlrpc-3.1.3-src.tar.bz2 diff --git a/.project b/.project new file mode 100644 index 0000000..d3cdf74 --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ + + + xmlrpc + + + + + + org.eclipse.linuxtools.rpm.rpmlint.rpmlintBuilder + + + + + + org.eclipse.linuxtools.rpm.rpmlint.rpmlintNature + + diff --git a/changelog-pre3.x.txt b/changelog-pre3.x.txt new file mode 100644 index 0000000..9cef632 --- /dev/null +++ b/changelog-pre3.x.txt @@ -0,0 +1,120 @@ +* Sun Jul 22 2012 Fedora Release Engineering - 0:2.0.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jun 05 2012 Stanislav Ochotnicky - 0:2.0.1-12 +- Migrate to new tomcat-servlet-api + +* Sat Jan 14 2012 Fedora Release Engineering - 0:2.0.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Feb 07 2011 Fedora Release Engineering - 0:2.0.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Dec 21 2010 Stanislav Ochotnicky - 0:2.0.1-9 +- Require java >= 1:1.6.0 +- Fix classpaths to ensure building of all optional features +- Remove stale patch + +* Thu Dec 16 2010 Stanislav Ochotnicky - 0:2.0.1-8 +- Migrate from old servlet api to new one + +* Thu Dec 9 2010 Stanislav Ochotnicky - 0:2.0.1-7 +- Remove gcj support +- Make jars/javadocs versionless +- Add ws-commons-util Requires +- Use apache-commons-codec +- Drop unneeded patch for jsse + +* Thu Mar 11 2010 Peter Lemenkov - 0:2.0.1-6.6 +- Added missing requires jpackage-utils + +* Mon Jul 27 2009 Fedora Release Engineering - 0:2.0.1-6.5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Feb 26 2009 Fedora Release Engineering - 0:2.0.1-5.5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Jul 10 2008 Tom "spot" Callaway - 0:2.0.1-4.5 +- drop repotag + +* Thu May 29 2008 Tom "spot" Callaway - 0:2.0.1-4jpp.4 +- fix license tag + +* Tue Feb 19 2008 Fedora Release Engineering - 0:2.0.1-4jpp.3 +- Autorebuild for GCC 4.3 + +* Tue Mar 27 2007 Matt Wringe 0:2.0.1-3jpp.3 +- Spec file clean up for Fedora Extras Review + +* Thu Mar 08 2007 Deepak Bhole 2.0.1-3jpp.2 +- Add javax.net.ssl support to build org.apache.xmlrpc.secure.* +- Minor spec file cleanup + +* Fri Aug 04 2006 Vivek Lakshmanan - 0:2.0.1-3jpp.1 +- Merge with latest from JPP. + +* Sat Jul 22 2006 Jakub Jelinek - 0:2.0.1-1jpp_8.2fc +- Rebuilt + +* Wed Jul 12 2006 Jesse Keating - 0:2.0.1-1jpp_8.1fc +- rebuild + +* Wed Mar 8 2006 Rafael Schloming - 0:2.0.1-1jpp_7fc +- excluded s390 due to eclipse + +* Mon Mar 6 2006 Jeremy Katz - 0:2.0.1-1jpp_6fc +- stop scriptlet spew + +* Fri Feb 24 2006 Igor Foox - 0:2.0.1-1jpp_5fc +- Added post/postun dependency on coreutils. + +* Fri Feb 10 2006 Jesse Keating - 0:2.0.1-1jpp_4fc +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 0:2.0.1-1jpp_3fc +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Wed Jan 25 2006 Igor Foox 0:2.0.1-1jpp_2fc +- ExcludeArch s390x and ppc64 + +* Wed Jan 18 2006 Andrew Overholt 0:2.0.1-1jpp_2fc +- Comment out JPackage Distribution and Vendor tags + +* Wed Jan 18 2006 Jesse Keating 0:2.0.1-1jpp_2fc +- bump for test + +* Wed Jan 18 2006 Igor Foox 0:2.0.1-1jpp_1fc +- Update to version 2.0.1 +- Natively compile + +* Thu Aug 26 2004 Ralph Apel 0:1.2-0.b1.3jpp +- Build with ant-1.6.2 + +* Thu Apr 29 2004 David Walluck 0:1.2-0.b1.2jpp +- add jar symlinks +- remove %%buildroot in %%install + +* Tue May 06 2003 David Walluck 0:1.2-0.b1.1jpp +- 1.2-b1 +- update for JPackage 1.5 + +* Mon Mar 18 2002 Guillaume Rousse 1.1-1jpp +- 1.1 +- generic servlet support +- used source release +- dropped patch +- added applet jar + +* Mon Jan 21 2002 Guillaume Rousse 1.0-3jpp +- versioned dir for javadoc +- no dependencies for javadoc package +- dropped jsse package +- adaptation to new servlet3 package +- adaptation to new jsse package +- section macro + +* Fri Dec 7 2001 Guillaume Rousse 1.0-2jpp +- javadoc into javadoc package + +* Sat Nov 3 2001 Guillaume Rousse 1.0-1jpp +- first JPackage release diff --git a/dead.package b/dead.package deleted file mode 100644 index 5204a84..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -Orphaned for 6+ weeks diff --git a/sources b/sources new file mode 100644 index 0000000..f4bbd2c --- /dev/null +++ b/sources @@ -0,0 +1 @@ +f7817485fa6a6a500c49ec9515d1f3b9 apache-xmlrpc-3.1.3-src.tar.bz2 diff --git a/xmlrpc-client-addosgimanifest.patch b/xmlrpc-client-addosgimanifest.patch new file mode 100644 index 0000000..437d78f --- /dev/null +++ b/xmlrpc-client-addosgimanifest.patch @@ -0,0 +1,20 @@ +--- pom.xml.sav 2010-02-06 17:44:57.000000000 +0200 ++++ pom.xml 2010-09-29 09:27:06.194857352 +0300 +@@ -48,6 +48,17 @@ + org.apache + Apache Software Foundation + ${project.version} ++ 2 ++ %Bundle-Name ++ plugin ++ org.apache.xmlrpc ++ ${project.version} ++ org.apache.xmlrpc.common ++ org.apache.xmlrpc, org.apache.xmlrpc.client, org.apache.xmlrpc.client.util ++ javax.xml.namespace, javax.xml.parsers, org.apache.commons.httpclient, org.apache.commons.httpclient.auth, org.apache.commons.httpclient.methods, org.apache.commons.httpclient.params, org.apache.commons.logging, org.apache.ws.commons.serialize, org.apache.ws.commons.util, org.w3c.dom, org.xml.sax, org.xml.sax.helpers ++ J2SE-1.4, CDC-1.0/Foundation-1.0, J2SE-1.3 ++ dependent ++ %Bundle-Vendor.0 + + + diff --git a/xmlrpc-common-addosgimanifest.patch b/xmlrpc-common-addosgimanifest.patch new file mode 100644 index 0000000..4d4aeca --- /dev/null +++ b/xmlrpc-common-addosgimanifest.patch @@ -0,0 +1,19 @@ +--- pom.xml.sav 2010-02-06 17:44:50.000000000 +0200 ++++ pom.xml 2010-09-29 09:30:38.857857644 +0300 +@@ -48,6 +48,16 @@ + org.apache + Apache Software Foundation + ${project.version} ++ 2 ++ %Bundle-Name ++ plugin ++ org.apache.xmlrpc.common ++ ${project.version} ++ org.apache.xmlrpc, org.apache.xmlrpc.common, org.apache.xmlrpc.jaxb, org.apache.xmlrpc.parser, org.apache.xmlrpc.serializer, org.apache.xmlrpc.util ++ javax.xml.namespace, javax.xml.parsers, org.apache.commons.httpclient, org.apache.commons.httpclient.auth, org.apache.commons.httpclient.methods, org.apache.commons.httpclient.params, org.apache.commons.logging, org.apache.ws.commons.serialize, org.apache.ws.commons.util, org.w3c.dom, org.xml.sax, org.xml.sax.helpers ++ J2SE-1.4, CDC-1.0/Foundation-1.0, J2SE-1.3 ++ dependent ++ %Bundle-Vendor.0 + + + diff --git a/xmlrpc-javax-methods.patch b/xmlrpc-javax-methods.patch new file mode 100644 index 0000000..0c66b6c --- /dev/null +++ b/xmlrpc-javax-methods.patch @@ -0,0 +1,264 @@ +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; + import java.util.Collections; ++import java.util.Collection; + import java.util.Enumeration; + import java.util.HashMap; + import java.util.Iterator; +@@ -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; ++import javax.servlet.ServletContext; ++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 +77,7 @@ public class HttpServletRequestImpl implements HttpServletRequest { + 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; +@@ -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); + } + ++ 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 +272,10 @@ public class HttpServletRequestImpl implements HttpServletRequest { + + 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 +314,20 @@ public class HttpServletRequestImpl implements HttpServletRequest { + 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; } +@@ -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; + 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 implements HttpServletResponse { + } + } + +- 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 implements HttpServletResponse { + } + } + ++ 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)); + } +@@ -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-server-addosgimanifest.patch b/xmlrpc-server-addosgimanifest.patch new file mode 100644 index 0000000..af54e20 --- /dev/null +++ b/xmlrpc-server-addosgimanifest.patch @@ -0,0 +1,15 @@ +--- pom.xml 2014-07-07 11:24:52.668887604 -0400 ++++ pom.xml.sav 2014-07-07 11:25:06.174916380 -0400 +@@ -48,6 +48,12 @@ + org.apache + Apache Software Foundation + ${project.version} ++ 1 ++ %Bundle-Name ++ org.apache.xmlrpc.server ++ ${project.version} ++ org.apache.xmlrpc.common ++ org.apache.xmlrpc.server,org.apache.xmlrpc.webserver + + + diff --git a/xmlrpc.spec b/xmlrpc.spec new file mode 100644 index 0000000..372a680 --- /dev/null +++ b/xmlrpc.spec @@ -0,0 +1,135 @@ +Name: xmlrpc +Version: 3.1.3 +Release: 11%{?dist} +Epoch: 1 +Summary: Java XML-RPC implementation +License: ASL 2.0 +URL: http://ws.apache.org/xmlrpc/ +BuildArch: noarch + +Source0: http://www.apache.org/dist/ws/xmlrpc/sources/apache-xmlrpc-%{version}-src.tar.bz2 +Patch0: %{name}-client-addosgimanifest.patch +Patch1: %{name}-common-addosgimanifest.patch +Patch2: %{name}-javax-methods.patch +Patch3: %{name}-server-addosgimanifest.patch + +BuildRequires: maven-local +BuildRequires: mvn(org.apache:apache:pom:) +BuildRequires: mvn(commons-httpclient:commons-httpclient) +BuildRequires: mvn(commons-logging:commons-logging) +BuildRequires: mvn(javax.servlet:servlet-api) +BuildRequires: mvn(org.apache.ws.commons.util:ws-commons-util) + + +%description +Apache XML-RPC is a Java implementation of XML-RPC, a popular protocol +that uses XML over HTTP to implement remote procedure calls. +Apache XML-RPC was previously known as Helma XML-RPC. If you have code +using the Helma library, all you should have to do is change the import +statements in your code from helma.xmlrpc.* to org.apache.xmlrpc.*. + +%package javadoc +Summary: Javadoc for %{name} + +%description javadoc +Javadoc for %{name}. + +%package common +Summary: Common classes for XML-RPC client and server implementations +# Provide xmlrpc is not here because it would be useless due to different jar names +Obsoletes: %{name} < 3.1.3 +Obsoletes: %{name}3-common < 3.1.3-13 +Provides: %{name}3-common = 3.1.3-13 + +%description common +%{summary}. + +%package client +Summary: XML-RPC client implementation +Obsoletes: %{name}3-client < 3.1.3-13 +Provides: %{name}3-client = 3.1.3-13 + +%description client +%{summary}. + +%package server +Summary: XML-RPC server implementation +Obsoletes: %{name}3-server < 3.1.3-13 +Provides: %{name}3-server = 3.1.3-13 + +%description server +%{summary}. + +%prep +%setup -q -n apache-%{name}-%{version}-src +%patch2 -p1 +pushd client +%patch0 -b .sav +popd +pushd common +%patch1 -b .sav +popd +pushd server +%patch3 -b .sav +popd + +sed -i 's/\r//' LICENSE.txt + +%pom_disable_module dist +%pom_remove_dep jaxme:jaxmeapi common +%mvn_file :{*} @1 +%mvn_package :*-common %{name} + +%build +# FIXME: ignore test failure because server part needs network +%mvn_build -s -- -Dmaven.test.failure.ignore=true + +%install +%mvn_install + +%files common -f .mfiles-%{name} +%doc LICENSE.txt NOTICE.txt + +%files client -f .mfiles-%{name}-client + +%files server -f .mfiles-%{name}-server + +%files javadoc -f .mfiles-javadoc +%doc LICENSE.txt NOTICE.txt + +%changelog +* Thu Jul 10 2014 Sami Wagiaalla - 1:3.1.3-10 +- Add OSGi info for xmlrpc-server jar. +- export o.a.xmlrpc from xmlrpc-client jar. + +* 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 + +* Tue Mar 04 2014 Stanislav Ochotnicky - 1:3.1.3-8 +- Use Requires: java-headless rebuild (#1067528) + +* Sun Aug 04 2013 Fedora Release Engineering - 1:3.1.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Jun 14 2013 Mikolaj Izdebski - 1:3.1.3-6 +- Update to current packaging guidelines + +* Fri May 17 2013 Alexander Kurtakov 1:3.1.3-5 +- Remove javax.xml.bind from osgi imports - it's part of the JVM now. +- Drop the ws-jaxme dependency for the same reason. + +* Fri Feb 15 2013 Fedora Release Engineering - 1:3.1.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 1:3.1.3-3 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Sat Oct 20 2012 Peter Robinson 3.1.3-2 +- xmlrpc v2 had an Epoch so we need one here. Add it back + +* Fri Sep 14 2012 Alexander Kurtakov 3.1.3-1 +- First release of version 3.x package