diff --git a/.gitignore b/.gitignore
index 217efb5..7d403e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
xmlrpc-3.0-src.tar.gz
xmlrpc3-buildfiles.tar.bz2
xmlrpc3-ant-osgimanifests.tar.bz2
+apache-xmlrpc-3.1.3-src.tar.bz2
diff --git a/sources b/sources
index 8ef39a4..f4bbd2c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-99500a5d04f2eb558716ba3d5a613d14 xmlrpc-3.0-src.tar.gz
-107ca9a1e78fcdacc9d5663a9ad3b464 xmlrpc3-ant-osgimanifests.tar.bz2
-b37aad1969dc66057d556bc18ba2ae61 xmlrpc3-buildfiles.tar.bz2
+f7817485fa6a6a500c49ec9515d1f3b9 apache-xmlrpc-3.1.3-src.tar.bz2
diff --git a/xmlrpc3-addjunitandservletapitotestpom.patch b/xmlrpc3-addjunitandservletapitotestpom.patch
index d1b4945..1279bc2 100644
--- a/xmlrpc3-addjunitandservletapitotestpom.patch
+++ b/xmlrpc3-addjunitandservletapitotestpom.patch
@@ -1,20 +1,13 @@
---- tests/pom.xml 2006-08-30 16:12:43.000000000 -0400
-+++ tests/pom.xml 2007-03-19 14:09:58.000000000 -0400
-@@ -44,5 +44,17 @@
- commons-httpclient
- test
-
-+
-+ javax.servlet
-+ servlet-api
-+ 2.4
-+ provided
-+
-+
-+ junit
-+ junit
-+ 3.8.1
-+ test
-+
-
-
+--- pom.xml.sav 2010-09-29 09:41:00.044633260 +0300
++++ pom.xml 2010-09-29 09:42:19.943607330 +0300
+@@ -88,5 +88,10 @@
+ commons-httpclient
+ test
+
++
++ junit
++ junit
++ test
++
+
+
diff --git a/xmlrpc3-ant-osgimanifests.patch b/xmlrpc3-ant-osgimanifests.patch
deleted file mode 100644
index 77a74bb..0000000
--- a/xmlrpc3-ant-osgimanifests.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up ./client/maven-build.xml.manifest ./client/maven-build.xml
---- ./client/maven-build.xml.manifest 2009-12-09 13:41:23.000000000 -0500
-+++ ./client/maven-build.xml 2009-12-09 13:42:14.000000000 -0500
-@@ -187,6 +187,7 @@
- compress="true"
- index="false"
- basedir="${maven.build.outputDir}"
-+ manifest="${maven.build.srcDir.0}/META-INF/MANIFEST.MF"
- excludes="**/package.html"/>
-
-
-diff -up ./common/maven-build.xml.manifest ./common/maven-build.xml
---- ./common/maven-build.xml.manifest 2009-12-09 13:41:59.000000000 -0500
-+++ ./common/maven-build.xml 2009-12-09 13:41:03.000000000 -0500
-@@ -173,6 +173,7 @@
- compress="true"
- index="false"
- basedir="${maven.build.outputDir}"
-+ manifest="${maven.build.srcDir.0}/META-INF/MANIFEST.MF"
- excludes="**/package.html"/>
-
-
-diff -up ./server/maven-build.xml.manifest ./server/maven-build.xml
---- ./server/maven-build.xml.manifest 2009-12-09 13:41:32.000000000 -0500
-+++ ./server/maven-build.xml 2009-12-09 13:42:07.000000000 -0500
-@@ -183,6 +183,7 @@
- compress="true"
- index="false"
- basedir="${maven.build.outputDir}"
-+ manifest="${maven.build.srcDir.0}/META-INF/MANIFEST.MF"
- excludes="**/package.html"/>
-
-
diff --git a/xmlrpc3-client-addosgimanifest.patch b/xmlrpc3-client-addosgimanifest.patch
index 0db05fa..b6c620d 100644
--- a/xmlrpc3-client-addosgimanifest.patch
+++ b/xmlrpc3-client-addosgimanifest.patch
@@ -1,34 +1,20 @@
---- pom.xml.orig 2007-09-06 14:09:29.000000000 -0400
-+++ pom.xml 2007-09-06 14:14:25.000000000 -0400
-@@ -11,7 +11,30 @@
- Apache XML-RPC Client Library
-
- src/main/java
--
-+
-+
-+ org.apache.maven.plugins
-+ maven-jar-plugin
-+
-+
-+
-+ 2
-+ %Bundle-Name
-+ plugin
-+ org.apache.xmlrpc
-+ 3.0.0.qualifier
-+ org.apache.xmlrpc.common
-+ org.apache.xmlrpc.client, org.apache.xmlrpc.client.util
-+ javax.xml.bind, 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
-+
-+
-+
-+
-+
-+
-
-
- org.apache.xmlrpc
+--- 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
++ 3.0.0.qualifier
++ org.apache.xmlrpc.common
++ org.apache.xmlrpc.client, org.apache.xmlrpc.client.util
++ javax.xml.bind, 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/xmlrpc3-common-addosgimanifest.patch b/xmlrpc3-common-addosgimanifest.patch
index c0cfc0a..ca2f890 100644
--- a/xmlrpc3-common-addosgimanifest.patch
+++ b/xmlrpc3-common-addosgimanifest.patch
@@ -1,29 +1,19 @@
---- pom.xml.orig 2007-09-06 14:09:36.000000000 -0400
-+++ pom.xml 2007-09-06 14:12:43.000000000 -0400
-@@ -34,6 +34,26 @@
-
-
- -->
-+
-+ org.apache.maven.plugins
-+ maven-jar-plugin
-+
-+
-+
-+ 2
-+ %Bundle-Name
-+ plugin
-+ org.apache.xmlrpc.common
-+ 3.0.0.qualifier
-+ 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.bind, 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
-+
-+
-+
-+
-
-
-
+--- 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
++ 3.0.0.qualifier
++ 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.bind, 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/xmlrpc3-jpp-depmap.xml b/xmlrpc3-jpp-depmap.xml
index d6c858a..fff971d 100644
--- a/xmlrpc3-jpp-depmap.xml
+++ b/xmlrpc3-jpp-depmap.xml
@@ -1,18 +1,6 @@
- junit
- junit
- 3.8.1
-
-
- JPP
- junit
- 3.8.1
-
-
-
-
jaxme
jaxmeapi
0.5.1
@@ -25,7 +13,7 @@
- org.apache.ws.commons
+ org.apache.ws.commons.util
ws-commons-util
1.0.1
@@ -35,16 +23,4 @@
1.0.1
-
-
- javax.servlet
- servlet-api
- 2.4
-
-
- JPP
- tomcat5-servlet-2.4-api
- 2.4
-
-
diff --git a/xmlrpc3.spec b/xmlrpc3.spec
index ecc8a21..9ad8159 100644
--- a/xmlrpc3.spec
+++ b/xmlrpc3.spec
@@ -29,49 +29,36 @@
#
%global mainname xmlrpc
-%global with_maven 0
Name: xmlrpc3
-Version: 3.0
-Release: 5%{?dist}
+Version: 3.1.3
+Release: 1%{?dist}
Summary: Java XML-RPC implementation
License: ASL 2.0
Group: Development/Libraries
-Url: http://ws.apache.org/xmlrpc/
-Source0: http://archive.apache.org/dist/ws/xmlrpc/sources/xmlrpc-%{version}-src.tar.gz
+URL: http://ws.apache.org/xmlrpc/
+Source0: http://www.apache.org/dist//ws/xmlrpc/sources/apache-xmlrpc-%{version}-src.tar.bz2
Source1: %{name}-jpp-depmap.xml
-%if ! %{with_maven}
-# These build files were generated with mvn ant:ant
-Source2: %{name}-buildfiles.tar.bz2
-Source3: %{name}-ant-osgimanifests.tar.bz2
-%endif
# FIXME: file this upstream
# The tests pom.xml doesn't include necessary dependencies on junit and
# servletapi
Patch0: %{name}-addjunitandservletapitotestpom.patch
-%if %{with_maven}
# Add OSGi MANIFEST information
Patch1: %{name}-client-addosgimanifest.patch
Patch2: %{name}-common-addosgimanifest.patch
-%else
Patch3: %{name}-ant-osgimanifests.patch
-%endif
BuildRequires: dos2unix
-%if %{with_maven}
BuildRequires: maven2 >= 2.0.4
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-surefire
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-eclipse
-BuildRequires: maven2-plugin-assembly
-BuildRequires: maven2-plugin-source
-%else
-BuildRequires: ant
-%endif
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-surefire-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-eclipse-plugin
+BuildRequires: maven-assembly-plugin
+BuildRequires: maven-source-plugin
BuildRequires: ws-jaxme
BuildRequires: ws-commons-util
BuildRequires: jpackage-utils >= 0:1.6
@@ -79,13 +66,13 @@ BuildRequires: servletapi5
BuildRequires: tomcat5
BuildRequires: junit
BuildRequires: jakarta-commons-httpclient
-BuildRequires: jakarta-commons-codec >= 1.3
+BuildRequires: apache-commons-codec >= 1.3
BuildRequires: jsse
Requires: jpackage-utils >= 0:1.6
Requires: servletapi5
Requires: junit
Requires: jakarta-commons-httpclient
-Requires: jakarta-commons-codec >= 1.3
+Requires: apache-commons-codec >= 1.3
Requires: jsse
Requires: ws-jaxme
Requires: ws-commons-util
@@ -112,158 +99,52 @@ Javadoc for %{name}.
%package common
Summary: Common classes for XML-RPC client and server implementations
Group: Development/Libraries
+Obsoletes: %{name}-common-devel <= %{version}
%description common
%{summary}.
-%package common-devel
-Summary: Source for common classes of XML-RPC
-Group: Development/Libraries
-Requires: %{name}-common
-
-%description common-devel
-%{summary} client and server implementations.
-
%package client
Summary: XML-RPC client implementation
Group: Development/Libraries
Requires: %{name}-common
+Obsoletes: %{name}-client-devel <= %{version}
%description client
%{summary}.
-%package client-devel
-Summary: Source for XML-RPC client implementation
-Group: Development/Libraries
-Requires: %{name}-client
-
-%description client-devel
-%{summary}.
-
%package server
Summary: XML-RPC server implementation
Group: Development/Libraries
Requires: %{name}-common
+Obsoletes: %{name}-server-devel <= %{version}
%description server
%{summary}.
-%package server-devel
-Summary: Source for XML-RPC server implementation
-Group: Development/Libraries
-Requires: %{name}-server
-
-%description server-devel
-%{summary}.
-
%prep
-%setup -q -n %{mainname}-%{version}
-%patch0
-%if %{with_maven}
-cp %{SOURCE1} .
+%setup -q -n apache-%{mainname}-%{version}-src
+pushd server
+%patch0 -b .sav
+popd
pushd client
-%patch1
+%patch1 -b .sav
popd
pushd common
-%patch2
+%patch2 -b .sav
popd
-%else
-tar jxf %{SOURCE2}
-tar jxf %{SOURCE3}
-%patch3
-%endif
-
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-rm -rf $MAVEN_REPO_LOCAL
-mkdir -p $MAVEN_REPO_LOCAL
-
-%if ! %{with_maven}
-mkdir -p $MAVEN_REPO_LOCAL/org/apache/ws/commons/ws-commons-util/1.0.1
-ln -s %{_javadir}/ws-commons-util-1.0.1.jar \
- $MAVEN_REPO_LOCAL/org/apache/ws/commons/ws-commons-util/1.0.1
-
-mkdir -p $MAVEN_REPO_LOCAL/junit/junit/3.8.1
-ln -s %{_javadir}/junit-3.8.2.jar \
- $MAVEN_REPO_LOCAL/junit/junit/3.8.1/junit-3.8.1.jar
-
-mkdir -p $MAVEN_REPO_LOCAL/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar
-ln -s %{_javadir}/xml-commons-apis-1.3.04.jar \
- $MAVEN_REPO_LOCAL/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar
-
-mkdir -p $MAVEN_REPO_LOCAL/jaxme/jaxmeapi/0.5.1/jaxmeapi-0.5.1.jar
-ln -s %{_javadir}/jaxme/ws-jaxmeapi-0.5.1.jar \
- $MAVEN_REPO_LOCAL/jaxme/jaxmeapi/0.5.1
-
-mkdir -p $MAVEN_REPO_LOCAL/commons-httpclient/commons-httpclient/3.0.1
-ln -s %{_javadir}/commons-httpclient.jar \
- $MAVEN_REPO_LOCAL/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar
-
-mkdir -p $MAVEN_REPO_LOCAL/commons-logging/commons-logging/1.1
-ln -s %{_javadir}/commons-logging.jar \
- $MAVEN_REPO_LOCAL/commons-logging/commons-logging/1.1/commons-logging-1.1.jar
-mkdir -p $MAVEN_REPO_LOCAL/log4j/log4j/1.2.12
-ln -s %{_javadir}/log4j.jar \
- $MAVEN_REPO_LOCAL/log4j/log4j/1.2.12/log4j-1.2.12.jar
-
-mkdir -p $MAVEN_REPO_LOCAL/logkit/logkit/1.0.1
-ln -s %{_javadir}/avalon-logkit.jar \
- $MAVEN_REPO_LOCAL/logkit/logkit/1.0.1/logkit-1.0.1.jar
-
-mkdir -p $MAVEN_REPO_LOCAL/avalon-framework/avalon-framework/4.1.3
-ln -s %{_javadir}/avalon-framework.jar \
- $MAVEN_REPO_LOCAL/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar
-
-mkdir -p $MAVEN_REPO_LOCAL/javax/servlet/servlet-api/2.4
-ln -s %{_javadir}/servlet_2_4_api.jar \
- $MAVEN_REPO_LOCAL/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar
-
-mkdir -p $MAVEN_REPO_LOCAL/commons-codec/commons-codec/1.2
-ln -s %{_javadir}/commons-codec.jar \
- $MAVEN_REPO_LOCAL/commons-codec/commons-codec/1.2/commons-codec-1.2.jar
-
-# These next three will appear broken but become un-broken during the build
-mkdir -p $MAVEN_REPO_LOCAL/org/apache/xmlrpc/xmlrpc-common/3.0
-ln -s ../../../../../../../common/target/xmlrpc-common-3.0.jar \
- $MAVEN_REPO_LOCAL/org/apache/xmlrpc/xmlrpc-common/3.0/xmlrpc-common-3.0.jar
-
-mkdir -p $MAVEN_REPO_LOCAL/org/apache/xmlrpc/xmlrpc-client/3.0
-ln -s ../../../../../../../client/target/xmlrpc-client-3.0.jar \
- $MAVEN_REPO_LOCAL/org/apache/xmlrpc/xmlrpc-client/3.0/xmlrpc-client-3.0.jar
-
-mkdir -p $MAVEN_REPO_LOCAL/org/apache/xmlrpc/xmlrpc-server/3.0
-ln -s ../../../../../../../server/target/xmlrpc-server-3.0.jar \
- $MAVEN_REPO_LOCAL/org/apache/xmlrpc/xmlrpc-server/3.0/xmlrpc-server-3.0.jar
-%endif
+dos2unix LICENSE.txt
%build
-dos2unix LICENSE.txt
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
-%if %{with_maven}
-# The java.home is due to java-gcj and libgcj weirdness on 64-bit
-# systems
mvn-jpp \
-e \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Djava.home=%{_jvmdir}/java/jre \
-Dmaven2.jpp.depmap.file=%{SOURCE1} \
-Dmaven.test.failure.ignore=true \
- install javadoc:javadoc
-%else
-ant -Dmaven.mode.offline=true -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- javadoc package
-find -name \.svn | xargs rm -rf
-jar cf common/target/%{mainname}-common-%{version}-sources.jar \
- common/src/main/java/META-INF/MANIFEST.MF \
- -C common/src/main/java .
-jar cf client/target/%{mainname}-client-%{version}-sources.jar \
- client/src/main/java/META-INF/MANIFEST.MF \
- -C client/src/main/java .
-jar cf server/target/%{mainname}-server-%{version}-sources.jar \
- server/src/main/java/META-INF/MANIFEST.MF \
- -C server/src/main/java .
-%endif
+ install javadoc:aggregate
%install
rm -rf $RPM_BUILD_ROOT
@@ -291,24 +172,9 @@ install -Dm 644 server/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-server
%add_to_maven_depmap org.apache.xmlrpc %{mainname}-client %{version} JPP %{name}-client
%add_to_maven_depmap org.apache.xmlrpc %{mainname}-server %{version} JPP %{name}-server
-
-# sources jars
-install -m 644 client/target/%{mainname}-client-%{version}-sources.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-client-%{version}-sources.jar
-install -m 644 server/target/%{mainname}-server-%{version}-sources.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-server-%{version}-sources.jar
-install -m 644 common/target/%{mainname}-common-%{version}-sources.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-common-%{version}-sources.jar
-
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-%if %{with_maven}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-%else
-cp -pr common/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr client/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr server/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -329,35 +195,30 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE.txt
%{_mavenpomdir}/JPP-%{name}.pom
%{_mavenpomdir}/JPP-%{name}-common.pom
-%{_mavenpomdir}/JPP-%{name}-client.pom
-%{_mavenpomdir}/JPP-%{name}-server.pom
%{_mavendepmapfragdir}/%{name}
%{_javadir}/%{name}-common.jar
%{_javadir}/%{name}-common-%{version}.jar
-%files common-devel
-%defattr(-,root,root,-)
-%{_javadir}/%{name}-common-%{version}-sources.jar
-
%files client
%defattr(-,root,root,-)
+%{_mavenpomdir}/JPP-%{name}-client.pom
%{_javadir}/%{name}-client.jar
%{_javadir}/%{name}-client-%{version}.jar
-%files client-devel
-%defattr(-,root,root,-)
-%{_javadir}/%{name}-client-%{version}-sources.jar
-
%files server
%defattr(-,root,root,-)
+%{_mavenpomdir}/JPP-%{name}-server.pom
%{_javadir}/%{name}-server.jar
%{_javadir}/%{name}-server-%{version}.jar
-%files server-devel
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}-server-%{version}-sources.jar
-
%changelog
+* Wed Sep 29 2010 Alexander Kurtakov 3.1.3-1
+- Update to new version.
+- Drop devel subpackages.
+- Drop ant build.
+- Move poms to the proper subpackages.
+- Use new names of dependencies.
+
* Wed Jul 21 2010 Stanislav Ochotnicky - 3.0-5
- Install maven depmaps and pom.xml files