http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/xdocs/navigation.xml ---------------------------------------------------------------------- diff --git a/xdocs/navigation.xml b/xdocs/navigation.xml index c857700..6db2b1a 100644 --- a/xdocs/navigation.xml +++ b/xdocs/navigation.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <!-- - Copyright 2002-2006 The Apache Software Foundation - - 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 + 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 @@ -14,22 +15,22 @@ See the License for the specific language governing permissions and limitations under the License. --> -<!DOCTYPE org.apache.commons.menus SYSTEM 'http://jakarta.apache.org/commons/build/maven-build.dtd'> +<!DOCTYPE org.apache.commons.menus SYSTEM 'http://commons.apache.org/build/maven-build.dtd'> <project name="Commons Collections"> <title>Commons Collections</title> <body> <links> - <item name="Jakarta Commons" href="http://jakarta.apache.org/commons/"/> + <item name="Apache Commons" href="http://commons.apache.org/"/> </links> <menu name="Commons Collections"> <item name="Overview" href="/index.html"/> - <item name="Download" href="http://jakarta.apache.org/site/downloads/downloads_commons-collections.cgi"/> + <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"> @@ -38,7 +39,7 @@ <item name="Team" href="/team-list.html"/> <item name="Tasks" href="/tasks.html"/> <item name="Proposal" href="/proposal.html"/> - <item name="SVN repository" href="http://svn.apache.org/viewcvs.cgi/jakarta/commons/proper/collections/trunk/"/> + <item name="SVN repository" href="http://svn.apache.org/viewvc/commons/proper/collections/trunk/"/> <item name="Javadoc (SVN latest)" href="apidocs/index.html"/> </menu>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/xdocs/pick.xml ---------------------------------------------------------------------- diff --git a/xdocs/pick.xml b/xdocs/pick.xml index 46bc791..4aa2531 100644 --- a/xdocs/pick.xml +++ b/xdocs/pick.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <!-- - Copyright 2003-2004 The Apache Software Foundation - - 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 + 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 @@ -19,7 +20,7 @@ <properties> <title>Choosing a collection</title> - <author email="commons-...@jakarta.apache.org">Commons Documentation Team</author> + <author email="d...@commons.apache.org">Commons Documentation Team</author> </properties> <body> @@ -89,19 +90,19 @@ For example you could convert a country code to text <i>but not</i> text to coun <h3>BidiMap interface</h3> <p> -The <a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/BidiMap.html";>BidiMap</a> interface and implementations in Commons Collections allow you to lookup data in both directions. There are three implementations: +The <a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/BidiMap.html";>BidiMap</a> interface and implementations in Commons Collections allow you to lookup data in both directions. There are three implementations: <table> <tr> -<td><a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/bidimap/DualHashBidiMap.html";>DualHashBidiMap</a></td> +<td><a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/bidimap/DualHashBidiMap.html";>DualHashBidiMap</a></td> <td>Uses two <a href="http://java.sun.com/j2se/1.4/docs/api/java/util/HashMap.html";>HashMap</a> objects internally. This implementation is a useful general purpose BidiMap that can store any object. The objects are stored in any order, and the order may change over time.</td> </tr> <tr> -<td><a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/bidimap/DualTreeBidiMap.html";>DualTreeBidiMap</a></td> -<td>Uses two <a href="http://java.sun.com/j2se/1.4/docs/api/java/util/TreeMap.html";>TreeMap</a> objects internally which means that keys and values must implement <a href="http://java.sun.com/j2se/1.4/docs/api/java/lang/Comparable.html";>Comparable</a>, unless a comparator is supplied. If considering this class, the TreeBidiMap is usually a better choice. However, this is the only implementation of the <a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/SortedBidiMap.html";>SortedBidiMap</a> interface.</td> +<td><a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/bidimap/DualTreeBidiMap.html";>DualTreeBidiMap</a></td> +<td>Uses two <a href="http://java.sun.com/j2se/1.4/docs/api/java/util/TreeMap.html";>TreeMap</a> objects internally which means that keys and values must implement <a href="http://java.sun.com/j2se/1.4/docs/api/java/lang/Comparable.html";>Comparable</a>, unless a comparator is supplied. If considering this class, the TreeBidiMap is usually a better choice. However, this is the only implementation of the <a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/SortedBidiMap.html";>SortedBidiMap</a> interface.</td> </tr> <tr> -<td><a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/bidimap/TreeBidiMap.html";>TreeBidiMap</a></td> -<td>Dedicated implementation that requires keys and values to implement <a href="http://java.sun.com/j2se/1.4/docs/api/java/lang/Comparable.html";>Comparable</a>, unless a comparator is supplied. This is an efficient implementation using a data structure that avoids duplicating data. The keys and values are held and viewed in sorted order, and the class implements the <a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/OrderedBidiMap.html";>OrderedBidiMap</a> interface.</td> +<td><a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/bidimap/TreeBidiMap.html";>TreeBidiMap</a></td> +<td>Dedicated implementation that requires keys and values to implement <a href="http://java.sun.com/j2se/1.4/docs/api/java/lang/Comparable.html";>Comparable</a>, unless a comparator is supplied. This is an efficient implementation using a data structure that avoids duplicating data. The keys and values are held and viewed in sorted order, and the class implements the <a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/OrderedBidiMap.html";>OrderedBidiMap</a> interface.</td> </tr> </table> </p> @@ -119,11 +120,11 @@ The <a href="http://java.sun.com/j2se/1.4/docs/api/java/util/Map.html";>Map</a> i <td>This map is the most commonly used and fastest implementation. It is suitable for most situations and can store any object. Objects are stored in any order, and the order may change over time.</td> </tr> <tr> -<td><a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/HashedMap.html";>HashedMap</a></td> -<td>The Commons Collections hash map implementation which is very similar in design to HashMap, but also supports easy iteration via a <a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/MapIterator.html";>MapIterator</a>. This implementation is also designed to be subclassed. Use this map if you want to use the extra iterator, or to subclass. Otherwise, there is no advantage (or disadvantage) compared to the JDK HashMap.</td> +<td><a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/HashedMap.html";>HashedMap</a></td> +<td>The Commons Collections hash map implementation which is very similar in design to HashMap, but also supports easy iteration via a <a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/MapIterator.html";>MapIterator</a>. This implementation is also designed to be subclassed. Use this map if you want to use the extra iterator, or to subclass. Otherwise, there is no advantage (or disadvantage) compared to the JDK HashMap.</td> </tr> <tr> -<td><a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/IdentityMap.html";>IdentityMap</a></td> +<td><a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/IdentityMap.html";>IdentityMap</a></td> <td>This map operates exactly as per HashedMap but compares keys and values using == not .equals().</td> </tr> <tr> @@ -135,7 +136,7 @@ The <a href="http://java.sun.com/j2se/1.4/docs/api/java/util/Map.html";>Map</a> i <td>This map ensures that the keys are always sorted, and iteration order is consistent. All keys must implement <a href="http://java.sun.com/j2se/1.4/docs/api/java/lang/Comparable.html";>Comparable</a>, unless a comparator is supplied. This map should be used if you need the map to be sorted.</td> </tr> <tr> -<td><a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/LinkedMap.html";>LinkedMap</a></td> +<td><a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/LinkedMap.html";>LinkedMap</a></td> <td>This map maintains the order that each object is added to the map. When the map is viewed via an iterator, the insertion order will be seen. This map should be used if you need to retain the insertion order.</td> </tr> <tr> @@ -143,15 +144,15 @@ The <a href="http://java.sun.com/j2se/1.4/docs/api/java/util/Map.html";>Map</a> i <td>This map, available from JDK 1.4, maintains the order that each object is added to the map. When the map is viewed via an iterator, the insertion order will be seen. Commons collections' LinkedMap provides the same functionality for JDK1.2 onwards and provides a MapIterator.</td> </tr> <tr> -<td><a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/ListOrderedMap.html";>ListOrderedMap</a></td> +<td><a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/ListOrderedMap.html";>ListOrderedMap</a></td> <td>This map decorates another map to maintains the order that each object is added to the map. The order is maintained using a list. This map should be used if you need to retain the insertion order but you also need the special features of another map.</td> </tr> <tr> -<td><a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/LRUMap.html";>LRUMap</a></td> +<td><a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/LRUMap.html";>LRUMap</a></td> <td>This map places a maximum size limit on the map and removes the least recently used (LRU) key-value when it is full. This map should be used for caches where you want to limit the maximum memory size used, and are happy with the least recently used algorithm for removals.</td> </tr> <tr> -<td><a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/ReferenceMap.html";>ReferenceMap</a></td> +<td><a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/ReferenceMap.html";>ReferenceMap</a></td> <td>This map enables keys and values to be garbage collected whilst still held in the map. This can be useful for building memory sensitive caches. This map should be used for caches where you want to allow garbage collection from the map.</td> </tr> <tr> @@ -159,19 +160,19 @@ The <a href="http://java.sun.com/j2se/1.4/docs/api/java/util/Map.html";>Map</a> i <td>This map stores each key-value pair with a key that can be garbage collected. This can be useful for building memory sensitive caches. ReferenceMap provides the same functionality but with much more flexibility.</td> </tr> <tr> -<td><a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/ReferenceIdentityMap.html";>ReferenceIdentityMap</a></td> +<td><a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/ReferenceIdentityMap.html";>ReferenceIdentityMap</a></td> <td>This map operates exactly as per ReferenceMap but compares keys and values using == not .equals().</td> </tr> <tr> -<td><a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/SingletonMap.html";>SingletonMap</a></td> +<td><a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/SingletonMap.html";>SingletonMap</a></td> <td>This map is restricted to storing one key-value pair. It may contain no more than and no less than one pair. It provides a MapIterator. This map should be used if you want to return one key-value pair and must use the Map interface.</td> </tr> <tr> -<td><a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/Flat3Map.html";>Flat3Map</a></td> +<td><a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/Flat3Map.html";>Flat3Map</a></td> <td>This map is optimised to store one, two or three key-value pairs and outperforms HashMap at these sizes. For size four and above performance is about 5% slower than HashMap. This map also has good garbage collection characteristics when below size four. It provides a MapIterator. This map should be used if are 99% sure that the map will be size three or less.</td> </tr> <tr> -<td><a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/StaticBucketMap.html";>StaticBucketMap</a></td> +<td><a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/StaticBucketMap.html";>StaticBucketMap</a></td> <td>This map is optimised to work well in a heavily loaded multi-threaded environment. It provides synchronization internally, locking on a per 'bucket' basis, where the buckets are fixed at construction time. You should use this class if you can predict the size of the map and you are working in a very intensive multi-threaded environment.</td> </tr> </table> http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/xdocs/proposal.xml ---------------------------------------------------------------------- diff --git a/xdocs/proposal.xml b/xdocs/proposal.xml index d16b9be..e3300e1 100644 --- a/xdocs/proposal.xml +++ b/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> @@ -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. </p> +several future proposed components for the Apache Commons subproject. </p> <p>No external configuration files are utilized.</p> http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/xdocs/release_3_2.xml ---------------------------------------------------------------------- diff --git a/xdocs/release_3_2.xml b/xdocs/release_3_2.xml index b3e78b6..f56871c 100644 --- a/xdocs/release_3_2.xml +++ b/xdocs/release_3_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0"?> <!-- -Copyright 2006 The Apache Software Foundation. - -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 +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 @@ -17,7 +18,7 @@ limitations under the License. <document> <properties> <title>Release notes for v3.2</title> - <author email="commons-...@jakarta.apache.org">Commons Documentation Team</author> + <author email="d...@commons.apache.org">Commons Documentation Team</author> </properties> <body> http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/xdocs/release_3_2_1.xml ---------------------------------------------------------------------- diff --git a/xdocs/release_3_2_1.xml b/xdocs/release_3_2_1.xml new file mode 100644 index 0000000..bba96e2 --- /dev/null +++ b/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="d...@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> http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/xdocs/style/project.css ---------------------------------------------------------------------- diff --git a/xdocs/style/project.css b/xdocs/style/project.css index 0130204..c1d541c 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";); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/xdocs/tasks.xml ---------------------------------------------------------------------- diff --git a/xdocs/tasks.xml b/xdocs/tasks.xml index e82a989..4b212e9 100644 --- a/xdocs/tasks.xml +++ b/xdocs/tasks.xml @@ -1,10 +1,11 @@ <?xml version="1.0"?> <!-- - Copyright 2003-2006 The Apache Software Foundation - - 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 + 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 @@ -19,7 +20,7 @@ <properties> <title>Tasks outstanding</title> - <author email="commons-...@jakarta.apache.org">Commons Documentation Team</author> + <author email="d...@commons.apache.org">Commons Documentation Team</author> </properties> <body> http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/xdocs/userguide.xml ---------------------------------------------------------------------- diff --git a/xdocs/userguide.xml b/xdocs/userguide.xml index 95701a5..544d64a 100644 --- a/xdocs/userguide.xml +++ b/xdocs/userguide.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <!-- - Copyright 2003-2005 The Apache Software Foundation - - 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 + 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 @@ -19,7 +20,7 @@ <properties> <title>User guide</title> - <author email="commons-...@jakarta.apache.org">Commons Documentation Team</author> + <author email="d...@commons.apache.org">Commons Documentation Team</author> </properties> <body>
