From d3a0373023186d2ae32965bf0f933d8e96d55488 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 03:31:35 +0000 Subject: [PATCH 01/19] Initialize branch F-13 for xmlrpc3 --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From ff997586ecc3f5d97cc0315bb33cce9926a763ab Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Mon, 12 Jul 2010 19:04:52 +0000 Subject: [PATCH 02/19] - Ensure license is also in -javadoc package --- xmlrpc3.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xmlrpc3.spec b/xmlrpc3.spec index 066dcce..cadc9c7 100644 --- a/xmlrpc3.spec +++ b/xmlrpc3.spec @@ -33,7 +33,7 @@ Name: xmlrpc3 Version: 3.0 -Release: 4.14%{?dist} +Release: 4.15%{?dist} Summary: Java XML-RPC implementation License: ASL 2.0 Group: Development/Libraries @@ -90,7 +90,7 @@ Requires: jsse Requires: ws-jaxme Requires: ws-commons-util -Buildarch: noarch +BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -300,6 +300,7 @@ rm -rf $RPM_BUILD_ROOT %files javadoc %defattr(-,root,root,-) +%doc LICENSE.txt %{_javadocdir}/* %files common @@ -331,6 +332,9 @@ rm -rf $RPM_BUILD_ROOT %{_javadir}/%{name}-server-%{version}-sources.jar %changelog +* Mon Jul 12 2010 Andrew Overholt 3.0-4.15 +- Ensure license is also in -javadoc package + * Wed Jan 13 2010 Andrew Overholt 3.0-4.14 - Really drop maven2-plugin-release BR. From 73084dabbe2cc0da28abed374dfd4977ffaa0937 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:56:55 +0000 Subject: [PATCH 03/19] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index c1a80bd..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xmlrpc3 -# $Id$ -NAME := xmlrpc3 -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 From cb1dbe37f2f597b3b12b99ef8dbb8cb8aca32ee4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:56:59 +0000 Subject: [PATCH 04/19] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index c1a80bd..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xmlrpc3 -# $Id$ -NAME := xmlrpc3 -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 7baabe7e4c531ca0dd02b19c68dd68d56013ecf5 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Tue, 24 Aug 2010 18:34:55 +0300 Subject: [PATCH 05/19] Install maven depmaps and poms. --- xmlrpc3.spec | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/xmlrpc3.spec b/xmlrpc3.spec index cadc9c7..ecc8a21 100644 --- a/xmlrpc3.spec +++ b/xmlrpc3.spec @@ -33,7 +33,7 @@ Name: xmlrpc3 Version: 3.0 -Release: 4.15%{?dist} +Release: 5%{?dist} Summary: Java XML-RPC implementation License: ASL 2.0 Group: Development/Libraries @@ -89,6 +89,8 @@ Requires: jakarta-commons-codec >= 1.3 Requires: jsse Requires: ws-jaxme Requires: ws-commons-util +Requires(post): jpackage-utils +Requires(postun): jpackage-utils BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -277,6 +279,19 @@ install -m 644 common/target/%{mainname}-common-%{version}.jar \ (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do \ ln -sf ${jar} ${jar/-%{version}/}; done) +# install maven pom files +install -Dm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom +install -Dm 644 common/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-common.pom +install -Dm 644 client/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-client.pom +install -Dm 644 server/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-server.pom + +# ... and maven depmaps +%add_to_maven_depmap org.apache.xmlrpc %{mainname} %{version} JPP %{name} +%add_to_maven_depmap org.apache.xmlrpc %{mainname}-common %{version} JPP %{name}-common +%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 @@ -298,6 +313,12 @@ cp -pr server/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{vers %clean rm -rf $RPM_BUILD_ROOT +%post common +%update_maven_depmap + +%postun common +%update_maven_depmap + %files javadoc %defattr(-,root,root,-) %doc LICENSE.txt @@ -306,6 +327,11 @@ rm -rf $RPM_BUILD_ROOT %files common %defattr(-,root,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 @@ -332,6 +358,9 @@ rm -rf $RPM_BUILD_ROOT %{_javadir}/%{name}-server-%{version}-sources.jar %changelog +* Wed Jul 21 2010 Stanislav Ochotnicky - 3.0-5 +- Install maven depmaps and pom.xml files + * Mon Jul 12 2010 Andrew Overholt 3.0-4.15 - Ensure license is also in -javadoc package From baee213eb4e6ef36a35ff2e641250af046fdfad4 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Wed, 29 Sep 2010 09:59:41 +0300 Subject: [PATCH 06/19] - Update to new version. - Drop devel subpackages. - Drop ant build. - Move poms to the proper subpackages. - Use new names of dependencies. --- .gitignore | 1 + sources | 4 +- xmlrpc3-addjunitandservletapitotestpom.patch | 33 ++- xmlrpc3-ant-osgimanifests.patch | 33 --- xmlrpc3-client-addosgimanifest.patch | 54 ++--- xmlrpc3-common-addosgimanifest.patch | 48 ++--- xmlrpc3-jpp-depmap.xml | 26 +-- xmlrpc3.spec | 209 ++++--------------- 8 files changed, 90 insertions(+), 318 deletions(-) delete mode 100644 xmlrpc3-ant-osgimanifests.patch 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,16 +1,4 @@ - - - junit - junit - 3.8.1 - - - JPP - junit - 3.8.1 - - jaxme @@ -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 From 59315cf21c433a7437f9392c9e3c611af05e6b74 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Wed, 29 Sep 2010 10:04:55 +0300 Subject: [PATCH 07/19] - Really remove old patch. --- xmlrpc3.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xmlrpc3.spec b/xmlrpc3.spec index 9ad8159..9a7500a 100644 --- a/xmlrpc3.spec +++ b/xmlrpc3.spec @@ -32,7 +32,7 @@ Name: xmlrpc3 Version: 3.1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java XML-RPC implementation License: ASL 2.0 Group: Development/Libraries @@ -46,7 +46,6 @@ Patch0: %{name}-addjunitandservletapitotestpom.patch # Add OSGi MANIFEST information Patch1: %{name}-client-addosgimanifest.patch Patch2: %{name}-common-addosgimanifest.patch -Patch3: %{name}-ant-osgimanifests.patch BuildRequires: dos2unix BuildRequires: maven2 >= 2.0.4 @@ -212,6 +211,9 @@ rm -rf $RPM_BUILD_ROOT %{_javadir}/%{name}-server-%{version}.jar %changelog +* Wed Sep 29 2010 Alexander Kurtakov 3.1.3-2 +- Really remove old patch. + * Wed Sep 29 2010 Alexander Kurtakov 3.1.3-1 - Update to new version. - Drop devel subpackages. From bd399491119da188c1247431dd5d784bae0fe3b3 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Wed, 29 Sep 2010 10:15:00 +0300 Subject: [PATCH 08/19] - Add missing maven-site-plugin BR. --- xmlrpc3.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xmlrpc3.spec b/xmlrpc3.spec index 9a7500a..c9908c6 100644 --- a/xmlrpc3.spec +++ b/xmlrpc3.spec @@ -32,7 +32,7 @@ Name: xmlrpc3 Version: 3.1.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java XML-RPC implementation License: ASL 2.0 Group: Development/Libraries @@ -58,6 +58,7 @@ BuildRequires: maven-javadoc-plugin BuildRequires: maven-eclipse-plugin BuildRequires: maven-assembly-plugin BuildRequires: maven-source-plugin +BuildRequires: maven-site-plugin BuildRequires: ws-jaxme BuildRequires: ws-commons-util BuildRequires: jpackage-utils >= 0:1.6 @@ -211,6 +212,9 @@ rm -rf $RPM_BUILD_ROOT %{_javadir}/%{name}-server-%{version}.jar %changelog +* Wed Sep 29 2010 Alexander Kurtakov 3.1.3-3 +- Add missing maven-site-plugin BR. + * Wed Sep 29 2010 Alexander Kurtakov 3.1.3-2 - Really remove old patch. From 91b6d3ed754d27b425e91ea8d3999eb393130a2c Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Thu, 9 Dec 2010 17:25:52 +0100 Subject: [PATCH 09/19] Fix Requires (split to sub-packages, change codec to logging) - Make jars and javadocs versionless --- xmlrpc3.spec | 61 ++++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/xmlrpc3.spec b/xmlrpc3.spec index c9908c6..faa85e0 100644 --- a/xmlrpc3.spec +++ b/xmlrpc3.spec @@ -32,7 +32,7 @@ Name: xmlrpc3 Version: 3.1.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java XML-RPC implementation License: ASL 2.0 Group: Development/Libraries @@ -47,7 +47,6 @@ Patch0: %{name}-addjunitandservletapitotestpom.patch Patch1: %{name}-client-addosgimanifest.patch Patch2: %{name}-common-addosgimanifest.patch -BuildRequires: dos2unix BuildRequires: maven2 >= 2.0.4 BuildRequires: maven-resources-plugin BuildRequires: maven-compiler-plugin @@ -62,25 +61,14 @@ BuildRequires: maven-site-plugin BuildRequires: ws-jaxme BuildRequires: ws-commons-util BuildRequires: jpackage-utils >= 0:1.6 -BuildRequires: servletapi5 -BuildRequires: tomcat5 +BuildRequires: servlet25 +BuildRequires: tomcat6 BuildRequires: junit BuildRequires: jakarta-commons-httpclient -BuildRequires: apache-commons-codec >= 1.3 +BuildRequires: apache-commons-logging BuildRequires: jsse -Requires: jpackage-utils >= 0:1.6 -Requires: servletapi5 -Requires: junit -Requires: jakarta-commons-httpclient -Requires: apache-commons-codec >= 1.3 -Requires: jsse -Requires: ws-jaxme -Requires: ws-commons-util -Requires(post): jpackage-utils -Requires(postun): jpackage-utils BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Apache XML-RPC is a Java implementation of XML-RPC, a popular protocol @@ -100,6 +88,12 @@ Javadoc for %{name}. Summary: Common classes for XML-RPC client and server implementations Group: Development/Libraries Obsoletes: %{name}-common-devel <= %{version} +Requires: ws-jaxme +Requires: ws-commons-util +Requires: jpackage-utils >= 0:1.6 +Requires: apache-commons-logging +Requires(post): jpackage-utils +Requires(postun): jpackage-utils %description common %{summary}. @@ -108,6 +102,7 @@ Obsoletes: %{name}-common-devel <= %{version} Summary: XML-RPC client implementation Group: Development/Libraries Requires: %{name}-common +Requires: jakarta-commons-httpclient Obsoletes: %{name}-client-devel <= %{version} %description client @@ -116,7 +111,9 @@ Obsoletes: %{name}-client-devel <= %{version} %package server Summary: XML-RPC server implementation Group: Development/Libraries -Requires: %{name}-common +Requires: %{name}-client +Requires: junit +Requires: servlet25 Obsoletes: %{name}-server-devel <= %{version} %description server @@ -134,11 +131,12 @@ pushd common %patch2 -b .sav popd -dos2unix LICENSE.txt +sed -i 's/\r//' LICENSE.txt %build export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository mkdir -p $MAVEN_REPO_LOCAL +# ignore test failure because server part needs network mvn-jpp \ -e \ -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ @@ -152,13 +150,11 @@ rm -rf $RPM_BUILD_ROOT # jars install -d -m 755 $RPM_BUILD_ROOT%{_javadir} install -m 644 client/target/%{mainname}-client-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-client-%{version}.jar + $RPM_BUILD_ROOT%{_javadir}/%{name}-client.jar install -m 644 server/target/%{mainname}-server-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-server-%{version}.jar + $RPM_BUILD_ROOT%{_javadir}/%{name}-server.jar install -m 644 common/target/%{mainname}-common-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-common-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do \ -ln -sf ${jar} ${jar/-%{version}/}; done) + $RPM_BUILD_ROOT%{_javadir}/%{name}-common.jar # install maven pom files install -Dm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom @@ -173,11 +169,8 @@ install -Dm 644 server/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-server %add_to_maven_depmap org.apache.xmlrpc %{mainname}-server %{version} JPP %{name}-server # javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} - -%clean -rm -rf $RPM_BUILD_ROOT +install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %post common %update_maven_depmap @@ -185,6 +178,11 @@ rm -rf $RPM_BUILD_ROOT %postun common %update_maven_depmap +%pre javadoc +# workaround rpm bug, can be removed in F-17 +[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \ +rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : + %files javadoc %defattr(-,root,root,-) %doc LICENSE.txt @@ -197,21 +195,22 @@ rm -rf $RPM_BUILD_ROOT %{_mavenpomdir}/JPP-%{name}-common.pom %{_mavendepmapfragdir}/%{name} %{_javadir}/%{name}-common.jar -%{_javadir}/%{name}-common-%{version}.jar %files client %defattr(-,root,root,-) %{_mavenpomdir}/JPP-%{name}-client.pom %{_javadir}/%{name}-client.jar -%{_javadir}/%{name}-client-%{version}.jar %files server %defattr(-,root,root,-) %{_mavenpomdir}/JPP-%{name}-server.pom %{_javadir}/%{name}-server.jar -%{_javadir}/%{name}-server-%{version}.jar %changelog +* Thu Dec 9 2010 Stanislav Ochotnicky - 3.1.3-4 +- Fix Requires (split to sub-packages, change codec to logging) +- Make jars and javadocs versionless + * Wed Sep 29 2010 Alexander Kurtakov 3.1.3-3 - Add missing maven-site-plugin BR. From 8b48cc32b01b890ae9d4a1417c506bbac044dee2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 23:33:58 -0600 Subject: [PATCH 10/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- xmlrpc3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlrpc3.spec b/xmlrpc3.spec index faa85e0..c63870a 100644 --- a/xmlrpc3.spec +++ b/xmlrpc3.spec @@ -32,7 +32,7 @@ Name: xmlrpc3 Version: 3.1.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java XML-RPC implementation License: ASL 2.0 Group: Development/Libraries @@ -207,6 +207,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %{_javadir}/%{name}-server.jar %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 3.1.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Thu Dec 9 2010 Stanislav Ochotnicky - 3.1.3-4 - Fix Requires (split to sub-packages, change codec to logging) - Make jars and javadocs versionless From 80e82552654dfeb2ac0b87cd60dd7294a4f23e77 Mon Sep 17 00:00:00 2001 From: Sami Wagiaalla Date: Mon, 28 Nov 2011 18:13:20 -0500 Subject: [PATCH 11/19] Use mvn-rpmbuild. * Mon Nov 28 2011 Sami Wagiaalla - Use mvn-rpmbuild. - Change the depmaps flag. - Use BR maven istead of maven2. --- xmlrpc3.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/xmlrpc3.spec b/xmlrpc3.spec index c63870a..68c52cc 100644 --- a/xmlrpc3.spec +++ b/xmlrpc3.spec @@ -32,7 +32,7 @@ Name: xmlrpc3 Version: 3.1.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java XML-RPC implementation License: ASL 2.0 Group: Development/Libraries @@ -47,7 +47,7 @@ Patch0: %{name}-addjunitandservletapitotestpom.patch Patch1: %{name}-client-addosgimanifest.patch Patch2: %{name}-common-addosgimanifest.patch -BuildRequires: maven2 >= 2.0.4 +BuildRequires: maven BuildRequires: maven-resources-plugin BuildRequires: maven-compiler-plugin BuildRequires: maven-surefire-plugin @@ -137,10 +137,9 @@ sed -i 's/\r//' LICENSE.txt export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository mkdir -p $MAVEN_REPO_LOCAL # ignore test failure because server part needs network -mvn-jpp \ +mvn-rpmbuild \ -e \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - -Dmaven2.jpp.depmap.file=%{SOURCE1} \ + -Dmaven.local.depmap.file=%{SOURCE1} \ -Dmaven.test.failure.ignore=true \ install javadoc:aggregate @@ -207,6 +206,11 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %{_javadir}/%{name}-server.jar %changelog +* Mon Nov 28 2011 Sami Wagiaalla - 3.1.3-6 +- Use mvn-rpmbuild. +- Change the depmaps flag. +- Use BR maven istead of maven2. + * Mon Feb 07 2011 Fedora Release Engineering - 3.1.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 803feb9c658aa04911048dbb64659330094610a2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 03:04:37 -0600 Subject: [PATCH 12/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- xmlrpc3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlrpc3.spec b/xmlrpc3.spec index 68c52cc..9c68eb7 100644 --- a/xmlrpc3.spec +++ b/xmlrpc3.spec @@ -32,7 +32,7 @@ Name: xmlrpc3 Version: 3.1.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Java XML-RPC implementation License: ASL 2.0 Group: Development/Libraries @@ -206,6 +206,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %{_javadir}/%{name}-server.jar %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 3.1.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Nov 28 2011 Sami Wagiaalla - 3.1.3-6 - Use mvn-rpmbuild. - Change the depmaps flag. From a008d2e284fd3b1162fe78a3faf06e2dabbf45fe Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Fri, 23 Mar 2012 10:08:39 +0200 Subject: [PATCH 13/19] Build against tomcat v7 apis. - Guideline fixes. --- xmlrpc3.spec | 40 +++++++++++----------------------------- 1 file changed, 11 insertions(+), 29 deletions(-) diff --git a/xmlrpc3.spec b/xmlrpc3.spec index 9c68eb7..6e8acb5 100644 --- a/xmlrpc3.spec +++ b/xmlrpc3.spec @@ -32,17 +32,13 @@ Name: xmlrpc3 Version: 3.1.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Java XML-RPC implementation License: ASL 2.0 Group: Development/Libraries 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 -# FIXME: file this upstream -# The tests pom.xml doesn't include necessary dependencies on junit and -# servletapi -Patch0: %{name}-addjunitandservletapitotestpom.patch # Add OSGi MANIFEST information Patch1: %{name}-client-addosgimanifest.patch Patch2: %{name}-common-addosgimanifest.patch @@ -61,8 +57,7 @@ BuildRequires: maven-site-plugin BuildRequires: ws-jaxme BuildRequires: ws-commons-util BuildRequires: jpackage-utils >= 0:1.6 -BuildRequires: servlet25 -BuildRequires: tomcat6 +BuildRequires: tomcat-servlet-3.0-api BuildRequires: junit BuildRequires: jakarta-commons-httpclient BuildRequires: apache-commons-logging @@ -92,8 +87,6 @@ Requires: ws-jaxme Requires: ws-commons-util Requires: jpackage-utils >= 0:1.6 Requires: apache-commons-logging -Requires(post): jpackage-utils -Requires(postun): jpackage-utils %description common %{summary}. @@ -113,7 +106,7 @@ Summary: XML-RPC server implementation Group: Development/Libraries Requires: %{name}-client Requires: junit -Requires: servlet25 +Requires: tomcat-servlet-3.0-api Obsoletes: %{name}-server-devel <= %{version} %description server @@ -121,9 +114,6 @@ Obsoletes: %{name}-server-devel <= %{version} %prep %setup -q -n apache-%{mainname}-%{version}-src -pushd server -%patch0 -b .sav -popd pushd client %patch1 -b .sav popd @@ -134,8 +124,6 @@ popd sed -i 's/\r//' LICENSE.txt %build -export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository -mkdir -p $MAVEN_REPO_LOCAL # ignore test failure because server part needs network mvn-rpmbuild \ -e \ @@ -162,33 +150,25 @@ install -Dm 644 client/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-client install -Dm 644 server/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-server.pom # ... and maven depmaps -%add_to_maven_depmap org.apache.xmlrpc %{mainname} %{version} JPP %{name} -%add_to_maven_depmap org.apache.xmlrpc %{mainname}-common %{version} JPP %{name}-common -%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 +%add_maven_depmap JPP-%{name}.pom +%add_maven_depmap JPP-%{name}-common.pom %{name}-common.jar +%add_maven_depmap JPP-%{name}-client.pom %{name}-client.jar +%add_maven_depmap JPP-%{name}-server.pom %{name}-server.jar # javadoc install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} -%post common -%update_maven_depmap - -%postun common -%update_maven_depmap - %pre javadoc # workaround rpm bug, can be removed in F-17 [ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %files javadoc -%defattr(-,root,root,-) %doc LICENSE.txt %{_javadocdir}/* %files common -%defattr(-,root,root,-) %doc LICENSE.txt %{_mavenpomdir}/JPP-%{name}.pom %{_mavenpomdir}/JPP-%{name}-common.pom @@ -196,16 +176,18 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %{_javadir}/%{name}-common.jar %files client -%defattr(-,root,root,-) %{_mavenpomdir}/JPP-%{name}-client.pom %{_javadir}/%{name}-client.jar %files server -%defattr(-,root,root,-) %{_mavenpomdir}/JPP-%{name}-server.pom %{_javadir}/%{name}-server.jar %changelog +* Fri Mar 23 2012 Alexander Kurtakov 3.1.3-8 +- Build against tomcat v7 apis. +- Guideline fixes. + * Sat Jan 14 2012 Fedora Release Engineering - 3.1.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 88612b61fdc20be35fba9515a7fd1876f9a21b09 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Fri, 13 Apr 2012 18:08:34 -0400 Subject: [PATCH 14/19] Remove .qualifier in common and client patches so the build version is set correctly. --- xmlrpc3-client-addosgimanifest.patch | 2 +- xmlrpc3-common-addosgimanifest.patch | 2 +- xmlrpc3.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/xmlrpc3-client-addosgimanifest.patch b/xmlrpc3-client-addosgimanifest.patch index b6c620d..2ef2636 100644 --- a/xmlrpc3-client-addosgimanifest.patch +++ b/xmlrpc3-client-addosgimanifest.patch @@ -8,7 +8,7 @@ + %Bundle-Name + plugin + org.apache.xmlrpc -+ 3.0.0.qualifier ++ ${project.version} + 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 diff --git a/xmlrpc3-common-addosgimanifest.patch b/xmlrpc3-common-addosgimanifest.patch index ca2f890..b136bbf 100644 --- a/xmlrpc3-common-addosgimanifest.patch +++ b/xmlrpc3-common-addosgimanifest.patch @@ -8,7 +8,7 @@ + %Bundle-Name + plugin + org.apache.xmlrpc.common -+ 3.0.0.qualifier ++ ${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.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 diff --git a/xmlrpc3.spec b/xmlrpc3.spec index 6e8acb5..ed19ba7 100644 --- a/xmlrpc3.spec +++ b/xmlrpc3.spec @@ -32,7 +32,7 @@ Name: xmlrpc3 Version: 3.1.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Java XML-RPC implementation License: ASL 2.0 Group: Development/Libraries @@ -184,6 +184,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %{_javadir}/%{name}-server.jar %changelog +* Fri Apr 13 2012 Jeff Johnston 3.1.3-9 +- Remove .qualifier in common and client patches so the build version is set correctly. + * Fri Mar 23 2012 Alexander Kurtakov 3.1.3-8 - Build against tomcat v7 apis. - Guideline fixes. From 95e7fa696de350e126c6bd4b560c6450ccfc43ac Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Fri, 13 Apr 2012 18:08:34 -0400 Subject: [PATCH 15/19] Remove .qualifier in common and client patches so the build version is set correctly. --- xmlrpc3-client-addosgimanifest.patch | 2 +- xmlrpc3-common-addosgimanifest.patch | 2 +- xmlrpc3.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/xmlrpc3-client-addosgimanifest.patch b/xmlrpc3-client-addosgimanifest.patch index b6c620d..2ef2636 100644 --- a/xmlrpc3-client-addosgimanifest.patch +++ b/xmlrpc3-client-addosgimanifest.patch @@ -8,7 +8,7 @@ + %Bundle-Name + plugin + org.apache.xmlrpc -+ 3.0.0.qualifier ++ ${project.version} + 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 diff --git a/xmlrpc3-common-addosgimanifest.patch b/xmlrpc3-common-addosgimanifest.patch index ca2f890..b136bbf 100644 --- a/xmlrpc3-common-addosgimanifest.patch +++ b/xmlrpc3-common-addosgimanifest.patch @@ -8,7 +8,7 @@ + %Bundle-Name + plugin + org.apache.xmlrpc.common -+ 3.0.0.qualifier ++ ${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.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 diff --git a/xmlrpc3.spec b/xmlrpc3.spec index 6e8acb5..ed19ba7 100644 --- a/xmlrpc3.spec +++ b/xmlrpc3.spec @@ -32,7 +32,7 @@ Name: xmlrpc3 Version: 3.1.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Java XML-RPC implementation License: ASL 2.0 Group: Development/Libraries @@ -184,6 +184,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %{_javadir}/%{name}-server.jar %changelog +* Fri Apr 13 2012 Jeff Johnston 3.1.3-9 +- Remove .qualifier in common and client patches so the build version is set correctly. + * Fri Mar 23 2012 Alexander Kurtakov 3.1.3-8 - Build against tomcat v7 apis. - Guideline fixes. From 93b074e8f48ba7eedf19dcbe1cfa899754d1783a Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Wed, 9 May 2012 15:03:47 +0200 Subject: [PATCH 16/19] Remove unneeded BR on maven-eclipse-plugin --- xmlrpc3.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/xmlrpc3.spec b/xmlrpc3.spec index ed19ba7..124e397 100644 --- a/xmlrpc3.spec +++ b/xmlrpc3.spec @@ -32,7 +32,7 @@ Name: xmlrpc3 Version: 3.1.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Java XML-RPC implementation License: ASL 2.0 Group: Development/Libraries @@ -50,7 +50,6 @@ 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: maven-site-plugin @@ -184,6 +183,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %{_javadir}/%{name}-server.jar %changelog +* Wed May 9 2012 Stanislav Ochotnicky - 3.1.3-10 +- Remove unneeded BR on maven-eclipse-plugin + * Fri Apr 13 2012 Jeff Johnston 3.1.3-9 - Remove .qualifier in common and client patches so the build version is set correctly. @@ -336,14 +338,14 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : - 1.2-b1 - update for JPackage 1.5 -* Mon Mar 18 2002 Guillaume Rousse 1.1-1jpp +* 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 +* Mon Jan 21 2002 Guillaume Rousse 1.0-3jpp - versioned dir for javadoc - no dependencies for javadoc package - dropped jsse package From 7a8e16e6ffc9b84f1981db84535371b3b78017c8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 22 Jul 2012 00:55:06 -0500 Subject: [PATCH 17/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- xmlrpc3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlrpc3.spec b/xmlrpc3.spec index 124e397..2ea67c7 100644 --- a/xmlrpc3.spec +++ b/xmlrpc3.spec @@ -32,7 +32,7 @@ Name: xmlrpc3 Version: 3.1.3 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Java XML-RPC implementation License: ASL 2.0 Group: Development/Libraries @@ -183,6 +183,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %{_javadir}/%{name}-server.jar %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 3.1.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Wed May 9 2012 Stanislav Ochotnicky - 3.1.3-10 - Remove unneeded BR on maven-eclipse-plugin From 4fc03ed132c048eb263da26f67f0b21eea315db2 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Tue, 24 Jul 2012 18:31:49 -0400 Subject: [PATCH 18/19] 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 deletion(-) create mode 100644 xmlrpc3-javax-methods.patch 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 - 3.1.3-12 +- Fix compiler errors for webserver classes that implement HttpServerResponse and HttpServerRequest + * Sun Jul 22 2012 Fedora Release Engineering - 3.1.3-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 6b8f0868fbaecab9911337dcb4d2c17b67a0b86e Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Fri, 14 Sep 2012 11:48:49 +0300 Subject: [PATCH 19/19] Merged into xmlprc package. --- .gitignore | 4 - dead.package | 1 + sources | 1 - xmlrpc3-addjunitandservletapitotestpom.patch | 13 - xmlrpc3-client-addosgimanifest.patch | 20 - xmlrpc3-common-addosgimanifest.patch | 19 - xmlrpc3-javax-methods.patch | 128 ------- xmlrpc3-jpp-depmap.xml | 26 -- xmlrpc3.spec | 368 ------------------- 9 files changed, 1 insertion(+), 579 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 xmlrpc3-addjunitandservletapitotestpom.patch delete mode 100644 xmlrpc3-client-addosgimanifest.patch delete mode 100644 xmlrpc3-common-addosgimanifest.patch delete mode 100644 xmlrpc3-javax-methods.patch delete mode 100644 xmlrpc3-jpp-depmap.xml delete mode 100644 xmlrpc3.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 7d403e8..0000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -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/dead.package b/dead.package new file mode 100644 index 0000000..6648e23 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Merged into xmlprc package. diff --git a/sources b/sources deleted file mode 100644 index f4bbd2c..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -f7817485fa6a6a500c49ec9515d1f3b9 apache-xmlrpc-3.1.3-src.tar.bz2 diff --git a/xmlrpc3-addjunitandservletapitotestpom.patch b/xmlrpc3-addjunitandservletapitotestpom.patch deleted file mode 100644 index 1279bc2..0000000 --- a/xmlrpc3-addjunitandservletapitotestpom.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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-client-addosgimanifest.patch b/xmlrpc3-client-addosgimanifest.patch deleted file mode 100644 index 2ef2636..0000000 --- a/xmlrpc3-client-addosgimanifest.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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.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 deleted file mode 100644 index b136bbf..0000000 --- a/xmlrpc3-common-addosgimanifest.patch +++ /dev/null @@ -1,19 +0,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 -+ ${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.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-javax-methods.patch b/xmlrpc3-javax-methods.patch deleted file mode 100644 index 2a99d9f..0000000 --- a/xmlrpc3-javax-methods.patch +++ /dev/null @@ -1,128 +0,0 @@ -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-jpp-depmap.xml b/xmlrpc3-jpp-depmap.xml deleted file mode 100644 index fff971d..0000000 --- a/xmlrpc3-jpp-depmap.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - jaxme - jaxmeapi - 0.5.1 - - - JPP - jaxme/jaxmeapi - 0.5.1 - - - - - org.apache.ws.commons.util - ws-commons-util - 1.0.1 - - - JPP - ws-commons-util - 1.0.1 - - - diff --git a/xmlrpc3.spec b/xmlrpc3.spec deleted file mode 100644 index bd4a2f3..0000000 --- a/xmlrpc3.spec +++ /dev/null @@ -1,368 +0,0 @@ -# Copyright (c) 2000-2005, JPackage roject -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the -# distribution. -# 3. Neither the name of the JPackage Project nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -%global mainname xmlrpc - -Name: xmlrpc3 -Version: 3.1.3 -Release: 12%{?dist} -Summary: Java XML-RPC implementation -License: ASL 2.0 -Group: Development/Libraries -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 -# 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 -BuildRequires: maven-compiler-plugin -BuildRequires: maven-surefire-plugin -BuildRequires: maven-jar-plugin -BuildRequires: maven-install-plugin -BuildRequires: maven-javadoc-plugin -BuildRequires: maven-assembly-plugin -BuildRequires: maven-source-plugin -BuildRequires: maven-site-plugin -BuildRequires: ws-jaxme -BuildRequires: ws-commons-util -BuildRequires: jpackage-utils >= 0:1.6 -BuildRequires: tomcat-servlet-3.0-api -BuildRequires: junit -BuildRequires: jakarta-commons-httpclient -BuildRequires: apache-commons-logging -BuildRequires: jsse - -BuildArch: noarch - -%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} -Group: Development/Libraries - -%description javadoc -Javadoc for %{name}. - -%package common -Summary: Common classes for XML-RPC client and server implementations -Group: Development/Libraries -Obsoletes: %{name}-common-devel <= %{version} -Requires: ws-jaxme -Requires: ws-commons-util -Requires: jpackage-utils >= 0:1.6 -Requires: apache-commons-logging - -%description common -%{summary}. - -%package client -Summary: XML-RPC client implementation -Group: Development/Libraries -Requires: %{name}-common -Requires: jakarta-commons-httpclient -Obsoletes: %{name}-client-devel <= %{version} - -%description client -%{summary}. - -%package server -Summary: XML-RPC server implementation -Group: Development/Libraries -Requires: %{name}-client -Requires: junit -Requires: tomcat-servlet-3.0-api -Obsoletes: %{name}-server-devel <= %{version} - -%description server -%{summary}. - -%prep -%setup -q -n apache-%{mainname}-%{version}-src -%patch3 -b .sav -pushd client -%patch1 -b .sav -popd -pushd common -%patch2 -b .sav -popd - -sed -i 's/\r//' LICENSE.txt - -%build -# ignore test failure because server part needs network -mvn-rpmbuild \ - -e \ - -Dmaven.local.depmap.file=%{SOURCE1} \ - -Dmaven.test.failure.ignore=true \ - install javadoc:aggregate - -%install -rm -rf $RPM_BUILD_ROOT - -# jars -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -m 644 client/target/%{mainname}-client-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-client.jar -install -m 644 server/target/%{mainname}-server-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-server.jar -install -m 644 common/target/%{mainname}-common-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-common.jar - -# install maven pom files -install -Dm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom -install -Dm 644 common/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-common.pom -install -Dm 644 client/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-client.pom -install -Dm 644 server/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-server.pom - -# ... and maven depmaps -%add_maven_depmap JPP-%{name}.pom -%add_maven_depmap JPP-%{name}-common.pom %{name}-common.jar -%add_maven_depmap JPP-%{name}-client.pom %{name}-client.jar -%add_maven_depmap JPP-%{name}-server.pom %{name}-server.jar - -# javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} - -%pre javadoc -# workaround rpm bug, can be removed in F-17 -[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \ -rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : - -%files javadoc -%doc LICENSE.txt -%{_javadocdir}/* - -%files common -%doc LICENSE.txt -%{_mavenpomdir}/JPP-%{name}.pom -%{_mavenpomdir}/JPP-%{name}-common.pom -%{_mavendepmapfragdir}/%{name} -%{_javadir}/%{name}-common.jar - -%files client -%{_mavenpomdir}/JPP-%{name}-client.pom -%{_javadir}/%{name}-client.jar - -%files server -%{_mavenpomdir}/JPP-%{name}-server.pom -%{_javadir}/%{name}-server.jar - -%changelog -* Tue Jul 24 2012 Jeff Johnston - 3.1.3-12 -- Fix compiler errors for webserver classes that implement HttpServerResponse and HttpServerRequest - -* Sun Jul 22 2012 Fedora Release Engineering - 3.1.3-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Wed May 9 2012 Stanislav Ochotnicky - 3.1.3-10 -- Remove unneeded BR on maven-eclipse-plugin - -* Fri Apr 13 2012 Jeff Johnston 3.1.3-9 -- Remove .qualifier in common and client patches so the build version is set correctly. - -* Fri Mar 23 2012 Alexander Kurtakov 3.1.3-8 -- Build against tomcat v7 apis. -- Guideline fixes. - -* Sat Jan 14 2012 Fedora Release Engineering - 3.1.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Nov 28 2011 Sami Wagiaalla - 3.1.3-6 -- Use mvn-rpmbuild. -- Change the depmaps flag. -- Use BR maven istead of maven2. - -* Mon Feb 07 2011 Fedora Release Engineering - 3.1.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Dec 9 2010 Stanislav Ochotnicky - 3.1.3-4 -- Fix Requires (split to sub-packages, change codec to logging) -- Make jars and javadocs versionless - -* Wed Sep 29 2010 Alexander Kurtakov 3.1.3-3 -- Add missing maven-site-plugin BR. - -* Wed Sep 29 2010 Alexander Kurtakov 3.1.3-2 -- Really remove old patch. - -* 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 - -* Mon Jul 12 2010 Andrew Overholt 3.0-4.15 -- Ensure license is also in -javadoc package - -* Wed Jan 13 2010 Andrew Overholt 3.0-4.14 -- Really drop maven2-plugin-release BR. - -* Mon Jan 11 2010 Andrew Overholt 3.0-4.13 -- Add ant BR. - -* Mon Jan 11 2010 Andrew Overholt 3.0-4.12 -- Fix Source0 URL. - -* Wed Dec 09 2009 Andrew Overholt 3.0-4.11 -- Disable building with maven due to missing -release plugin. -- Provide ability to build with ant. -- Drop maven2-plugin-release BR as it's folded into maven2. - -* Mon Aug 17 2009 Andrew Overholt 3.0-4.10 -- Fixed URL (bug #354031) - -* Mon Jul 27 2009 Fedora Release Engineering - 3.0-4.9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Feb 26 2009 Fedora Release Engineering - 3.0-3.9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Fri Oct 31 2008 Alexander Kurtakov 3.0-2.9 -- Fix client osgi manifest - client should require common bundle. - -* Wed Oct 22 2008 Alexander Kurtakov 3.0-2.8 -- Drop gcj_support. -- Fix commons osgi manifest. -- BR tomcat5. - -* Fri Sep 12 2008 Andrew Overholt 3.0-2.7 -- Add ppc64. - -* Thu Jul 10 2008 Tom "spot" Callaway 3.0-2.6 -- drop repotag -- fix license tag - -* Wed Mar 19 2008 Andrew Overholt 3.0-2jpp.5 -- Fix server description (rhbz#433699) - -* Tue Feb 19 2008 Fedora Release Engineering - 3.0-2jpp.4 -- Autorebuild for GCC 4.3 - -* Fri Sep 07 2007 Andrew Overholt 3.0-1jpp.4 -- Disable ppc64 (rh#239123). - -* Fri Sep 07 2007 Andrew Overholt 3.0-1jpp.3 -- Add OSGi manifests. - -* Fri Aug 24 2007 Andrew Overholt 3.0-1jpp.2 -- Rebuild. - -* Fri Mar 16 2007 Andrew Overholt 3.0-1jpp.1 -- Create new xmlrpc3 package -- Use maven to build -- Shuffle to common, server, and client sub-packages -- Add -devel sub-packages for -sources jars - -* 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