Merge site changes from 3.2.1 branch

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@648092 13f79535-47bb-0310-9956-ffa450edef68

pom.xml

@@ -379,7 +379,7 @@
 
   <properties>
     <commons.componentid>collections</commons.componentid>
-    <commons.release.version>3.2</commons.release.version>
+    <commons.release.version>3.2.1</commons.release.version>
     <commons.binary.suffix></commons.binary.suffix>
     <commons.jira.id>COLLECTIONS</commons.jira.id>
     <commons.jira.pid>12310465</commons.jira.pid>

xdocs/building.xml

@@ -29,7 +29,7 @@ limitations under the License.
   build is also available.
 </p>
 <p>
-  You may also be interested in the <a href="release_3_2.html">v3.2 release notes</a>.
+  You may also be interested in the <a href="release_3_2_1.html">v3.2.1 release notes</a>.
 </p>
 </section>
 <!-- ================================================== -->

xdocs/download_collections.xml

@@ -102,17 +102,17 @@ limitations under the License.
         <ul class="downloads">
           <li class="group"><div class="links"><span class="label">Binary</span></div>
             <ul>
-              <li class="download"><a href="[preferred]/commons/collections/binaries/commons-collections-3.2.tar.gz">3.2.tar.gz</a>
+              <li class="download"><a href="[preferred]/commons/collections/binaries/commons-collections-3.2.1-bin.tar.gz">3.2.1.tar.gz</a>
                 <ul class="attributes">
-                  <li><span class="md5">[<a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections-3.2.tar.gz.md5">md5</a>]</span>
+                  <li><span class="md5">[<a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections-3.2.1-bin.tar.gz.md5">md5</a>]</span>
-                      <span class="pgp">[<a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections-3.2.tar.gz.asc">pgp</a>]</span>
+                      <span class="pgp">[<a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections-3.2.1-bin.tar.gz.asc">pgp</a>]</span>
                   </li>
                 </ul>
               </li>
-              <li class="download"><a href="[preferred]/commons/collections/binaries/commons-collections-3.2.zip">3.2.zip</a>
+              <li class="download"><a href="[preferred]/commons/collections/binaries/commons-collections-3.2.1-bin.zip">3.2.1.zip</a>
                 <ul class="attributes">
-                  <li><span class="md5">[<a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections-3.2.zip.md5">md5</a>]</span>
+                  <li><span class="md5">[<a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections-3.2.1-bin.zip.md5">md5</a>]</span>
-                      <span class="pgp">[<a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections-3.2.zip.asc">pgp</a>]</span>
+                      <span class="pgp">[<a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections-3.2.1-bin.zip.asc">pgp</a>]</span>
                   </li>
                 </ul>
               </li>
@@ -120,17 +120,17 @@ limitations under the License.
           </li>
           <li class="group"><div class="links"><span class="label">Source</span></div>
             <ul>
-              <li class="download"><a href="[preferred]/commons/collections/source/commons-collections-3.2-src.tar.gz">3.2.tar.gz</a>
+              <li class="download"><a href="[preferred]/commons/collections/source/commons-collections-3.2.1-src.tar.gz">3.2.1.tar.gz</a>
                 <ul class="attributes">
-                  <li><span class="md5">[<a href="http://www.apache.org/dist/commons/collections/source/commons-collections-3.2-src.tar.gz.md5">md5</a>]</span>
+                  <li><span class="md5">[<a href="http://www.apache.org/dist/commons/collections/source/commons-collections-3.2.1-src.tar.gz.md5">md5</a>]</span>
-                      <span class="pgp">[<a href="http://www.apache.org/dist/commons/collections/source/commons-collections-3.2-src.tar.gz.asc">pgp</a>]</span>
+                      <span class="pgp">[<a href="http://www.apache.org/dist/commons/collections/source/commons-collections-3.2.1-src.tar.gz.asc">pgp</a>]</span>
                   </li>
                 </ul>
               </li>
-              <li class="download"><a href="[preferred]/commons/collections/source/commons-collections-3.2-src.zip">3.2.zip</a>
+              <li class="download"><a href="[preferred]/commons/collections/source/commons-collections-3.2.1-src.zip">3.2.1.zip</a>
                 <ul class="attributes">
-                  <li><span class="md5">[<a href="http://www.apache.org/dist/commons/collections/source/commons-collections-3.2-src.zip.md5">md5</a>]</span>
+                  <li><span class="md5">[<a href="http://www.apache.org/dist/commons/collections/source/commons-collections-3.2.1-src.zip.md5">md5</a>]</span>
-                      <span class="pgp">[<a href="http://www.apache.org/dist/commons/collections/source/commons-collections-3.2-src.zip.asc">pgp</a>]</span>
+                      <span class="pgp">[<a href="http://www.apache.org/dist/commons/collections/source/commons-collections-3.2.1-src.zip.asc">pgp</a>]</span>
                   </li>
                 </ul>
               </li>

xdocs/history.xml

@@ -100,6 +100,10 @@ Other changes included more classes implementing Serializable and a ReferenceIde
 Notably MultiValueMap is a new more flexible implementation of MultiHashMap.
 </p>
 
+<p>
+<b>Collections 3.2.1</b> Re-packaged v3.2 release which is OSGi enabled.
+</p>
+
 </section>
 
 </body>

xdocs/index.xml

@@ -60,7 +60,7 @@ as are various <a href="maven-reports.html">project reports</a>.
 The JavaDoc API documents are available online:
 </p>
 <ul>
-<li>The <a href="api-release/index.html">current release 3.2</a></li>
+<li>The <a href="api-release/index.html">current release 3.2.1</a></li>
 <li>The latest 2.x release - <a href="api-2.1.1/index.html">version 2.1.1</a></li>
 <li>The <a href="apidocs/index.html">latest SVN</a></li>
 </ul>
@@ -72,9 +72,9 @@ The <a href="cvs-usage.html">subversion repository</a> can be
 <!-- ================================================== -->
 <section name="Releases">
 <p>
-The latest version is v3.2. - 
+The latest version is v3.2.1 - 
 <a href="http://commons.apache.org/downloads/download_collections.cgi">Download now!</a><br />
-The <a href="release_3_2.html">release notes</a> are also available.
+The <a href="release_3_2_1.html">release notes</a> are also available.
 </p>
 <p>
 For previous releases, see the <a href="http://archive.apache.org/dist/commons/collections/">Apache Archive</a>

xdocs/navigation.xml

@@ -30,7 +30,7 @@
       <item name="Download" href="http://commons.apache.org/downloads/download_collections.cgi"/>
       <item name="User guide" href="/userguide.html"/>
       <item name="History" href="/history.html"/>
-      <item name="Javadoc (3.2 release)" href="api-release/index.html"/>
+      <item name="Javadoc (3.2.1 release)" href="api-release/index.html"/>
     </menu>
 
     <menu name="Development">

xdocs/proposal.xml

@@ -1,3 +1,20 @@
+<?xml version="1.0"?>
+<!--
+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
+
+     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.
+-->
 <document>
 <properties>
 <title>Proposal</title>

xdocs/release_3_2_1.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<!--
+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
+
+     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.
+-->
+<document>
+ <properties>
+  <title>Release notes for v3.2.1</title>
+  <author email="dev@commons.apache.org">Commons Documentation Team</author>
+ </properties>
+<body>
+
+<section name="Release notes for v3.2.1">
+<p>
+These are the release notes for Commons Collections v3.2.1:
+</p>
+<hr />
+<p>
+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.
+</p>
+<p>
+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.
+</p>
+<hr />
+
+<center><h3>COMPATIBILITY</h3></center>
+<p>
+This release is fully source and binary compatible with v3.2. For changes since the
+v3.1 see the <a href="release_3_2.html">v3.2 Release Notes</a>.
+</p>
+</section>
+
+</body>
+</document>