From e2df21a0ecc4eb284aa6e8a897f34a710281db74 Mon Sep 17 00:00:00 2001 From: gil Date: Fri, 5 Jan 2024 20:28:06 +0100 Subject: [PATCH] update to 1.5.5 [release 1.5.5-1mamba;Sun Feb 27 2011] --- README.md | 7 + apache-commons-pool-1.5.5-build_xml.patch | 58 +++++ apache-commons-pool.spec | 186 ++++++++++++++++ jakarta-commons-pool-1.3-build.patch | 11 + jakarta-commons-pool-1.3-tomcat5-build.xml | 71 ++++++ maven2-2.2.0-settings.xml | 245 +++++++++++++++++++++ 6 files changed, 578 insertions(+) create mode 100644 apache-commons-pool-1.5.5-build_xml.patch create mode 100644 apache-commons-pool.spec create mode 100644 jakarta-commons-pool-1.3-build.patch create mode 100644 jakarta-commons-pool-1.3-tomcat5-build.xml create mode 100644 maven2-2.2.0-settings.xml diff --git a/README.md b/README.md index cc7e00d..fbaa379 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,9 @@ # apache-commons-pool +Pool provides an Object-pooling API, with three major aspects: + +1. A generic object pool interface that clients and + implementors can use to provide easily interchangable pooling implementations. +2. A toolkit for creating modular object pools. +3. Several general purpose pool implementations. + diff --git a/apache-commons-pool-1.5.5-build_xml.patch b/apache-commons-pool-1.5.5-build_xml.patch new file mode 100644 index 0000000..194a0a7 --- /dev/null +++ b/apache-commons-pool-1.5.5-build_xml.patch @@ -0,0 +1,58 @@ +--- build.xml 2010-09-05 21:20:34.000000000 +0200 ++++ build.xml-gil 2011-02-28 00:29:13.000000000 +0100 +@@ -51,6 +51,7 @@ + + + ++ + + + +@@ -94,7 +95,7 @@ + nonavbar="false" + serialwarn="false" + source="${javac.src.version}"> +- ++ + + + +@@ -155,25 +156,23 @@ + + + +- +- ++ ++ ++ ++ ++ ++ ++ ++ + +- +- +- +- +- +- +- +- +- +- +- +- + + + +- ++ + + + diff --git a/apache-commons-pool.spec b/apache-commons-pool.spec new file mode 100644 index 0000000..fc3bb1a --- /dev/null +++ b/apache-commons-pool.spec @@ -0,0 +1,186 @@ +%define maven 0 +%if %maven + %define target_dir target + %define api_dir %target_dir/site/apidocs +%else + %define target_dir dist + %define api_dir %target_dir/docs/api +%endif +Name: apache-commons-pool +Version: 1.5.5 +Release: 1mamba +Summary: Jakarta Commons Pool Package +Group: Development/Libraries/Java +Vendor: openmamba +Distribution: openmamba +Packager: gil +URL: http://commons.apache.org/pool/ +Source0: http://www.apache.org/dist/jakarta/commons/pool/source/commons-pool-%{version}-src.tar.gz +Source1: maven2-2.2.0-settings.xml +Source2: commons-pool-1.5.5-autogeneratedfiles.tar.gz +Source3: jakarta-commons-pool-1.3-tomcat5-build.xml +Patch0: jakarta-commons-pool-1.3-build.patch +Patch1: apache-commons-pool-1.5.5-build_xml.patch +License: Apache Software License 2.0 +BuildRequires: apache-ant +%if %maven +BuildRequires: apache-maven2 +BuildRequires: apache-maven2-ant-plugin +BuildRequires: apache-maven2-compiler-plugin +BuildRequires: apache-maven2-install-plugin +BuildRequires: apache-maven2-jar-plugin +BuildRequires: apache-maven2-javadoc-plugin +BuildRequires: apache-maven2-source-plugin +#BuildRequires: felix maven-bundle-plugin +%endif +BuildRequires: java-junit3 +BuildRequires: jpackage-utils +BuildRequires: java-openjdk +BuildRequires: java-openjdk-javadoc +Obsoletes: apache-commons-pool-tomcat5 +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +Pool provides an Object-pooling API, with three major aspects: + +1. A generic object pool interface that clients and + implementors can use to provide easily interchangable pooling implementations. +2. A toolkit for creating modular object pools. +3. Several general purpose pool implementations. + +%package javadoc +Group: Documentation +Summary: Javadoc for %{name} + +%description javadoc +Jakarta Commons Pool Package. + +This package contains javadoc for %{name} + +%prep + +%setup -q -n commons-pool-%{version}-src + +for j in $(find . -name "*.jar"); do + rm -rf $j +done + +for c in $(find . -name "*.class"); do + rm -rf $c +done + +%if %maven + + cp %{SOURCE1} settings.xml + mkdir -p .m2/repository/JPP/maven2 + sed -i -e "s|__INTERNAL_REPO_PLACEHOLDER__|file://`pwd`/external_repo|g" settings.xml + sed -i -e "s|__EXTERNAL_REPOPLACEHOLDER__|file://`pwd`/.m2/repository|g" settings.xml + +%else + tar -xf %{SOURCE2} + +%patch1 -p0 + +#%patch +#cp %{S:3} tomcat5-build.xml + +%endif + +%build + + +export JAVA_HOME=/usr/lib/jvm/java +export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository + +%if %maven + mkdir external_repo + ln -s %{_javadir} external_repo/JPP + + mvn-jpp \ + -e \ + -s $(pwd)/settings.xml \ + -Dmaven.test.failure.ignore=true \ + -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ + ant:ant org.apache.felix:maven-bundle-plugin:ant install javadoc:javadoc +%else + + mkdir ./tmp + export CLASSPATH=$(build-classpath junit ant) + ant -Dname=commons-pool-%{version} -Dj2se.api=%{_javadocdir}/java dist test +# export CLASSPATH=$CLASSPATH +# ant -f tomcat5-build.xml +%endif + +%install +[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" + +mkdir -p %{buildroot}%{_javadir}/pool + +install -p -m 644 %target_dir/commons-pool-%{version}.jar \ + %{buildroot}%{_javadir}/pool/%{name}-%{version}.jar + +#install -p -m 644 pool-tomcat5/commons-pool-tomcat5.jar \ +# %{buildroot}%{_javadir}/pool/%{name}-tomcat5-%{version}.jar + +mkdir -p %{buildroot}%{_datadir}/maven2/poms +install -pm 644 pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.pool-commons-pool.pom +%add_to_maven_depmap org.apache.commons commons-pool %{version} JPP/pool commons-pool +%add_to_maven_depmap commons-pool commons-pool %{version} JPP/pool commons-pool + +( + cd %{buildroot}%{_javadir}/pool + for jar in *-%{version}*; do + ln -sf ${jar} `echo $jar| sed "s|apache-||g"` + done +) + +( + cd %{buildroot}%{_javadir}/pool + for jar in *-%{version}*; do + ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"` + done +) + +mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version} +cp -pr %api_dir/* %{buildroot}%{_javadocdir}/%{name}-%{version} +ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} + +#%{_bindir}/aot-compile-rpm + +%clean +[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" + +%post +%update_maven_depmap + +%postun +%update_maven_depmap + +%files +%defattr(-,root,root) +%{_javadir}/pool/apache-commons-pool-%{version}.jar +%{_javadir}/pool/apache-commons-pool.jar +%{_javadir}/pool/commons-pool-%{version}.jar +%{_javadir}/pool/commons-pool.jar +%{_datadir}/maven2/poms +%{_mavendepmapfragdir} +%doc LICENSE.txt NOTICE.txt README.txt RELEASE-NOTES.txt + +%files javadoc +%defattr(-,root,root) +%{_javadocdir}/%{name}-%{version} +%{_javadocdir}/%{name} + +%changelog +* Sun Feb 27 2011 gil 1.5.5-1mamba +- update to 1.5.5 + +* Wed Nov 10 2010 gil 1.4-2mamba +- rebuilt devel + +* Thu Jun 11 2009 gil 1.4-1mamba +- update to 1.4 +- renamed to legacy apache-commons-pool (ex jakarta) + +* Sun Mar 08 2009 gil 1.3-1mamba +- package created by autospec diff --git a/jakarta-commons-pool-1.3-build.patch b/jakarta-commons-pool-1.3-build.patch new file mode 100644 index 0000000..052bdd5 --- /dev/null +++ b/jakarta-commons-pool-1.3-build.patch @@ -0,0 +1,11 @@ +--- build.xml.orig 2006-09-25 15:20:08.000000000 -0400 ++++ build.xml 2006-09-25 15:20:27.000000000 -0400 +@@ -93,7 +93,7 @@ + nonavbar="false" + serialwarn="false" + source="1.3"> +- ++ + + + diff --git a/jakarta-commons-pool-1.3-tomcat5-build.xml b/jakarta-commons-pool-1.3-tomcat5-build.xml new file mode 100644 index 0000000..b6cbcbd --- /dev/null +++ b/jakarta-commons-pool-1.3-tomcat5-build.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/maven2-2.2.0-settings.xml b/maven2-2.2.0-settings.xml new file mode 100644 index 0000000..0d6ad48 --- /dev/null +++ b/maven2-2.2.0-settings.xml @@ -0,0 +1,245 @@ + + + + + + __INTERNAL_REPO_PLACEHOLDER__ + + + + + + + + + + + + + + + + + + + + + + + + mirrorId + repositoryId + Human Readable Name for this Mirror. + __EXTERNAL_REPO_PLACEHOLDER__ + + + + + + + + + + + + +