svn commit: r1500007 - in /commons/proper/collections/trunk/src: main/java/org/apache/commons/collections4/ main/java/org/apache/commons/collections4/bag/ test/java/org/apache/commons/collections4/bag

2013-07-05 Thread ggregory
Author: ggregory
Date: Fri Jul  5 13:44:02 2013
New Revision: 157

URL: http://svn.apache.org/r157
Log:
Rename CompliantBag to CollectionBag.

Added:

commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java
  - copied, changed from r154, 
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/CompliantBag.java

commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java
  - copied, changed from r154, 
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/CompliantBagTest.java
Removed:

commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/CompliantBag.java

commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/CompliantBagTest.java
Modified:

commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/BagUtils.java

Modified: 
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/BagUtils.java
URL: 
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/BagUtils.java?rev=157r1=156r2=157view=diff
==
--- 
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/BagUtils.java
 (original)
+++ 
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/BagUtils.java
 Fri Jul  5 13:44:02 2013
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.collections4;
 
-import org.apache.commons.collections4.bag.CompliantBag;
+import org.apache.commons.collections4.bag.CollectionBag;
 import org.apache.commons.collections4.bag.HashBag;
 import org.apache.commons.collections4.bag.PredicatedBag;
 import org.apache.commons.collections4.bag.PredicatedSortedBag;
@@ -144,8 +144,8 @@ public class BagUtils {
  * @throws IllegalArgumentException if bag is null
  * @since 4.0
  */
-public static E BagE compliantBag(final BagE bag) {
-return CompliantBag.compliantBag(bag);
+public static E BagE collectionBag(final BagE bag) {
+return CollectionBag.collectionBag(bag);
 }
 
 //---

Copied: 
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java
 (from r154, 
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/CompliantBag.java)
URL: 
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java?p2=commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/CollectionBag.javap1=commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/CompliantBag.javar1=154r2=157rev=157view=diff
==
--- 
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/CompliantBag.java
 (original)
+++ 
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java
 Fri Jul  5 13:44:02 2013
@@ -31,7 +31,7 @@ import org.apache.commons.collections4.B
  * @since 4.0
  * @version $Id$
  */
-public final class CompliantBagE
+public final class CollectionBagE
 extends AbstractBagDecoratorE implements Serializable {
 
 /** Serialization version */
@@ -45,8 +45,8 @@ public final class CompliantBagE
  * @return a Bag that complies to the Collection contract
  * @throws IllegalArgumentException if bag is null
  */
-public static E BagE compliantBag(final BagE bag) {
-return new CompliantBagE(bag);
+public static E BagE collectionBag(final BagE bag) {
+return new CollectionBagE(bag);
 }
 
 //---
@@ -56,7 +56,7 @@ public final class CompliantBagE
  * @param bag  the bag to decorate, must not be null
  * @throws IllegalArgumentException if bag is null
  */
-public CompliantBag(final BagE bag) {
+public CollectionBag(final BagE bag) {
 super(bag);
 }
 

Copied: 
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java
 (from r154, 
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/CompliantBagTest.java)
URL: 
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.javap1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/CompliantBagTest.javar1=154r2=157rev=157view=diff

svn commit: r1500018 - in /commons/proper/math/trunk/src: changes/ main/java/org/apache/commons/math3/analysis/integration/gauss/ test/java/org/apache/commons/math3/analysis/integration/gauss/

2013-07-05 Thread erans
Author: erans
Date: Fri Jul  5 14:20:19 2013
New Revision: 1500018

URL: http://svn.apache.org/r1500018
Log:
MATH-997
Gauss-Hermite quadrature scheme.

Added:

commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/integration/gauss/HermiteRuleFactory.java
   (with props)

commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/integration/gauss/SymmetricGaussIntegrator.java
   (with props)

commons/proper/math/trunk/src/test/java/org/apache/commons/math3/analysis/integration/gauss/GaussIntegratorTest.java
   (with props)

commons/proper/math/trunk/src/test/java/org/apache/commons/math3/analysis/integration/gauss/HermiteParametricTest.java
   (with props)

commons/proper/math/trunk/src/test/java/org/apache/commons/math3/analysis/integration/gauss/HermiteTest.java
   (with props)
Modified:
commons/proper/math/trunk/src/changes/changes.xml

commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/integration/gauss/GaussIntegrator.java

commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/integration/gauss/GaussIntegratorFactory.java

Modified: commons/proper/math/trunk/src/changes/changes.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/changes/changes.xml?rev=1500018r1=1500017r2=1500018view=diff
==
--- commons/proper/math/trunk/src/changes/changes.xml (original)
+++ commons/proper/math/trunk/src/changes/changes.xml Fri Jul  5 14:20:19 2013
@@ -51,6 +51,14 @@ If the output is not quite correct, chec
   /properties
   body
 release version=x.y date=TBD description=TBD
+  action dev=erans type=add issue=MATH-997
+Implemented Gauss-Hermite quadrature scheme (in package
+o.a.c.m.analysis.integration.gauss).
+  /action
+  action dev=erans type=update issue=MATH-995
+Documented limitation of IterativeLegendreGaussIntegrator (added 
+warning about potential wrong usage).
+  /action
   action dev=erans type=fix issue=MATH-993
 In GaussNewtonOptimizer, check for convergence before updating the
 parameters estimation for the next iteration.

Modified: 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/integration/gauss/GaussIntegrator.java
URL: 
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/integration/gauss/GaussIntegrator.java?rev=1500018r1=1500017r2=1500018view=diff
==
--- 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/integration/gauss/GaussIntegrator.java
 (original)
+++ 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/integration/gauss/GaussIntegrator.java
 Fri Jul  5 14:20:19 2013
@@ -107,4 +107,24 @@ public class GaussIntegrator {
 public int getNumberOfPoints() {
 return points.length;
 }
+
+/**
+ * Gets the integration point at the given index.
+ * The index must be in the valid range but no check is performed.
+ *
+ * @return the integration point.
+ */
+public double getPoint(int index) {
+return points[index];
+}
+
+/**
+ * Gets the weight of the integration point at the given index.
+ * The index must be in the valid range but no check is performed.
+ *
+ * @return the weight.
+ */
+public double getWeight(int index) {
+return weights[index];
+}
 }

Modified: 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/integration/gauss/GaussIntegratorFactory.java
URL: 
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/integration/gauss/GaussIntegratorFactory.java?rev=1500018r1=1500017r2=1500018view=diff
==
--- 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/integration/gauss/GaussIntegratorFactory.java
 (original)
+++ 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/integration/gauss/GaussIntegratorFactory.java
 Fri Jul  5 14:20:19 2013
@@ -20,7 +20,9 @@ import java.math.BigDecimal;
 
 import org.apache.commons.math3.exception.DimensionMismatchException;
 import org.apache.commons.math3.exception.NotStrictlyPositiveException;
+import org.apache.commons.math3.analysis.BivariateFunction;
 import org.apache.commons.math3.util.Pair;
+import org.apache.commons.math3.util.FastMath;
 
 /**
  * Class that provides different ways to compute the nodes and weights to be
@@ -34,9 +36,12 @@ public class GaussIntegratorFactory {
 private final BaseRuleFactoryDouble legendre = new LegendreRuleFactory();
 /** Generator of Gauss-Legendre integrators. */
 private final BaseRuleFactoryBigDecimal legendreHighPrecision = new 

svn commit: r1500025 - in /commons/proper/compress/branches/LZMA: ./ README.txt pom.xml

2013-07-05 Thread bodewig
Author: bodewig
Date: Fri Jul  5 14:42:34 2013
New Revision: 1500025

URL: http://svn.apache.org/r1500025
Log:
merge

Modified:
commons/proper/compress/branches/LZMA/   (props changed)
commons/proper/compress/branches/LZMA/README.txt
commons/proper/compress/branches/LZMA/pom.xml

Propchange: commons/proper/compress/branches/LZMA/
--
  Merged /commons/proper/compress/trunk:r1491497-1500024

Modified: commons/proper/compress/branches/LZMA/README.txt
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/branches/LZMA/README.txt?rev=1500025r1=1500024r2=1500025view=diff
==
--- commons/proper/compress/branches/LZMA/README.txt (original)
+++ commons/proper/compress/branches/LZMA/README.txt Fri Jul  5 14:42:34 2013
@@ -10,3 +10,26 @@ Original Zip classes from contributors o
 
 Original CPIO classes contributed by Markus Kuss and the jRPM project
 (jrpm.sourceforge.net).
+
+This distribution includes cryptographic software. The country in
+which you currently reside may have restrictions on the import,
+possession, use, and/or re-export to another country, of encryption
+software. BEFORE using any encryption software, please check your
+country's laws, regulations and policies concerning the import,
+possession, or use, and re-export of encryption software, to see if
+this is permitted. See http://www.wassenaar.org/ for more
+information.
+
+The U.S. Government Department of Commerce, Bureau of Industry and
+Security (BIS), has classified this software as Export Commodity
+Control Number (ECCN) 5D002.C.1, which includes information security
+software using or performing cryptographic functions with asymmetric
+algorithms. The form and manner of this Apache Software Foundation
+distribution makes it eligible for export under the License Exception
+ENC Technology Software Unrestricted (TSU) exception (see the BIS
+Export Administration Regulations, Section 740.13) for both object
+code and source code.
+
+The following provides more details on the included cryptographic
+software:
+  * the 7zip package can read AES encrypted archives

Modified: commons/proper/compress/branches/LZMA/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/branches/LZMA/pom.xml?rev=1500025r1=1500024r2=1500025view=diff
==
--- commons/proper/compress/branches/LZMA/pom.xml (original)
+++ commons/proper/compress/branches/LZMA/pom.xml Fri Jul  5 14:42:34 2013
@@ -20,7 +20,7 @@
   parent
 groupIdorg.apache.commons/groupId
 artifactIdcommons-parent/artifactId
-version28/version
+version32/version
   /parent
 
   groupIdorg.apache.commons/groupId
@@ -35,8 +35,8 @@ These include: bzip2, gzip, pack200, xz 
   /description
 
   properties
-maven.compile.source1.5/maven.compile.source
-maven.compile.target1.5/maven.compile.target
+maven.compiler.source1.5/maven.compiler.source
+maven.compiler.target1.5/maven.compiler.target
 commons.componentidcompress/commons.componentid
 commons.jira.idCOMPRESS/commons.jira.id
 commons.jira.pid12310904/commons.jira.pid
@@ -199,7 +199,7 @@ These include: bzip2, gzip, pack200, xz 
 version2.5/version
 configuration
   minimumTokens200/minimumTokens
-  targetJdk${maven.compile.source}/targetJdk
+  targetJdk${maven.compiler.source}/targetJdk
   rulesets
 ruleset${basedir}/pmd-ruleset.xml/ruleset
   /rulesets
@@ -211,7 +211,7 @@ These include: bzip2, gzip, pack200, xz 
 artifactIdmaven-javadoc-plugin/artifactId
 configuration 
   quiettrue/quiet
-  source${maven.compile.source}/source
+  source${maven.compiler.source}/source
   encoding${commons.encoding}/encoding
   docEncoding${commons.docEncoding}/docEncoding
   linksourcetrue/linksource




svn commit: r868492 - in /websites/production/commons/content/proper/commons-collections/javadocs: api-3.2.1/ api-release/

2013-07-05 Thread tn
Author: tn
Date: Fri Jul  5 19:30:40 2013
New Revision: 868492

Log:
Move 3.2.1 javadocs to proper place.

Added:

websites/production/commons/content/proper/commons-collections/javadocs/api-3.2.1/
  - copied from r868491, 
websites/production/commons/content/proper/commons-collections/javadocs/api-release/
Removed:

websites/production/commons/content/proper/commons-collections/javadocs/api-release/



svn commit: r868493 - /websites/production/commons/content/proper/commons-collections/javadocs/api-release/

2013-07-05 Thread tn
Author: tn
Date: Fri Jul  5 19:32:00 2013
New Revision: 868493

Log:
Copy released 4.0-alpha1 javadocs to the right place.

Added:

websites/production/commons/content/proper/commons-collections/javadocs/api-release/
  - copied from r868492, 
websites/production/commons/content/proper/commons-collections/apidocs/



svn commit: r1500115 - in /commons/proper/collections/trunk: RELEASE-NOTES.txt src/site/xdoc/release_4_0.xml

2013-07-05 Thread tn
Author: tn
Date: Fri Jul  5 20:10:16 2013
New Revision: 1500115

URL: http://svn.apache.org/r1500115
Log:
Update release notes with notes about compatibility, document changes since 
4.0-alpha1.

Modified:
commons/proper/collections/trunk/RELEASE-NOTES.txt
commons/proper/collections/trunk/src/site/xdoc/release_4_0.xml

Modified: commons/proper/collections/trunk/RELEASE-NOTES.txt
URL: 
http://svn.apache.org/viewvc/commons/proper/collections/trunk/RELEASE-NOTES.txt?rev=1500115r1=1500114r2=1500115view=diff
==
--- commons/proper/collections/trunk/RELEASE-NOTES.txt (original)
+++ commons/proper/collections/trunk/RELEASE-NOTES.txt Fri Jul  5 20:10:16 2013
@@ -25,6 +25,14 @@ These release notes will try to guide yo
 should remember that this is a new API based on the original, so some concepts
 have changed.
 
+Compatibility with previous releases
+
+
+This release is not source or binary compatible with previous releases of
+Commons Collections. This includes releases from the 3.x branch as well as
+preceding alpha releases for 4.0 (see details of changes below).
+
+
 Major changes since 3.2.1
 -
 
@@ -35,6 +43,12 @@ Major changes since 3.2.1
  - Added new Trie interface together with an implementation of a Patricia Trie
 
 
+Changes since 4.0-alpha1
+
+
+ - renamed CompliantBag to CollectionBag
+
+
 Removed classes
 ---
 
@@ -64,7 +78,7 @@ Removed classes
 New classes
 ---
 
- o [COLLECTIONS-468] CompliantBag - decorates another Bag to make it comply 
with the Collection contract.
+ o [COLLECTIONS-468] CollectionBag - decorates another Bag to make it comply 
with the Collection contract.
  o [COLLECTIONS-463] PushbackIterator - supports pushback of elements during 
iteration. Thanks to Andy Seaborne, Claude Warren.
  o [COLLECTIONS-462] PeekingIterator - supports one-element lookahead during 
iteration. Thanks to Andy Seaborne, Claude Warren.
  o [COLLECTIONS-432] CircularFifoQueue - analogous class to CircularFifoBuffer 
for the Queue interface

Modified: commons/proper/collections/trunk/src/site/xdoc/release_4_0.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/site/xdoc/release_4_0.xml?rev=1500115r1=1500114r2=1500115view=diff
==
--- commons/proper/collections/trunk/src/site/xdoc/release_4_0.xml (original)
+++ commons/proper/collections/trunk/src/site/xdoc/release_4_0.xml Fri Jul  5 
20:10:16 2013
@@ -95,7 +95,7 @@ This release is bnot/b source or bin
 
 centerh3New Classes/h3/center
 ul
-liCompliantBag - decorates another Bag to make it comply with the Collection 
contract./li
+liCollectionBag - decorates another Bag to make it comply with the 
Collection contract./li
 liPushbackIterator - supports pushback of elements during iteration. Thanks 
to Andy Seaborne, Claude Warren./li
 liPeekingIterator - supports one-element lookahead during iteration. Thanks 
to Andy Seaborne, Claude Warren./li
 liCircularFifoQueue - analogous class to CircularFifoBuffer for the Queue 
interface/li




svn commit: r1500117 - /commons/proper/collections/trunk/src/site/xdoc/release_4_0.xml

2013-07-05 Thread tn
Author: tn
Date: Fri Jul  5 20:11:02 2013
New Revision: 1500117

URL: http://svn.apache.org/r1500117
Log:
remove the alpha1 from the release-notes.

Modified:
commons/proper/collections/trunk/src/site/xdoc/release_4_0.xml

Modified: commons/proper/collections/trunk/src/site/xdoc/release_4_0.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/site/xdoc/release_4_0.xml?rev=1500117r1=1500116r2=1500117view=diff
==
--- commons/proper/collections/trunk/src/site/xdoc/release_4_0.xml (original)
+++ commons/proper/collections/trunk/src/site/xdoc/release_4_0.xml Fri Jul  5 
20:11:02 2013
@@ -17,14 +17,14 @@ limitations under the License.
 --
 document
  properties
-  titleRelease notes for v4.0-alpha1/title
+  titleRelease notes for v4.0/title
   author email=d...@commons.apache.orgCommons Documentation Team/author
  /properties
 body
 
-section name=Release notes for v4.0-alpha1
+section name=Release notes for v4.0
 p
-These are the release notes for Commons Collections v4.0-alpha1:
+These are the release notes for Commons Collections v4.0:
 /p
 hr /
 p




svn commit: r1500123 - in /commons/proper/collections/trunk/src/test/resources/data/test: CollectionBag.emptyCollection.version4.obj CollectionBag.fullCollection.version4.obj

2013-07-05 Thread tn
Author: tn
Date: Fri Jul  5 20:39:41 2013
New Revision: 1500123

URL: http://svn.apache.org/r1500123
Log:
Add missing serialization files after rename of CollectionBag.

Added:

commons/proper/collections/trunk/src/test/resources/data/test/CollectionBag.emptyCollection.version4.obj
   (with props)

commons/proper/collections/trunk/src/test/resources/data/test/CollectionBag.fullCollection.version4.obj
   (with props)

Added: 
commons/proper/collections/trunk/src/test/resources/data/test/CollectionBag.emptyCollection.version4.obj
URL: 
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/resources/data/test/CollectionBag.emptyCollection.version4.obj?rev=1500123view=auto
==
Binary file - no diff available.

Propchange: 
commons/proper/collections/trunk/src/test/resources/data/test/CollectionBag.emptyCollection.version4.obj
--
svn:mime-type = application/octet-stream

Added: 
commons/proper/collections/trunk/src/test/resources/data/test/CollectionBag.fullCollection.version4.obj
URL: 
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/resources/data/test/CollectionBag.fullCollection.version4.obj?rev=1500123view=auto
==
Binary file - no diff available.

Propchange: 
commons/proper/collections/trunk/src/test/resources/data/test/CollectionBag.fullCollection.version4.obj
--
svn:mime-type = application/octet-stream




svn commit: r1500125 - in /commons/proper/collections/trunk/src/test/resources/data/test: CompliantBag.emptyCollection.version4.obj CompliantBag.fullCollection.version4.obj

2013-07-05 Thread tn
Author: tn
Date: Fri Jul  5 20:40:22 2013
New Revision: 1500125

URL: http://svn.apache.org/r1500125
Log:
Remove obsolete test data.

Removed:

commons/proper/collections/trunk/src/test/resources/data/test/CompliantBag.emptyCollection.version4.obj

commons/proper/collections/trunk/src/test/resources/data/test/CompliantBag.fullCollection.version4.obj



svn commit: r1500126 - /commons/proper/collections/trunk/src/changes/changes.xml

2013-07-05 Thread tn
Author: tn
Date: Fri Jul  5 20:40:52 2013
New Revision: 1500126

URL: http://svn.apache.org/r1500126
Log:
Update changes.xml with rename of CompliantBag to CollectionBag.

Modified:
commons/proper/collections/trunk/src/changes/changes.xml

Modified: commons/proper/collections/trunk/src/changes/changes.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/changes/changes.xml?rev=1500126r1=1500125r2=1500126view=diff
==
--- commons/proper/collections/trunk/src/changes/changes.xml (original)
+++ commons/proper/collections/trunk/src/changes/changes.xml Fri Jul  5 
20:40:52 2013
@@ -39,7 +39,7 @@
   name clash with similar class in package map.
 /action
 action issue=COLLECTIONS-468 dev=tn type=add
-  Added bag decorator CompliantBag which decorates a bag to make it 
comply with the
+  Added bag decorator CollectionBag which decorates a bag to make it 
comply with the
   Collection contract.
 /action  
 action issue=COLLECTIONS-466 dev=tn type=update




svn commit: r1500129 - /commons/proper/collections/trunk/src/site/xdoc/download_collections.xml

2013-07-05 Thread tn
Author: tn
Date: Fri Jul  5 20:43:36 2013
New Revision: 1500129

URL: http://svn.apache.org/r1500129
Log:
Update download page after release of 4.0-alpha1.

Modified:
commons/proper/collections/trunk/src/site/xdoc/download_collections.xml

Modified: 
commons/proper/collections/trunk/src/site/xdoc/download_collections.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/site/xdoc/download_collections.xml?rev=1500129r1=1500128r2=1500129view=diff
==
--- commons/proper/collections/trunk/src/site/xdoc/download_collections.xml 
(original)
+++ commons/proper/collections/trunk/src/site/xdoc/download_collections.xml Fri 
Jul  5 20:43:36 2013
@@ -54,7 +54,7 @@ limitations under the License.
   p
 We recommend you use a mirror to download our release
 builds, but you strongmust/strong verify the integrity of
-the downloaded files using signatures downloaded from our main 
+the downloaded files using signatures downloaded from our main
 distribution directories. Recent releases (48 hours) may not yet
 be available from the mirrors.
   /p
@@ -71,7 +71,7 @@ limitations under the License.
 
   form action=[location] method=get id=SelectMirror
 p
-  Other mirrors: 
+  Other mirrors:
   select name=Preferred
   [if-any http]
 [for http]option value=[http][http]/option[end]
@@ -90,12 +90,42 @@ limitations under the License.
   p
 The a href=http://www.apache.org/dist/commons/KEYS;KEYS/a
 link links to the code signing keys used to sign the product.
-The codePGP/code link downloads the OpenPGP compatible signature 
from our main site. 
+The codePGP/code link downloads the OpenPGP compatible signature 
from our main site.
 The codeMD5/code link downloads the checksum from the main site.
   /p
 /subsection
 /section
-section name=Commons Collections 3.2.1 
+section name=Commons Collections 4.0-alpha1 (Java 5.0+)
+  subsection name=Binaries
+table
+  tr
+  tda 
href=[preferred]/commons/collections/binaries/commons-collections4-4.0-alpha1-bin.tar.gzcommons-collections4-4.0-alpha1-bin.tar.gz/a/td
+  tda 
href=http://www.apache.org/dist/commons/collections/binaries/commons-collections4-4.0-alpha1-bin.tar.gz.md5;md5/a/td
+  tda 
href=http://www.apache.org/dist/commons/collections/binaries/commons-collections4-4.0-alpha1-bin.tar.gz.asc;pgp/a/td
+  /tr
+  tr
+  tda 
href=[preferred]/commons/collections/binaries/commons-collections4-4.0-alpha1-bin.zipcommons-collections4-4.0-alpha1-bin.zip/a/td
+  tda 
href=http://www.apache.org/dist/commons/collections/binaries/commons-collections4-4.0-alpha1-bin.zip.md5;md5/a/td
+  tda 
href=http://www.apache.org/dist/commons/collections/binaries/commons-collections4-4.0-alpha1-bin.zip.asc;pgp/a/td
+  /tr
+/table
+  /subsection
+  subsection name=Source
+table
+  tr
+  tda 
href=[preferred]/commons/collections/source/commons-collections4-4.0-alpha1-src.tar.gzcommons-collections4-4.0-alpha1-src.tar.gz/a/td
+  tda 
href=http://www.apache.org/dist/commons/collections/source/commons-collections4-4.0-alpha1-src.tar.gz.md5;md5/a/td
+  tda 
href=http://www.apache.org/dist/commons/collections/source/commons-collections4-4.0-alpha1-src.tar.gz.asc;pgp/a/td
+  /tr
+  tr
+  tda 
href=[preferred]/commons/collections/source/commons-collections4-4.0-alpha1-src.zipcommons-collections4-4.0-alpha1-src.zip/a/td
+  tda 
href=http://www.apache.org/dist/commons/collections/source/commons-collections4-4.0-alpha1-src.zip.md5;md5/a/td
+  tda 
href=http://www.apache.org/dist/commons/collections/source/commons-collections4-4.0-alpha1-src.zip.asc;pgp/a/td
+  /tr
+/table
+  /subsection
+/section
+section name=Commons Collections 3.2.1 (Requires Java 1.2 or later)
   subsection name=Binaries
 table
   tr