From 7e5919524f3fbfd2b12fa3c7debc326e7abe9c96 Mon Sep 17 00:00:00 2001 From: gil Date: Sat, 6 Jan 2024 00:01:41 +0100 Subject: [PATCH] rebuilt with java-openjdk support [release 3.2.1-6mamba;Thu Mar 24 2011] --- README.md | 6 + ...ns-collections-3.2.1-addosgimanifest.patch | 41 +++ ...-commons-collections-3.2.1-build_xml.patch | 29 ++ ...mons-collections-3.2.1-javadoc-nonet.patch | 26 ++ ...ommons-collections-3.2.1-project_xml.patch | 10 + ...ommons-collections-3.2.1-tomcat5-build.xml | 70 ++++ ...ommons-collections-testframework-3.2.1.pom | 6 + jakarta-commons-collections-tomcat5-3.2.1.pom | 6 + jakarta-commons-collections.spec | 303 ++++++++++++++++++ java-component-info3.xml | 16 + maven2-2.2.0-settings.xml | 245 ++++++++++++++ 11 files changed, 758 insertions(+) create mode 100644 jakarta-commons-collections-3.2.1-addosgimanifest.patch create mode 100644 jakarta-commons-collections-3.2.1-build_xml.patch create mode 100644 jakarta-commons-collections-3.2.1-javadoc-nonet.patch create mode 100644 jakarta-commons-collections-3.2.1-project_xml.patch create mode 100644 jakarta-commons-collections-3.2.1-tomcat5-build.xml create mode 100644 jakarta-commons-collections-testframework-3.2.1.pom create mode 100644 jakarta-commons-collections-tomcat5-3.2.1.pom create mode 100644 jakarta-commons-collections.spec create mode 100644 java-component-info3.xml create mode 100644 maven2-2.2.0-settings.xml diff --git a/README.md b/README.md index 2d3c8fd..8d4e91e 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,8 @@ # jakarta-commons-collections +The introduction of the Collections API by Sun in JDK 1.2 has been a boon to quick and effective Java programming. Ready access to powerful data structures has accelerated development by reducing the need for custom container classes around each core object. Most Java2 APIs are significantly easier to use because of the Collections API. +However, there are certain holes left unfilled by Sun's implementations, and the Jakarta-Commons Collections Component strives to fulfill them. Among the features of this package are: +- special-purpose implementations of Lists and Maps for fast access +- adapter classes from Java1-style containers (arrays, enumerations) to Java2-style collections. +- methods to test or create typical set-theory properties of collections such as union, intersection, and closure. + diff --git a/jakarta-commons-collections-3.2.1-addosgimanifest.patch b/jakarta-commons-collections-3.2.1-addosgimanifest.patch new file mode 100644 index 0000000..ffb47ec --- /dev/null +++ b/jakarta-commons-collections-3.2.1-addosgimanifest.patch @@ -0,0 +1,41 @@ +--- src/conf/MANIFEST.MF 2008-04-11 16:36:02.000000000 +0200 ++++ src/conf/MANIFEST.MF-gil 2010-01-09 03:13:09.000000000 +0100 +@@ -9,4 +9,35 @@ + Implementation-Title: Commons Collections + Implementation-Vendor-Id: org.apache + X-Compile-Source-JDK: 1.2 +-X-Compile-Target-JDK: 1.2 +\ No newline at end of file ++X-Compile-Target-JDK: 1.2 ++Export-Package: org.apache.commons.collections.iterators;version="3.2. ++ 1",org.apache.commons.collections.keyvalue;version="3.2.1",org.apache ++ .commons.collections.comparators;version="3.2.1",org.apache.commons.c ++ ollections.map;version="3.2.1",org.apache.commons.collections.bag;ver ++ sion="3.2.1",org.apache.commons.collections;version="3.2.1",org.apach ++ e.commons.collections.buffer;version="3.2.1",org.apache.commons.colle ++ ctions.bidimap;version="3.2.1",org.apache.commons.collections.list;ve ++ rsion="3.2.1",org.apache.commons.collections.functors;version="3.2.1" ++ ,org.apache.commons.collections.collection;version="3.2.1",org.apache ++ .commons.collections.set;version="3.2.1" ++Tool: Bnd-0.0.238 ++Bundle-Name: Commons Collections ++Bundle-Vendor: The Apache Software Foundation ++Bundle-Version: 3.2.1 ++Bnd-LastModified: 1263002820105 ++Bundle-ManifestVersion: 2 ++Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt ++Bundle-Description: Types that extend and augment the Java Collections ++ Framework. ++Import-Package: org.apache.commons.collections;version="3.2.1",org.apa ++ che.commons.collections.bag;version="3.2.1",org.apache.commons.collec ++ tions.bidimap;version="3.2.1",org.apache.commons.collections.buffer;v ++ ersion="3.2.1",org.apache.commons.collections.collection;version="3.2 ++ .1",org.apache.commons.collections.comparators;version="3.2.1",org.ap ++ ache.commons.collections.functors;version="3.2.1",org.apache.commons. ++ collections.iterators;version="3.2.1",org.apache.commons.collections. ++ keyvalue;version="3.2.1",org.apache.commons.collections.list;version= ++ "3.2.1",org.apache.commons.collections.map;version="3.2.1",org.apache ++ .commons.collections.set;version="3.2.1" ++Bundle-SymbolicName: org.apache.commons.collections ++Bundle-DocURL: http://commons.apache.org/collections/ +\ No newline at end of file diff --git a/jakarta-commons-collections-3.2.1-build_xml.patch b/jakarta-commons-collections-3.2.1-build_xml.patch new file mode 100644 index 0000000..3aa52e8 --- /dev/null +++ b/jakarta-commons-collections-3.2.1-build_xml.patch @@ -0,0 +1,29 @@ +--- commons-collections-3.2.1-src/build.xml 2008-04-11 16:36:25.000000000 +0200 ++++ commons-collections-3.2.1-src/build.xml-gil 2009-02-28 13:26:20.000000000 +0100 +@@ -286,7 +286,7 @@ + + + +- ++ + + + +@@ -312,7 +312,7 @@ + + + +- ++ + + + +@@ -331,7 +331,7 @@ + + +- ++ + + + diff --git a/jakarta-commons-collections-3.2.1-javadoc-nonet.patch b/jakarta-commons-collections-3.2.1-javadoc-nonet.patch new file mode 100644 index 0000000..6092b9e --- /dev/null +++ b/jakarta-commons-collections-3.2.1-javadoc-nonet.patch @@ -0,0 +1,26 @@ +--- commons-collections-3.2.1-src/build.xml 2008-04-11 16:36:25.000000000 +0200 ++++ commons-collections-3.2.1-src/build.xml-gil 2009-02-28 13:12:56.000000000 +0100 +@@ -85,7 +85,6 @@ + + + +- + + + +@@ -361,7 +360,6 @@ + author="true" + version="true" + use="true" +- link="${javadoc.links}" + overview="${source.java}/org/apache/commons/collections/overview.html" + doctitle="${component.title} ${component.version} API;" + windowtitle="${component.title} ${component.version} API" +@@ -456,7 +454,6 @@ + access="protected" + author="false" + version="false" +- link="${javadoc.links}" + overview="${source.test}/org/apache/commons/collections/overview.html" + doctitle="${tf.title} ${tf.version} API;" + windowtitle="${tf.title} ${tf.version} API" diff --git a/jakarta-commons-collections-3.2.1-project_xml.patch b/jakarta-commons-collections-3.2.1-project_xml.patch new file mode 100644 index 0000000..a0d2751 --- /dev/null +++ b/jakarta-commons-collections-3.2.1-project_xml.patch @@ -0,0 +1,10 @@ +--- commons-collections-3.2.1-src/project.xml 2008-04-11 16:36:25.000000000 +0200 ++++ commons-collections-3.2.1-src/project.xml-gil 2009-02-28 13:15:32.000000000 +0100 +@@ -455,7 +455,6 @@ + dev@commons.apache.org + src/java + src/test +- + + + diff --git a/jakarta-commons-collections-3.2.1-tomcat5-build.xml b/jakarta-commons-collections-3.2.1-tomcat5-build.xml new file mode 100644 index 0000000..7091724 --- /dev/null +++ b/jakarta-commons-collections-3.2.1-tomcat5-build.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jakarta-commons-collections-testframework-3.2.1.pom b/jakarta-commons-collections-testframework-3.2.1.pom new file mode 100644 index 0000000..fccd5ea --- /dev/null +++ b/jakarta-commons-collections-testframework-3.2.1.pom @@ -0,0 +1,6 @@ + + 4.0.0 + commons-collections + commons-collections-testframework + 3.2.1 + \ No newline at end of file diff --git a/jakarta-commons-collections-tomcat5-3.2.1.pom b/jakarta-commons-collections-tomcat5-3.2.1.pom new file mode 100644 index 0000000..1402e89 --- /dev/null +++ b/jakarta-commons-collections-tomcat5-3.2.1.pom @@ -0,0 +1,6 @@ + + 4.0.0 + commons-collections + commons-collections-tomcat5 + 3.2.1 + \ No newline at end of file diff --git a/jakarta-commons-collections.spec b/jakarta-commons-collections.spec new file mode 100644 index 0000000..17dd560 --- /dev/null +++ b/jakarta-commons-collections.spec @@ -0,0 +1,303 @@ +%define repodir %{_javadir}/repository.jboss.com/apache-collections/%{version}-brew +%define repodirlib %{repodir}/lib +%define repodirsrc %{repodir}/src +%define maven 0 +%define javahome %{_jvmdir}/jdk +Name: jakarta-commons-collections +Version: 3.2.1 +Release: 6mamba +Summary: Jakarta Commons Collections Package +Group: Development/Libraries/Java +Vendor: openmamba +Distribution: openmamba +Packager: Silvan Calarco +URL: http://jakarta.apache.org/commons/collections +Source0: http://www.apache.org/dist/commons/collections/source/commons-collections-%{version}-src.tar.gz +Source1: jakarta-commons-collections-3.2.1-build.tar.gz +Source2: jakarta-commons-collections-3.2.1-tomcat5-build.xml +Source3: java-component-info3.xml +Source4: maven2-2.2.0-settings.xml +Source5: jakarta-commons-collections-testframework-3.2.1.pom +Source6: jakarta-commons-collections-tomcat5-3.2.1.pom +Patch0: jakarta-commons-collections-3.2.1-javadoc-nonet.patch +Patch1: jakarta-commons-collections-3.2.1-project_xml.patch +Patch2: jakarta-commons-collections-3.2.1-build_xml.patch +Patch3: jakarta-commons-collections-3.2.1-addosgimanifest.patch +License: Apache Software License 2.0 +BuildRequires: apache-ant +BuildRequires: apache-ant-junit +%if %maven +BuildRequires: apache-maven2 +BuildRequires: apache-maven2-ant-plugin +BuildRequires: apache-maven2-compiler-plugin +BuildRequires: apache-maven2-jar-plugin +BuildRequires: apache-maven2-javadoc-plugin +%endif +%if "%{stage1}" != "1" +BuildRequires: apache-tomcat5-servletapi5 +%endif +#BuildRequires: java-clirr +BuildRequires: java-junit3 +BuildRequires: jpackage-utils +BuildRequires: objectweb-asm +BuildRequires: xml-commons-apis +Requires: jpackage-utils +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +The introduction of the Collections API by Sun in JDK 1.2 has been a boon to quick and effective Java programming. Ready access to powerful data structures has accelerated development by reducing the need for custom container classes around each core object. Most Java2 APIs are significantly easier to use because of the Collections API. +However, there are certain holes left unfilled by Sun's implementations, and the Jakarta-Commons Collections Component strives to fulfill them. Among the features of this package are: +- special-purpose implementations of Lists and Maps for fast access +- adapter classes from Java1-style containers (arrays, enumerations) to Java2-style collections. +- methods to test or create typical set-theory properties of collections such as union, intersection, and closure. + +%package testframework +Group: Development/Tools +Summary: Testframework for %{name} +Requires: %{name} = %{version}-%{release} + +%description testframework +Provides new interfaces, implementations and utilities for Java Collections. + +%package tomcat5 +Group: Development/Libraries/Java +Summary: Jakarta Commons Collection dependency for Tomcat5 + +%description tomcat5 +A package that is specifically designed to fulfill to a Tomcat5 dependency. + +%package javadoc +Group: Documentation +Summary: Javadoc for %{name} + +%description javadoc +Types that extend and augment the Java Collections Framework. + +This package contains javadoc for %{name} + +%package testframework-javadoc +Group: Documentation +Summary: Javadoc for %{name}-testframework + +%description testframework-javadoc +Types that extend and augment the Java Collections Framework. + +This package contains javadoc for %{name}-testframework. + +%package repolib +Group: Development/Libraries/Java +Summary: Artifacts to be uploaded to a repository library + +%description repolib +Types that extend and augment the Java Collections Framework. + +This package contains artifacts to be uploaded to a repository library. +This package is not meant to be installed but so its contents +can be extracted through rpm2cpio + +%prep + +%setup -q -n commons-collections-%{version}-src + +perl -pi -e 's/\r//g' *.txt +sed -i 's/\r//' PROPOSAL.html + +%if %maven + cp %{SOURCE4} 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_REPO_PLACEHOLDER__|file://`pwd`/.m2/repository|g" settings.xml +%else + +gzip -dc %{S:1} | tar xf - + +for j in $(find . -name "*.jar"); do + rm -rf $j +done + +%patch0 -p1 +%patch1 -p1 +# gcj support +#% patch2 -p1 +%patch3 + cp %{S:2} collections-tomcat5-build.xml +%endif + +sed -i 's/\r//' LICENSE.txt +sed -i 's/\r//' PROPOSAL.html +sed -i 's/\r//' RELEASE-NOTES.html +sed -i 's/\r//' README.txt +sed -i 's/\r//' NOTICE.txt + +%build +export JAVA_HOME=%javahome +%if %maven + + export MAVEN_REPO_LOCAL=$PWD/.m2/repository + export MAVEN_SETTINGS=$PWD/settings.xml + + mkdir external_repo + ln -s %{_javadir} external_repo/JPP + + mvn-jpp \ + -e \ + -s $MAVEN_SETTINGS \ + -Dmaven.test.failure.ignore=true \ + -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ + -Dmaven.javadoc.source=1.4 \ + install javadoc:javadoc +%else +# See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28423 +# gcj support +# ant -Djava.io.tmpdir=. jar javadoc tf.validate tf.jar dist.bin dist.src tf.javadoc +# clirr-core + export CLASSPATH=$(build-classpath xml-commons-jaxp-1.3-apis servletapi5) + CLASSPATH=$CLASSPATH:$(build-classpath junit-3.8.2 ant/ant-junit objectweb-asm/asm):build/classes + ant -Djava.io.tmpdir=. -Dmaven.repo test dist tf.javadoc + ant -f collections-tomcat5-build.xml +%endif + +%install +[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" + +mkdir -p %{buildroot}%{_javadir} +mkdir -p %{buildroot}%{_datadir}/maven2/poms + +install -m 644 build/commons-collections-%{version}.jar \ + %{buildroot}%{_javadir}/%{name}-%{version}.jar + +install -m 644 pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-jakarta-commons-collections.pom +%add_to_maven_depmap commons-collections commons-collections %{version} JPP commons-collections + +install -m 644 %{SOURCE5} %{buildroot}%{_datadir}/maven2/poms/JPP-jakarta-commons-collections-testframework.pom +%add_to_maven_depmap commons-collections commons-collections-testframework %{version} JPP commons-collections-testframework + +install -m 644 build/commons-collections-testframework-%{version}.jar \ + %{buildroot}%{_javadir}/%{name}-testframework-%{version}.jar + +install -m 644 %{SOURCE6} %{buildroot}%{_datadir}/maven2/poms/JPP-jakarta-commons-collections-tomcat5.pom +%add_to_maven_depmap commons-collections commons-collections-tomcat5 %{version} JPP commons-collections-tomcat5 + +install -m 644 collections-tomcat5/commons-collections-tomcat5.jar \ + %{buildroot}%{_javadir}/%{name}-tomcat5-%{version}.jar + +( + cd %{buildroot}%{_javadir} + for jar in *-%{version}*; do + ln -s ${jar} `echo $jar | sed "s|jakarta-||g"` + done +) +( + cd %{buildroot}%{_javadir} + for jar in *-%{version}*; do + ln -s ${jar} `echo $jar | sed "s|-%{version}||g"` + done +) + +mkdir -p %{buildroot}%{_javadocdir}/commons-collections-%{version} +cp -pr build/docs/apidocs/* %{buildroot}%{_javadocdir}/commons-collections-%{version} +ln -s commons-collections-%{version} %{buildroot}%{_javadocdir}/commons-collections +rm -rf target/docs/apidocs + +mkdir -p %{buildroot}%{_javadocdir}/commons-collections-testframework-%{version} +cp -pr build/docs/testframework/* %{buildroot}%{_javadocdir}/commons-collections-testframework-%{version} +ln -s commons-collections-testframework-%{version} %{buildroot}%{_javadocdir}/commons-collections-testframework + +mkdir -p %{buildroot}%{repodir} +mkdir -p %{buildroot}%{repodirlib} +install -m 644 %{SOURCE3} %{buildroot}%{repodir}/component-info.xml +tag=`echo %{name}-%{version}-%{release} | sed 's|\.|_|g'` +sed -i "s/@NAME@/apache-commons-collections/g" %{buildroot}%{repodir}/component-info.xml +sed -i "s/@ID@/apache-collections/g" %{buildroot}%{repodir}/component-info.xml +sed -i "s/@TAG@/$tag/g" %{buildroot}%{repodir}/component-info.xml +sed -i "s/@VERSION@/%{version}-brew/g" %{buildroot}%{repodir}/component-info.xml +sed -i "s/@LICENSE@/%{license}/g" %{buildroot}%{repodir}/component-info.xml +sed -i "s|@PROJECTHOME@|%{url}|g" %{buildroot}%{repodir}/component-info.xml +sed -i "s/@DESCRIPTION@/Jakarta Commons Collections Package: extensions to java.util type of collections/g" \ + %{buildroot}%{repodir}/component-info.xml +sed -i "s/@ARTIFACTID@/commons-codec.jar/g" %{buildroot}%{repodir}/component-info.xml +sed -i "s/@INCLUDEINPUT@/commons-codec.jar/g" %{buildroot}%{repodir}/component-info.xml +mkdir -p %{buildroot}%{repodirsrc} +install -m 644 %{SOURCE0} %{buildroot}%{repodirsrc} +install -m 644 %{SOURCE1} %{buildroot}%{repodirsrc} +install -m 644 %{SOURCE2} %{buildroot}%{repodirsrc} +install -m 644 %{PATCH0} %{buildroot}%{repodirsrc} +install -m 644 %{PATCH1} %{buildroot}%{repodirsrc} +install -m 644 %{PATCH2} %{buildroot}%{repodirsrc} +cp %{buildroot}%{_javadir}/jakarta-commons-collections-%{version}.jar %{buildroot}%{repodirlib}/commons-collections.jar + +# gcj support +#%{_bindir}/aot-compile-rpm + +%clean +[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" + +%post +%update_maven_depmap + +%postun +%update_maven_depmap + +%files +%defattr(-,root,root) +%{_javadir}/commons-collections-%{version}.jar +%{_javadir}/commons-collections.jar +%{_javadir}/jakarta-commons-collections-%{version}.jar +%{_javadir}/jakarta-commons-collections.jar +%{_datadir}/maven2/poms/JPP-jakarta-commons-collections.pom +%{_mavendepmapfragdir} +%doc LICENSE.txt NOTICE.txt +%doc PROPOSAL.html README.txt RELEASE-NOTES.html + +%files testframework +%defattr(-,root,root) +%{_javadir}/commons-collections-testframework-%{version}.jar +%{_javadir}/commons-collections-testframework.jar +%{_javadir}/jakarta-commons-collections-testframework-%{version}.jar +%{_javadir}/jakarta-commons-collections-testframework.jar +%{_datadir}/maven2/poms/JPP-jakarta-commons-collections-testframework.pom + +%files tomcat5 +%defattr(-,root,root) +%{_javadir}/commons-collections-tomcat5-%{version}.jar +%{_javadir}/commons-collections-tomcat5.jar +%{_javadir}/jakarta-commons-collections-tomcat5-%{version}.jar +%{_javadir}/jakarta-commons-collections-tomcat5.jar +%{_datadir}/maven2/poms/JPP-jakarta-commons-collections-tomcat5.pom +%doc LICENSE.txt NOTICE.txt + +%files javadoc +%defattr(-,root,root) +%{_javadocdir}/commons-collections-%{version} +%{_javadocdir}/commons-collections + +%files testframework-javadoc +%defattr(-,root,root) +%{_javadocdir}/commons-collections-testframework-%{version} +%{_javadocdir}/commons-collections-testframework + +%files repolib +%defattr(-,root,root) +%{repodir} + +%changelog +* Thu Mar 24 2011 gil 3.2.1-6mamba +- rebuilt with java-openjdk support + +* Sat Oct 30 2010 gil 3.2.1-5mamba +- rebuilt devel + +* Sat Jan 09 2010 gil 3.2.1-4mamba +- added maven poms +- added osgi manifest + +* Tue Oct 20 2009 gil 3.2.1-3mamba +- added new sub package: repolib + +* Mon Mar 09 2009 gil 3.2.1-2mamba +- added new sub package: tomcat5 + +* Thu Feb 19 2009 gil 3.2.1-1mamba +- package created by autospec diff --git a/java-component-info3.xml b/java-component-info3.xml new file mode 100644 index 0000000..0115b98 --- /dev/null +++ b/java-component-info3.xml @@ -0,0 +1,16 @@ + + + + + + + + + + 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__ + + + + + + + + + + + + +