diff --git a/DEVELOPERS-GUIDE.html b/DEVELOPERS-GUIDE.html index 0a4d9ae64..70d4a869a 100644 --- a/DEVELOPERS-GUIDE.html +++ b/DEVELOPERS-GUIDE.html @@ -1,9 +1,10 @@ -Developers guide for Jakarta Commons "Collections" Package +Developers guide for Apache Commons "Collections" Package
-

The Jakarta Commons Collections Package

+

The Apache Commons Collections Package

Developers Guide

$Id$
[Introduction] diff --git a/NOTICE.txt b/NOTICE.txt index 3f59805ce..a9e0fff6c 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,2 +1,5 @@ +Apache Commons Collections +Copyright 2001-2008 The Apache Software Foundation + This product includes software developed by The Apache Software Foundation (http://www.apache.org/). diff --git a/PROPOSAL.html b/PROPOSAL.html index 484540cd0..822f57318 100644 --- a/PROPOSAL.html +++ b/PROPOSAL.html @@ -1,9 +1,10 @@ -RELEASE NOTES: COLLECTIONS 3.2 +RELEASE NOTES: COLLECTIONS 3.2.1 -

RELEASE NOTES: COLLECTIONS 3.2

+

RELEASE NOTES: COLLECTIONS 3.2.1

Commons collections is a project to develop and maintain collection classes @@ -26,104 +27,14 @@ based on and inspired by the JDK collection framework. This project is JDK1.2 compatible, and does not use JDK1.5 generics.

-This release adds various new classes and fixes a number of bugs. -All feedback should be directed to commons-user at jakarta.apache.org. +This v3.2.1 release is simply a re-packaging of the v3.2 release, with appropriate +OSGi meta data added to the jar's manifest file.

COMPATIBILITY

-This release is fully source and binary compatible with v3.1. -(Checks performed using JDiff and Clirr, thanks). -Please check the bug fixes to ensure you weren't relying on the behaviour of a bug. +This release is fully source and binary compatible with v3.2.

-

-There are two new deprecations:
-BeanMap is now deprecated and will be removed in v4.0. -The class is now available in commons-beanutils (full jar version). -This change was made to ensure that all bean related collections were in one place (ie. beanutils). -If this causes major headaches to anyone please contact commons-dev at jakarta.apache.org. -

-

-MultiHashMap is now deprecated and will be removed in v4.0. -The class is now available as MultiValueMap in the map subpackage. -This new version of the class is a decorator and can wrap maps other than HashMap -making it much more flexible. -If this causes major headaches to anyone please contact commons-dev at jakarta.apache.org. -

- -

NEW CLASSES

- - -

ENHANCEMENTS

- - -

BUG FIXES

- - -

JAVADOC

- diff --git a/STATUS.html b/STATUS.html index 1dcf5392f..930d048f1 100644 --- a/STATUS.html +++ b/STATUS.html @@ -1,9 +1,10 @@ -Status File for Jakarta Commons "Collections" Package +Status File for Apache Commons "Collections" Package
-

The Jakarta Commons Collections Package

+

The Apache Commons Collections Package

$Id$
[Introduction] [Dependencies] @@ -59,9 +60,9 @@ components for development and use:

3. RELEASE INFO

Current Release: -Version 3.1 +Version 3.2 -

Planned Next Release: 3.2

+

Planned Next Release: 3.3

4. COMMITTERS

diff --git a/build-testframework.xml b/build-testframework.xml new file mode 100644 index 000000000..71834eeec --- /dev/null +++ b/build-testframework.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build.xml b/build.xml index 4ed927cd3..2895d14e9 100644 --- a/build.xml +++ b/build.xml @@ -1,9 +1,10 @@ - + - + @@ -373,7 +374,7 @@ - + @@ -431,28 +432,15 @@ - - - - - - - - - - - - - - - - - + + + + + + + + @@ -539,9 +527,12 @@ + + + diff --git a/maven.xml b/maven.xml index e2ca08585..171949b8a 100644 --- a/maven.xml +++ b/maven.xml @@ -1,9 +1,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -123,6 +98,10 @@ + + + + diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000..2fa89ae5e --- /dev/null +++ b/pom.xml @@ -0,0 +1,438 @@ + + + + + org.apache.commons + commons-parent + 9 + + 4.0.0 + commons-collections + commons-collections + 3.2.1 + Commons Collections + + 2001 + Types that extend and augment the Java Collections Framework. + + http://commons.apache.org/collections/ + + + jira + http://issues.apache.org/jira/browse/COLLECTIONS + + + + scm:svn:http://svn.apache.org/repos/asf/commons/proper/collections/trunk + scm:svn:https://svn.apache.org/repos/asf/commons/proper/collections/trunk + http://svn.apache.org/viewvc/commons/proper/collections/trunk + + + + + Stephen Colebourne + scolebourne + + + + + Morgan Delagrange + morgand + + + + + Matthew Hawthorne + matth + + + + + Geir Magnusson + geirm + + + + + Craig McClanahan + craigmcc + + + + + Phil Steitz + psteitz + + + + + Arun M. Thomas + amamment + + + + + Rodney Waldhoff + rwaldhoff + + + + + Henri Yandell + bayard + + + + + James Carman + jcarman + + + + + Robert Burrell Donkin + rdonkin + + + + + + Rafael U. C. Afonso + + + Max Rydahl Andersen + + + Federico Barbieri + + + Arron Bates + + + Nicola Ken Barozzi + + + Sebastian Bazley + + + Matt Benson + + + Ola Berg + + + Christopher Berry + + + Nathan Beyer + + + Janek Bogucki + + + Chuck Burdick + + + Dave Bryson + + + Julien Buret + + + Jonathan Carlson + + + Ram Chidambaram + + + Steve Clark + + + Eric Crampton + + + Dimiter Dimitrov + + + Peter Donald + + + Steve Downey + + + Rich Dougherty + + + Tom Dunham + + + Stefano Fornari + + + Andrew Freeman + + + Gerhard Froehlich + + + Paul Jack + + + Eric Johnson + + + Kent Johnson + + + Marc Johnson + + + Nissim Karpenstein + + + Shinobu Kawai + + + Mohan Kishore + + + Simon Kitching + + + Thomas Knych + + + Serge Knystautas + + + Peter KoBek + + + Jordan Krey + + + Olaf Krische + + + Guilhem Lavaux + + + Paul Legato + + + David Leppik + + + Berin Loritsch + + + Hendrik Maryns + + + Stefano Mazzocchi + + + Brian McCallister + + + Steven Melzer + + + Leon Messerschmidt + + + Mauricio S. Moura + + + Kasper Nielsen + + + Stanislaw Osinski + + + Alban Peignier + + + Mike Pettypiece + + + Steve Phelps + + + Ilkka Priha + + + Jonas Van Poucke + + + Will Pugh + + + Herve Quiroz + + + Daniel Rall + + + Robert Ribnitz + + + Huw Roberts + + + Henning P. Schmiedehausen + + + Howard Lewis Ship + + + Joe Raysa + + + Thomas Schapitz + + + Jon Schewe + + + Andreas Schlosser + + + Christian Siefkes + + + Michael Smith + + + Stephen Smith + + + Jan Sorensen + + + Jon S. Stevens + + + James Strachan + + + Leo Sutic + + + Chris Tilden + + + Neil O'Toole + + + Jeff Turner + + + Kazuya Ujihara + + + Jeff Varszegi + + + Ralph Wagner + + + David Weinrich + + + Dieter Wimberger + + + Serhiy Yevtushenko + + + Jason van Zyl + + + + + + junit + junit + 3.8.1 + test + + + + + 1.2 + 1.2 + collections + 3.2.1 + -bin + COLLECTIONS + 12310465 + + + + src/java + src/test + + + org.apache.maven.plugins + maven-surefire-plugin + + + org/apache/commons/collections/TestAllPackages.java + + + + + maven-antrun-plugin + + + package + + + + + + + + + + + + + run + + + + + + maven-assembly-plugin + + + src/assembly/bin.xml + src/assembly/src.xml + + gnu + + + + + + diff --git a/project.properties b/project.properties index 2ea296ada..535e22270 100644 --- a/project.properties +++ b/project.properties @@ -1,22 +1,25 @@ -# Copyright 2003-2005 The Apache Software Foundation +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 # -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +maven.repo.remote=http://repo1.maven.org/maven maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory maven.xdoc.date=left maven.xdoc.version=${pom.currentVersion} -maven.xdoc.developmentProcessUrl=http://jakarta.apache.org/commons/charter.html +maven.xdoc.developmentProcessUrl=http://commons.apache.org/charter.html maven.xdoc.poweredby.image=maven-feather.png maven.xdoc.copy.excludes=images/file.gif,images/folder-closed.gif,images/folder-open.gif,images/icon_alert.gif,images/icon_alertsml.gif,images/icon_arrowfolder1_sml.gif,images/icon_arrowfolder2_sml.gif,images/icon_arrowmembers1_sml.gif,images/icon_arrowmembers2_sml.gif,images/icon_arrowusergroups1_sml.gif,images/icon_arrowusergroups2_sml.gif,images/icon_confirmsml.gif,images/icon_help_lrg.gif,images/icon_infosml.gif,images/icon_members_sml.gif,images/icon_sortleft.gif,images/icon_sortright.gif,images/icon_usergroups_sml.gif,images/icon_waste_lrg.gif,images/icon_waste_sml.gif,images/none.png,images/nw_maj.gif,images/nw_maj_hi.gif,images/nw_med.gif,images/nw_med_hi.gif,images/nw_med_rond.gif,images/nw_min.gif,images/nw_min_036.gif,images/nw_min_hi.gif,images/poweredby_036.gif,images/product_logo.gif,images/se_maj_rond.gif,images/sw_min.gif,images/logos/** maven.xdoc.copy.excludes.classic=images/external-classic.png,images/help_logo.gif,images/icon_arrowfolderclosed1_sml.gif,images/icon_arrowwaste1_sml.gif,images/icon_arrowwaste2_sml.gif,images/icon_doc_lrg.gif,images/icon_doc_sml.gif,images/icon_error_lrg.gif,images/icon_folder_lrg.gif,images/icon_folder_sml.gif,images/icon_help_sml.gif,images/icon_info_lrg.gif,images/icon_members_lrg.gif,images/icon_sortdown.gif,images/icon_sortup.gif,images/icon_success_lrg.gif,images/icon_usergroups_lrg.gif,images/icon_arrowfolderopen2_sml.gif,images/icon_warning_lrg.gif,images/newwindow-classic.png,images/nw_maj_rond.gif,images/strich.gif,images/sw_maj_rond.gif,images/sw_med_rond.gif @@ -51,7 +54,8 @@ maven.compile.target = 1.1 # Specifies the source version for the Java compiler. # Corresponds to the source attribute for the ant javac task. # Valid values are 1.3, 1.4, 1.5. -maven.compile.source = 1.3 +maven.compile.source = 1.2 +maven.compile.target = 1.2 maven.compile.debug=on maven.compile.deprecation=off diff --git a/project.xml b/project.xml index 588be23ca..1dcabedc2 100644 --- a/project.xml +++ b/project.xml @@ -1,10 +1,11 @@ - - - - + + maven-checkstyle-plugin + maven-pmd-plugin + maven-javadoc-plugin maven-jdepend-plugin maven-junit-report-plugin maven-jxr-plugin maven-license-plugin - + diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml new file mode 100644 index 000000000..ba5c51afd --- /dev/null +++ b/src/assembly/bin.xml @@ -0,0 +1,45 @@ + + + bin + + tar.gz + zip + + false + + + + LICENSE.txt + NOTICE.txt + README.txt + RELEASE-NOTES.html + + + + target + + + *.jar + + + + target/site/apidocs + apidocs + + + diff --git a/src/assembly/src.xml b/src/assembly/src.xml new file mode 100644 index 000000000..3f9c66422 --- /dev/null +++ b/src/assembly/src.xml @@ -0,0 +1,52 @@ + + + src + + tar.gz + zip + + ${project.artifactId}-${project.version}-src + + + + build.xml + build-testframework.xml + checkstyle.xml + DEVELOPERS-GUIDE.html + LICENSE.txt + maven.xml + NOTICE.txt + pom.xml + project.properties + project.xml + PROPOSAL.html + README.txt + RELEASE-NOTES.html + + + + data + + + src + + + xdocs + + + diff --git a/src/site/resources/images/logo.png b/src/site/resources/images/logo.png new file mode 100644 index 000000000..44654dc40 Binary files /dev/null and b/src/site/resources/images/logo.png differ diff --git a/src/site/site.xml b/src/site/site.xml new file mode 100644 index 000000000..c9102e632 --- /dev/null +++ b/src/site/site.xml @@ -0,0 +1,46 @@ + + + + + Commons Collections + /images/logo.png + /index.html + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xdocs/building.xml b/xdocs/building.xml index 26fec892b..32e28ed60 100644 --- a/xdocs/building.xml +++ b/xdocs/building.xml @@ -1,10 +1,11 @@ @@ -28,7 +29,7 @@ limitations under the License. is used for site generation.

- You may also be interested in the v3.2 release notes. + You may also be interested in the v3.2.1 release notes.

@@ -47,15 +48,44 @@ limitations under the License.

-
+

- To build the Javadocs, change into Collection's root directory and run "maven javadoc". - The result will be in "target/docs/apidocs". + The following Maven 2 commands can be used to build collections:

+
    +
  • mvn clean - clean up
    • +
  • mvn test - compile and run the unit tests
    • +
  • mvn site - create io documentation
    • +
  • mvn package - build the jar
    • +
  • mvn install - build the jar and install in local maven repository
    • +
  • mvn site assembly:assembly - Create the source and binary distributions
    • +
+
+ +

- To build the full website, run "maven site". - The result will be in "target/docs". + The following Maven 1 commands can be used to build collections:

+
    +
  • maven clean - clean up
    • +
  • maven test - compile and run the unit tests
    • +
  • maven site - create io documentation
    • +
  • maven jar - build the jar
    • +
  • maven dist - Create the source and binary distributions
    • +
+
+ +
+

+ The following Ant commands can be used to build collections: +

+
    +
  • ant clean - clean up
    • +
  • ant test - compile and run the unit tests
    • +
  • ant javadoc - create javadocs
    • +
  • ant jar - build the jar
    • +
  • ant dist - Create the source and binary distributions
    • +
diff --git a/xdocs/compatibility.xml b/xdocs/compatibility.xml index fa697ac4a..50fe0e48f 100644 --- a/xdocs/compatibility.xml +++ b/xdocs/compatibility.xml @@ -1,10 +1,11 @@

- Jakarta Commons Collections is hosted on the Apache + Apache Commons Collections is hosted on the Apache subversion repository.

The project URL is:
- http://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk + http://svn.apache.org/repos/asf/commons/proper/collections/trunk

The best way to view the repository is via the - subversion viewer. + subversion viewer.

The alternative is to use the - native subversion display. + native subversion display.

diff --git a/xdocs/download_collections.xml b/xdocs/download_collections.xml new file mode 100644 index 000000000..cc67f382e --- /dev/null +++ b/xdocs/download_collections.xml @@ -0,0 +1,145 @@ + + + + + + Download Commons Collections + Commons Documentation Team + + +
+

+ We recommend you use a mirror to download our release + builds, but you must verify the integrity of + the downloaded files using signatures downloaded from our main + distribution directories. Recent releases (48 hours) may not yet + be available from the mirrors. +

+ +

+ You are currently using [preferred]. If you + encounter a problem with this mirror, please select another + mirror. If all mirrors are failing, there are backup + mirrors (at the end of the mirrors list) that should be + available. +

+ [if-any logo][end] +

+ +
+

+ Other mirrors: + + +

+
+ +

+ The KEYS link links to the code signing keys used to sign the product. + The PGP link downloads the OpenPGP compatible signature from our main site. + The MD5 link downloads the checksum from the main site. +

+ +

+ For more information concerning Commons Collections, see the + Commons Collections web site. +

+ +

+

KEYS
+ +

+
+ + diff --git a/xdocs/history.xml b/xdocs/history.xml index 1164b9fb4..b7568a488 100644 --- a/xdocs/history.xml +++ b/xdocs/history.xml @@ -1,10 +1,11 @@ @@ -59,24 +60,24 @@ as are various project reports. The JavaDoc API documents are available online:

The subversion repository can be -browsed. +browsed.

-The latest version is v3.2. - -Download now!
-The release notes are also available. +The latest version is v3.2.1 - +Download now!
+The release notes are also available.

-For previous releases, see the Apache Archive +For previous releases, see the Apache Archive

@@ -89,9 +90,8 @@ Please remember that the lists are shared between all commons components, so prefix your email by [collections].

-Issues may be reported via ASF Bugzilla. -Please remember that Bugzilla is shared between all commons components, -so prefix your issue by [collections]. +Issues may be reported via ASF JIRA. +Please read the instructions carefully to submit a useful bug report or enhancement request.

diff --git a/xdocs/issue-tracking.xml b/xdocs/issue-tracking.xml index 0de244152..92ad6e58d 100644 --- a/xdocs/issue-tracking.xml +++ b/xdocs/issue-tracking.xml @@ -1,61 +1,102 @@ + - - Issue tracking - Commons Documentation Team - - - -
-

- Commons Collections uses ASF Bugzilla for tracking issues. - To use Bugzilla you may need to create an account. -

-

- If you would like to report a bug, or raise an enhancement request with - Commons Collections please do the following: -

    -
  1. Search existing open bugs. - If you find your issue listed then please add a comment with your details.
    2. -
  2. Search the mailing list archive. - You may find your issue or idea has already been discussed.
    3. -
  3. Submit a bug report or enhancement request. - Please prefix all new issues with [collections] in the summary line. -
    4. -
-

-

- Please also remember these points: -

    -
  • the more information you provide, the better we can help you
    • -
  • test cases are vital, particularly for any proposed enhancements
    • -
  • the developers of Commons Collections are all unpaid volunteers
    • -
-

-

- You may also find these links useful: -

-

-
- - + + Commons Collections Issue tracking + Commons Documentation Team + + + +
+

+ Commons Collections uses ASF JIRA for tracking issues. + See the Commons Collections JIRA project page. +

+ +

+ To use JIRA you may need to create an account + (if you have previously created/updated Commons issues using Bugzilla an account will have been automatically + created and you can use the Forgot Password + page to get a new password). +

+ +

+ If you would like to report a bug, or raise an enhancement request with + Commons Collections please do the following: +

    +
  1. Search existing open bugs. + If you find your issue listed then please add a comment with your details.
    2. +
  2. Search the mailing list archive(s). + You may find your issue or idea has already been discussed.
    3. +
  3. Decide if your issue is a bug or an enhancement.
    4. +
  4. Submit either a bug report + or enhancement request.
    5. +
+

+ +

+ Please also remember these points: +

    +
  • the more information you provide, the better we can help you
    • +
  • test cases are vital, particularly for any proposed enhancements
    • +
  • the developers of Commons Collections are all unpaid volunteers
    • +
+

+ +

+ For more information on subversion and creating patches see the + Apache Contributors Guide. +

+ +

+ You may also find these links useful: +

+

+
+ diff --git a/xdocs/navigation.xml b/xdocs/navigation.xml index c857700b4..6db2b1a08 100644 --- a/xdocs/navigation.xml +++ b/xdocs/navigation.xml @@ -1,10 +1,11 @@ - + Commons Collections - + - + - + @@ -38,7 +39,7 @@ - + diff --git a/xdocs/pick.xml b/xdocs/pick.xml index 46bc79170..4aa253139 100644 --- a/xdocs/pick.xml +++ b/xdocs/pick.xml @@ -1,10 +1,11 @@ Proposal @@ -45,7 +62,7 @@ production deployment. It utilizes the JUnit unit testing framework for developing and executing unit tests, but this is of interest only to developers of the component. Collections will also be a dependency for -several future proposed components for the Jakarta Commons subproject.

+several future proposed components for the Apache Commons subproject.

No external configuration files are utilized.

diff --git a/xdocs/release_3_2.xml b/xdocs/release_3_2.xml index b3e78b661..f56871c66 100644 --- a/xdocs/release_3_2.xml +++ b/xdocs/release_3_2.xml @@ -1,10 +1,11 @@ + + + Release notes for v3.2.1 + Commons Documentation Team + + + +
+

+These are the release notes for Commons Collections v3.2.1: +

+
+

+Commons collections is a project to develop and maintain collection classes +based on and inspired by the JDK collection framework. +This project is JDK1.2 compatible, and does not use JDK1.5 generics. +

+

+This v3.2.1 release is simply a re-packaging of the v3.2 release, with appropriate +OSGi meta data added to the jar's manifest file. +

+
+ +

COMPATIBILITY

+

+This release is fully source and binary compatible with v3.2. For changes since the +v3.1 see the v3.2 Release Notes. +

+
+ + + diff --git a/xdocs/style/project.css b/xdocs/style/project.css index 013020460..c1d541c82 100644 --- a/xdocs/style/project.css +++ b/xdocs/style/project.css @@ -1 +1 @@ -@import url("http://jakarta.apache.org/style/jakarta-maven.css"); +@import url("http://commons.apache.org/style/commons-maven.css"); diff --git a/xdocs/tasks.xml b/xdocs/tasks.xml index e82a9894e..4b212e9aa 100644 --- a/xdocs/tasks.xml +++ b/xdocs/tasks.xml @@ -1,10 +1,11 @@