diff --git a/DEVELOPERS-GUIDE.html b/DEVELOPERS-GUIDE.html
index b0294e2e9..0a4d9ae64 100644
--- a/DEVELOPERS-GUIDE.html
+++ b/DEVELOPERS-GUIDE.html
@@ -23,7 +23,7 @@
 <div align="center">
 <h1>The Jakarta Commons <em>Collections</em> Package</h1>
 <h2>Developers Guide</h2>
-$Id: DEVELOPERS-GUIDE.html,v 1.5 2004/12/19 21:43:26 scolebourne Exp $<br />
+$Id$<br />
 <a href="#Introduction">[Introduction]</a>
 <a href="#CollectionInterfaces">[Collection Interfaces]</a>
 <a href="#CollectionImplementations">[Collection Implementations]</a>
diff --git a/STATUS.html b/STATUS.html
index 9e2a5fa49..f30390f02 100644
--- a/STATUS.html
+++ b/STATUS.html
@@ -22,7 +22,7 @@
 
 <div align="center">
 <h1>The Jakarta Commons <em>Collections</em> Package</h1>
-$Id: STATUS.html,v 1.36 2004/06/10 23:23:30 scolebourne Exp $<br>
+$Id$<br>
 <a href="#Introduction">[Introduction]</a>
 <a href="#Dependencies">[Dependencies]</a>
 <a href="#Release Info">[Release Info]</a>
diff --git a/src/java/org/apache/commons/collections/ArrayStack.java b/src/java/org/apache/commons/collections/ArrayStack.java
index a2e320c32..2bd77b636 100644
--- a/src/java/org/apache/commons/collections/ArrayStack.java
+++ b/src/java/org/apache/commons/collections/ArrayStack.java
@@ -35,7 +35,7 @@ import java.util.EmptyStackException;
  *
  * @see java.util.Stack
  * @since Commons Collections 1.0
- * @version $Revision: 1.17 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  * 
  * @author Craig R. McClanahan
  * @author Paul Jack
diff --git a/src/java/org/apache/commons/collections/Bag.java b/src/java/org/apache/commons/collections/Bag.java
index 0a492bde0..18750d5d4 100644
--- a/src/java/org/apache/commons/collections/Bag.java
+++ b/src/java/org/apache/commons/collections/Bag.java
@@ -38,7 +38,7 @@ import java.util.Set;
  * it has been decided to maintain backwards compatibility instead.
  *
  * @since Commons Collections 2.0
- * @version $Revision: 1.18 $ $Date: 2004/05/03 15:12:20 $
+ * @version $Revision$ $Date$
  * 
  * @author Chuck Burdick
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/BagUtils.java b/src/java/org/apache/commons/collections/BagUtils.java
index c42ab2d56..0fa921aa3 100644
--- a/src/java/org/apache/commons/collections/BagUtils.java
+++ b/src/java/org/apache/commons/collections/BagUtils.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.bag.UnmodifiableSortedBag;
  * {@link Bag} and {@link SortedBag} instances.
  *
  * @since Commons Collections 2.1
- * @version $Revision: 1.20 $ $Date: 2004/04/01 20:12:00 $
+ * @version $Revision$ $Date$
  * 
  * @author Paul Jack
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/BeanMap.java b/src/java/org/apache/commons/collections/BeanMap.java
index a9780709c..b2d2e9eb3 100644
--- a/src/java/org/apache/commons/collections/BeanMap.java
+++ b/src/java/org/apache/commons/collections/BeanMap.java
@@ -42,7 +42,7 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  * property is considered non existent in the Map
  *
  * @since Commons Collections 1.0
- * @version $Revision: 1.29 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  * 
  * @author James Strachan
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/BidiMap.java b/src/java/org/apache/commons/collections/BidiMap.java
index d8e427315..aaddef2a9 100644
--- a/src/java/org/apache/commons/collections/BidiMap.java
+++ b/src/java/org/apache/commons/collections/BidiMap.java
@@ -33,7 +33,7 @@ package org.apache.commons.collections;
  * duplicate keys. See the {@link #put} method description for more information.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.16 $ $Date: 2004/05/10 20:37:19 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/BinaryHeap.java b/src/java/org/apache/commons/collections/BinaryHeap.java
index 7980d08d6..22d23eeb1 100644
--- a/src/java/org/apache/commons/collections/BinaryHeap.java
+++ b/src/java/org/apache/commons/collections/BinaryHeap.java
@@ -51,7 +51,7 @@ import java.util.NoSuchElementException;
  * @deprecated Replaced by PriorityBuffer in buffer subpackage.
  *  Due to be removed in v4.0.
  * @since Commons Collections 1.0
- * @version $Revision: 1.24 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  * 
  * @author Peter Donald
  * @author Ram Chidambaram
diff --git a/src/java/org/apache/commons/collections/BoundedCollection.java b/src/java/org/apache/commons/collections/BoundedCollection.java
index 2bd013945..773c61e40 100644
--- a/src/java/org/apache/commons/collections/BoundedCollection.java
+++ b/src/java/org/apache/commons/collections/BoundedCollection.java
@@ -28,7 +28,7 @@ import java.util.Collection;
  * @see CollectionUtils#maxSize
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.11 $ $Date: 2004/04/14 20:13:11 $
+ * @version $Revision$ $Date$
  * 
  * @author Herve Quiroz
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/BoundedFifoBuffer.java b/src/java/org/apache/commons/collections/BoundedFifoBuffer.java
index c9d8864bf..71007c6d6 100644
--- a/src/java/org/apache/commons/collections/BoundedFifoBuffer.java
+++ b/src/java/org/apache/commons/collections/BoundedFifoBuffer.java
@@ -43,7 +43,7 @@ import java.util.NoSuchElementException;
  *
  * @deprecated Moved to buffer subpackage. Due to be removed in v4.0.
  * @since 2.1
- * @version $Revision: 1.16 $ $Date: 2004/02/18 01:15:43 $
+ * @version $Revision$ $Date$
  * 
  * @author Avalon
  * @author Berin Loritsch
diff --git a/src/java/org/apache/commons/collections/BoundedMap.java b/src/java/org/apache/commons/collections/BoundedMap.java
index e878204e7..385fe8de3 100644
--- a/src/java/org/apache/commons/collections/BoundedMap.java
+++ b/src/java/org/apache/commons/collections/BoundedMap.java
@@ -25,7 +25,7 @@ import java.util.Map;
  * associated with the maximum number of elements.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/Buffer.java b/src/java/org/apache/commons/collections/Buffer.java
index 587df2c0a..900d42c1f 100644
--- a/src/java/org/apache/commons/collections/Buffer.java
+++ b/src/java/org/apache/commons/collections/Buffer.java
@@ -35,7 +35,7 @@ import java.util.Collection;
  * {@link Bag}.
  *
  * @since Commons Collections 2.1
- * @version $Revision: 1.10 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  * 
  * @author Avalon
  * @author Berin Loritsch
diff --git a/src/java/org/apache/commons/collections/BufferOverflowException.java b/src/java/org/apache/commons/collections/BufferOverflowException.java
index 1f59a71f8..9c17d5af5 100644
--- a/src/java/org/apache/commons/collections/BufferOverflowException.java
+++ b/src/java/org/apache/commons/collections/BufferOverflowException.java
@@ -20,7 +20,7 @@ package org.apache.commons.collections;
  * exceeded.
  *
  * @since Commons Collections 2.1
- * @version $Revision: 1.9 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  * 
  * @author Avalon
  * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
diff --git a/src/java/org/apache/commons/collections/BufferUnderflowException.java b/src/java/org/apache/commons/collections/BufferUnderflowException.java
index 478d1591c..8f700ed1d 100644
--- a/src/java/org/apache/commons/collections/BufferUnderflowException.java
+++ b/src/java/org/apache/commons/collections/BufferUnderflowException.java
@@ -23,7 +23,7 @@ import java.util.NoSuchElementException;
  * NOTE: From version 3.0, this exception extends NoSuchElementException.
  * 
  * @since Commons Collections 2.1
- * @version $Revision: 1.11 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  *
  * @author Avalon
  * @author Berin Loritsch
diff --git a/src/java/org/apache/commons/collections/BufferUtils.java b/src/java/org/apache/commons/collections/BufferUtils.java
index 8842593e2..c472bf4c8 100644
--- a/src/java/org/apache/commons/collections/BufferUtils.java
+++ b/src/java/org/apache/commons/collections/BufferUtils.java
@@ -26,7 +26,7 @@ import org.apache.commons.collections.buffer.UnmodifiableBuffer;
  * Provides utility methods and decorators for {@link Buffer} instances.
  *
  * @since Commons Collections 2.1
- * @version $Revision: 1.20 $ $Date: 2004/04/01 20:12:00 $
+ * @version $Revision$ $Date$
  * 
  * @author Paul Jack
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/Closure.java b/src/java/org/apache/commons/collections/Closure.java
index 9775c89d5..9475df97b 100644
--- a/src/java/org/apache/commons/collections/Closure.java
+++ b/src/java/org/apache/commons/collections/Closure.java
@@ -25,7 +25,7 @@ package org.apache.commons.collections;
  * {@link ClosureUtils}. These include method invokation and for/while loops.
  *  
  * @since Commons Collections 1.0
- * @version $Revision: 1.11 $ $Date: 2004/04/14 20:08:56 $
+ * @version $Revision$ $Date$
  *
  * @author James Strachan
  * @author Nicola Ken Barozzi
diff --git a/src/java/org/apache/commons/collections/ClosureUtils.java b/src/java/org/apache/commons/collections/ClosureUtils.java
index f40073643..f1b2bdbc9 100644
--- a/src/java/org/apache/commons/collections/ClosureUtils.java
+++ b/src/java/org/apache/commons/collections/ClosureUtils.java
@@ -48,7 +48,7 @@ import org.apache.commons.collections.functors.WhileClosure;
  * All the supplied closures are Serializable.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.9 $ $Date: 2004/05/26 21:50:52 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/CollectionUtils.java b/src/java/org/apache/commons/collections/CollectionUtils.java
index ee05a25a6..78776aadd 100644
--- a/src/java/org/apache/commons/collections/CollectionUtils.java
+++ b/src/java/org/apache/commons/collections/CollectionUtils.java
@@ -38,7 +38,7 @@ import org.apache.commons.collections.collection.UnmodifiableCollection;
  * Provides utility methods and decorators for {@link Collection} instances.
  *
  * @since Commons Collections 1.0
- * @version $Revision: 1.65 $ $Date: 2004/12/24 11:03:45 $
+ * @version $Revision$ $Date$
  * 
  * @author Rodney Waldhoff
  * @author Paul Jack
diff --git a/src/java/org/apache/commons/collections/ComparatorUtils.java b/src/java/org/apache/commons/collections/ComparatorUtils.java
index cd0c57bac..b6f8bfbe6 100644
--- a/src/java/org/apache/commons/collections/ComparatorUtils.java
+++ b/src/java/org/apache/commons/collections/ComparatorUtils.java
@@ -35,7 +35,7 @@ import org.apache.commons.collections.comparators.TransformingComparator;
  * in the <code>comparators</code> subpackage.
  *
  * @since Commons Collections 2.1
- * @version $Revision: $ $Date: $
+ * @version $Revision$ $Date$
  * 
  * @author Paul Jack
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/CursorableLinkedList.java b/src/java/org/apache/commons/collections/CursorableLinkedList.java
index 221f7f729..99929a64d 100644
--- a/src/java/org/apache/commons/collections/CursorableLinkedList.java
+++ b/src/java/org/apache/commons/collections/CursorableLinkedList.java
@@ -45,7 +45,7 @@ import java.lang.ref.WeakReference;
  *  and now returns the cursor from the listIterator method. Will be removed in v4.0
  * @see java.util.LinkedList
  * @since Commons Collections 1.0
- * @version $Revision: 1.23 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  * 
  * @author Rodney Waldhoff
  * @author Janek Bogucki
diff --git a/src/java/org/apache/commons/collections/DefaultMapBag.java b/src/java/org/apache/commons/collections/DefaultMapBag.java
index f6902f547..390dc223c 100644
--- a/src/java/org/apache/commons/collections/DefaultMapBag.java
+++ b/src/java/org/apache/commons/collections/DefaultMapBag.java
@@ -37,7 +37,7 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  *
  * @deprecated Moved to bag subpackage as AbstractMapBag. Due to be removed in v4.0.
  * @since Commons Collections 2.0
- * @version $Revision: 1.17 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  * 
  * @author Chuck Burdick
  * @author Michael A. Smith
diff --git a/src/java/org/apache/commons/collections/DefaultMapEntry.java b/src/java/org/apache/commons/collections/DefaultMapEntry.java
index f4ca45f01..3d6b5b09a 100644
--- a/src/java/org/apache/commons/collections/DefaultMapEntry.java
+++ b/src/java/org/apache/commons/collections/DefaultMapEntry.java
@@ -22,7 +22,7 @@ import java.util.Map;
  *
  * @deprecated Use the version in the keyvalue subpackage. Will be removed in v4.0
  * @since Commons Collections 1.0
- * @version $Revision: 1.21 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  * 
  * @author James Strachan
  * @author Michael A. Smith
diff --git a/src/java/org/apache/commons/collections/DoubleOrderedMap.java b/src/java/org/apache/commons/collections/DoubleOrderedMap.java
index 37be56f6b..e444aae43 100644
--- a/src/java/org/apache/commons/collections/DoubleOrderedMap.java
+++ b/src/java/org/apache/commons/collections/DoubleOrderedMap.java
@@ -99,7 +99,7 @@ import java.util.Set;
  * @see org.apache.commons.collections.bidimap.DualTreeBidiMap
  * @see org.apache.commons.collections.bidimap.DualHashBidiMap
  * @since Commons Collections 2.0
- * @version $Revision: 1.14 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  * 
  * @author Marc Johnson
  */
diff --git a/src/java/org/apache/commons/collections/EnumerationUtils.java b/src/java/org/apache/commons/collections/EnumerationUtils.java
index c0f412b2a..1fc548789 100644
--- a/src/java/org/apache/commons/collections/EnumerationUtils.java
+++ b/src/java/org/apache/commons/collections/EnumerationUtils.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.iterators.EnumerationIterator;
  * Provides utility methods for {@link Enumeration} instances.
  * 
  * @since Commons Collections 3.0
- * @version $Id: EnumerationUtils.java,v 1.5 2004/02/18 01:15:42 scolebourne Exp $
+ * @version $Id$
  * 
  * @author <a href="mailto:ggregory@seagullsw.com">Gary Gregory</a>
  */
diff --git a/src/java/org/apache/commons/collections/ExtendedProperties.java b/src/java/org/apache/commons/collections/ExtendedProperties.java
index 2f85027a0..a150309c3 100644
--- a/src/java/org/apache/commons/collections/ExtendedProperties.java
+++ b/src/java/org/apache/commons/collections/ExtendedProperties.java
@@ -123,7 +123,7 @@ import java.util.Vector;
  * it, go ahead and tune it up!
  *
  * @since Commons Collections 1.0
- * @version $Revision: 1.24 $ $Date: 2004/09/22 23:35:03 $
+ * @version $Revision$ $Date$
  * 
  * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  * @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
diff --git a/src/java/org/apache/commons/collections/Factory.java b/src/java/org/apache/commons/collections/Factory.java
index f0c5666d1..08c4f9743 100644
--- a/src/java/org/apache/commons/collections/Factory.java
+++ b/src/java/org/apache/commons/collections/Factory.java
@@ -26,7 +26,7 @@ package org.apache.commons.collections;
  * a copy of a prototype or a new instance.
  * 
  * @since Commons Collections 2.1
- * @version $Revision: 1.9 $ $Date: 2004/04/14 20:08:57 $
+ * @version $Revision$ $Date$
  *
  * @author Arron Bates
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/FactoryUtils.java b/src/java/org/apache/commons/collections/FactoryUtils.java
index 252be2b6a..a4aeb567d 100644
--- a/src/java/org/apache/commons/collections/FactoryUtils.java
+++ b/src/java/org/apache/commons/collections/FactoryUtils.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.functors.PrototypeFactory;
  * All the supplied factories are Serializable.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.14 $ $Date: 2004/04/14 21:47:47 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/FastArrayList.java b/src/java/org/apache/commons/collections/FastArrayList.java
index ad89bff7f..fed663252 100644
--- a/src/java/org/apache/commons/collections/FastArrayList.java
+++ b/src/java/org/apache/commons/collections/FastArrayList.java
@@ -57,7 +57,7 @@ import java.util.ListIterator;
  * Double-Checked Locking Idiom Is Broken Declaration</a>.</p>
  *
  * @since Commons Collections 1.0
- * @version $Revision: 1.16 $ $Date: 2004/06/23 21:41:49 $
+ * @version $Revision$ $Date$
  * 
  * @author Craig R. McClanahan
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/FastHashMap.java b/src/java/org/apache/commons/collections/FastHashMap.java
index 7426addf6..04b4e3714 100644
--- a/src/java/org/apache/commons/collections/FastHashMap.java
+++ b/src/java/org/apache/commons/collections/FastHashMap.java
@@ -57,7 +57,7 @@ import java.util.Set;
  * Double-Checked Locking Idiom Is Broken Declaration</a>.</p>
  *
  * @since Commons Collections 1.0
- * @version $Revision: 1.17 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  * 
  * @author Craig R. McClanahan
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/FastTreeMap.java b/src/java/org/apache/commons/collections/FastTreeMap.java
index 7cf2dbfb3..788e6e525 100644
--- a/src/java/org/apache/commons/collections/FastTreeMap.java
+++ b/src/java/org/apache/commons/collections/FastTreeMap.java
@@ -59,7 +59,7 @@ import java.util.TreeMap;
  * Double-Checked Locking Idiom Is Broken Declaration</a>.</p>
  *
  * @since Commons Collections 1.0
- * @version $Revision: 1.16 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  * 
  * @author Craig R. McClanahan
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/FunctorException.java b/src/java/org/apache/commons/collections/FunctorException.java
index 2da77881d..2db1c075a 100644
--- a/src/java/org/apache/commons/collections/FunctorException.java
+++ b/src/java/org/apache/commons/collections/FunctorException.java
@@ -23,7 +23,7 @@ import java.io.PrintWriter;
  * If required, a root cause error can be wrapped within this one.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/HashBag.java b/src/java/org/apache/commons/collections/HashBag.java
index d5496ccdf..db252a914 100644
--- a/src/java/org/apache/commons/collections/HashBag.java
+++ b/src/java/org/apache/commons/collections/HashBag.java
@@ -23,7 +23,7 @@ import java.util.HashMap;
  *
  * @deprecated Moved to bag subpackage and rewritten internally. Due to be removed in v4.0.
  * @since Commons Collections 2.0
- * @version $Revision: 1.13 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  * 
  * @author Chuck Burdick
  */
diff --git a/src/java/org/apache/commons/collections/IterableMap.java b/src/java/org/apache/commons/collections/IterableMap.java
index b7029fd51..193d84e2e 100644
--- a/src/java/org/apache/commons/collections/IterableMap.java
+++ b/src/java/org/apache/commons/collections/IterableMap.java
@@ -33,7 +33,7 @@ import java.util.Map;
  * </pre>
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/02/18 01:15:43 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/IteratorUtils.java b/src/java/org/apache/commons/collections/IteratorUtils.java
index 9654fd71a..ecb8623a3 100644
--- a/src/java/org/apache/commons/collections/IteratorUtils.java
+++ b/src/java/org/apache/commons/collections/IteratorUtils.java
@@ -65,7 +65,7 @@ import org.apache.commons.collections.iterators.UnmodifiableMapIterator;
  * against versions 2.1.1 and 3.1.
  *
  * @since Commons Collections 2.1
- * @version $Revision: 1.28 $ $Date: 2004/07/17 21:08:05 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Phil Steitz
diff --git a/src/java/org/apache/commons/collections/KeyValue.java b/src/java/org/apache/commons/collections/KeyValue.java
index c5255d07b..2b68b020f 100644
--- a/src/java/org/apache/commons/collections/KeyValue.java
+++ b/src/java/org/apache/commons/collections/KeyValue.java
@@ -23,7 +23,7 @@ package org.apache.commons.collections;
  * two get methods.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/LRUMap.java b/src/java/org/apache/commons/collections/LRUMap.java
index 532847dd8..00c13dc39 100644
--- a/src/java/org/apache/commons/collections/LRUMap.java
+++ b/src/java/org/apache/commons/collections/LRUMap.java
@@ -44,7 +44,7 @@ import java.util.Iterator;
  * 
  * @deprecated Moved to map subpackage. Due to be removed in v4.0.
  * @since Commons Collections 1.0
- * @version $Revision: 1.23 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  * 
  * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
  * @author <a href="mailto:morgand@apache.org">Morgan Delagrange</a>
diff --git a/src/java/org/apache/commons/collections/ListUtils.java b/src/java/org/apache/commons/collections/ListUtils.java
index af136d216..de243bda2 100644
--- a/src/java/org/apache/commons/collections/ListUtils.java
+++ b/src/java/org/apache/commons/collections/ListUtils.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.list.UnmodifiableList;
  * Provides utility methods and decorators for {@link List} instances.
  *
  * @since Commons Collections 1.0
- * @version $Revision: 1.31 $ $Date: 2004/12/24 11:03:45 $
+ * @version $Revision$ $Date$
  * 
  * @author Federico Barbieri
  * @author Peter Donald
diff --git a/src/java/org/apache/commons/collections/MapIterator.java b/src/java/org/apache/commons/collections/MapIterator.java
index 67b1d6053..56327be46 100644
--- a/src/java/org/apache/commons/collections/MapIterator.java
+++ b/src/java/org/apache/commons/collections/MapIterator.java
@@ -40,7 +40,7 @@ import java.util.Iterator;
  * </pre>
  *  
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/MapUtils.java b/src/java/org/apache/commons/collections/MapUtils.java
index 9b064fb68..e17f95281 100644
--- a/src/java/org/apache/commons/collections/MapUtils.java
+++ b/src/java/org/apache/commons/collections/MapUtils.java
@@ -67,7 +67,7 @@ import org.apache.commons.collections.map.UnmodifiableSortedMap;
  *  </ul>
  *
  * @since Commons Collections 1.0
- * @version $Revision: 1.52 $ $Date: 2004/12/24 11:03:44 $
+ * @version $Revision$ $Date$
  * 
  * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
  * @author <a href="mailto:nissim@nksystems.com">Nissim Karpenstein</a>
diff --git a/src/java/org/apache/commons/collections/MultiHashMap.java b/src/java/org/apache/commons/collections/MultiHashMap.java
index 07672cf60..0dd401822 100644
--- a/src/java/org/apache/commons/collections/MultiHashMap.java
+++ b/src/java/org/apache/commons/collections/MultiHashMap.java
@@ -52,7 +52,7 @@ import org.apache.commons.collections.iterators.EmptyIterator;
  * <code>list</code> will be a list containing "A", "B", "C".
  *
  * @since Commons Collections 2.0
- * @version $Revision: 1.21 $ $Date: 2005/01/04 00:13:25 $
+ * @version $Revision$ $Date$
  * 
  * @author Christopher Berry
  * @author James Strachan
diff --git a/src/java/org/apache/commons/collections/MultiMap.java b/src/java/org/apache/commons/collections/MultiMap.java
index 784dfa5cd..217016636 100644
--- a/src/java/org/apache/commons/collections/MultiMap.java
+++ b/src/java/org/apache/commons/collections/MultiMap.java
@@ -40,7 +40,7 @@ import java.util.Map;
  * as they were defined in the superinterface <code>Map</code> anyway.
  *
  * @since Commons Collections 2.0
- * @version $Revision: 1.12 $ $Date: 2004/03/14 15:33:57 $
+ * @version $Revision$ $Date$
  * 
  * @author Christopher Berry
  * @author James Strachan
diff --git a/src/java/org/apache/commons/collections/OrderedBidiMap.java b/src/java/org/apache/commons/collections/OrderedBidiMap.java
index 74782bd32..cfc36775d 100644
--- a/src/java/org/apache/commons/collections/OrderedBidiMap.java
+++ b/src/java/org/apache/commons/collections/OrderedBidiMap.java
@@ -23,7 +23,7 @@ package org.apache.commons.collections;
  * a key to be looked up from a value with equal performance.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/OrderedIterator.java b/src/java/org/apache/commons/collections/OrderedIterator.java
index 2352badbe..c14b592e6 100644
--- a/src/java/org/apache/commons/collections/OrderedIterator.java
+++ b/src/java/org/apache/commons/collections/OrderedIterator.java
@@ -23,7 +23,7 @@ import java.util.Iterator;
  * This iterator allows both forward and reverse iteration through the collection.
  *  
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/09/22 23:16:48 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/OrderedMap.java b/src/java/org/apache/commons/collections/OrderedMap.java
index 1e7ee36ff..bb37b0fd0 100644
--- a/src/java/org/apache/commons/collections/OrderedMap.java
+++ b/src/java/org/apache/commons/collections/OrderedMap.java
@@ -20,7 +20,7 @@ package org.apache.commons.collections;
  * iteration through that order.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/OrderedMapIterator.java b/src/java/org/apache/commons/collections/OrderedMapIterator.java
index f0bf09651..b454f18d9 100644
--- a/src/java/org/apache/commons/collections/OrderedMapIterator.java
+++ b/src/java/org/apache/commons/collections/OrderedMapIterator.java
@@ -21,7 +21,7 @@ package org.apache.commons.collections;
  * This iterator allows both forward and reverse iteration through the map.
  *  
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/Predicate.java b/src/java/org/apache/commons/collections/Predicate.java
index 7f391e42c..1d6aa1986 100644
--- a/src/java/org/apache/commons/collections/Predicate.java
+++ b/src/java/org/apache/commons/collections/Predicate.java
@@ -28,7 +28,7 @@ package org.apache.commons.collections;
  * or, not, method invokation and null testing.
  * 
  * @since Commons Collections 1.0
- * @version $Revision: 1.11 $ $Date: 2004/04/14 20:08:57 $
+ * @version $Revision$ $Date$
  * 
  * @author James Strachan
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/PredicateUtils.java b/src/java/org/apache/commons/collections/PredicateUtils.java
index 65c96fec4..e8c733f2c 100644
--- a/src/java/org/apache/commons/collections/PredicateUtils.java
+++ b/src/java/org/apache/commons/collections/PredicateUtils.java
@@ -66,7 +66,7 @@ import org.apache.commons.collections.functors.UniquePredicate;
  * All the supplied predicates are Serializable.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.19 $ $Date: 2004/05/26 21:50:52 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Ola Berg
diff --git a/src/java/org/apache/commons/collections/PriorityQueue.java b/src/java/org/apache/commons/collections/PriorityQueue.java
index 0fe292dc7..f4b44b78b 100644
--- a/src/java/org/apache/commons/collections/PriorityQueue.java
+++ b/src/java/org/apache/commons/collections/PriorityQueue.java
@@ -23,7 +23,7 @@ package org.apache.commons.collections;
  * @deprecated Replaced by the Buffer interface and implementations in buffer subpackage.
  *  Due to be removed in v4.0.
  * @since Commons Collections 1.0
- * @version $Revision: 1.14 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  * 
  * @author Peter Donald
  */
diff --git a/src/java/org/apache/commons/collections/ProxyMap.java b/src/java/org/apache/commons/collections/ProxyMap.java
index 1d75ade09..621b9154a 100644
--- a/src/java/org/apache/commons/collections/ProxyMap.java
+++ b/src/java/org/apache/commons/collections/ProxyMap.java
@@ -36,7 +36,7 @@ import java.util.Set;
  *
  * @deprecated Moved to map subpackage as AbstractMapDecorator. It will be removed in v4.0.
  * @since Commons Collections 2.0
- * @version $Revision: 1.15 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  * 
  * @author Daniel Rall
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/ReferenceMap.java b/src/java/org/apache/commons/collections/ReferenceMap.java
index bfcbb6bcc..7af5cdb3a 100644
--- a/src/java/org/apache/commons/collections/ReferenceMap.java
+++ b/src/java/org/apache/commons/collections/ReferenceMap.java
@@ -77,7 +77,7 @@ import org.apache.commons.collections.keyvalue.DefaultMapEntry;
  * 
  * @deprecated Moved to map subpackage. Due to be removed in v4.0.
  * @since Commons Collections 2.1
- * @version $Revision: 1.22 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  * 
  * @author Paul Jack
  */
diff --git a/src/java/org/apache/commons/collections/ResettableIterator.java b/src/java/org/apache/commons/collections/ResettableIterator.java
index 56461f4c4..77585aeb7 100644
--- a/src/java/org/apache/commons/collections/ResettableIterator.java
+++ b/src/java/org/apache/commons/collections/ResettableIterator.java
@@ -23,7 +23,7 @@ import java.util.Iterator;
  * This interface allows an iterator to be repeatedly reused.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/ResettableListIterator.java b/src/java/org/apache/commons/collections/ResettableListIterator.java
index 74a0f789d..70769243b 100644
--- a/src/java/org/apache/commons/collections/ResettableListIterator.java
+++ b/src/java/org/apache/commons/collections/ResettableListIterator.java
@@ -23,7 +23,7 @@ import java.util.ListIterator;
  * This interface allows an iterator to be repeatedly reused.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/SequencedHashMap.java b/src/java/org/apache/commons/collections/SequencedHashMap.java
index 456019419..ea939e1ee 100644
--- a/src/java/org/apache/commons/collections/SequencedHashMap.java
+++ b/src/java/org/apache/commons/collections/SequencedHashMap.java
@@ -51,7 +51,7 @@ import org.apache.commons.collections.list.UnmodifiableList;
  * @see org.apache.commons.collections.map.LinkedMap
  * @see org.apache.commons.collections.map.ListOrderedMap
  * @since Commons Collections 2.0
- * @version $Revision: 1.28 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  * 
  * @author Michael A. Smith
  * @author Daniel Rall
diff --git a/src/java/org/apache/commons/collections/SetUtils.java b/src/java/org/apache/commons/collections/SetUtils.java
index 8e5a63abd..cda15e075 100644
--- a/src/java/org/apache/commons/collections/SetUtils.java
+++ b/src/java/org/apache/commons/collections/SetUtils.java
@@ -39,7 +39,7 @@ import org.apache.commons.collections.set.UnmodifiableSortedSet;
  * {@link Set} and {@link SortedSet} instances.
  *
  * @since Commons Collections 2.1
- * @version $Revision: 1.26 $ $Date: 2004/04/01 20:12:00 $
+ * @version $Revision$ $Date$
  * 
  * @author Paul Jack
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/SortedBag.java b/src/java/org/apache/commons/collections/SortedBag.java
index bfc9611d7..d1b167c9d 100644
--- a/src/java/org/apache/commons/collections/SortedBag.java
+++ b/src/java/org/apache/commons/collections/SortedBag.java
@@ -22,7 +22,7 @@ import java.util.Comparator;
  * its unique representative members.
  *
  * @since Commons Collections 2.0
- * @version $Revision: 1.9 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  * 
  * @author Chuck Burdick
  */
diff --git a/src/java/org/apache/commons/collections/SortedBidiMap.java b/src/java/org/apache/commons/collections/SortedBidiMap.java
index 9975ae1e5..1de59aa03 100644
--- a/src/java/org/apache/commons/collections/SortedBidiMap.java
+++ b/src/java/org/apache/commons/collections/SortedBidiMap.java
@@ -25,7 +25,7 @@ import java.util.SortedMap;
  * a key to be looked up from a value with equal performance.
  *  
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/StaticBucketMap.java b/src/java/org/apache/commons/collections/StaticBucketMap.java
index ef579b4ea..5599d54f3 100644
--- a/src/java/org/apache/commons/collections/StaticBucketMap.java
+++ b/src/java/org/apache/commons/collections/StaticBucketMap.java
@@ -89,7 +89,7 @@ import java.util.Set;
  *
  * @deprecated Moved to map subpackage. Due to be removed in v4.0.
  * @since Commons Collections 2.1
- * @version $Revision: 1.18 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  * 
  * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  * @author <a href="mailto:g-froehlich@gmx.de">Gerhard Froehlich</a>
diff --git a/src/java/org/apache/commons/collections/SynchronizedPriorityQueue.java b/src/java/org/apache/commons/collections/SynchronizedPriorityQueue.java
index 648bdbd31..e461767cc 100644
--- a/src/java/org/apache/commons/collections/SynchronizedPriorityQueue.java
+++ b/src/java/org/apache/commons/collections/SynchronizedPriorityQueue.java
@@ -25,7 +25,7 @@ import java.util.NoSuchElementException;
  * @deprecated PriorityQueue is replaced by the Buffer interface, see buffer subpackage.
  *  Due to be removed in v4.0.
  * @since Commons Collections 1.0
- * @version $Revision: 1.13 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  * 
  * @author Ram Chidambaram
  */
diff --git a/src/java/org/apache/commons/collections/Transformer.java b/src/java/org/apache/commons/collections/Transformer.java
index 077d8365b..844fa15cc 100644
--- a/src/java/org/apache/commons/collections/Transformer.java
+++ b/src/java/org/apache/commons/collections/Transformer.java
@@ -29,7 +29,7 @@ package org.apache.commons.collections;
  * cloning and returning the string value.
  * 
  * @since Commons Collections 1.0
- * @version $Revision: 1.10 $ $Date: 2004/04/14 20:08:57 $
+ * @version $Revision$ $Date$
  * 
  * @author James Strachan
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/TransformerUtils.java b/src/java/org/apache/commons/collections/TransformerUtils.java
index 68ba66c5c..1c131bd0f 100644
--- a/src/java/org/apache/commons/collections/TransformerUtils.java
+++ b/src/java/org/apache/commons/collections/TransformerUtils.java
@@ -57,7 +57,7 @@ import org.apache.commons.collections.functors.SwitchTransformer;
  * All the supplied transformers are Serializable.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.13 $ $Date: 2004/05/26 21:50:52 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author James Carman
diff --git a/src/java/org/apache/commons/collections/TreeBag.java b/src/java/org/apache/commons/collections/TreeBag.java
index cfbdff526..e91d84e61 100644
--- a/src/java/org/apache/commons/collections/TreeBag.java
+++ b/src/java/org/apache/commons/collections/TreeBag.java
@@ -27,7 +27,7 @@ import java.util.TreeMap;
  *
  * @deprecated Moved to bag subpackage and rewritten internally. Due to be removed in v4.0.
  * @since Commons Collections 2.0
- * @version $Revision: 1.13 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  * 
  * @author Chuck Burdick
  */
diff --git a/src/java/org/apache/commons/collections/UnboundedFifoBuffer.java b/src/java/org/apache/commons/collections/UnboundedFifoBuffer.java
index d2eb55529..cd2358524 100644
--- a/src/java/org/apache/commons/collections/UnboundedFifoBuffer.java
+++ b/src/java/org/apache/commons/collections/UnboundedFifoBuffer.java
@@ -42,7 +42,7 @@ import java.util.NoSuchElementException;
  * 
  * @deprecated Moved to buffer subpackage. Due to be removed in v4.0.
  * @since Commons Collections 2.1
- * @version $Revision: 1.15 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  *
  * @author Avalon
  * @author Federico Barbieri
diff --git a/src/java/org/apache/commons/collections/Unmodifiable.java b/src/java/org/apache/commons/collections/Unmodifiable.java
index 969d395bf..2ba78b66a 100644
--- a/src/java/org/apache/commons/collections/Unmodifiable.java
+++ b/src/java/org/apache/commons/collections/Unmodifiable.java
@@ -30,7 +30,7 @@ package org.apache.commons.collections;
  * then the interface won't be there.
  *  
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/02/18 01:15:42 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/bag/AbstractBagDecorator.java b/src/java/org/apache/commons/collections/bag/AbstractBagDecorator.java
index 3a9f52793..5c2bb6726 100644
--- a/src/java/org/apache/commons/collections/bag/AbstractBagDecorator.java
+++ b/src/java/org/apache/commons/collections/bag/AbstractBagDecorator.java
@@ -26,7 +26,7 @@ import org.apache.commons.collections.collection.AbstractCollectionDecorator;
  * Methods are forwarded directly to the decorated bag.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/06/02 21:53:02 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/bag/AbstractMapBag.java b/src/java/org/apache/commons/collections/bag/AbstractMapBag.java
index e18ed8491..07cc80901 100644
--- a/src/java/org/apache/commons/collections/bag/AbstractMapBag.java
+++ b/src/java/org/apache/commons/collections/bag/AbstractMapBag.java
@@ -37,7 +37,7 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  * the number of occurrences of that element in the bag.
  *
  * @since Commons Collections 3.0 (previously DefaultMapBag v2.0)
- * @version $Revision: 1.15 $ $Date: 2004/05/15 12:27:04 $
+ * @version $Revision$ $Date$
  * 
  * @author Chuck Burdick
  * @author Michael A. Smith
diff --git a/src/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java b/src/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java
index c8d345fc6..e8fe9c132 100644
--- a/src/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java
+++ b/src/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.SortedBag;
  * Methods are forwarded directly to the decorated bag.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/06/02 21:53:02 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/bag/HashBag.java b/src/java/org/apache/commons/collections/bag/HashBag.java
index 7da53e380..5e1b765e5 100644
--- a/src/java/org/apache/commons/collections/bag/HashBag.java
+++ b/src/java/org/apache/commons/collections/bag/HashBag.java
@@ -35,7 +35,7 @@ import org.apache.commons.collections.Bag;
  * <code>Collection</code> interface specification.
  *
  * @since Commons Collections 3.0 (previously in main package v2.0)
- * @version $Revision: 1.8 $ $Date: 2004/02/18 00:56:25 $
+ * @version $Revision$ $Date$
  * 
  * @author Chuck Burdick
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/bag/PredicatedBag.java b/src/java/org/apache/commons/collections/bag/PredicatedBag.java
index 81cab3834..aa572ff5d 100644
--- a/src/java/org/apache/commons/collections/bag/PredicatedBag.java
+++ b/src/java/org/apache/commons/collections/bag/PredicatedBag.java
@@ -35,7 +35,7 @@ import org.apache.commons.collections.collection.PredicatedCollection;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.8 $ $Date: 2004/06/03 22:02:12 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Paul Jack
diff --git a/src/java/org/apache/commons/collections/bag/PredicatedSortedBag.java b/src/java/org/apache/commons/collections/bag/PredicatedSortedBag.java
index 83efa52eb..4454af02c 100644
--- a/src/java/org/apache/commons/collections/bag/PredicatedSortedBag.java
+++ b/src/java/org/apache/commons/collections/bag/PredicatedSortedBag.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.SortedBag;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.8 $ $Date: 2004/06/03 22:02:12 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Paul Jack
diff --git a/src/java/org/apache/commons/collections/bag/SynchronizedBag.java b/src/java/org/apache/commons/collections/bag/SynchronizedBag.java
index 41417cf6b..07470c535 100644
--- a/src/java/org/apache/commons/collections/bag/SynchronizedBag.java
+++ b/src/java/org/apache/commons/collections/bag/SynchronizedBag.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.set.SynchronizedSet;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.8 $ $Date: 2004/06/03 22:02:12 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/bag/SynchronizedSortedBag.java b/src/java/org/apache/commons/collections/bag/SynchronizedSortedBag.java
index c4242a299..d70cd1766 100644
--- a/src/java/org/apache/commons/collections/bag/SynchronizedSortedBag.java
+++ b/src/java/org/apache/commons/collections/bag/SynchronizedSortedBag.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.SortedBag;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.8 $ $Date: 2004/06/03 22:02:12 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/bag/TransformedBag.java b/src/java/org/apache/commons/collections/bag/TransformedBag.java
index 02b0da05c..7ca6286f1 100644
--- a/src/java/org/apache/commons/collections/bag/TransformedBag.java
+++ b/src/java/org/apache/commons/collections/bag/TransformedBag.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.set.TransformedSet;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/06/03 22:02:12 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/bag/TransformedSortedBag.java b/src/java/org/apache/commons/collections/bag/TransformedSortedBag.java
index ae629cf16..02a69956b 100644
--- a/src/java/org/apache/commons/collections/bag/TransformedSortedBag.java
+++ b/src/java/org/apache/commons/collections/bag/TransformedSortedBag.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.Transformer;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/06/03 22:02:12 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/bag/TreeBag.java b/src/java/org/apache/commons/collections/bag/TreeBag.java
index 1d74f6003..1af943a24 100644
--- a/src/java/org/apache/commons/collections/bag/TreeBag.java
+++ b/src/java/org/apache/commons/collections/bag/TreeBag.java
@@ -40,7 +40,7 @@ import org.apache.commons.collections.SortedBag;
  * <code>Collection</code> interface specification.
  *
  * @since Commons Collections 3.0 (previously in main package v2.0)
- * @version $Revision: 1.9 $ $Date: 2004/02/18 00:56:25 $
+ * @version $Revision$ $Date$
  * 
  * @author Chuck Burdick
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/bag/TypedBag.java b/src/java/org/apache/commons/collections/bag/TypedBag.java
index c7a9bb966..f270d653f 100644
--- a/src/java/org/apache/commons/collections/bag/TypedBag.java
+++ b/src/java/org/apache/commons/collections/bag/TypedBag.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.functors.InstanceofPredicate;
  * collection, an IllegalArgumentException is thrown.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/05/15 12:27:04 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Matthew Hawthorne
diff --git a/src/java/org/apache/commons/collections/bag/TypedSortedBag.java b/src/java/org/apache/commons/collections/bag/TypedSortedBag.java
index 5ae2ba061..d4c8c607e 100644
--- a/src/java/org/apache/commons/collections/bag/TypedSortedBag.java
+++ b/src/java/org/apache/commons/collections/bag/TypedSortedBag.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.functors.InstanceofPredicate;
  * collection, an IllegalArgumentException is thrown.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/05/15 12:27:04 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Matthew Hawthorne
diff --git a/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java b/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java
index a104cb6d3..94520d8ec 100644
--- a/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java
+++ b/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.8 $ $Date: 2004/06/02 21:56:19 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java b/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java
index ac6d8cffc..ac5bde007 100644
--- a/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java
+++ b/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.9 $ $Date: 2004/06/02 21:56:19 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/bag/package.html b/src/java/org/apache/commons/collections/bag/package.html
index 722544e57..f5a84b421 100644
--- a/src/java/org/apache/commons/collections/bag/package.html
+++ b/src/java/org/apache/commons/collections/bag/package.html
@@ -1,4 +1,4 @@
-<!-- $Id: package.html,v 1.6 2004/02/18 21:39:04 scolebourne Exp $ -->
+<!-- $Id$ -->
  <!--
    Copyright 2003-2004 The Apache Software Foundation
 
diff --git a/src/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java b/src/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java
index 0d1c7cd73..1e95eb3b6 100644
--- a/src/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java
+++ b/src/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java
@@ -32,7 +32,7 @@ import org.apache.commons.collections.map.AbstractMapDecorator;
  * But, you might want that loophole, so this class is kept simple.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/02/18 00:57:39 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java b/src/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java
index 96b74504f..cc08b6841 100644
--- a/src/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java
+++ b/src/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java
@@ -36,7 +36,7 @@ import org.apache.commons.collections.keyvalue.AbstractMapEntryDecorator;
  * @see DualHashBidiMap
  * @see DualTreeBidiMap
  * @since Commons Collections 3.0
- * @version $Id: AbstractDualBidiMap.java,v 1.14 2004/06/22 21:54:35 scolebourne Exp $
+ * @version $Id$
  * 
  * @author Matthew Hawthorne
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java b/src/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java
index 7c930ee3c..154b3bdc9 100644
--- a/src/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java
+++ b/src/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.OrderedMapIterator;
  * But, you might want that loophole, so this class is kept simple.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/02/18 00:57:39 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java b/src/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java
index 8d870e285..afeecb551 100644
--- a/src/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java
+++ b/src/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.SortedBidiMap;
  * But, you might want that loophole, so this class is kept simple.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/02/18 00:57:39 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/bidimap/DualHashBidiMap.java b/src/java/org/apache/commons/collections/bidimap/DualHashBidiMap.java
index a7c0a360e..1f214f74c 100644
--- a/src/java/org/apache/commons/collections/bidimap/DualHashBidiMap.java
+++ b/src/java/org/apache/commons/collections/bidimap/DualHashBidiMap.java
@@ -36,7 +36,7 @@ import org.apache.commons.collections.BidiMap;
  * and the flawed <code>createMap</code> method is ignored.
  * 
  * @since Commons Collections 3.0
- * @version $Id: DualHashBidiMap.java,v 1.7 2004/06/11 23:27:37 scolebourne Exp $
+ * @version $Id$
  * 
  * @author Matthew Hawthorne
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java b/src/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java
index a4b5edf27..2b657475d 100644
--- a/src/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java
+++ b/src/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java
@@ -49,7 +49,7 @@ import org.apache.commons.collections.map.AbstractSortedMapDecorator;
  * and the flawed <code>createMap</code> method is ignored.
  * 
  * @since Commons Collections 3.0
- * @version $Id: DualTreeBidiMap.java,v 1.14 2004/06/11 23:27:37 scolebourne Exp $
+ * @version $Id$
  * 
  * @author Matthew Hawthorne
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java b/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
index 2396daef3..778ebb554 100644
--- a/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
+++ b/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
@@ -67,7 +67,7 @@ import org.apache.commons.collections.keyvalue.UnmodifiableMapEntry;
  * UnsupportedOperationException on attempts to call that method.
  *
  * @since Commons Collections 3.0 (previously DoubleOrderedMap v2.0)
- * @version $Revision: 1.16 $ $Date: 2005/01/03 23:52:49 $
+ * @version $Revision$ $Date$
  * 
  * @author Marc Johnson
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java b/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java
index c5cff8c32..b8b668131 100644
--- a/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java
+++ b/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  * Decorates another <code>BidiMap</code> to ensure it can't be altered.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/05/15 12:13:03 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java b/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java
index 62d1d3856..785f0f693 100644
--- a/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java
+++ b/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  * Decorates another <code>OrderedBidiMap</code> to ensure it can't be altered.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/05/15 12:13:03 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java b/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java
index 3375d9fa5..c359d9f7e 100644
--- a/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java
+++ b/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java
@@ -36,7 +36,7 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  * Decorates another <code>SortedBidiMap</code> to ensure it can't be altered.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/05/15 12:13:03 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/bidimap/package.html b/src/java/org/apache/commons/collections/bidimap/package.html
index 129fefc37..0892dc86e 100644
--- a/src/java/org/apache/commons/collections/bidimap/package.html
+++ b/src/java/org/apache/commons/collections/bidimap/package.html
@@ -1,4 +1,4 @@
-<!-- $Id: package.html,v 1.5 2004/02/18 21:39:04 scolebourne Exp $ -->
+<!-- $Id$ -->
  <!--
    Copyright 2003-2004 The Apache Software Foundation
 
diff --git a/src/java/org/apache/commons/collections/buffer/AbstractBufferDecorator.java b/src/java/org/apache/commons/collections/buffer/AbstractBufferDecorator.java
index 3ab71c11c..e88e80fff 100644
--- a/src/java/org/apache/commons/collections/buffer/AbstractBufferDecorator.java
+++ b/src/java/org/apache/commons/collections/buffer/AbstractBufferDecorator.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.collection.AbstractCollectionDecorator;
  * Methods are forwarded directly to the decorated buffer.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/06/02 21:53:02 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/buffer/BlockingBuffer.java b/src/java/org/apache/commons/collections/buffer/BlockingBuffer.java
index 6b4194428..f7ac6d574 100644
--- a/src/java/org/apache/commons/collections/buffer/BlockingBuffer.java
+++ b/src/java/org/apache/commons/collections/buffer/BlockingBuffer.java
@@ -37,7 +37,7 @@ import org.apache.commons.collections.BufferUnderflowException;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/06/03 22:02:13 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Janek Bogucki
diff --git a/src/java/org/apache/commons/collections/buffer/BoundedFifoBuffer.java b/src/java/org/apache/commons/collections/buffer/BoundedFifoBuffer.java
index 44ce20b46..efe02f21a 100644
--- a/src/java/org/apache/commons/collections/buffer/BoundedFifoBuffer.java
+++ b/src/java/org/apache/commons/collections/buffer/BoundedFifoBuffer.java
@@ -53,7 +53,7 @@ import org.apache.commons.collections.BufferUnderflowException;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0 (previously in main package v2.1)
- * @version $Revision: 1.11 $ $Date: 2005/01/22 00:48:22 $
+ * @version $Revision$ $Date$
  * 
  * @author Avalon
  * @author Berin Loritsch
diff --git a/src/java/org/apache/commons/collections/buffer/CircularFifoBuffer.java b/src/java/org/apache/commons/collections/buffer/CircularFifoBuffer.java
index 016970d46..361947572 100644
--- a/src/java/org/apache/commons/collections/buffer/CircularFifoBuffer.java
+++ b/src/java/org/apache/commons/collections/buffer/CircularFifoBuffer.java
@@ -40,7 +40,7 @@ import java.util.Collection;
  * This class is Serializable from Commons Collections 3.1.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/06/03 22:02:13 $
+ * @version $Revision$ $Date$
  * 
  * @author Stefano Fornari
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/buffer/PredicatedBuffer.java b/src/java/org/apache/commons/collections/buffer/PredicatedBuffer.java
index c484c02be..0a16c1764 100644
--- a/src/java/org/apache/commons/collections/buffer/PredicatedBuffer.java
+++ b/src/java/org/apache/commons/collections/buffer/PredicatedBuffer.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.collection.PredicatedCollection;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/06/03 22:02:13 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Paul Jack
diff --git a/src/java/org/apache/commons/collections/buffer/PriorityBuffer.java b/src/java/org/apache/commons/collections/buffer/PriorityBuffer.java
index c7de86e5f..f0b735bbb 100644
--- a/src/java/org/apache/commons/collections/buffer/PriorityBuffer.java
+++ b/src/java/org/apache/commons/collections/buffer/PriorityBuffer.java
@@ -50,7 +50,7 @@ import org.apache.commons.collections.BufferUnderflowException;
  * </pre>
  *
  * @since Commons Collections 3.0 (previously BinaryHeap v1.0)
- * @version $Revision: 1.5 $ $Date: 2004/05/15 12:33:23 $
+ * @version $Revision$ $Date$
  * 
  * @author Peter Donald
  * @author Ram Chidambaram
diff --git a/src/java/org/apache/commons/collections/buffer/SynchronizedBuffer.java b/src/java/org/apache/commons/collections/buffer/SynchronizedBuffer.java
index 3b5a048ef..d255cc3cd 100644
--- a/src/java/org/apache/commons/collections/buffer/SynchronizedBuffer.java
+++ b/src/java/org/apache/commons/collections/buffer/SynchronizedBuffer.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.collection.SynchronizedCollection;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/06/03 22:02:13 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/buffer/TransformedBuffer.java b/src/java/org/apache/commons/collections/buffer/TransformedBuffer.java
index 394aaed11..0937123e0 100644
--- a/src/java/org/apache/commons/collections/buffer/TransformedBuffer.java
+++ b/src/java/org/apache/commons/collections/buffer/TransformedBuffer.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.collection.TransformedCollection;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/06/03 22:02:13 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/buffer/TypedBuffer.java b/src/java/org/apache/commons/collections/buffer/TypedBuffer.java
index 9540bf88e..3aed311dc 100644
--- a/src/java/org/apache/commons/collections/buffer/TypedBuffer.java
+++ b/src/java/org/apache/commons/collections/buffer/TypedBuffer.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.functors.InstanceofPredicate;
  * collection, an IllegalArgumentException is thrown.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/05/15 12:33:23 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Matthew Hawthorne
diff --git a/src/java/org/apache/commons/collections/buffer/UnboundedFifoBuffer.java b/src/java/org/apache/commons/collections/buffer/UnboundedFifoBuffer.java
index a23cf3801..6e42f9f82 100644
--- a/src/java/org/apache/commons/collections/buffer/UnboundedFifoBuffer.java
+++ b/src/java/org/apache/commons/collections/buffer/UnboundedFifoBuffer.java
@@ -50,7 +50,7 @@ import org.apache.commons.collections.BufferUnderflowException;
  * This class is Serializable from Commons Collections 3.1.
  * 
  * @since Commons Collections 3.0 (previously in main package v2.1)
- * @version $Revision: 1.9 $ $Date: 2004/06/01 22:57:18 $
+ * @version $Revision$ $Date$
  *
  * @author Avalon
  * @author Federico Barbieri
diff --git a/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java b/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java
index 476f16735..576e4d3ae 100644
--- a/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java
+++ b/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java
@@ -32,7 +32,7 @@ import org.apache.commons.collections.iterators.UnmodifiableIterator;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/06/02 21:57:03 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/buffer/package.html b/src/java/org/apache/commons/collections/buffer/package.html
index f82cd067b..fb9692708 100644
--- a/src/java/org/apache/commons/collections/buffer/package.html
+++ b/src/java/org/apache/commons/collections/buffer/package.html
@@ -1,4 +1,4 @@
-<!-- $Id: package.html,v 1.8 2004/02/18 21:39:04 scolebourne Exp $ -->
+<!-- $Id$ -->
  <!--
    Copyright 2003-2004 The Apache Software Foundation
 
diff --git a/src/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java b/src/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java
index 79bd9ed33..191dea9ba 100644
--- a/src/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java
+++ b/src/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java
@@ -34,7 +34,7 @@ import java.util.Iterator;
  * to write an unmodifiable implementation it might provide a loophole.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/06/02 21:53:03 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Paul Jack
diff --git a/src/java/org/apache/commons/collections/collection/CompositeCollection.java b/src/java/org/apache/commons/collections/collection/CompositeCollection.java
index 95ce796bf..cf55b72fa 100644
--- a/src/java/org/apache/commons/collections/collection/CompositeCollection.java
+++ b/src/java/org/apache/commons/collections/collection/CompositeCollection.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.list.UnmodifiableList;
  * strategy is provided then add and remove are unsupported.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/05/26 21:58:02 $
+ * @version $Revision$ $Date$
  *
  * @author Brian McCallister
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/collection/PredicatedCollection.java b/src/java/org/apache/commons/collections/collection/PredicatedCollection.java
index ba160f9ef..cfd2773f2 100644
--- a/src/java/org/apache/commons/collections/collection/PredicatedCollection.java
+++ b/src/java/org/apache/commons/collections/collection/PredicatedCollection.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.Predicate;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/06/03 22:02:13 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Paul Jack
diff --git a/src/java/org/apache/commons/collections/collection/SynchronizedCollection.java b/src/java/org/apache/commons/collections/collection/SynchronizedCollection.java
index 62986d576..c91072849 100644
--- a/src/java/org/apache/commons/collections/collection/SynchronizedCollection.java
+++ b/src/java/org/apache/commons/collections/collection/SynchronizedCollection.java
@@ -34,7 +34,7 @@ import java.util.Iterator;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/06/03 22:02:13 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/collection/TransformedCollection.java b/src/java/org/apache/commons/collections/collection/TransformedCollection.java
index ea4ac5072..642dc2072 100644
--- a/src/java/org/apache/commons/collections/collection/TransformedCollection.java
+++ b/src/java/org/apache/commons/collections/collection/TransformedCollection.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.Transformer;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/06/03 22:02:13 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/collection/TypedCollection.java b/src/java/org/apache/commons/collections/collection/TypedCollection.java
index 43b9cbaf2..6783c0fc2 100644
--- a/src/java/org/apache/commons/collections/collection/TypedCollection.java
+++ b/src/java/org/apache/commons/collections/collection/TypedCollection.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.functors.InstanceofPredicate;
  * collection, an IllegalArgumentException is thrown.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/05/15 12:39:13 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Matthew Hawthorne
diff --git a/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java b/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java
index 79daa0aa6..081c1112f 100644
--- a/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java
+++ b/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.iterators.UnmodifiableIterator;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.10 $ $Date: 2004/06/03 22:02:13 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java b/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java
index 833910006..a347390bd 100644
--- a/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java
+++ b/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.iterators.UnmodifiableIterator;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.8 $ $Date: 2004/06/03 22:02:13 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/collection/package.html b/src/java/org/apache/commons/collections/collection/package.html
index 3a65af834..8057b144c 100644
--- a/src/java/org/apache/commons/collections/collection/package.html
+++ b/src/java/org/apache/commons/collections/collection/package.html
@@ -1,4 +1,4 @@
-<!-- $Id: package.html,v 1.5 2004/02/18 21:39:04 scolebourne Exp $ -->
+<!-- $Id$ -->
  <!--
    Copyright 2003-2004 The Apache Software Foundation
 
diff --git a/src/java/org/apache/commons/collections/comparators/BooleanComparator.java b/src/java/org/apache/commons/collections/comparators/BooleanComparator.java
index 264d9cd8b..52660f400 100644
--- a/src/java/org/apache/commons/collections/comparators/BooleanComparator.java
+++ b/src/java/org/apache/commons/collections/comparators/BooleanComparator.java
@@ -27,7 +27,7 @@ import java.util.Comparator;
  * @see #getBooleanComparator(boolean)
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.15 $ $Date: 2004/10/16 21:26:14 $
+ * @version $Revision$ $Date$
  * 
  * @author Rodney Waldhoff
  */
diff --git a/src/java/org/apache/commons/collections/comparators/ComparableComparator.java b/src/java/org/apache/commons/collections/comparators/ComparableComparator.java
index 32cffcb5d..c435dbac0 100644
--- a/src/java/org/apache/commons/collections/comparators/ComparableComparator.java
+++ b/src/java/org/apache/commons/collections/comparators/ComparableComparator.java
@@ -35,7 +35,7 @@ import java.util.Comparator;
  * {@link #compare(Object, Object) compare} for details.
  *
  * @since Commons Collections 2.0
- * @version $Revision: 1.15 $ $Date: 2004/05/15 13:24:11 $
+ * @version $Revision$ $Date$
  *
  * @author Henri Yandell
  *
diff --git a/src/java/org/apache/commons/collections/comparators/ComparatorChain.java b/src/java/org/apache/commons/collections/comparators/ComparatorChain.java
index aa5ce2518..6d0d776d5 100644
--- a/src/java/org/apache/commons/collections/comparators/ComparatorChain.java
+++ b/src/java/org/apache/commons/collections/comparators/ComparatorChain.java
@@ -51,7 +51,7 @@ import java.util.List;
  * 
  * @since Commons Collections 2.0
  * @author Morgan Delagrange
- * @version $Revision: 1.18 $ $Date: 2004/05/16 11:48:49 $
+ * @version $Revision$ $Date$
  */
 public class ComparatorChain implements Comparator, Serializable {
 
diff --git a/src/java/org/apache/commons/collections/comparators/FixedOrderComparator.java b/src/java/org/apache/commons/collections/comparators/FixedOrderComparator.java
index bce6ba04e..e339809d3 100644
--- a/src/java/org/apache/commons/collections/comparators/FixedOrderComparator.java
+++ b/src/java/org/apache/commons/collections/comparators/FixedOrderComparator.java
@@ -41,7 +41,7 @@ import java.util.Map;
  * multiple comparisons  after all the setup operations are complete.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.10 $ $Date: 2004/05/15 13:24:11 $
+ * @version $Revision$ $Date$
  *
  * @author David Leppik
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/comparators/NullComparator.java b/src/java/org/apache/commons/collections/comparators/NullComparator.java
index aae82c03a..adf22568e 100644
--- a/src/java/org/apache/commons/collections/comparators/NullComparator.java
+++ b/src/java/org/apache/commons/collections/comparators/NullComparator.java
@@ -23,7 +23,7 @@ import java.util.Comparator;
  * other objects.
  *
  * @since Commons Collections 2.0
- * @version $Revision: 1.13 $ $Date: 2004/05/15 13:24:11 $ 
+ * @version $Revision$ $Date$ 
  *
  * @author Michael A. Smith
  */
diff --git a/src/java/org/apache/commons/collections/comparators/ReverseComparator.java b/src/java/org/apache/commons/collections/comparators/ReverseComparator.java
index e7f87321d..ca47fbfc7 100644
--- a/src/java/org/apache/commons/collections/comparators/ReverseComparator.java
+++ b/src/java/org/apache/commons/collections/comparators/ReverseComparator.java
@@ -23,7 +23,7 @@ import java.util.Comparator;
  * to its {@link #compare(Object, Object) compare} method.
  * 
  * @since Commons Collections 2.0
- * @version $Revision: 1.20 $ $Date: 2004/05/16 11:49:24 $
+ * @version $Revision$ $Date$
  *
  * @author Henri Yandell
  * @author Michael A. Smith
diff --git a/src/java/org/apache/commons/collections/comparators/package.html b/src/java/org/apache/commons/collections/comparators/package.html
index 2076934a3..99e8c963a 100644
--- a/src/java/org/apache/commons/collections/comparators/package.html
+++ b/src/java/org/apache/commons/collections/comparators/package.html
@@ -1,4 +1,4 @@
-<!-- $Id: package.html,v 1.5 2004/02/18 21:39:04 scolebourne Exp $ -->
+<!-- $Id$ -->
  <!--
    Copyright 2002-2004 The Apache Software Foundation
 
diff --git a/src/java/org/apache/commons/collections/functors/AllPredicate.java b/src/java/org/apache/commons/collections/functors/AllPredicate.java
index 6186c2f39..6280ce54e 100644
--- a/src/java/org/apache/commons/collections/functors/AllPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/AllPredicate.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.Predicate;
  * Predicate implementation that returns true if all the predicates return true.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/05/31 16:43:17 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/AndPredicate.java b/src/java/org/apache/commons/collections/functors/AndPredicate.java
index 462859762..430b8b0e4 100644
--- a/src/java/org/apache/commons/collections/functors/AndPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/AndPredicate.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.Predicate;
  * Predicate implementation that returns true if both the predicates return true.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/05/31 16:43:17 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/AnyPredicate.java b/src/java/org/apache/commons/collections/functors/AnyPredicate.java
index 8dfc2e356..2b06b25e5 100644
--- a/src/java/org/apache/commons/collections/functors/AnyPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/AnyPredicate.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.Predicate;
  * Predicate implementation that returns true if any of the predicates return true.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/05/31 16:43:17 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/ChainedClosure.java b/src/java/org/apache/commons/collections/functors/ChainedClosure.java
index bb1fa7e91..bf5a007bd 100644
--- a/src/java/org/apache/commons/collections/functors/ChainedClosure.java
+++ b/src/java/org/apache/commons/collections/functors/ChainedClosure.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.Closure;
  * Closure implementation that chains the specified closures together.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/03/13 17:17:03 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/ChainedTransformer.java b/src/java/org/apache/commons/collections/functors/ChainedTransformer.java
index f561b2795..ac327d2cb 100644
--- a/src/java/org/apache/commons/collections/functors/ChainedTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/ChainedTransformer.java
@@ -28,7 +28,7 @@ import org.apache.commons.collections.Transformer;
  * is passed to the second transformer and so on.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/05/16 11:36:31 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/CloneTransformer.java b/src/java/org/apache/commons/collections/functors/CloneTransformer.java
index 4b87164b5..3e6d6caa0 100644
--- a/src/java/org/apache/commons/collections/functors/CloneTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/CloneTransformer.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.Transformer;
  * Clone is performed using <code>PrototypeFactory.getInstance(input).create()</code>.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/05/16 11:36:31 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/ClosureTransformer.java b/src/java/org/apache/commons/collections/functors/ClosureTransformer.java
index 522199624..8e5929e76 100644
--- a/src/java/org/apache/commons/collections/functors/ClosureTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/ClosureTransformer.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.Transformer;
  * and then returns the input.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/05/16 11:36:31 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/ConstantFactory.java b/src/java/org/apache/commons/collections/functors/ConstantFactory.java
index 8396b8275..9f7fa16f3 100644
--- a/src/java/org/apache/commons/collections/functors/ConstantFactory.java
+++ b/src/java/org/apache/commons/collections/functors/ConstantFactory.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.Factory;
  * use the prototype factory.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/05/16 11:47:38 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/ConstantTransformer.java b/src/java/org/apache/commons/collections/functors/ConstantTransformer.java
index fcb3dc7bb..a828fa425 100644
--- a/src/java/org/apache/commons/collections/functors/ConstantTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/ConstantTransformer.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.Transformer;
  * use the prototype factory.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/05/16 11:36:31 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/EqualPredicate.java b/src/java/org/apache/commons/collections/functors/EqualPredicate.java
index 9ce875b76..9a4c30d29 100644
--- a/src/java/org/apache/commons/collections/functors/EqualPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/EqualPredicate.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.Predicate;
  * as the one stored in this predicate by equals.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/05/16 11:16:01 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/ExceptionClosure.java b/src/java/org/apache/commons/collections/functors/ExceptionClosure.java
index 3098f619c..9a5fdae34 100644
--- a/src/java/org/apache/commons/collections/functors/ExceptionClosure.java
+++ b/src/java/org/apache/commons/collections/functors/ExceptionClosure.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.FunctorException;
  * Closure implementation that always throws an exception.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/05/16 11:47:38 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/ExceptionFactory.java b/src/java/org/apache/commons/collections/functors/ExceptionFactory.java
index 5304c5235..231568e1d 100644
--- a/src/java/org/apache/commons/collections/functors/ExceptionFactory.java
+++ b/src/java/org/apache/commons/collections/functors/ExceptionFactory.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.FunctorException;
  * Factory implementation that always throws an exception.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/05/16 11:47:38 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/ExceptionPredicate.java b/src/java/org/apache/commons/collections/functors/ExceptionPredicate.java
index e4bb2a72f..ab8e52f43 100644
--- a/src/java/org/apache/commons/collections/functors/ExceptionPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/ExceptionPredicate.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.Predicate;
  * Predicate implementation that always throws an exception.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/05/16 11:16:01 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/ExceptionTransformer.java b/src/java/org/apache/commons/collections/functors/ExceptionTransformer.java
index e6a0e16a6..27a7f11ce 100644
--- a/src/java/org/apache/commons/collections/functors/ExceptionTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/ExceptionTransformer.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.Transformer;
  * Transformer implementation that always throws an exception.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/05/16 11:36:31 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/FactoryTransformer.java b/src/java/org/apache/commons/collections/functors/FactoryTransformer.java
index 79a2ececb..63e738ab0 100644
--- a/src/java/org/apache/commons/collections/functors/FactoryTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/FactoryTransformer.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.Transformer;
  * Transformer implementation that calls a Factory and returns the result.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/05/16 11:36:31 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/FalsePredicate.java b/src/java/org/apache/commons/collections/functors/FalsePredicate.java
index 0f827e579..603966fea 100644
--- a/src/java/org/apache/commons/collections/functors/FalsePredicate.java
+++ b/src/java/org/apache/commons/collections/functors/FalsePredicate.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.Predicate;
  * Predicate implementation that always returns false.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/05/16 11:16:01 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/ForClosure.java b/src/java/org/apache/commons/collections/functors/ForClosure.java
index 43e846809..76c15a6aa 100644
--- a/src/java/org/apache/commons/collections/functors/ForClosure.java
+++ b/src/java/org/apache/commons/collections/functors/ForClosure.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.Closure;
  * Closure implementation that calls another closure n times, like a for loop.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/05/16 11:47:38 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/FunctorUtils.java b/src/java/org/apache/commons/collections/functors/FunctorUtils.java
index 22f84f9e4..fd4e23f76 100644
--- a/src/java/org/apache/commons/collections/functors/FunctorUtils.java
+++ b/src/java/org/apache/commons/collections/functors/FunctorUtils.java
@@ -26,7 +26,7 @@ import org.apache.commons.collections.Transformer;
  * Internal utilities for functors.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/05/16 11:47:38 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/IdentityPredicate.java b/src/java/org/apache/commons/collections/functors/IdentityPredicate.java
index 5421d86a1..53d8cee4c 100644
--- a/src/java/org/apache/commons/collections/functors/IdentityPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/IdentityPredicate.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.Predicate;
  * as the one stored in this predicate.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/05/16 11:16:01 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/IfClosure.java b/src/java/org/apache/commons/collections/functors/IfClosure.java
index 19b403831..db0b853c1 100644
--- a/src/java/org/apache/commons/collections/functors/IfClosure.java
+++ b/src/java/org/apache/commons/collections/functors/IfClosure.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.Predicate;
  * based on a predicate.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/05/16 11:47:38 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/InstanceofPredicate.java b/src/java/org/apache/commons/collections/functors/InstanceofPredicate.java
index da3ec92bb..a239dbdc7 100644
--- a/src/java/org/apache/commons/collections/functors/InstanceofPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/InstanceofPredicate.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.Predicate;
  * the type stored in this predicate.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/05/16 11:16:01 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/InstantiateFactory.java b/src/java/org/apache/commons/collections/functors/InstantiateFactory.java
index 6f4cac982..590173d65 100644
--- a/src/java/org/apache/commons/collections/functors/InstantiateFactory.java
+++ b/src/java/org/apache/commons/collections/functors/InstantiateFactory.java
@@ -26,7 +26,7 @@ import org.apache.commons.collections.FunctorException;
  * Factory implementation that creates a new object instance by reflection.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/05/16 11:47:38 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/InstantiateTransformer.java b/src/java/org/apache/commons/collections/functors/InstantiateTransformer.java
index f69af60fe..68c797444 100644
--- a/src/java/org/apache/commons/collections/functors/InstantiateTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/InstantiateTransformer.java
@@ -26,7 +26,7 @@ import org.apache.commons.collections.Transformer;
  * Transformer implementation that creates a new object instance by reflection.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/05/16 11:36:31 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/InvokerTransformer.java b/src/java/org/apache/commons/collections/functors/InvokerTransformer.java
index 192803047..4fa25b215 100644
--- a/src/java/org/apache/commons/collections/functors/InvokerTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/InvokerTransformer.java
@@ -26,7 +26,7 @@ import org.apache.commons.collections.Transformer;
  * Transformer implementation that creates a new object instance by reflection.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/05/26 21:44:05 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/MapTransformer.java b/src/java/org/apache/commons/collections/functors/MapTransformer.java
index 7b2a5461f..eb496bfa9 100644
--- a/src/java/org/apache/commons/collections/functors/MapTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/MapTransformer.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.Transformer;
  * using the input parameter as a key.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/05/16 11:36:31 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/NOPClosure.java b/src/java/org/apache/commons/collections/functors/NOPClosure.java
index 98ca690be..69e31e6f6 100644
--- a/src/java/org/apache/commons/collections/functors/NOPClosure.java
+++ b/src/java/org/apache/commons/collections/functors/NOPClosure.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.Closure;
  * Closure implementation that does nothing.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/05/16 11:47:38 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/NOPTransformer.java b/src/java/org/apache/commons/collections/functors/NOPTransformer.java
index 080f180c5..9c7232b99 100644
--- a/src/java/org/apache/commons/collections/functors/NOPTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/NOPTransformer.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.Transformer;
  * Transformer implementation that does nothing.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/05/16 11:36:31 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/NonePredicate.java b/src/java/org/apache/commons/collections/functors/NonePredicate.java
index e914ab8fa..1683d822c 100644
--- a/src/java/org/apache/commons/collections/functors/NonePredicate.java
+++ b/src/java/org/apache/commons/collections/functors/NonePredicate.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.Predicate;
  * Predicate implementation that returns true if none of the predicates return true.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/05/31 16:43:17 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/NotNullPredicate.java b/src/java/org/apache/commons/collections/functors/NotNullPredicate.java
index 2e7758f88..92f732002 100644
--- a/src/java/org/apache/commons/collections/functors/NotNullPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/NotNullPredicate.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.Predicate;
  * Predicate implementation that returns true if the input is not null.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/05/16 11:47:38 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/NotPredicate.java b/src/java/org/apache/commons/collections/functors/NotPredicate.java
index ecae2c914..493bb2cea 100644
--- a/src/java/org/apache/commons/collections/functors/NotPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/NotPredicate.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.Predicate;
  * Predicate implementation that returns the opposite of the decorated predicate.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/05/31 16:43:17 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java b/src/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java
index 516198810..b1cddb068 100644
--- a/src/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.Predicate;
  * Predicate implementation that throws an exception if the input is null.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/05/31 16:43:17 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java b/src/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java
index 27e48cbad..d43f0c732 100644
--- a/src/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java
+++ b/src/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.Predicate;
  * Predicate implementation that returns false if the input is null.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/05/31 16:43:17 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/NullIsTruePredicate.java b/src/java/org/apache/commons/collections/functors/NullIsTruePredicate.java
index 46078064e..2989da2fd 100644
--- a/src/java/org/apache/commons/collections/functors/NullIsTruePredicate.java
+++ b/src/java/org/apache/commons/collections/functors/NullIsTruePredicate.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.Predicate;
  * Predicate implementation that returns true if the input is null.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/05/31 16:43:17 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/NullPredicate.java b/src/java/org/apache/commons/collections/functors/NullPredicate.java
index 151e27a9a..299706f92 100644
--- a/src/java/org/apache/commons/collections/functors/NullPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/NullPredicate.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.Predicate;
  * Predicate implementation that returns true if the input is null.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/05/16 11:16:01 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/OnePredicate.java b/src/java/org/apache/commons/collections/functors/OnePredicate.java
index 49772988a..513acdac1 100644
--- a/src/java/org/apache/commons/collections/functors/OnePredicate.java
+++ b/src/java/org/apache/commons/collections/functors/OnePredicate.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.Predicate;
  * Predicate implementation that returns true if only one of the predicates return true.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/05/31 16:43:17 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/OrPredicate.java b/src/java/org/apache/commons/collections/functors/OrPredicate.java
index 25164625f..57a2f3725 100644
--- a/src/java/org/apache/commons/collections/functors/OrPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/OrPredicate.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.Predicate;
  * Predicate implementation that returns true if either of the predicates return true.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/05/31 16:43:17 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/PredicateDecorator.java b/src/java/org/apache/commons/collections/functors/PredicateDecorator.java
index b0f7eeb4e..edd2bb212 100644
--- a/src/java/org/apache/commons/collections/functors/PredicateDecorator.java
+++ b/src/java/org/apache/commons/collections/functors/PredicateDecorator.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.Predicate;
  * This interface enables tools to access the decorated predicates.
  * 
  * @since Commons Collections 3.1
- * @version $Revision: 1.1 $ $Date: 2004/05/31 16:43:17 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/PredicateTransformer.java b/src/java/org/apache/commons/collections/functors/PredicateTransformer.java
index 7c45e8ca6..139c1a181 100644
--- a/src/java/org/apache/commons/collections/functors/PredicateTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/PredicateTransformer.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.Transformer;
  * and then returns the input.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/05/16 11:36:31 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/PrototypeFactory.java b/src/java/org/apache/commons/collections/functors/PrototypeFactory.java
index b3390c49e..0f2d2ca24 100644
--- a/src/java/org/apache/commons/collections/functors/PrototypeFactory.java
+++ b/src/java/org/apache/commons/collections/functors/PrototypeFactory.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.FunctorException;
  * Factory implementation that creates a new instance each time based on a prototype.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/05/16 11:47:38 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/StringValueTransformer.java b/src/java/org/apache/commons/collections/functors/StringValueTransformer.java
index 1bb94db19..25e990a88 100644
--- a/src/java/org/apache/commons/collections/functors/StringValueTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/StringValueTransformer.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.Transformer;
  * Transformer implementation that returns the <code>String.valueOf</code>.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/05/16 11:36:31 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/SwitchClosure.java b/src/java/org/apache/commons/collections/functors/SwitchClosure.java
index 7cae97eb5..af48c422e 100644
--- a/src/java/org/apache/commons/collections/functors/SwitchClosure.java
+++ b/src/java/org/apache/commons/collections/functors/SwitchClosure.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.Predicate;
  * like a switch statement.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/05/16 11:47:38 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/SwitchTransformer.java b/src/java/org/apache/commons/collections/functors/SwitchTransformer.java
index 4ebff1e04..2455753f3 100644
--- a/src/java/org/apache/commons/collections/functors/SwitchTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/SwitchTransformer.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.Transformer;
  * like a switch statement.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/05/16 11:36:31 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/TransformedPredicate.java b/src/java/org/apache/commons/collections/functors/TransformedPredicate.java
index d73c38619..55d66b472 100644
--- a/src/java/org/apache/commons/collections/functors/TransformedPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/TransformedPredicate.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.Transformer;
  * another <code>Predicate</code>.
  * 
  * @since Commons Collections 3.1
- * @version $Revision: 1.4 $ $Date: 2004/05/31 16:43:17 $
+ * @version $Revision$ $Date$
  * @author Alban Peignier
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/TransformerClosure.java b/src/java/org/apache/commons/collections/functors/TransformerClosure.java
index 807384623..f2427f01a 100644
--- a/src/java/org/apache/commons/collections/functors/TransformerClosure.java
+++ b/src/java/org/apache/commons/collections/functors/TransformerClosure.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.Transformer;
  * and ignore the result.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/05/16 11:47:38 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/TransformerPredicate.java b/src/java/org/apache/commons/collections/functors/TransformerPredicate.java
index 73f74be55..e51876e5d 100644
--- a/src/java/org/apache/commons/collections/functors/TransformerPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/TransformerPredicate.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.Transformer;
  * Predicate implementation that returns the result of a transformer.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/05/16 11:16:01 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/TruePredicate.java b/src/java/org/apache/commons/collections/functors/TruePredicate.java
index a8f028d56..a10898d98 100644
--- a/src/java/org/apache/commons/collections/functors/TruePredicate.java
+++ b/src/java/org/apache/commons/collections/functors/TruePredicate.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.Predicate;
  * Predicate implementation that always returns true.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/05/16 11:16:01 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/UniquePredicate.java b/src/java/org/apache/commons/collections/functors/UniquePredicate.java
index 56264a711..2e5fcfab9 100644
--- a/src/java/org/apache/commons/collections/functors/UniquePredicate.java
+++ b/src/java/org/apache/commons/collections/functors/UniquePredicate.java
@@ -26,7 +26,7 @@ import org.apache.commons.collections.Predicate;
  * passed into the predicate.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/05/16 11:16:01 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/WhileClosure.java b/src/java/org/apache/commons/collections/functors/WhileClosure.java
index f39d6081f..d8fa0e4f7 100644
--- a/src/java/org/apache/commons/collections/functors/WhileClosure.java
+++ b/src/java/org/apache/commons/collections/functors/WhileClosure.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.Predicate;
  * like a do-while or while loop.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/05/16 11:47:38 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/functors/package.html b/src/java/org/apache/commons/collections/functors/package.html
index bb84c46ac..7e4aa6ed6 100644
--- a/src/java/org/apache/commons/collections/functors/package.html
+++ b/src/java/org/apache/commons/collections/functors/package.html
@@ -1,4 +1,4 @@
-<!-- $Id: package.html,v 1.2 2004/02/18 21:39:04 scolebourne Exp $ -->
+<!-- $Id$ -->
  <!--
    Copyright 2003-2004 The Apache Software Foundation
 
diff --git a/src/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java b/src/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java
index 5273b922d..d551c93da 100644
--- a/src/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java
@@ -21,7 +21,7 @@ import java.util.NoSuchElementException;
  * Provides an implementation of an empty iterator.
  *
  * @since Commons Collections 3.1
- * @version $Revision: 1.2 $ $Date: 2004/05/26 20:57:43 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/iterators/AbstractIteratorDecorator.java b/src/java/org/apache/commons/collections/iterators/AbstractIteratorDecorator.java
index e7cf03bce..342e4fde1 100644
--- a/src/java/org/apache/commons/collections/iterators/AbstractIteratorDecorator.java
+++ b/src/java/org/apache/commons/collections/iterators/AbstractIteratorDecorator.java
@@ -23,7 +23,7 @@ import java.util.Iterator;
  * All methods are forwarded to the decorated iterator.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/02/18 00:59:50 $
+ * @version $Revision$ $Date$
  * 
  * @author James Strachan
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java b/src/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java
index 2ad78b30f..37cf0b95f 100644
--- a/src/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java
+++ b/src/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java
@@ -23,7 +23,7 @@ import java.util.ListIterator;
  * All methods are forwarded to the decorated list iterator.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/02/18 00:59:50 $
+ * @version $Revision$ $Date$
  * 
  * @author Rodney Waldhoff
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java b/src/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java
index faa995d5e..c8c41f473 100644
--- a/src/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java
+++ b/src/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.MapIterator;
  * All methods are forwarded to the decorated map iterator.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/02/18 00:59:50 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorDecorator.java b/src/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorDecorator.java
index 42696f225..9013d7f41 100644
--- a/src/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorDecorator.java
+++ b/src/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorDecorator.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.OrderedMapIterator;
  * All methods are forwarded to the decorated map iterator.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/02/18 00:59:50 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/iterators/ArrayIterator.java b/src/java/org/apache/commons/collections/iterators/ArrayIterator.java
index 17d8c7eda..3b6addee2 100644
--- a/src/java/org/apache/commons/collections/iterators/ArrayIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/ArrayIterator.java
@@ -32,7 +32,7 @@ import org.apache.commons.collections.ResettableIterator;
  * the iterator back to the start if required.
  *
  * @since Commons Collections 1.0
- * @version $Revision: 1.11 $ $Date: 2004/02/18 00:59:50 $
+ * @version $Revision$ $Date$
  *
  * @author James Strachan
  * @author Mauricio S. Moura
diff --git a/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java b/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java
index eb5fc7616..f937a1ddd 100644
--- a/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java
@@ -37,7 +37,7 @@ import org.apache.commons.collections.ResettableListIterator;
  * @see java.util.ListIterator
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.12 $ $Date: 2004/02/18 00:59:50 $
+ * @version $Revision$ $Date$
  *
  * @author Neil O'Toole
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/iterators/CollatingIterator.java b/src/java/org/apache/commons/collections/iterators/CollatingIterator.java
index 5dcdc0d02..be8f2d55c 100644
--- a/src/java/org/apache/commons/collections/iterators/CollatingIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/CollatingIterator.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.list.UnmodifiableList;
  * <code>A.next()</code> and <code>B.next()</code>.
  *
  * @since Commons Collections 2.1
- * @version $Revision: 1.13 $ $Date: 2004/02/18 00:59:50 $
+ * @version $Revision$ $Date$
  * 
  * @author Rodney Waldhoff
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/iterators/EmptyIterator.java b/src/java/org/apache/commons/collections/iterators/EmptyIterator.java
index d8b5eb199..43009cce3 100644
--- a/src/java/org/apache/commons/collections/iterators/EmptyIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/EmptyIterator.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.ResettableIterator;
  * 2.1.1 and 3.1 due to issues with <code>IteratorUtils</code>.
  *
  * @since Commons Collections 2.1.1 and 3.1
- * @version $Revision: 1.1 $ $Date: 2004/05/22 09:46:39 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/iterators/EmptyListIterator.java b/src/java/org/apache/commons/collections/iterators/EmptyListIterator.java
index f6b9103f7..1001aa2e6 100644
--- a/src/java/org/apache/commons/collections/iterators/EmptyListIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/EmptyListIterator.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.ResettableListIterator;
  * 2.1.1 and 3.1 due to issues with <code>IteratorUtils</code>.
  *
  * @since Commons Collections 2.1.1 and 3.1
- * @version $Revision: 1.2 $ $Date: 2004/05/26 21:53:18 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/iterators/EmptyMapIterator.java b/src/java/org/apache/commons/collections/iterators/EmptyMapIterator.java
index 6c984ff4e..c4214282d 100644
--- a/src/java/org/apache/commons/collections/iterators/EmptyMapIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/EmptyMapIterator.java
@@ -22,7 +22,7 @@ import org.apache.commons.collections.ResettableIterator;
  * Provides an implementation of an empty map iterator.
  *
  * @since Commons Collections 3.1
- * @version $Revision: 1.1 $ $Date: 2004/05/22 09:46:39 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/iterators/EmptyOrderedIterator.java b/src/java/org/apache/commons/collections/iterators/EmptyOrderedIterator.java
index 409fec483..2b4189391 100644
--- a/src/java/org/apache/commons/collections/iterators/EmptyOrderedIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/EmptyOrderedIterator.java
@@ -22,7 +22,7 @@ import org.apache.commons.collections.ResettableIterator;
  * Provides an implementation of an empty ordered iterator.
  *
  * @since Commons Collections 3.1
- * @version $Revision: 1.1 $ $Date: 2004/05/26 21:52:40 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/iterators/EmptyOrderedMapIterator.java b/src/java/org/apache/commons/collections/iterators/EmptyOrderedMapIterator.java
index 58321e7dc..f99464249 100644
--- a/src/java/org/apache/commons/collections/iterators/EmptyOrderedMapIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/EmptyOrderedMapIterator.java
@@ -22,7 +22,7 @@ import org.apache.commons.collections.ResettableIterator;
  * Provides an implementation of an empty ordered map iterator.
  *
  * @since Commons Collections 3.1
- * @version $Revision: 1.1 $ $Date: 2004/05/22 09:46:39 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java b/src/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java
index 5fc1b27f0..7eedca311 100644
--- a/src/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.ResettableIterator;
  * </pre>
  *  
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/02/18 00:59:50 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/iterators/EnumerationIterator.java b/src/java/org/apache/commons/collections/iterators/EnumerationIterator.java
index 3038f8152..096539bbc 100644
--- a/src/java/org/apache/commons/collections/iterators/EnumerationIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/EnumerationIterator.java
@@ -24,7 +24,7 @@ import java.util.Iterator;
  * to be {@link Iterator Iterator} instances.
  *
  * @since Commons Collections 1.0
- * @version $Revision: 1.8 $ $Date: 2004/04/21 20:34:12 $
+ * @version $Revision$ $Date$
  * 
  * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
  * @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
diff --git a/src/java/org/apache/commons/collections/iterators/FilterIterator.java b/src/java/org/apache/commons/collections/iterators/FilterIterator.java
index 96a0a2e31..a452dd3b0 100644
--- a/src/java/org/apache/commons/collections/iterators/FilterIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/FilterIterator.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.Predicate;
  * are returned.
  *
  * @since Commons Collections 1.0
- * @version $Revision: 1.8 $ $Date: 2004/02/18 00:59:50 $
+ * @version $Revision$ $Date$
  * 
  * @author James Strachan
  * @author Jan Sorensen
diff --git a/src/java/org/apache/commons/collections/iterators/FilterListIterator.java b/src/java/org/apache/commons/collections/iterators/FilterListIterator.java
index fe511cee6..27a5e199e 100644
--- a/src/java/org/apache/commons/collections/iterators/FilterListIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/FilterListIterator.java
@@ -29,7 +29,7 @@ import org.apache.commons.collections.Predicate;
  * returned by the iterator.
  * 
  * @since Commons Collections 2.0
- * @version $Revision: 1.7 $ $Date: 2004/02/18 00:59:50 $
+ * @version $Revision$ $Date$
  * 
  * @author Rodney Waldhoff
  */
diff --git a/src/java/org/apache/commons/collections/iterators/IteratorChain.java b/src/java/org/apache/commons/collections/iterators/IteratorChain.java
index b2aa98c15..0e08fbac0 100644
--- a/src/java/org/apache/commons/collections/iterators/IteratorChain.java
+++ b/src/java/org/apache/commons/collections/iterators/IteratorChain.java
@@ -42,7 +42,7 @@ import org.apache.commons.collections.list.UnmodifiableList;
  * iterators. In this case the class will function as an empty iterator.
  * 
  * @since Commons Collections 2.1
- * @version $Revision: 1.13 $ $Date: 2004/05/26 21:58:02 $
+ * @version $Revision$ $Date$
  * 
  * @author Morgan Delagrange
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/iterators/IteratorEnumeration.java b/src/java/org/apache/commons/collections/iterators/IteratorEnumeration.java
index 9bae94e5d..9336ec227 100644
--- a/src/java/org/apache/commons/collections/iterators/IteratorEnumeration.java
+++ b/src/java/org/apache/commons/collections/iterators/IteratorEnumeration.java
@@ -23,7 +23,7 @@ import java.util.Iterator;
  * an {@link Enumeration Enumeration} instance.
  *
  * @since Commons Collections 1.0
- * @version $Revision: 1.9 $ $Date: 2004/05/03 10:23:38 $
+ * @version $Revision$ $Date$
  * 
  * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
  */
diff --git a/src/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java b/src/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java
index 4c8fc5466..0d0774b06 100644
--- a/src/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java
+++ b/src/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java
@@ -26,7 +26,7 @@ import java.util.NoSuchElementException;
  * operations of ListIterator.
  * 
  * @since Commons Collections 2.1
- * @version $Revision: 1.7 $ $Date: 2004/02/18 00:59:50 $
+ * @version $Revision$ $Date$
  * 
  * @author Morgan Delagrange
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/iterators/LoopingIterator.java b/src/java/org/apache/commons/collections/iterators/LoopingIterator.java
index 2a269281e..277172bfb 100644
--- a/src/java/org/apache/commons/collections/iterators/LoopingIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/LoopingIterator.java
@@ -32,7 +32,7 @@ import org.apache.commons.collections.ResettableIterator;
  * implementations will throw a ConcurrentModificationException. 
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.9 $ $Date: 2004/02/18 00:59:50 $
+ * @version $Revision$ $Date$
  *
  * @author <a href="mailto:joncrlsn@users.sf.net">Jonathan Carlson</a>
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/iterators/LoopingListIterator.java b/src/java/org/apache/commons/collections/iterators/LoopingListIterator.java
index 74a476cf3..3fb0ec6af 100644
--- a/src/java/org/apache/commons/collections/iterators/LoopingListIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/LoopingListIterator.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.ResettableIterator;
  * ConcurrentModificationException.
  *
  * @since Commons Collections 3.2
- * @version $Revision: 1.1 $ $Date: 2004/07/17 21:02:47 $
+ * @version $Revision$ $Date$
  *
  * @author Eric Crampton <ccesc@eonomine.com>
  */
diff --git a/src/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java b/src/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java
index 6401245f0..54718709d 100644
--- a/src/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.ResettableIterator;
  * back to the start if required.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.12 $ $Date: 2004/02/18 00:59:50 $
+ * @version $Revision$ $Date$
  * 
  * @author James Strachan
  * @author Mauricio S. Moura
diff --git a/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java b/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java
index ba687113a..a0ec89c0a 100644
--- a/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.ResettableListIterator;
  * @see java.util.ListIterator
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.13 $ $Date: 2004/02/18 00:59:50 $
+ * @version $Revision$ $Date$
  * 
  * @author Neil O'Toole
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java b/src/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java
index c45f17667..6060b73d4 100644
--- a/src/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java
@@ -70,7 +70,7 @@ import org.apache.commons.collections.Transformer;
  * more efficient (and convenient) than using nested for loops to extract a list.
  * 
  * @since Commons Collections 3.1
- * @version $Revision: 1.3 $ $Date: 2004/05/03 11:50:30 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/iterators/ProxyIterator.java b/src/java/org/apache/commons/collections/iterators/ProxyIterator.java
index 2a2b81c98..fa159218d 100644
--- a/src/java/org/apache/commons/collections/iterators/ProxyIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/ProxyIterator.java
@@ -22,7 +22,7 @@ import java.util.Iterator;
  *
  * @deprecated Use AbstractIteratorDecorator. Will be removed in v4.0
  * @since Commons Collections 1.0
- * @version $Revision: 1.10 $ $Date: 2004/02/18 00:59:50 $
+ * @version $Revision$ $Date$
  * 
  * @author James Strachan
  */
diff --git a/src/java/org/apache/commons/collections/iterators/ProxyListIterator.java b/src/java/org/apache/commons/collections/iterators/ProxyListIterator.java
index d24c0bbd6..714648900 100644
--- a/src/java/org/apache/commons/collections/iterators/ProxyListIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/ProxyListIterator.java
@@ -23,7 +23,7 @@ import java.util.ListIterator;
  *
  * @deprecated Use AbstractListIteratorDecorator. Will be removed in v4.0
  * @since Commons Collections 2.0
- * @version $Revision: 1.9 $ $Date: 2004/02/18 00:59:50 $
+ * @version $Revision$ $Date$
  * 
  * @author Rodney Waldhoff
  */
diff --git a/src/java/org/apache/commons/collections/iterators/SingletonIterator.java b/src/java/org/apache/commons/collections/iterators/SingletonIterator.java
index 026256d63..00e9fa34f 100644
--- a/src/java/org/apache/commons/collections/iterators/SingletonIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/SingletonIterator.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.ResettableIterator;
  * object instance.
  *
  * @since Commons Collections 2.0
- * @version $Revision: 1.14 $ $Date: 2004/04/09 22:52:48 $
+ * @version $Revision$ $Date$
  * 
  * @author James Strachan
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/iterators/SingletonListIterator.java b/src/java/org/apache/commons/collections/iterators/SingletonListIterator.java
index 9364b85f2..22dab4293 100644
--- a/src/java/org/apache/commons/collections/iterators/SingletonListIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/SingletonListIterator.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.ResettableListIterator;
  * object instance.
  *
  * @since Commons Collections 2.1
- * @version $Revision: 1.13 $ $Date: 2004/02/18 00:59:50 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Rodney Waldhoff
diff --git a/src/java/org/apache/commons/collections/iterators/TransformIterator.java b/src/java/org/apache/commons/collections/iterators/TransformIterator.java
index c2b4c96d1..86509eac9 100644
--- a/src/java/org/apache/commons/collections/iterators/TransformIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/TransformIterator.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.Transformer;
  * Decorates an iterator such that each element returned is transformed.
  *
  * @since Commons Collections 1.0
- * @version $Revision: 1.9 $ $Date: 2004/02/18 00:59:50 $
+ * @version $Revision$ $Date$
  * 
  * @author James Strachan
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java b/src/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java
index 2b273a763..ff7817ad8 100644
--- a/src/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.functors.UniquePredicate;
  * and duplicate Objects are skipped.
  *
  * @since Commons Collections 2.1
- * @version $Revision: 1.9 $ $Date: 2004/05/07 23:29:02 $
+ * @version $Revision$ $Date$
  * 
  * @author Morgan Delagrange
  */
diff --git a/src/java/org/apache/commons/collections/iterators/UnmodifiableIterator.java b/src/java/org/apache/commons/collections/iterators/UnmodifiableIterator.java
index 7ad1408f2..11fc80234 100644
--- a/src/java/org/apache/commons/collections/iterators/UnmodifiableIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/UnmodifiableIterator.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.Unmodifiable;
  * Decorates an iterator such that it cannot be modified.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/02/18 00:59:50 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/iterators/UnmodifiableListIterator.java b/src/java/org/apache/commons/collections/iterators/UnmodifiableListIterator.java
index 55ac94422..d5a33575a 100644
--- a/src/java/org/apache/commons/collections/iterators/UnmodifiableListIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/UnmodifiableListIterator.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.Unmodifiable;
  * Decorates a list iterator such that it cannot be modified.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/02/18 00:59:50 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java b/src/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java
index 9ae377d90..752d2139f 100644
--- a/src/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java
@@ -22,7 +22,7 @@ import org.apache.commons.collections.Unmodifiable;
  * Decorates a map iterator such that it cannot be modified.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/02/18 00:59:50 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java b/src/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java
index be1c795aa..b072de648 100644
--- a/src/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java
@@ -22,7 +22,7 @@ import org.apache.commons.collections.Unmodifiable;
  * Decorates an ordered map iterator such that it cannot be modified.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/02/18 00:59:50 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/iterators/package.html b/src/java/org/apache/commons/collections/iterators/package.html
index 1009337dd..7bd2db3a5 100644
--- a/src/java/org/apache/commons/collections/iterators/package.html
+++ b/src/java/org/apache/commons/collections/iterators/package.html
@@ -1,4 +1,4 @@
-<!-- $Id: package.html,v 1.4 2004/02/18 21:39:04 scolebourne Exp $ -->
+<!-- $Id$ -->
  <!--
    Copyright 2002-2004 The Apache Software Foundation
 
diff --git a/src/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java b/src/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java
index bfcb00dac..6de7b85db 100644
--- a/src/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java
+++ b/src/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java
@@ -21,7 +21,7 @@ import org.apache.commons.collections.KeyValue;
  * Abstract pair class to assist with creating KeyValue and MapEntry implementations.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.3 $ $Date: 2004/02/18 01:00:08 $
+ * @version $Revision$ $Date$
  * 
  * @author James Strachan
  * @author Michael A. Smith
diff --git a/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java b/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java
index 6ea23ae22..440ab977b 100644
--- a/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java
+++ b/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java
@@ -21,7 +21,7 @@ import java.util.Map;
  * Abstract Pair class to assist with creating correct Map Entry implementations.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/02/18 01:00:08 $
+ * @version $Revision$ $Date$
  * 
  * @author James Strachan
  * @author Michael A. Smith
diff --git a/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java b/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java
index a6b60d9c3..bd924825e 100644
--- a/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java
+++ b/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.KeyValue;
  * to a Map Entry.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/02/18 01:00:08 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java b/src/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java
index 77fa16db8..6f52fb8d7 100644
--- a/src/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java
+++ b/src/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java
@@ -26,7 +26,7 @@ import org.apache.commons.collections.KeyValue;
  * itself as a key or value.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/02/18 01:00:08 $
+ * @version $Revision$ $Date$
  * 
  * @author James Strachan
  * @author Michael A. Smith
diff --git a/src/java/org/apache/commons/collections/keyvalue/DefaultMapEntry.java b/src/java/org/apache/commons/collections/keyvalue/DefaultMapEntry.java
index 8d9de8884..455799ec5 100644
--- a/src/java/org/apache/commons/collections/keyvalue/DefaultMapEntry.java
+++ b/src/java/org/apache/commons/collections/keyvalue/DefaultMapEntry.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.KeyValue;
  * the MapEntry contract from being broken.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.3 $ $Date: 2004/02/18 01:00:08 $
+ * @version $Revision$ $Date$
  * 
  * @author James Strachan
  * @author Michael A. Smith
diff --git a/src/java/org/apache/commons/collections/keyvalue/MultiKey.java b/src/java/org/apache/commons/collections/keyvalue/MultiKey.java
index ad01b27e8..dc4c795a9 100644
--- a/src/java/org/apache/commons/collections/keyvalue/MultiKey.java
+++ b/src/java/org/apache/commons/collections/keyvalue/MultiKey.java
@@ -39,7 +39,7 @@ import java.util.Arrays;
  * </pre>
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/03/13 12:43:43 $
+ * @version $Revision$ $Date$
  * 
  * @author Howard Lewis Ship
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java b/src/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java
index 662a9e58b..fa65e73cf 100644
--- a/src/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java
+++ b/src/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.KeyValue;
  * map, however this will probably mess up any iterators.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/04/09 14:35:10 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java b/src/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java
index 9efecee42..b5f877c5f 100644
--- a/src/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java
+++ b/src/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.Unmodifiable;
  * when <code>setValue</code> is called.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.3 $ $Date: 2004/02/18 01:00:08 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/keyvalue/package.html b/src/java/org/apache/commons/collections/keyvalue/package.html
index c751cfbb4..fd79e5545 100644
--- a/src/java/org/apache/commons/collections/keyvalue/package.html
+++ b/src/java/org/apache/commons/collections/keyvalue/package.html
@@ -1,4 +1,4 @@
-<!-- $Id: package.html,v 1.2 2004/02/18 21:39:03 scolebourne Exp $ -->
+<!-- $Id$ -->
  <!--
    Copyright 2003-2004 The Apache Software Foundation
 
diff --git a/src/java/org/apache/commons/collections/list/AbstractLinkedList.java b/src/java/org/apache/commons/collections/list/AbstractLinkedList.java
index cd6c01f98..34b1f4663 100644
--- a/src/java/org/apache/commons/collections/list/AbstractLinkedList.java
+++ b/src/java/org/apache/commons/collections/list/AbstractLinkedList.java
@@ -38,7 +38,7 @@ import org.apache.commons.collections.OrderedIterator;
  * is here.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.9 $ $Date: 2004/04/20 23:33:54 $
+ * @version $Revision$ $Date$
  *
  * @author Rich Dougherty
  * @author Phil Steitz
diff --git a/src/java/org/apache/commons/collections/list/AbstractListDecorator.java b/src/java/org/apache/commons/collections/list/AbstractListDecorator.java
index 8cfa1e09b..012a10f72 100644
--- a/src/java/org/apache/commons/collections/list/AbstractListDecorator.java
+++ b/src/java/org/apache/commons/collections/list/AbstractListDecorator.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.collection.AbstractCollectionDecorator;
  * Methods are forwarded directly to the decorated list.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/06/02 21:53:02 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/list/CursorableLinkedList.java b/src/java/org/apache/commons/collections/list/CursorableLinkedList.java
index 5f24bd282..4b8181bca 100644
--- a/src/java/org/apache/commons/collections/list/CursorableLinkedList.java
+++ b/src/java/org/apache/commons/collections/list/CursorableLinkedList.java
@@ -52,7 +52,7 @@ import java.util.ListIterator;
  *
  * @see java.util.LinkedList
  * @since Commons Collections 1.0
- * @version $Revision: 1.5 $ $Date: 2004/02/18 01:12:26 $
+ * @version $Revision$ $Date$
  * 
  * @author Rodney Waldhoff
  * @author Janek Bogucki
diff --git a/src/java/org/apache/commons/collections/list/FixedSizeList.java b/src/java/org/apache/commons/collections/list/FixedSizeList.java
index e37b86852..8a2850d02 100644
--- a/src/java/org/apache/commons/collections/list/FixedSizeList.java
+++ b/src/java/org/apache/commons/collections/list/FixedSizeList.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.iterators.UnmodifiableIterator;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.8 $ $Date: 2004/06/03 22:02:13 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Paul Jack
diff --git a/src/java/org/apache/commons/collections/list/LazyList.java b/src/java/org/apache/commons/collections/list/LazyList.java
index f20206542..fe298805b 100644
--- a/src/java/org/apache/commons/collections/list/LazyList.java
+++ b/src/java/org/apache/commons/collections/list/LazyList.java
@@ -49,7 +49,7 @@ import org.apache.commons.collections.Factory;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/06/03 22:02:13 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Arron Bates
diff --git a/src/java/org/apache/commons/collections/list/NodeCachingLinkedList.java b/src/java/org/apache/commons/collections/list/NodeCachingLinkedList.java
index 93b3a054a..059b6b889 100644
--- a/src/java/org/apache/commons/collections/list/NodeCachingLinkedList.java
+++ b/src/java/org/apache/commons/collections/list/NodeCachingLinkedList.java
@@ -36,7 +36,7 @@ import java.util.Collection;
  * <b>Note that this implementation is not synchronized.</b>
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/04/20 23:46:50 $
+ * @version $Revision$ $Date$
  * 
  * @author Jeff Varszegi
  * @author Rich Dougherty
diff --git a/src/java/org/apache/commons/collections/list/PredicatedList.java b/src/java/org/apache/commons/collections/list/PredicatedList.java
index f49e7d8f9..21e22ed3d 100644
--- a/src/java/org/apache/commons/collections/list/PredicatedList.java
+++ b/src/java/org/apache/commons/collections/list/PredicatedList.java
@@ -38,7 +38,7 @@ import org.apache.commons.collections.iterators.AbstractListIteratorDecorator;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/06/03 22:02:13 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Paul Jack
diff --git a/src/java/org/apache/commons/collections/list/SetUniqueList.java b/src/java/org/apache/commons/collections/list/SetUniqueList.java
index f97054311..29406d8d7 100644
--- a/src/java/org/apache/commons/collections/list/SetUniqueList.java
+++ b/src/java/org/apache/commons/collections/list/SetUniqueList.java
@@ -44,7 +44,7 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.8 $ $Date$
+ * @version $Revision$ $Date$
  * 
  * @author Matthew Hawthorne
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/list/SynchronizedList.java b/src/java/org/apache/commons/collections/list/SynchronizedList.java
index 5e61eafd3..77b00cd25 100644
--- a/src/java/org/apache/commons/collections/list/SynchronizedList.java
+++ b/src/java/org/apache/commons/collections/list/SynchronizedList.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.collection.SynchronizedCollection;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/06/03 22:02:13 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/list/TransformedList.java b/src/java/org/apache/commons/collections/list/TransformedList.java
index 95c694fc4..4e73e29dd 100644
--- a/src/java/org/apache/commons/collections/list/TransformedList.java
+++ b/src/java/org/apache/commons/collections/list/TransformedList.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.iterators.AbstractListIteratorDecorator;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/06/03 22:02:13 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/list/TreeList.java b/src/java/org/apache/commons/collections/list/TreeList.java
index 7bd928e5a..242835267 100644
--- a/src/java/org/apache/commons/collections/list/TreeList.java
+++ b/src/java/org/apache/commons/collections/list/TreeList.java
@@ -50,7 +50,7 @@ import org.apache.commons.collections.OrderedIterator;
  * does use sligtly more memory.
  * 
  * @since Commons Collections 3.1
- * @version $Revision: 1.4 $ $Date: 2005/01/03 23:52:49 $
+ * @version $Revision$ $Date$
  *
  * @author Joerg Schmuecker
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/list/TypedList.java b/src/java/org/apache/commons/collections/list/TypedList.java
index b32915553..37defe07a 100644
--- a/src/java/org/apache/commons/collections/list/TypedList.java
+++ b/src/java/org/apache/commons/collections/list/TypedList.java
@@ -28,7 +28,7 @@ import org.apache.commons.collections.functors.InstanceofPredicate;
  * collection, an IllegalArgumentException is thrown.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/05/07 23:28:38 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Matthew Hawthorne
diff --git a/src/java/org/apache/commons/collections/list/UnmodifiableList.java b/src/java/org/apache/commons/collections/list/UnmodifiableList.java
index 18d240222..db5f2c7c5 100644
--- a/src/java/org/apache/commons/collections/list/UnmodifiableList.java
+++ b/src/java/org/apache/commons/collections/list/UnmodifiableList.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.iterators.UnmodifiableListIterator;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/06/03 22:02:13 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/list/package.html b/src/java/org/apache/commons/collections/list/package.html
index c006a4c3e..320fa43d3 100644
--- a/src/java/org/apache/commons/collections/list/package.html
+++ b/src/java/org/apache/commons/collections/list/package.html
@@ -1,4 +1,4 @@
-<!-- $Id: package.html,v 1.6 2004/06/10 23:24:45 scolebourne Exp $ -->
+<!-- $Id$ -->
  <!--
    Copyright 2003-2004 The Apache Software Foundation
 
diff --git a/src/java/org/apache/commons/collections/map/AbstractHashedMap.java b/src/java/org/apache/commons/collections/map/AbstractHashedMap.java
index 1098678a8..2ff910097 100644
--- a/src/java/org/apache/commons/collections/map/AbstractHashedMap.java
+++ b/src/java/org/apache/commons/collections/map/AbstractHashedMap.java
@@ -52,7 +52,7 @@ import org.apache.commons.collections.iterators.EmptyMapIterator;
  * This extends clause will be removed in v4.0.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.20 $ $Date: 2004/06/22 21:42:12 $
+ * @version $Revision$ $Date$
  *
  * @author java util HashMap
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/map/AbstractInputCheckedMapDecorator.java b/src/java/org/apache/commons/collections/map/AbstractInputCheckedMapDecorator.java
index 0d3c24d9f..f89117d73 100644
--- a/src/java/org/apache/commons/collections/map/AbstractInputCheckedMapDecorator.java
+++ b/src/java/org/apache/commons/collections/map/AbstractInputCheckedMapDecorator.java
@@ -39,7 +39,7 @@ import org.apache.commons.collections.set.AbstractSetDecorator;
  * versions of Commons Collections.
  *
  * @since Commons Collections 3.1
- * @version $Revision: 1.3 $ $Date: 2005/01/03 23:52:49 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/map/AbstractLinkedMap.java b/src/java/org/apache/commons/collections/map/AbstractLinkedMap.java
index 70f38b601..10ef799b2 100644
--- a/src/java/org/apache/commons/collections/map/AbstractLinkedMap.java
+++ b/src/java/org/apache/commons/collections/map/AbstractLinkedMap.java
@@ -57,7 +57,7 @@ import org.apache.commons.collections.iterators.EmptyOrderedMapIterator;
  * methods exposed.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.12 $ $Date: 2004/05/26 21:56:05 $
+ * @version $Revision$ $Date$
  *
  * @author java util LinkedHashMap
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/map/AbstractMapDecorator.java b/src/java/org/apache/commons/collections/map/AbstractMapDecorator.java
index 9878c7d7c..836c7f888 100644
--- a/src/java/org/apache/commons/collections/map/AbstractMapDecorator.java
+++ b/src/java/org/apache/commons/collections/map/AbstractMapDecorator.java
@@ -33,7 +33,7 @@ import java.util.Set;
  * But, you might want that loophole, so this class is kept simple.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/04/02 21:02:54 $
+ * @version $Revision$ $Date$
  * 
  * @author Daniel Rall
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java b/src/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java
index e4211ae62..d4b958e67 100644
--- a/src/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java
+++ b/src/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java
@@ -32,7 +32,7 @@ import org.apache.commons.collections.OrderedMapIterator;
  * But, you might want that loophole, so this class is kept simple.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/04/02 21:17:48 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/map/AbstractReferenceMap.java b/src/java/org/apache/commons/collections/map/AbstractReferenceMap.java
index bb999d1f0..587cba9e4 100644
--- a/src/java/org/apache/commons/collections/map/AbstractReferenceMap.java
+++ b/src/java/org/apache/commons/collections/map/AbstractReferenceMap.java
@@ -76,7 +76,7 @@ import org.apache.commons.collections.keyvalue.DefaultMapEntry;
  *
  * @see java.lang.ref.Reference
  * @since Commons Collections 3.1 (extracted from ReferenceMap in 3.0)
- * @version $Revision: 1.3 $ $Date: 2004/06/07 22:14:42 $
+ * @version $Revision$ $Date$
  * 
  * @author Paul Jack
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/map/AbstractSortedMapDecorator.java b/src/java/org/apache/commons/collections/map/AbstractSortedMapDecorator.java
index f281b1444..bf8c0c1ec 100644
--- a/src/java/org/apache/commons/collections/map/AbstractSortedMapDecorator.java
+++ b/src/java/org/apache/commons/collections/map/AbstractSortedMapDecorator.java
@@ -31,7 +31,7 @@ import java.util.SortedMap;
  * But, you might want that loophole, so this class is kept simple.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/04/02 21:16:50 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/map/CaseInsensitiveMap.java b/src/java/org/apache/commons/collections/map/CaseInsensitiveMap.java
index f8c739a64..32c5dfd1c 100644
--- a/src/java/org/apache/commons/collections/map/CaseInsensitiveMap.java
+++ b/src/java/org/apache/commons/collections/map/CaseInsensitiveMap.java
@@ -46,7 +46,7 @@ import java.util.Map;
  * equals <code>{"one", "two", null}.</code>
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/02/18 01:13:19 $
+ * @version $Revision$ $Date$
  *
  * @author Commons-Collections team
  */
diff --git a/src/java/org/apache/commons/collections/map/CompositeMap.java b/src/java/org/apache/commons/collections/map/CompositeMap.java
index 57de70af6..0b4c5b6e3 100644
--- a/src/java/org/apache/commons/collections/map/CompositeMap.java
+++ b/src/java/org/apache/commons/collections/map/CompositeMap.java
@@ -32,7 +32,7 @@ import org.apache.commons.collections.set.CompositeSet;
  * strategy is provided then add and remove are unsupported.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/02/18 01:13:19 $
+ * @version $Revision$ $Date$
  *
  * @author Brian McCallister
  */
diff --git a/src/java/org/apache/commons/collections/map/FixedSizeMap.java b/src/java/org/apache/commons/collections/map/FixedSizeMap.java
index 751bd89c8..fc7d9602b 100644
--- a/src/java/org/apache/commons/collections/map/FixedSizeMap.java
+++ b/src/java/org/apache/commons/collections/map/FixedSizeMap.java
@@ -44,7 +44,7 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.8 $ $Date: 2004/05/07 23:58:33 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Paul Jack
diff --git a/src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java b/src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java
index 810ab4811..92a67a061 100644
--- a/src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java
+++ b/src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java
@@ -45,7 +45,7 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.8 $ $Date: 2004/06/03 22:26:52 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Paul Jack
diff --git a/src/java/org/apache/commons/collections/map/Flat3Map.java b/src/java/org/apache/commons/collections/map/Flat3Map.java
index e4e1af82e..e64afc54d 100644
--- a/src/java/org/apache/commons/collections/map/Flat3Map.java
+++ b/src/java/org/apache/commons/collections/map/Flat3Map.java
@@ -61,7 +61,7 @@ import org.apache.commons.collections.iterators.EmptyMapIterator;
  * Do not use <code>Flat3Map</code> if the size is likely to grow beyond 3.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.18 $ $Date: 2004/05/26 21:56:05 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/map/HashedMap.java b/src/java/org/apache/commons/collections/map/HashedMap.java
index 32f2a4b77..e7414fb6f 100644
--- a/src/java/org/apache/commons/collections/map/HashedMap.java
+++ b/src/java/org/apache/commons/collections/map/HashedMap.java
@@ -30,7 +30,7 @@ import java.util.Map;
  * functionality and many methods for subclassing.
  * <p>
  * @since Commons Collections 3.0
- * @version $Revision: 1.15 $ $Date: 2004/02/18 01:13:19 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/map/IdentityMap.java b/src/java/org/apache/commons/collections/map/IdentityMap.java
index e4ca90653..408e4fb22 100644
--- a/src/java/org/apache/commons/collections/map/IdentityMap.java
+++ b/src/java/org/apache/commons/collections/map/IdentityMap.java
@@ -29,7 +29,7 @@ import java.util.Map;
  * As a general rule, don't compare this map to other maps.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/02/18 01:13:19 $
+ * @version $Revision$ $Date$
  *
  * @author java util HashMap
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/map/LRUMap.java b/src/java/org/apache/commons/collections/map/LRUMap.java
index 2a15fdda9..b4b66958f 100644
--- a/src/java/org/apache/commons/collections/map/LRUMap.java
+++ b/src/java/org/apache/commons/collections/map/LRUMap.java
@@ -41,7 +41,7 @@ import org.apache.commons.collections.BoundedMap;
  * <code>ResettableIterator</code> and calling <code>reset()</code>.
  * 
  * @since Commons Collections 3.0 (previously in main package v1.0)
- * @version $Revision: 1.15 $ $Date: 2004/10/16 21:26:14 $
+ * @version $Revision$ $Date$
  *
  * @author James Strachan
  * @author Morgan Delagrange
diff --git a/src/java/org/apache/commons/collections/map/LazyMap.java b/src/java/org/apache/commons/collections/map/LazyMap.java
index b07d46ff7..ebcd91965 100644
--- a/src/java/org/apache/commons/collections/map/LazyMap.java
+++ b/src/java/org/apache/commons/collections/map/LazyMap.java
@@ -50,7 +50,7 @@ import org.apache.commons.collections.functors.FactoryTransformer;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/05/07 23:30:33 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Paul Jack
diff --git a/src/java/org/apache/commons/collections/map/LazySortedMap.java b/src/java/org/apache/commons/collections/map/LazySortedMap.java
index 050aa8ce2..e78d28ae6 100644
--- a/src/java/org/apache/commons/collections/map/LazySortedMap.java
+++ b/src/java/org/apache/commons/collections/map/LazySortedMap.java
@@ -46,7 +46,7 @@ import org.apache.commons.collections.Transformer;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/04/09 10:36:01 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Paul Jack
diff --git a/src/java/org/apache/commons/collections/map/LinkedMap.java b/src/java/org/apache/commons/collections/map/LinkedMap.java
index 1f3711209..9c733cd34 100644
--- a/src/java/org/apache/commons/collections/map/LinkedMap.java
+++ b/src/java/org/apache/commons/collections/map/LinkedMap.java
@@ -51,7 +51,7 @@ import org.apache.commons.collections.list.UnmodifiableList;
  * methods exposed.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.9 $ $Date: 2004/02/18 01:13:19 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/map/ListOrderedMap.java b/src/java/org/apache/commons/collections/map/ListOrderedMap.java
index cae67e814..764a31fd6 100644
--- a/src/java/org/apache/commons/collections/map/ListOrderedMap.java
+++ b/src/java/org/apache/commons/collections/map/ListOrderedMap.java
@@ -55,7 +55,7 @@ import org.apache.commons.collections.list.UnmodifiableList;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.16 $ $Date: 2004/06/07 21:51:39 $
+ * @version $Revision$ $Date$
  * 
  * @author Henri Yandell
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/map/MultiKeyMap.java b/src/java/org/apache/commons/collections/map/MultiKeyMap.java
index 9ce6cc6e4..dc90f8e11 100644
--- a/src/java/org/apache/commons/collections/map/MultiKeyMap.java
+++ b/src/java/org/apache/commons/collections/map/MultiKeyMap.java
@@ -67,7 +67,7 @@ import org.apache.commons.collections.keyvalue.MultiKey;
  * </pre>
  *
  * @since Commons Collections 3.1
- * @version $Revision: 1.4 $ $Date: 2004/10/16 21:26:14 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/map/PredicatedMap.java b/src/java/org/apache/commons/collections/map/PredicatedMap.java
index 8827d5a22..c6844da56 100644
--- a/src/java/org/apache/commons/collections/map/PredicatedMap.java
+++ b/src/java/org/apache/commons/collections/map/PredicatedMap.java
@@ -38,7 +38,7 @@ import org.apache.commons.collections.Predicate;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.14 $ $Date: 2004/06/07 22:14:42 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Paul Jack
diff --git a/src/java/org/apache/commons/collections/map/PredicatedSortedMap.java b/src/java/org/apache/commons/collections/map/PredicatedSortedMap.java
index 0e4d8514f..552d346d4 100644
--- a/src/java/org/apache/commons/collections/map/PredicatedSortedMap.java
+++ b/src/java/org/apache/commons/collections/map/PredicatedSortedMap.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.Predicate;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/05/21 21:38:49 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Paul Jack
diff --git a/src/java/org/apache/commons/collections/map/ReferenceIdentityMap.java b/src/java/org/apache/commons/collections/map/ReferenceIdentityMap.java
index 18106d8b9..f639735ae 100644
--- a/src/java/org/apache/commons/collections/map/ReferenceIdentityMap.java
+++ b/src/java/org/apache/commons/collections/map/ReferenceIdentityMap.java
@@ -59,7 +59,7 @@ import java.lang.ref.Reference;
  * @see java.lang.ref.Reference
  * 
  * @since Commons Collections 3.0 (previously in main package v2.1)
- * @version $Revision: 1.2 $ $Date: 2004/10/16 21:26:14 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/map/ReferenceMap.java b/src/java/org/apache/commons/collections/map/ReferenceMap.java
index a05772836..4d0d933fc 100644
--- a/src/java/org/apache/commons/collections/map/ReferenceMap.java
+++ b/src/java/org/apache/commons/collections/map/ReferenceMap.java
@@ -61,7 +61,7 @@ import java.io.Serializable;
  * @see java.lang.ref.Reference
  * 
  * @since Commons Collections 3.0 (previously in main package v2.1)
- * @version $Revision: 1.14 $ $Date: 2004/10/16 21:26:14 $
+ * @version $Revision$ $Date$
  * 
  * @author Paul Jack
  * @author Stephen Colebourne
diff --git a/src/java/org/apache/commons/collections/map/SingletonMap.java b/src/java/org/apache/commons/collections/map/SingletonMap.java
index 02e03020f..51b1e1efd 100644
--- a/src/java/org/apache/commons/collections/map/SingletonMap.java
+++ b/src/java/org/apache/commons/collections/map/SingletonMap.java
@@ -54,7 +54,7 @@ import org.apache.commons.collections.keyvalue.TiedMapEntry;
  * </ul>
  * 
  * @since Commons Collections 3.1
- * @version $Revision: 1.2 $ $Date: 2004/10/16 21:26:14 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/map/StaticBucketMap.java b/src/java/org/apache/commons/collections/map/StaticBucketMap.java
index 9fb55fe6f..a58f0484a 100644
--- a/src/java/org/apache/commons/collections/map/StaticBucketMap.java
+++ b/src/java/org/apache/commons/collections/map/StaticBucketMap.java
@@ -90,7 +90,7 @@ import org.apache.commons.collections.KeyValue;
  * operations will affect the map.<p>
  *
  * @since Commons Collections 3.0 (previously in main package v2.1)
- * @version $Revision: 1.11 $ $Date: 2004/02/18 01:13:19 $
+ * @version $Revision$ $Date$
  * 
  * @author Berin Loritsch
  * @author Gerhard Froehlich
diff --git a/src/java/org/apache/commons/collections/map/TransformedMap.java b/src/java/org/apache/commons/collections/map/TransformedMap.java
index a5ac310ce..383673f07 100644
--- a/src/java/org/apache/commons/collections/map/TransformedMap.java
+++ b/src/java/org/apache/commons/collections/map/TransformedMap.java
@@ -35,7 +35,7 @@ import org.apache.commons.collections.Transformer;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.11 $ $Date: 2004/06/07 22:14:42 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/map/TransformedSortedMap.java b/src/java/org/apache/commons/collections/map/TransformedSortedMap.java
index 66e40a8ab..00ee57c10 100644
--- a/src/java/org/apache/commons/collections/map/TransformedSortedMap.java
+++ b/src/java/org/apache/commons/collections/map/TransformedSortedMap.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.Transformer;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/04/09 10:36:01 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/map/TypedMap.java b/src/java/org/apache/commons/collections/map/TypedMap.java
index 71a708d5e..78af31b8e 100644
--- a/src/java/org/apache/commons/collections/map/TypedMap.java
+++ b/src/java/org/apache/commons/collections/map/TypedMap.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.functors.InstanceofPredicate;
  * The returned implementation is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/05/07 23:17:13 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Matthew Hawthorne
diff --git a/src/java/org/apache/commons/collections/map/TypedSortedMap.java b/src/java/org/apache/commons/collections/map/TypedSortedMap.java
index 32d57ead2..d01c7a537 100644
--- a/src/java/org/apache/commons/collections/map/TypedSortedMap.java
+++ b/src/java/org/apache/commons/collections/map/TypedSortedMap.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.functors.InstanceofPredicate;
  * The returned implementation is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/05/07 23:18:26 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Matthew Hawthorne
diff --git a/src/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java b/src/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java
index bc93e3dc4..cdc121bf2 100644
--- a/src/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java
+++ b/src/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.set.AbstractSetDecorator;
  * Decorates a map entry <code>Set</code> to ensure it can't be altered.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/02/18 01:13:19 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/map/UnmodifiableMap.java b/src/java/org/apache/commons/collections/map/UnmodifiableMap.java
index 48d29d555..43cf18ebb 100644
--- a/src/java/org/apache/commons/collections/map/UnmodifiableMap.java
+++ b/src/java/org/apache/commons/collections/map/UnmodifiableMap.java
@@ -37,7 +37,7 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.10 $ $Date: 2004/04/09 10:32:25 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java b/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java
index a83c32e4d..d58716fbd 100644
--- a/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java
+++ b/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java
@@ -38,7 +38,7 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.8 $ $Date: 2004/04/09 10:46:32 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java b/src/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java
index bc6743fb8..4d79791d2 100644
--- a/src/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java
+++ b/src/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java
@@ -35,7 +35,7 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/04/09 10:46:32 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/map/package.html b/src/java/org/apache/commons/collections/map/package.html
index 0c304d715..47e421196 100644
--- a/src/java/org/apache/commons/collections/map/package.html
+++ b/src/java/org/apache/commons/collections/map/package.html
@@ -1,4 +1,4 @@
-<!-- $Id: package.html,v 1.9 2004/04/30 21:13:38 scolebourne Exp $ -->
+<!-- $Id$ -->
  <!--
    Copyright 2003-2004 The Apache Software Foundation
 
diff --git a/src/java/org/apache/commons/collections/overview.html b/src/java/org/apache/commons/collections/overview.html
index 82f6571a3..83d1f5148 100644
--- a/src/java/org/apache/commons/collections/overview.html
+++ b/src/java/org/apache/commons/collections/overview.html
@@ -1,4 +1,4 @@
-<!-- $Id: overview.html,v 1.3 2004/06/10 23:23:51 scolebourne Exp $ -->
+<!-- $Id$ -->
  <!--
    Copyright 2003-2004 The Apache Software Foundation
 
diff --git a/src/java/org/apache/commons/collections/package.html b/src/java/org/apache/commons/collections/package.html
index 126c4cdc0..46c8efefb 100644
--- a/src/java/org/apache/commons/collections/package.html
+++ b/src/java/org/apache/commons/collections/package.html
@@ -1,4 +1,4 @@
-<!-- $Id: package.html,v 1.12 2004/02/18 21:39:03 scolebourne Exp $ -->
+<!-- $Id$ -->
  <!--
    Copyright 2003-2004 The Apache Software Foundation
 
diff --git a/src/java/org/apache/commons/collections/set/AbstractSetDecorator.java b/src/java/org/apache/commons/collections/set/AbstractSetDecorator.java
index c483dfef4..28225f9e2 100644
--- a/src/java/org/apache/commons/collections/set/AbstractSetDecorator.java
+++ b/src/java/org/apache/commons/collections/set/AbstractSetDecorator.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.collection.AbstractCollectionDecorator;
  * Methods are forwarded directly to the decorated set.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/06/02 21:53:03 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java b/src/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java
index 2e3045821..8f2c7c864 100644
--- a/src/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java
+++ b/src/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java
@@ -25,7 +25,7 @@ import java.util.SortedSet;
  * Methods are forwarded directly to the decorated set.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/06/02 21:53:03 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/set/CompositeSet.java b/src/java/org/apache/commons/collections/set/CompositeSet.java
index a9239cb56..ecea97659 100644
--- a/src/java/org/apache/commons/collections/set/CompositeSet.java
+++ b/src/java/org/apache/commons/collections/set/CompositeSet.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.collection.CompositeCollection;
  * If no strategy is provided then add is unsupported.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/09/22 23:39:46 $
+ * @version $Revision$ $Date$
  *
  * @author Brian McCallister
  */
diff --git a/src/java/org/apache/commons/collections/set/ListOrderedSet.java b/src/java/org/apache/commons/collections/set/ListOrderedSet.java
index d34700adb..8cb980684 100644
--- a/src/java/org/apache/commons/collections/set/ListOrderedSet.java
+++ b/src/java/org/apache/commons/collections/set/ListOrderedSet.java
@@ -44,7 +44,7 @@ import org.apache.commons.collections.list.UnmodifiableList;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.10 $ $Date: 2005/01/04 00:01:31 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Henning P. Schmiedehausen
diff --git a/src/java/org/apache/commons/collections/set/MapBackedSet.java b/src/java/org/apache/commons/collections/set/MapBackedSet.java
index ce751dc50..bdfd0c94e 100644
--- a/src/java/org/apache/commons/collections/set/MapBackedSet.java
+++ b/src/java/org/apache/commons/collections/set/MapBackedSet.java
@@ -32,7 +32,7 @@ import java.util.Set;
  * Exceptions include <code>BidiMap</code> implementations, as they require unique values.
  *
  * @since Commons Collections 3.1
- * @version $Revision: 1.2 $ $Date: 2004/06/02 22:00:47 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/set/PredicatedSet.java b/src/java/org/apache/commons/collections/set/PredicatedSet.java
index 8b14385f6..0e09dd624 100644
--- a/src/java/org/apache/commons/collections/set/PredicatedSet.java
+++ b/src/java/org/apache/commons/collections/set/PredicatedSet.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.collection.PredicatedCollection;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/06/03 22:02:13 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Paul Jack
diff --git a/src/java/org/apache/commons/collections/set/PredicatedSortedSet.java b/src/java/org/apache/commons/collections/set/PredicatedSortedSet.java
index 35bbaf618..7696279c1 100644
--- a/src/java/org/apache/commons/collections/set/PredicatedSortedSet.java
+++ b/src/java/org/apache/commons/collections/set/PredicatedSortedSet.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.Predicate;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/06/03 22:02:13 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Paul Jack
diff --git a/src/java/org/apache/commons/collections/set/SynchronizedSet.java b/src/java/org/apache/commons/collections/set/SynchronizedSet.java
index c4ee3d1f5..bdbcf34f2 100644
--- a/src/java/org/apache/commons/collections/set/SynchronizedSet.java
+++ b/src/java/org/apache/commons/collections/set/SynchronizedSet.java
@@ -28,7 +28,7 @@ import org.apache.commons.collections.collection.SynchronizedCollection;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/06/03 22:02:13 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/set/SynchronizedSortedSet.java b/src/java/org/apache/commons/collections/set/SynchronizedSortedSet.java
index b9e257e1e..346c8616b 100644
--- a/src/java/org/apache/commons/collections/set/SynchronizedSortedSet.java
+++ b/src/java/org/apache/commons/collections/set/SynchronizedSortedSet.java
@@ -29,7 +29,7 @@ import org.apache.commons.collections.collection.SynchronizedCollection;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/06/03 22:02:13 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/set/TransformedSet.java b/src/java/org/apache/commons/collections/set/TransformedSet.java
index bfdb29e6e..32500ef4b 100644
--- a/src/java/org/apache/commons/collections/set/TransformedSet.java
+++ b/src/java/org/apache/commons/collections/set/TransformedSet.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.collection.TransformedCollection;
  * This class is Serializable from Commons Collections 3.1.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/06/03 22:02:13 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/set/TransformedSortedSet.java b/src/java/org/apache/commons/collections/set/TransformedSortedSet.java
index fff83c762..0dee68f58 100644
--- a/src/java/org/apache/commons/collections/set/TransformedSortedSet.java
+++ b/src/java/org/apache/commons/collections/set/TransformedSortedSet.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.Transformer;
  * This class is Serializable from Commons Collections 3.1.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/06/03 22:02:13 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/set/TypedSet.java b/src/java/org/apache/commons/collections/set/TypedSet.java
index 7d1cf4085..fa49fa604 100644
--- a/src/java/org/apache/commons/collections/set/TypedSet.java
+++ b/src/java/org/apache/commons/collections/set/TypedSet.java
@@ -28,7 +28,7 @@ import org.apache.commons.collections.functors.InstanceofPredicate;
  * collection, an IllegalArgumentException is thrown.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/05/07 23:28:38 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Matthew Hawthorne
diff --git a/src/java/org/apache/commons/collections/set/TypedSortedSet.java b/src/java/org/apache/commons/collections/set/TypedSortedSet.java
index 5314eb373..ba465a69a 100644
--- a/src/java/org/apache/commons/collections/set/TypedSortedSet.java
+++ b/src/java/org/apache/commons/collections/set/TypedSortedSet.java
@@ -28,7 +28,7 @@ import org.apache.commons.collections.functors.InstanceofPredicate;
  * collection, an IllegalArgumentException is thrown.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/05/07 23:28:38 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Matthew Hawthorne
diff --git a/src/java/org/apache/commons/collections/set/UnmodifiableSet.java b/src/java/org/apache/commons/collections/set/UnmodifiableSet.java
index d9af3205d..d70f46d38 100644
--- a/src/java/org/apache/commons/collections/set/UnmodifiableSet.java
+++ b/src/java/org/apache/commons/collections/set/UnmodifiableSet.java
@@ -28,7 +28,7 @@ import org.apache.commons.collections.iterators.UnmodifiableIterator;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/06/03 22:02:13 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java b/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java
index 0853ae4c3..41f60fa53 100644
--- a/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java
+++ b/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java
@@ -32,7 +32,7 @@ import org.apache.commons.collections.iterators.UnmodifiableIterator;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/06/02 22:02:34 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/java/org/apache/commons/collections/set/package.html b/src/java/org/apache/commons/collections/set/package.html
index 7d2038076..36f895bc6 100644
--- a/src/java/org/apache/commons/collections/set/package.html
+++ b/src/java/org/apache/commons/collections/set/package.html
@@ -1,4 +1,4 @@
-<!-- $Id: package.html,v 1.5 2004/06/10 23:24:45 scolebourne Exp $ -->
+<!-- $Id$ -->
  <!--
    Copyright 2003-2004 The Apache Software Foundation
 
diff --git a/src/test/org/apache/commons/collections/AbstractTestObject.java b/src/test/org/apache/commons/collections/AbstractTestObject.java
index 4fc7e6356..7cf6ddaeb 100644
--- a/src/test/org/apache/commons/collections/AbstractTestObject.java
+++ b/src/test/org/apache/commons/collections/AbstractTestObject.java
@@ -37,7 +37,7 @@ import java.io.Serializable;
  * you may still use this base set of cases.  Simply override the
  * test case (method) your {@link Object} fails.
  *
- * @version $Revision: 1.7 $ $Date: 2004/06/01 22:55:14 $
+ * @version $Revision$ $Date$
  * 
  * @author Rodney Waldhoff
  * @author Stephen Colebourne
diff --git a/src/test/org/apache/commons/collections/BulkTest.java b/src/test/org/apache/commons/collections/BulkTest.java
index d02f89699..ebd41d756 100644
--- a/src/test/org/apache/commons/collections/BulkTest.java
+++ b/src/test/org/apache/commons/collections/BulkTest.java
@@ -133,7 +133,7 @@ import junit.framework.TestSuite;
  *  interpret bulk test methods.
  *
  *  @author Paul Jack
- *  @version $Id: BulkTest.java,v 1.10 2004/02/18 01:20:35 scolebourne Exp $
+ *  @version $Id$
  */
 public class BulkTest extends TestCase implements Cloneable {
 
diff --git a/src/test/org/apache/commons/collections/LocalTestNode.java b/src/test/org/apache/commons/collections/LocalTestNode.java
index 3bb8f58df..5e7ab659c 100644
--- a/src/test/org/apache/commons/collections/LocalTestNode.java
+++ b/src/test/org/apache/commons/collections/LocalTestNode.java
@@ -18,7 +18,7 @@ package org.apache.commons.collections;
 /**
  * Class LocalTestNode, a helper class for TestDoubleOrderedMap
  * 
- * @version $Revision: 1.5 $ $Date: 2004/02/18 01:20:35 $
+ * @version $Revision$ $Date$
  *
  * @author Marc Johnson (marcj at users dot sourceforge dot net)
  */
diff --git a/src/test/org/apache/commons/collections/TestAll.java b/src/test/org/apache/commons/collections/TestAll.java
index 8833aa8d4..74f26350f 100644
--- a/src/test/org/apache/commons/collections/TestAll.java
+++ b/src/test/org/apache/commons/collections/TestAll.java
@@ -22,7 +22,7 @@ import junit.framework.TestSuite;
 /**
  * Entry point for all Collections package tests.
  * 
- * @version $Revision: 1.57 $ $Date: 2004/02/18 01:20:35 $
+ * @version $Revision$ $Date$
  * 
  * @author Rodney Waldhoff
  * @author Stephen Colebourne
diff --git a/src/test/org/apache/commons/collections/TestAllPackages.java b/src/test/org/apache/commons/collections/TestAllPackages.java
index 1d804bd0f..5d112f81e 100644
--- a/src/test/org/apache/commons/collections/TestAllPackages.java
+++ b/src/test/org/apache/commons/collections/TestAllPackages.java
@@ -22,7 +22,7 @@ import junit.framework.TestSuite;
 /**
  * Entry point for all Collections project tests.
  * 
- * @version $Revision: 1.10 $ $Date: 2004/02/18 01:20:35 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/TestArrayList.java b/src/test/org/apache/commons/collections/TestArrayList.java
index f59b7c020..ffcdb91d0 100644
--- a/src/test/org/apache/commons/collections/TestArrayList.java
+++ b/src/test/org/apache/commons/collections/TestArrayList.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.list.AbstractTestList;
 /**
  * Abstract test class for ArrayList.
  * 
- * @version $Revision: 1.12 $ $Date: 2004/02/18 01:20:35 $
+ * @version $Revision$ $Date$
  * 
  * @author Jason van Zyl
  */
diff --git a/src/test/org/apache/commons/collections/TestArrayStack.java b/src/test/org/apache/commons/collections/TestArrayStack.java
index 995a632c2..716fa2dc3 100644
--- a/src/test/org/apache/commons/collections/TestArrayStack.java
+++ b/src/test/org/apache/commons/collections/TestArrayStack.java
@@ -23,7 +23,7 @@ import junit.framework.Test;
 /**
  * Tests ArrayStack.
  * 
- * @version $Revision: 1.12 $ $Date: 2004/02/18 01:20:35 $
+ * @version $Revision$ $Date$
  * 
  * @author Craig McClanahan
  */
diff --git a/src/test/org/apache/commons/collections/TestBagUtils.java b/src/test/org/apache/commons/collections/TestBagUtils.java
index 5a51c656b..234a7a10f 100644
--- a/src/test/org/apache/commons/collections/TestBagUtils.java
+++ b/src/test/org/apache/commons/collections/TestBagUtils.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.bag.UnmodifiableSortedBag;
 /**
  * Tests for BagUtils factory methods.
  * 
- * @version $Revision: 1.7 $ $Date: 2004/02/18 01:20:35 $
+ * @version $Revision$ $Date$
  *
  * @author Phil Steitz
  */
diff --git a/src/test/org/apache/commons/collections/TestBeanMap.java b/src/test/org/apache/commons/collections/TestBeanMap.java
index 31c35c045..7de4e7033 100644
--- a/src/test/org/apache/commons/collections/TestBeanMap.java
+++ b/src/test/org/apache/commons/collections/TestBeanMap.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.map.AbstractTestMap;
 /**
  * Test cases for BeanMap
  * 
- * @version $Revision: 1.18 $ $Date: 2004/02/18 01:20:35 $
+ * @version $Revision$ $Date$
  * 
  * @author Morgan Delagrange
  * @author Stephen Colebourne
diff --git a/src/test/org/apache/commons/collections/TestBinaryHeap.java b/src/test/org/apache/commons/collections/TestBinaryHeap.java
index e8737a560..43ea2a6ac 100644
--- a/src/test/org/apache/commons/collections/TestBinaryHeap.java
+++ b/src/test/org/apache/commons/collections/TestBinaryHeap.java
@@ -32,7 +32,7 @@ import org.apache.commons.collections.comparators.ReverseComparator;
 /**
  * Tests the BinaryHeap.
  * 
- * @version $Revision: 1.16 $ $Date: 2004/02/18 01:20:35 $
+ * @version $Revision$ $Date$
  * 
  * @author Michael A. Smith
  */
diff --git a/src/test/org/apache/commons/collections/TestBoundedFifoBuffer.java b/src/test/org/apache/commons/collections/TestBoundedFifoBuffer.java
index 65772bb49..b294e4432 100644
--- a/src/test/org/apache/commons/collections/TestBoundedFifoBuffer.java
+++ b/src/test/org/apache/commons/collections/TestBoundedFifoBuffer.java
@@ -26,7 +26,7 @@ import org.apache.commons.collections.collection.AbstractTestCollection;
 /**
  * Test cases for BoundedFifoBuffer.
  * 
- * @version $Revision: 1.13 $ $Date: 2004/02/18 01:20:35 $
+ * @version $Revision$ $Date$
  * 
  * @author Paul Jack
  */
diff --git a/src/test/org/apache/commons/collections/TestBoundedFifoBuffer2.java b/src/test/org/apache/commons/collections/TestBoundedFifoBuffer2.java
index 4e49d0ec7..b0ade0ba1 100644
--- a/src/test/org/apache/commons/collections/TestBoundedFifoBuffer2.java
+++ b/src/test/org/apache/commons/collections/TestBoundedFifoBuffer2.java
@@ -24,7 +24,7 @@ import junit.framework.Test;
  * Runs tests against a full BoundedFifoBuffer, since many of the algorithms
  * differ depending on whether the fifo is full or not.
  * 
- * @version $Revision: 1.10 $ $Date: 2004/02/18 01:20:35 $
+ * @version $Revision$ $Date$
  * 
  * @author Unknown
  */
diff --git a/src/test/org/apache/commons/collections/TestBufferUtils.java b/src/test/org/apache/commons/collections/TestBufferUtils.java
index 7983f55b4..9600da82f 100644
--- a/src/test/org/apache/commons/collections/TestBufferUtils.java
+++ b/src/test/org/apache/commons/collections/TestBufferUtils.java
@@ -22,7 +22,7 @@ import org.apache.commons.collections.buffer.PredicatedBuffer;
 /**
  * Tests for BufferUtils.
  * 
- * @version $Revision: 1.13 $ $Date: 2004/06/02 22:12:14 $
+ * @version $Revision$ $Date$
  * 
  * @author Unknown
  */
diff --git a/src/test/org/apache/commons/collections/TestClosureUtils.java b/src/test/org/apache/commons/collections/TestClosureUtils.java
index 4bc34a13f..1f36d8dfc 100644
--- a/src/test/org/apache/commons/collections/TestClosureUtils.java
+++ b/src/test/org/apache/commons/collections/TestClosureUtils.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.functors.NOPClosure;
  * Tests the org.apache.commons.collections.ClosureUtils class.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.9 $ $Date: 2004/02/18 01:20:35 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/TestCollectionUtils.java b/src/test/org/apache/commons/collections/TestCollectionUtils.java
index 7b0bc4dd8..370542c8c 100644
--- a/src/test/org/apache/commons/collections/TestCollectionUtils.java
+++ b/src/test/org/apache/commons/collections/TestCollectionUtils.java
@@ -51,7 +51,7 @@ import org.apache.commons.collections.collection.UnmodifiableCollection;
  * @author Steven Melzer
  * @author Neil O'Toole
  * 
- * @version $Revision: 1.44 $ $Date: 2004/12/24 11:03:45 $
+ * @version $Revision$ $Date$
  */
 public class TestCollectionUtils extends TestCase {
     
diff --git a/src/test/org/apache/commons/collections/TestCursorableLinkedList.java b/src/test/org/apache/commons/collections/TestCursorableLinkedList.java
index e7972170e..84dbae8c1 100644
--- a/src/test/org/apache/commons/collections/TestCursorableLinkedList.java
+++ b/src/test/org/apache/commons/collections/TestCursorableLinkedList.java
@@ -28,7 +28,7 @@ import org.apache.commons.collections.list.AbstractTestList;
 /**
  * Test class.
  * 
- * @version $Revision: 1.18 $ $Date: 2004/02/18 01:20:35 $
+ * @version $Revision$ $Date$
  * 
  * @author Rodney Waldhoff
  * @author Simon Kitching
diff --git a/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java b/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java
index dafaadca4..cf92be798 100644
--- a/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java
+++ b/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java
@@ -37,7 +37,7 @@ import org.apache.commons.collections.map.AbstractTestMap;
  * Map that does not support duplicate keys, duplicate 
  * values, or null values.
  * 
- * @version $Revision: 1.15 $ $Date: 2004/02/18 01:20:35 $
+ * @version $Revision$ $Date$
  * 
  * @author Marc Johnson
  * @author Stephen Colebourne
diff --git a/src/test/org/apache/commons/collections/TestEnumerationUtils.java b/src/test/org/apache/commons/collections/TestEnumerationUtils.java
index 807335d02..dda2b9bf7 100644
--- a/src/test/org/apache/commons/collections/TestEnumerationUtils.java
+++ b/src/test/org/apache/commons/collections/TestEnumerationUtils.java
@@ -27,7 +27,7 @@ import junit.framework.Test;
  * Tests EnumerationUtils.
  * 
  * @author <a href="mailto:ggregory@seagullsw.com">Gary Gregory</a>
- * @version $Id: TestEnumerationUtils.java,v 1.4 2004/02/18 01:20:35 scolebourne Exp $
+ * @version $Id$
  */
 public class TestEnumerationUtils extends BulkTest {
 
diff --git a/src/test/org/apache/commons/collections/TestExtendedProperties.java b/src/test/org/apache/commons/collections/TestExtendedProperties.java
index af6b4a67c..0fd57380e 100644
--- a/src/test/org/apache/commons/collections/TestExtendedProperties.java
+++ b/src/test/org/apache/commons/collections/TestExtendedProperties.java
@@ -26,7 +26,7 @@ import junit.framework.TestSuite;
 /**
  * Tests some basic functions of the ExtendedProperties class.
  * 
- * @version $Revision: 1.13 $ $Date: 2004/06/21 23:39:25 $
+ * @version $Revision$ $Date$
  * 
  * @author Geir Magnusson Jr.
  * @author Mohan Kishore
diff --git a/src/test/org/apache/commons/collections/TestFactoryUtils.java b/src/test/org/apache/commons/collections/TestFactoryUtils.java
index a3017517e..de783e10c 100644
--- a/src/test/org/apache/commons/collections/TestFactoryUtils.java
+++ b/src/test/org/apache/commons/collections/TestFactoryUtils.java
@@ -35,7 +35,7 @@ import org.apache.commons.collections.functors.ConstantFactory;
  * Tests the org.apache.commons.collections.FactoryUtils class.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.11 $ $Date: 2004/02/18 01:20:35 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/TestFastArrayList.java b/src/test/org/apache/commons/collections/TestFastArrayList.java
index 887408156..540d02f68 100644
--- a/src/test/org/apache/commons/collections/TestFastArrayList.java
+++ b/src/test/org/apache/commons/collections/TestFastArrayList.java
@@ -23,7 +23,7 @@ import junit.framework.Test;
 /**
  * Test FastArrayList.
  * 
- * @version $Revision: 1.10 $ $Date: 2004/02/18 01:20:35 $
+ * @version $Revision$ $Date$
  * 
  * @author Jason van Zyl
  */
diff --git a/src/test/org/apache/commons/collections/TestFastArrayList1.java b/src/test/org/apache/commons/collections/TestFastArrayList1.java
index 733ed0be9..fb97f5da2 100644
--- a/src/test/org/apache/commons/collections/TestFastArrayList1.java
+++ b/src/test/org/apache/commons/collections/TestFastArrayList1.java
@@ -26,7 +26,7 @@ import junit.framework.Test;
 /**
  * Test FastArrayList implementation in <strong>fast</strong> mode.
  * 
- * @version $Revision: 1.10 $ $Date: 2004/06/23 21:41:49 $
+ * @version $Revision$ $Date$
  *
  * @author Jason van Zyl
  */
diff --git a/src/test/org/apache/commons/collections/TestFastHashMap.java b/src/test/org/apache/commons/collections/TestFastHashMap.java
index b08995fef..4be82a00a 100644
--- a/src/test/org/apache/commons/collections/TestFastHashMap.java
+++ b/src/test/org/apache/commons/collections/TestFastHashMap.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.map.AbstractTestMap;
 /**
  * Tests FastHashMap.
  * 
- * @version $Revision: 1.16 $ $Date: 2004/04/12 12:01:38 $
+ * @version $Revision$ $Date$
  * 
  * @author Jason van Zyl
  */
diff --git a/src/test/org/apache/commons/collections/TestFastHashMap1.java b/src/test/org/apache/commons/collections/TestFastHashMap1.java
index 7298f358b..cfbdb5b20 100644
--- a/src/test/org/apache/commons/collections/TestFastHashMap1.java
+++ b/src/test/org/apache/commons/collections/TestFastHashMap1.java
@@ -23,7 +23,7 @@ import junit.framework.Test;
 /**
  * Test FastHashMap in <strong>fast</strong> mode.
  * 
- * @version $Revision: 1.9 $ $Date: 2004/02/18 01:20:35 $
+ * @version $Revision$ $Date$
  *
  * @author Jason van Zyl
  */
diff --git a/src/test/org/apache/commons/collections/TestFastTreeMap.java b/src/test/org/apache/commons/collections/TestFastTreeMap.java
index 55d1d5ec0..9462a6386 100644
--- a/src/test/org/apache/commons/collections/TestFastTreeMap.java
+++ b/src/test/org/apache/commons/collections/TestFastTreeMap.java
@@ -23,7 +23,7 @@ import junit.framework.Test;
 /**
  * Tests FastTreeMap.
  * 
- * @version $Revision: 1.15 $ $Date: 2004/04/12 12:01:38 $
+ * @version $Revision$ $Date$
  * 
  * @author Jason van Zyl
  */
diff --git a/src/test/org/apache/commons/collections/TestFastTreeMap1.java b/src/test/org/apache/commons/collections/TestFastTreeMap1.java
index a12965d30..bb2a8d93b 100644
--- a/src/test/org/apache/commons/collections/TestFastTreeMap1.java
+++ b/src/test/org/apache/commons/collections/TestFastTreeMap1.java
@@ -23,7 +23,7 @@ import junit.framework.Test;
 /**
  * Test FastTreeMap in <strong>fast</strong> mode.
  * 
- * @version $Revision: 1.9 $ $Date: 2004/02/18 01:20:35 $
+ * @version $Revision$ $Date$
  *
  * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
  */
diff --git a/src/test/org/apache/commons/collections/TestHashBag.java b/src/test/org/apache/commons/collections/TestHashBag.java
index 58ba95642..eda31e22a 100644
--- a/src/test/org/apache/commons/collections/TestHashBag.java
+++ b/src/test/org/apache/commons/collections/TestHashBag.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.bag.AbstractTestBag;
  * Extension of {@link TestBag} for exercising the {@link HashBag}
  * implementation.
  * 
- * @version $Revision: 1.10 $ $Date: 2004/02/18 01:20:35 $
+ * @version $Revision$ $Date$
  *
  * @author Chuck Burdick
  */
diff --git a/src/test/org/apache/commons/collections/TestIteratorUtils.java b/src/test/org/apache/commons/collections/TestIteratorUtils.java
index e1e3f9b79..fbb5192bb 100644
--- a/src/test/org/apache/commons/collections/TestIteratorUtils.java
+++ b/src/test/org/apache/commons/collections/TestIteratorUtils.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.iterators.EmptyOrderedMapIterator;
 /**
  * Tests for IteratorUtils.
  * 
- * @version $Revision: 1.16 $ $Date: 2004/05/26 21:56:45 $
+ * @version $Revision$ $Date$
  * 
  * @author Unknown
  */
diff --git a/src/test/org/apache/commons/collections/TestLRUMap.java b/src/test/org/apache/commons/collections/TestLRUMap.java
index 61b999a57..c5db876b4 100644
--- a/src/test/org/apache/commons/collections/TestLRUMap.java
+++ b/src/test/org/apache/commons/collections/TestLRUMap.java
@@ -26,7 +26,7 @@ import junit.framework.Test;
 /**
  * Tests LRUMap.
  * 
- * @version $Revision: 1.29 $ $Date: 2004/02/18 01:20:35 $
+ * @version $Revision$ $Date$
  * 
  * @author James Strachan
  * @author Morgan Delagrange
diff --git a/src/test/org/apache/commons/collections/TestLinkedList.java b/src/test/org/apache/commons/collections/TestLinkedList.java
index f15a3a061..fe97623d4 100644
--- a/src/test/org/apache/commons/collections/TestLinkedList.java
+++ b/src/test/org/apache/commons/collections/TestLinkedList.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.list.AbstractTestList;
  * you may still use this base set of cases.  Simply override the
  * test case (method) your {@link List} fails.
  * 
- * @version $Revision: 1.9 $ $Date: 2004/02/18 01:20:35 $
+ * @version $Revision$ $Date$
  *
  * @author Rich Dougherty
  */
diff --git a/src/test/org/apache/commons/collections/TestListUtils.java b/src/test/org/apache/commons/collections/TestListUtils.java
index 8f6e4a94e..2d0d16b5a 100644
--- a/src/test/org/apache/commons/collections/TestListUtils.java
+++ b/src/test/org/apache/commons/collections/TestListUtils.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.list.PredicatedList;
 /**
  * Tests for ListUtils.
  * 
- * @version $Revision: 1.22 $ $Date: 2004/12/24 11:03:45 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Neil O'Toole
diff --git a/src/test/org/apache/commons/collections/TestMapUtils.java b/src/test/org/apache/commons/collections/TestMapUtils.java
index df5e22719..fb898727b 100644
--- a/src/test/org/apache/commons/collections/TestMapUtils.java
+++ b/src/test/org/apache/commons/collections/TestMapUtils.java
@@ -37,7 +37,7 @@ import org.apache.commons.collections.map.TestPredicatedMap;
 /**
  * Tests for MapUtils.
  * 
- * @version $Revision: 1.27 $ $Date: 2004/12/24 11:03:45 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Arun Mammen Thomas
diff --git a/src/test/org/apache/commons/collections/TestMultiHashMap.java b/src/test/org/apache/commons/collections/TestMultiHashMap.java
index ba0c84976..c6f7abec6 100644
--- a/src/test/org/apache/commons/collections/TestMultiHashMap.java
+++ b/src/test/org/apache/commons/collections/TestMultiHashMap.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.map.AbstractTestMap;
 /**
  * Unit Tests for <code>MultiHashMap</code>.
  * 
- * @version $Revision: 1.21 $ $Date: 2005/01/04 00:13:25 $
+ * @version $Revision$ $Date$
  *
  * @author Unknown
  */
diff --git a/src/test/org/apache/commons/collections/TestPredicateUtils.java b/src/test/org/apache/commons/collections/TestPredicateUtils.java
index 2895f0087..2e0309630 100644
--- a/src/test/org/apache/commons/collections/TestPredicateUtils.java
+++ b/src/test/org/apache/commons/collections/TestPredicateUtils.java
@@ -31,7 +31,7 @@ import junit.textui.TestRunner;
  * Tests the org.apache.commons.collections.PredicateUtils class.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.8 $ $Date: 2004/03/13 16:34:46 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/TestReferenceMap.java b/src/test/org/apache/commons/collections/TestReferenceMap.java
index a243f95c0..c4f9572b6 100644
--- a/src/test/org/apache/commons/collections/TestReferenceMap.java
+++ b/src/test/org/apache/commons/collections/TestReferenceMap.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.map.AbstractTestMap;
 /**
  * Tests for ReferenceMap. 
  * 
- * @version $Revision: 1.19 $ $Date: 2004/05/03 22:03:06 $
+ * @version $Revision$ $Date$
  *
  * @author Paul Jack
  */
diff --git a/src/test/org/apache/commons/collections/TestSequencedHashMap.java b/src/test/org/apache/commons/collections/TestSequencedHashMap.java
index 85913391d..3720ea380 100644
--- a/src/test/org/apache/commons/collections/TestSequencedHashMap.java
+++ b/src/test/org/apache/commons/collections/TestSequencedHashMap.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.map.AbstractTestMap;
  * Be sure to use the "labRat" instance whenever possible,
  * so that subclasses will be tested correctly.
  * 
- * @version $Revision: 1.26 $ $Date: 2004/02/18 01:20:35 $
+ * @version $Revision$ $Date$
  * 
  * @author Morgan Delagrange
  * @author Daniel Rall
diff --git a/src/test/org/apache/commons/collections/TestSetUtils.java b/src/test/org/apache/commons/collections/TestSetUtils.java
index f45724ee8..7e4a6aea6 100644
--- a/src/test/org/apache/commons/collections/TestSetUtils.java
+++ b/src/test/org/apache/commons/collections/TestSetUtils.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.set.PredicatedSet;
 /**
  * Tests for SetUtils.
  * 
- * @version $Revision: 1.16 $ $Date: 2004/06/02 22:12:14 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Neil O'Toole
diff --git a/src/test/org/apache/commons/collections/TestStaticBucketMap.java b/src/test/org/apache/commons/collections/TestStaticBucketMap.java
index 8864ad6e4..153cffe92 100644
--- a/src/test/org/apache/commons/collections/TestStaticBucketMap.java
+++ b/src/test/org/apache/commons/collections/TestStaticBucketMap.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.map.AbstractTestMap;
  * Unit tests 
  * {@link org.apache.commons.collections.StaticBucketMap}.
  * 
- * @version $Revision: 1.11 $ $Date: 2004/02/18 01:20:35 $
+ * @version $Revision$ $Date$
  * 
  * @author Michael A. Smith
  */
diff --git a/src/test/org/apache/commons/collections/TestTransformerUtils.java b/src/test/org/apache/commons/collections/TestTransformerUtils.java
index ecdbe44fc..61587e5ad 100644
--- a/src/test/org/apache/commons/collections/TestTransformerUtils.java
+++ b/src/test/org/apache/commons/collections/TestTransformerUtils.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.functors.NOPTransformer;
  * Tests the org.apache.commons.collections.TransformerUtils class.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.10 $ $Date: 2004/02/18 01:20:35 $
+ * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
  * @author James Carman
diff --git a/src/test/org/apache/commons/collections/TestTreeBag.java b/src/test/org/apache/commons/collections/TestTreeBag.java
index 2467e1856..1dc0067b4 100644
--- a/src/test/org/apache/commons/collections/TestTreeBag.java
+++ b/src/test/org/apache/commons/collections/TestTreeBag.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.bag.AbstractTestBag;
  * Extension of {@link TestBag} for exercising the {@link TreeBag}
  * implementation.
  * 
- * @version $Revision: 1.10 $ $Date: 2004/02/18 01:20:35 $
+ * @version $Revision$ $Date$
  *
  * @author Chuck Burdick
  */
diff --git a/src/test/org/apache/commons/collections/TestTreeMap.java b/src/test/org/apache/commons/collections/TestTreeMap.java
index 90c3664a4..74407a1bc 100644
--- a/src/test/org/apache/commons/collections/TestTreeMap.java
+++ b/src/test/org/apache/commons/collections/TestTreeMap.java
@@ -22,7 +22,7 @@ import org.apache.commons.collections.map.AbstractTestMap;
 /**
  * Tests TreeMap.
  * 
- * @version $Revision: 1.13 $ $Date: 2004/02/18 01:20:35 $
+ * @version $Revision$ $Date$
  * 
  * @author Jason van Zyl
  */
diff --git a/src/test/org/apache/commons/collections/TestTypedCollection.java b/src/test/org/apache/commons/collections/TestTypedCollection.java
index 5bf6af792..d353b350d 100644
--- a/src/test/org/apache/commons/collections/TestTypedCollection.java
+++ b/src/test/org/apache/commons/collections/TestTypedCollection.java
@@ -22,7 +22,7 @@ import java.util.List;
 /**
  * Tests TypedCollection.
  * 
- * @version $Revision: 1.5 $ $Date: 2004/02/18 01:20:35 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java b/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java
index 58d4e42eb..b93a99efb 100644
--- a/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java
+++ b/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java
@@ -26,7 +26,7 @@ import org.apache.commons.collections.collection.AbstractTestCollection;
 /**
  * Test cases for UnboundedFifoBuffer.
  * 
- * @version $Revision: 1.12 $ $Date: 2004/02/18 01:20:35 $
+ * @version $Revision$ $Date$
  * 
  * @author Unknown
  */
diff --git a/src/test/org/apache/commons/collections/bag/AbstractTestBag.java b/src/test/org/apache/commons/collections/bag/AbstractTestBag.java
index 7be74246c..c7e7e1b0a 100644
--- a/src/test/org/apache/commons/collections/bag/AbstractTestBag.java
+++ b/src/test/org/apache/commons/collections/bag/AbstractTestBag.java
@@ -36,7 +36,7 @@ import org.apache.commons.collections.Bag;
  * you may still use this base set of cases.  Simply override the
  * test case (method) your bag fails.
  *
- * @version $Revision: 1.9 $ $Date: 2004/05/31 22:39:20 $
+ * @version $Revision$ $Date$
  * 
  * @author Chuck Burdick
  * @author Stephen Colebourne
diff --git a/src/test/org/apache/commons/collections/bag/AbstractTestSortedBag.java b/src/test/org/apache/commons/collections/bag/AbstractTestSortedBag.java
index adb785f57..36daee513 100644
--- a/src/test/org/apache/commons/collections/bag/AbstractTestSortedBag.java
+++ b/src/test/org/apache/commons/collections/bag/AbstractTestSortedBag.java
@@ -21,7 +21,7 @@ package org.apache.commons.collections.bag;
  * methods and contracts.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/02/18 01:20:39 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/bag/TestAll.java b/src/test/org/apache/commons/collections/bag/TestAll.java
index ef38925eb..ee9682ce2 100644
--- a/src/test/org/apache/commons/collections/bag/TestAll.java
+++ b/src/test/org/apache/commons/collections/bag/TestAll.java
@@ -23,7 +23,7 @@ import junit.framework.TestSuite;
  * Entry point for tests.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/02/18 01:20:39 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/bag/TestHashBag.java b/src/test/org/apache/commons/collections/bag/TestHashBag.java
index 1a29695c7..a3a807e21 100644
--- a/src/test/org/apache/commons/collections/bag/TestHashBag.java
+++ b/src/test/org/apache/commons/collections/bag/TestHashBag.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.Bag;
  * Extension of {@link TestBag} for exercising the {@link HashBag}
  * implementation.
  * 
- * @version $Revision: 1.4 $ $Date: 2004/02/18 01:20:39 $
+ * @version $Revision$ $Date$
  *
  * @author Chuck Burdick
  */
diff --git a/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java b/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java
index 867548008..3a1d07f28 100644
--- a/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java
+++ b/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java
@@ -29,7 +29,7 @@ import org.apache.commons.collections.PredicateUtils;
  * implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/06/02 22:05:03 $
+ * @version $Revision$ $Date$
  * 
  * @author Phil Steitz
  */
diff --git a/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java b/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java
index cd8526564..087c0304e 100644
--- a/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java
+++ b/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.SortedBag;
  * implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.8 $ $Date: 2004/06/02 22:05:03 $
+ * @version $Revision$ $Date$
  * 
  * @author Phil Steitz
  */
diff --git a/src/test/org/apache/commons/collections/bag/TestTransformedBag.java b/src/test/org/apache/commons/collections/bag/TestTransformedBag.java
index 3dac4be22..f08497e48 100644
--- a/src/test/org/apache/commons/collections/bag/TestTransformedBag.java
+++ b/src/test/org/apache/commons/collections/bag/TestTransformedBag.java
@@ -26,7 +26,7 @@ import org.apache.commons.collections.collection.TestTransformedCollection;
  * implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/06/02 22:05:03 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java b/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java
index 86abb55bb..bc749b1a8 100644
--- a/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java
+++ b/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java
@@ -26,7 +26,7 @@ import org.apache.commons.collections.collection.TestTransformedCollection;
  * implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/06/02 22:05:03 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/bag/TestTreeBag.java b/src/test/org/apache/commons/collections/bag/TestTreeBag.java
index 93d2217c1..296d1b93c 100644
--- a/src/test/org/apache/commons/collections/bag/TestTreeBag.java
+++ b/src/test/org/apache/commons/collections/bag/TestTreeBag.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.SortedBag;
  * Extension of {@link TestBag} for exercising the {@link TreeBag}
  * implementation.
  * 
- * @version $Revision: 1.4 $ $Date: 2004/02/18 01:20:39 $
+ * @version $Revision$ $Date$
  *
  * @author Chuck Burdick
  */
diff --git a/src/test/org/apache/commons/collections/bag/TestTypedBag.java b/src/test/org/apache/commons/collections/bag/TestTypedBag.java
index 54f07b38d..0c9b7374f 100644
--- a/src/test/org/apache/commons/collections/bag/TestTypedBag.java
+++ b/src/test/org/apache/commons/collections/bag/TestTypedBag.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.Bag;
  * implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/06/02 22:05:03 $
+ * @version $Revision$ $Date$
  * 
  * @author Phil Steitz
  */
diff --git a/src/test/org/apache/commons/collections/bag/TestTypedSortedBag.java b/src/test/org/apache/commons/collections/bag/TestTypedSortedBag.java
index 9bd11b97f..4a1141ce9 100644
--- a/src/test/org/apache/commons/collections/bag/TestTypedSortedBag.java
+++ b/src/test/org/apache/commons/collections/bag/TestTypedSortedBag.java
@@ -28,7 +28,7 @@ import org.apache.commons.collections.SortedBag;
  * implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.8 $ $Date: 2004/06/02 22:05:03 $
+ * @version $Revision$ $Date$
  * 
  * @author Phil Steitz
  */
diff --git a/src/test/org/apache/commons/collections/bidimap/AbstractTestBidiMap.java b/src/test/org/apache/commons/collections/bidimap/AbstractTestBidiMap.java
index 5cbd8a34e..d5888b15a 100644
--- a/src/test/org/apache/commons/collections/bidimap/AbstractTestBidiMap.java
+++ b/src/test/org/apache/commons/collections/bidimap/AbstractTestBidiMap.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.map.AbstractTestMap;
 /**
  * Abstract test class for {@link BidiMap} methods and contracts.
  * 
- * @version $Revision: 1.9 $ $Date: 2004/02/18 01:20:40 $
+ * @version $Revision$ $Date$
  * 
  * @author Matthew Hawthorne
  * @author Stephen Colebourne
diff --git a/src/test/org/apache/commons/collections/bidimap/AbstractTestOrderedBidiMap.java b/src/test/org/apache/commons/collections/bidimap/AbstractTestOrderedBidiMap.java
index dabbafc85..3b13ab5e9 100644
--- a/src/test/org/apache/commons/collections/bidimap/AbstractTestOrderedBidiMap.java
+++ b/src/test/org/apache/commons/collections/bidimap/AbstractTestOrderedBidiMap.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.iterators.AbstractTestMapIterator;
 /**
  * Abstract test class for {@link OrderedBidiMap} methods and contracts.
  * 
- * @version $Revision: 1.6 $ $Date: 2004/02/18 01:20:40 $
+ * @version $Revision$ $Date$
  * 
  * @author Matthew Hawthorne
  * @author Stephen Colebourne
diff --git a/src/test/org/apache/commons/collections/bidimap/AbstractTestSortedBidiMap.java b/src/test/org/apache/commons/collections/bidimap/AbstractTestSortedBidiMap.java
index bdebaeda4..81daba2fb 100644
--- a/src/test/org/apache/commons/collections/bidimap/AbstractTestSortedBidiMap.java
+++ b/src/test/org/apache/commons/collections/bidimap/AbstractTestSortedBidiMap.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.map.AbstractTestSortedMap;
 /**
  * Abstract test class for {@link SortedBidiMap} methods and contracts.
  * 
- * @version $Revision: 1.8 $ $Date: 2004/02/18 01:20:39 $
+ * @version $Revision$ $Date$
  * 
  * @author Matthew Hawthorne
  * @author Stephen Colebourne
diff --git a/src/test/org/apache/commons/collections/bidimap/TestAbstractOrderedBidiMapDecorator.java b/src/test/org/apache/commons/collections/bidimap/TestAbstractOrderedBidiMapDecorator.java
index 154d52ac1..6d6427de1 100644
--- a/src/test/org/apache/commons/collections/bidimap/TestAbstractOrderedBidiMapDecorator.java
+++ b/src/test/org/apache/commons/collections/bidimap/TestAbstractOrderedBidiMapDecorator.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.OrderedBidiMap;
 /**
  * Test class for AbstractOrderedBidiMapDecorator.
  * 
- * @version $Revision: 1.3 $ $Date: 2004/02/18 01:20:39 $
+ * @version $Revision$ $Date$
  */
 public class TestAbstractOrderedBidiMapDecorator
         extends AbstractTestOrderedBidiMap {
diff --git a/src/test/org/apache/commons/collections/bidimap/TestAll.java b/src/test/org/apache/commons/collections/bidimap/TestAll.java
index cd1298b55..18fcf64bd 100644
--- a/src/test/org/apache/commons/collections/bidimap/TestAll.java
+++ b/src/test/org/apache/commons/collections/bidimap/TestAll.java
@@ -23,7 +23,7 @@ import junit.framework.TestSuite;
  * Entry point for tests.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/06/11 23:29:07 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/bidimap/TestDualHashBidiMap.java b/src/test/org/apache/commons/collections/bidimap/TestDualHashBidiMap.java
index 28b86e21b..5a76a4150 100644
--- a/src/test/org/apache/commons/collections/bidimap/TestDualHashBidiMap.java
+++ b/src/test/org/apache/commons/collections/bidimap/TestDualHashBidiMap.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.BulkTest;
 /**
  * JUnit tests.
  * 
- * @version $Revision: 1.5 $ $Date: 2004/02/18 01:20:40 $
+ * @version $Revision$ $Date$
  * 
  * @author Matthew Hawthorne
  * @author Stephen Colebourne
diff --git a/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap.java b/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap.java
index c41cd0069..485e0c89b 100644
--- a/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap.java
+++ b/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.BulkTest;
 /**
  * JUnit tests.
  * 
- * @version $Revision: 1.5 $ $Date: 2004/02/18 01:20:40 $
+ * @version $Revision$ $Date$
  * 
  * @author Matthew Hawthorne
  * @author Stephen Colebourne
diff --git a/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap2.java b/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap2.java
index 93c35f03e..3c18f0477 100644
--- a/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap2.java
+++ b/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap2.java
@@ -39,7 +39,7 @@ import org.apache.commons.collections.comparators.ReverseComparator;
 /**
  * JUnit tests.
  * 
- * @version $Revision: 1.2 $ $Date: 2004/06/21 22:30:05 $
+ * @version $Revision$ $Date$
  * 
  * @author Matthew Hawthorne
  * @author Stephen Colebourne
diff --git a/src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java b/src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java
index 34d7559b7..b16187b7f 100644
--- a/src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java
+++ b/src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.BulkTest;
 /**
  * JUnit tests.
  * 
- * @version $Revision: 1.6 $ $Date: 2004/02/18 01:20:40 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java
index d74ed5694..0568ca6e2 100644
--- a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java
+++ b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.BulkTest;
 /**
  * JUnit tests.
  * 
- * @version $Revision: 1.3 $ $Date: 2004/02/18 01:20:40 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java
index b05a7884a..38c5042de 100644
--- a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java
+++ b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java
@@ -28,7 +28,7 @@ import org.apache.commons.collections.OrderedBidiMap;
 /**
  * JUnit tests.
  * 
- * @version $Revision: 1.3 $ $Date: 2004/02/18 01:20:40 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java
index a0c106dde..1f218a8f7 100644
--- a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java
+++ b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java
@@ -28,7 +28,7 @@ import org.apache.commons.collections.SortedBidiMap;
 /**
  * JUnit tests.
  * 
- * @version $Revision: 1.4 $ $Date: 2004/04/09 15:15:18 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/buffer/TestAll.java b/src/test/org/apache/commons/collections/buffer/TestAll.java
index d042916c0..43c9a5c72 100644
--- a/src/test/org/apache/commons/collections/buffer/TestAll.java
+++ b/src/test/org/apache/commons/collections/buffer/TestAll.java
@@ -23,7 +23,7 @@ import junit.framework.TestSuite;
  * Entry point for tests.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/06/02 22:05:54 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java b/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java
index 092c288d0..484667b52 100644
--- a/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java
+++ b/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.BufferUnderflowException;
  * implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $
+ * @version $Revision$
  * 
  * @author Janek Bogucki
  * @author Phil Steitz
diff --git a/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer.java b/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer.java
index c19b6c4d3..50cb16d31 100644
--- a/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer.java
+++ b/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer.java
@@ -28,7 +28,7 @@ import org.apache.commons.collections.collection.AbstractTestCollection;
 /**
  * Test cases for BoundedFifoBuffer.
  * 
- * @version $Revision: 1.5 $ $Date: 2005/01/15 22:47:40 $
+ * @version $Revision$ $Date$
  * 
  * @author Paul Jack
  */
diff --git a/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer2.java b/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer2.java
index e2f577df1..f6800b3eb 100644
--- a/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer2.java
+++ b/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer2.java
@@ -28,7 +28,7 @@ import org.apache.commons.collections.BulkTest;
  * Runs tests against a full BoundedFifoBuffer, since many of the algorithms
  * differ depending on whether the fifo is full or not.
  * 
- * @version $Revision: 1.4 $ $Date: 2004/02/18 01:20:37 $
+ * @version $Revision$ $Date$
  * 
  * @author Unknown
  */
diff --git a/src/test/org/apache/commons/collections/buffer/TestCircularFifoBuffer.java b/src/test/org/apache/commons/collections/buffer/TestCircularFifoBuffer.java
index 02addbda0..d0138d19d 100644
--- a/src/test/org/apache/commons/collections/buffer/TestCircularFifoBuffer.java
+++ b/src/test/org/apache/commons/collections/buffer/TestCircularFifoBuffer.java
@@ -35,7 +35,7 @@ import org.apache.commons.collections.collection.AbstractTestCollection;
 /**
  * Test cases for CircularFifoBuffer.
  * 
- * @version $Revision: 1.6 $ $Date: 2005/01/22 00:47:49 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java b/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java
index dfecd4ebf..2daaa79b9 100644
--- a/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java
+++ b/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.collection.TestPredicatedCollection;
  * {@link PredicatedBuffer} implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/06/02 22:05:54 $
+ * @version $Revision$ $Date$
  * 
  * @author Phil Steitz
  */
diff --git a/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java b/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java
index cc5236f0e..95ac1e42b 100644
--- a/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java
+++ b/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.comparators.ReverseComparator;
 /**
  * Tests the PriorityBuffer.
  * 
- * @version $Revision: 1.3 $ $Date: 2004/02/18 01:20:37 $
+ * @version $Revision$ $Date$
  * 
  * @author Michael A. Smith
  */
diff --git a/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java b/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java
index 39fdc53ec..ac75e9e90 100644
--- a/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java
+++ b/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.collection.AbstractTestCollection;
  * {@link SynchronizedBuffer} implementation.
  *
  * @since Commons Collections 3.1
- * @version $Revision: 1.1 $ $Date: 2004/06/02 22:05:54 $
+ * @version $Revision$ $Date$
  * 
  * @author Phil Steitz
  * @author Stephen Colebourne
diff --git a/src/test/org/apache/commons/collections/buffer/TestTransformedBuffer.java b/src/test/org/apache/commons/collections/buffer/TestTransformedBuffer.java
index cc057a127..b2db8d6d7 100644
--- a/src/test/org/apache/commons/collections/buffer/TestTransformedBuffer.java
+++ b/src/test/org/apache/commons/collections/buffer/TestTransformedBuffer.java
@@ -28,7 +28,7 @@ import org.apache.commons.collections.collection.TestTransformedCollection;
  * implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.3 $ $Date: 2004/02/18 01:20:37 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/buffer/TestUnboundedFifoBuffer.java b/src/test/org/apache/commons/collections/buffer/TestUnboundedFifoBuffer.java
index 8be86b834..e6b9b2ed8 100644
--- a/src/test/org/apache/commons/collections/buffer/TestUnboundedFifoBuffer.java
+++ b/src/test/org/apache/commons/collections/buffer/TestUnboundedFifoBuffer.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.collection.AbstractTestCollection;
 /**
  * Test cases for UnboundedFifoBuffer.
  * 
- * @version $Revision: 1.4 $ $Date: 2004/06/01 22:55:54 $
+ * @version $Revision$ $Date$
  * 
  * @author Unknown
  */
diff --git a/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java b/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java
index 586b8e3cd..f86f03a27 100644
--- a/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java
+++ b/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.collection.AbstractTestCollection;
  * {@link UnmodifiableBuffer} implementation.
  *
  * @since Commons Collections 3.1
- * @version $Revision: 1.1 $ $Date: 2004/06/02 22:05:54 $
+ * @version $Revision$ $Date$
  * 
  * @author Phil Steitz
  * @author Stephen Colebourne
diff --git a/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java b/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java
index b5b851506..859aeccbf 100644
--- a/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java
+++ b/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java
@@ -112,7 +112,7 @@ import org.apache.commons.collections.AbstractTestObject;
  * you may still use this base set of cases.  Simply override the
  * test case (method) your {@link Collection} fails.
  *
- * @version $Revision: 1.8 $ $Date: 2004/06/01 22:55:14 $
+ * @version $Revision$ $Date$
  * 
  * @author Rodney Waldhoff
  * @author Paul Jack
diff --git a/src/test/org/apache/commons/collections/collection/TestAll.java b/src/test/org/apache/commons/collections/collection/TestAll.java
index b952789ea..97c3cbcd8 100644
--- a/src/test/org/apache/commons/collections/collection/TestAll.java
+++ b/src/test/org/apache/commons/collections/collection/TestAll.java
@@ -23,7 +23,7 @@ import junit.framework.TestSuite;
  * Entry point for tests.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/06/01 23:07:12 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/collection/TestCompositeCollection.java b/src/test/org/apache/commons/collections/collection/TestCompositeCollection.java
index 042b6265e..5f83be3e9 100644
--- a/src/test/org/apache/commons/collections/collection/TestCompositeCollection.java
+++ b/src/test/org/apache/commons/collections/collection/TestCompositeCollection.java
@@ -28,7 +28,7 @@ import junit.framework.TestSuite;
  * {@link CompositeCollection} implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/02/18 01:20:40 $
+ * @version $Revision$ $Date$
  * 
  * @author Brian McCallister
  * @author Phil Steitz
diff --git a/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java b/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java
index 89db9cfea..d33552efb 100644
--- a/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java
+++ b/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.PredicateUtils;
  * {@link PredicatedCollection} implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/06/02 22:06:33 $
+ * @version $Revision$ $Date$
  * 
  * @author Phil Steitz
  */
diff --git a/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java b/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java
index 7fa699df9..83aa5cdb7 100644
--- a/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java
+++ b/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java
@@ -27,7 +27,7 @@ import junit.framework.TestSuite;
  * {@link SynchronizedCollection} implementation.
  *
  * @since Commons Collections 3.1
- * @version $Revision: 1.1 $ $Date: 2004/06/01 23:07:12 $
+ * @version $Revision$ $Date$
  * 
  * @author Phil Steitz
  * @author Stephen Colebourne
diff --git a/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java b/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java
index 2edfb2a27..c4da2192a 100644
--- a/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java
+++ b/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.TransformerUtils;
  * implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/06/02 22:06:33 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java b/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java
index 8f7aaa273..382e5ea55 100644
--- a/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java
+++ b/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java
@@ -28,7 +28,7 @@ import junit.framework.TestSuite;
  * {@link UnmodifiableCollection} implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/06/02 22:06:33 $
+ * @version $Revision$ $Date$
  * 
  * @author Phil Steitz
  * @author Stephen Colebourne
diff --git a/src/test/org/apache/commons/collections/comparators/TestAll.java b/src/test/org/apache/commons/collections/comparators/TestAll.java
index 09cac73c6..7b1096705 100644
--- a/src/test/org/apache/commons/collections/comparators/TestAll.java
+++ b/src/test/org/apache/commons/collections/comparators/TestAll.java
@@ -22,7 +22,7 @@ import junit.framework.TestSuite;
 /**
  * Entry point for all Comparator Collections tests.
  * 
- * @version $Revision: 1.7 $ $Date: 2004/02/18 01:20:34 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java b/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java
index 7820bab7e..8e7379487 100644
--- a/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java
+++ b/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java
@@ -25,7 +25,7 @@ import junit.framework.TestSuite;
 /**
  * Tests for {@link BooleanComparator}.
  * 
- * @version $Revision: 1.9 $ $Date: 2004/02/18 01:20:34 $
+ * @version $Revision$ $Date$
  * 
  * @author Rodney Waldhoff
  */
diff --git a/src/test/org/apache/commons/collections/comparators/TestComparableComparator.java b/src/test/org/apache/commons/collections/comparators/TestComparableComparator.java
index b65b48d49..b7b063595 100644
--- a/src/test/org/apache/commons/collections/comparators/TestComparableComparator.java
+++ b/src/test/org/apache/commons/collections/comparators/TestComparableComparator.java
@@ -25,7 +25,7 @@ import junit.framework.TestSuite;
 /**
  * Tests for ComparableComparator.
  * 
- * @version $Revision: 1.6 $ $Date: 2004/02/18 01:20:34 $
+ * @version $Revision$ $Date$
  * 
  * @author Unknown
  */
diff --git a/src/test/org/apache/commons/collections/comparators/TestComparatorChain.java b/src/test/org/apache/commons/collections/comparators/TestComparatorChain.java
index 684cf6131..5efd2a0b5 100644
--- a/src/test/org/apache/commons/collections/comparators/TestComparatorChain.java
+++ b/src/test/org/apache/commons/collections/comparators/TestComparatorChain.java
@@ -26,7 +26,7 @@ import junit.framework.TestSuite;
 /**
  * Tests for ComparatorChain.
  * 
- * @version $Revision: 1.10 $ $Date: 2004/02/18 01:20:34 $
+ * @version $Revision$ $Date$
  * 
  * @author Unknown
  */
diff --git a/src/test/org/apache/commons/collections/comparators/TestFixedOrderComparator.java b/src/test/org/apache/commons/collections/comparators/TestFixedOrderComparator.java
index b1ec37d20..63ffa13e6 100644
--- a/src/test/org/apache/commons/collections/comparators/TestFixedOrderComparator.java
+++ b/src/test/org/apache/commons/collections/comparators/TestFixedOrderComparator.java
@@ -28,7 +28,7 @@ import junit.framework.TestSuite;
 /**
  * Test class for FixedOrderComparator.
  * 
- * @version $Revision: 1.6 $ $Date: 2004/02/18 01:20:34 $
+ * @version $Revision$ $Date$
  * 
  * @author David Leppik 
  * @author Stephen Colebourne
diff --git a/src/test/org/apache/commons/collections/comparators/TestNullComparator.java b/src/test/org/apache/commons/collections/comparators/TestNullComparator.java
index 8516cacda..b5882bb7c 100644
--- a/src/test/org/apache/commons/collections/comparators/TestNullComparator.java
+++ b/src/test/org/apache/commons/collections/comparators/TestNullComparator.java
@@ -25,7 +25,7 @@ import junit.framework.TestSuite;
 /**
  * Test the NullComparator.
  * 
- * @version $Revision: 1.9 $ $Date: 2004/02/18 01:20:34 $
+ * @version $Revision$ $Date$
  * 
  * @author Michael A. Smith
  */
diff --git a/src/test/org/apache/commons/collections/comparators/TestReverseComparator.java b/src/test/org/apache/commons/collections/comparators/TestReverseComparator.java
index fc8236de8..412b2951d 100644
--- a/src/test/org/apache/commons/collections/comparators/TestReverseComparator.java
+++ b/src/test/org/apache/commons/collections/comparators/TestReverseComparator.java
@@ -30,7 +30,7 @@ import junit.framework.TestSuite;
 /**
  * Tests for ReverseComparator.
  * 
- * @version $Revision: 1.9 $ $Date: 2004/02/18 01:20:34 $
+ * @version $Revision$ $Date$
  * 
  * @author Unknown
  */
diff --git a/src/test/org/apache/commons/collections/iterators/AbstractTestIterator.java b/src/test/org/apache/commons/collections/iterators/AbstractTestIterator.java
index 484f1d688..dde798b0d 100644
--- a/src/test/org/apache/commons/collections/iterators/AbstractTestIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/AbstractTestIterator.java
@@ -29,7 +29,7 @@ import org.apache.commons.collections.AbstractTestObject;
  * overriding the supportsXxx() methods if necessary.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.8 $ $Date: 2004/02/18 01:20:33 $
+ * @version $Revision$ $Date$
  * 
  * @author Morgan Delagrange
  * @author Stephen Colebourne
diff --git a/src/test/org/apache/commons/collections/iterators/AbstractTestListIterator.java b/src/test/org/apache/commons/collections/iterators/AbstractTestListIterator.java
index a5f731e5d..8d39f1f67 100644
--- a/src/test/org/apache/commons/collections/iterators/AbstractTestListIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/AbstractTestListIterator.java
@@ -29,7 +29,7 @@ import java.util.NoSuchElementException;
  * overriding the supportsXxx() methods if necessary.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.8 $ $Date: 2004/02/18 01:20:33 $
+ * @version $Revision$ $Date$
  * 
  * @author Rodney Waldhoff
  * @author Stephen Colebourne
diff --git a/src/test/org/apache/commons/collections/iterators/AbstractTestMapIterator.java b/src/test/org/apache/commons/collections/iterators/AbstractTestMapIterator.java
index d619c3c32..da9774211 100644
--- a/src/test/org/apache/commons/collections/iterators/AbstractTestMapIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/AbstractTestMapIterator.java
@@ -32,7 +32,7 @@ import org.apache.commons.collections.MapIterator;
  * overriding the supportsXxx() methods if necessary.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.12 $ $Date: 2004/04/09 14:38:13 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/iterators/AbstractTestOrderedMapIterator.java b/src/test/org/apache/commons/collections/iterators/AbstractTestOrderedMapIterator.java
index de14ad6a0..0a6273b93 100644
--- a/src/test/org/apache/commons/collections/iterators/AbstractTestOrderedMapIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/AbstractTestOrderedMapIterator.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.OrderedMapIterator;
  * overriding the supportsXxx() methods if necessary.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.8 $ $Date: 2004/02/18 01:20:33 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/iterators/TestAll.java b/src/test/org/apache/commons/collections/iterators/TestAll.java
index 148a6353c..50fcb58da 100644
--- a/src/test/org/apache/commons/collections/iterators/TestAll.java
+++ b/src/test/org/apache/commons/collections/iterators/TestAll.java
@@ -22,7 +22,7 @@ import junit.framework.TestSuite;
 /**
  * Entry point for all iterator tests.
  * 
- * @version $Revision: 1.16 $ $Date: 2004/07/17 21:02:47 $
+ * @version $Revision$ $Date$
  * 
  * @author Rodney Waldhoff
  */
diff --git a/src/test/org/apache/commons/collections/iterators/TestArrayIterator.java b/src/test/org/apache/commons/collections/iterators/TestArrayIterator.java
index 1ca408b73..92475dbb5 100644
--- a/src/test/org/apache/commons/collections/iterators/TestArrayIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestArrayIterator.java
@@ -26,7 +26,7 @@ import junit.framework.TestSuite;
  * perform the iteration rather than the hasNext() method.
  * The code of this test was supplied by Mauricio S. Moura.
  * 
- * @version $Revision: 1.7 $ $Date: 2004/02/18 01:20:33 $
+ * @version $Revision$ $Date$
  * 
  * @author James Strachan
  * @author Mauricio S. Moura
diff --git a/src/test/org/apache/commons/collections/iterators/TestArrayIterator2.java b/src/test/org/apache/commons/collections/iterators/TestArrayIterator2.java
index 111e1da71..4bec2c48c 100644
--- a/src/test/org/apache/commons/collections/iterators/TestArrayIterator2.java
+++ b/src/test/org/apache/commons/collections/iterators/TestArrayIterator2.java
@@ -24,7 +24,7 @@ import junit.framework.TestSuite;
 /**
  * Tests the ArrayIterator with primitive type arrays.
  * 
- * @version $Revision: 1.7 $ $Date: 2004/02/18 01:20:33 $
+ * @version $Revision$ $Date$
  * 
  * @author Morgan Delagrange
  * @author James Strachan
diff --git a/src/test/org/apache/commons/collections/iterators/TestArrayListIterator.java b/src/test/org/apache/commons/collections/iterators/TestArrayListIterator.java
index 9b0bf9a54..c4e33e2e5 100644
--- a/src/test/org/apache/commons/collections/iterators/TestArrayListIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestArrayListIterator.java
@@ -26,7 +26,7 @@ import junit.framework.TestSuite;
 /**
  * Test the ArrayListIterator class.
  * 
- * @version $Revision: 1.5 $ $Date: 2004/02/18 01:20:33 $
+ * @version $Revision$ $Date$
  * @author Neil O'Toole
  */
 public class TestArrayListIterator extends TestArrayIterator {
diff --git a/src/test/org/apache/commons/collections/iterators/TestArrayListIterator2.java b/src/test/org/apache/commons/collections/iterators/TestArrayListIterator2.java
index 7e9e7b1e8..98a18c5ad 100644
--- a/src/test/org/apache/commons/collections/iterators/TestArrayListIterator2.java
+++ b/src/test/org/apache/commons/collections/iterators/TestArrayListIterator2.java
@@ -23,7 +23,7 @@ import junit.framework.TestSuite;
 /**
  * Test the ArrayListIterator class with primitives.
  * 
- * @version $Revision: 1.5 $ $Date: 2004/02/18 01:20:33 $
+ * @version $Revision$ $Date$
  * @author Neil O'Toole
  */
 public class TestArrayListIterator2 extends TestArrayIterator2 {
diff --git a/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java b/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java
index 38e5469c3..adb1a1c06 100644
--- a/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.comparators.ComparableComparator;
 /**
  * Unit test suite for {@link CollatingIterator}.
  * 
- * @version $Revision: 1.6 $ $Date: 2004/02/18 01:20:33 $
+ * @version $Revision$ $Date$
  * @author Rodney Waldhoff
  */
 public class TestCollatingIterator extends AbstractTestIterator {
diff --git a/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java b/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java
index 7fda1bdb4..dadc7c22a 100644
--- a/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java
@@ -29,7 +29,7 @@ import org.apache.commons.collections.Predicate;
 /**
  * Test the filter iterator.
  *
- * @version $Revision: 1.9 $ $Date: 2004/02/18 01:20:33 $
+ * @version $Revision$ $Date$
  * 
  * @author  Jan Sorensen
  * @author Ralph Wagner
diff --git a/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java b/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java
index 0e4746132..c3ee7e180 100644
--- a/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java
@@ -29,7 +29,7 @@ import org.apache.commons.collections.Predicate;
 /**
  * Tests the FilterListIterator class.
  * 
- * @version $Revision: 1.9 $ $Date: 2004/02/18 01:20:33 $
+ * @version $Revision$ $Date$
  * 
  * @author Rodney Waldhoff
  */
diff --git a/src/test/org/apache/commons/collections/iterators/TestIteratorChain.java b/src/test/org/apache/commons/collections/iterators/TestIteratorChain.java
index 615dd9e21..3f29fd6a4 100644
--- a/src/test/org/apache/commons/collections/iterators/TestIteratorChain.java
+++ b/src/test/org/apache/commons/collections/iterators/TestIteratorChain.java
@@ -26,7 +26,7 @@ import junit.framework.TestSuite;
 /**
  * Tests the IteratorChain class.
  * 
- * @version $Revision: 1.9 $ $Date: 2004/02/18 01:20:33 $
+ * @version $Revision$ $Date$
  * 
  * @author James Strachan
  * @author Mauricio S. Moura
diff --git a/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper.java b/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper.java
index 966db42a8..f913cca87 100644
--- a/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper.java
+++ b/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper.java
@@ -28,7 +28,7 @@ import junit.framework.TestSuite;
  * Tests the ListIteratorWrapper to insure that it simulates
  * a ListIterator correctly.
  *
- * @version $Revision: 1.6 $ $Date: 2004/02/18 01:20:33 $
+ * @version $Revision$ $Date$
  * 
  * @author Morgan Delagrange
  */
diff --git a/src/test/org/apache/commons/collections/iterators/TestLoopingIterator.java b/src/test/org/apache/commons/collections/iterators/TestLoopingIterator.java
index 9a820a1dd..a2eb2b96d 100644
--- a/src/test/org/apache/commons/collections/iterators/TestLoopingIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestLoopingIterator.java
@@ -27,7 +27,7 @@ import junit.framework.TestSuite;
 /**
  * Tests the LoopingIterator class.
  * 
- * @version $Revision: 1.5 $ $Date: 2004/02/18 01:20:33 $
+ * @version $Revision$ $Date$
  * 
  * @author Jonathan Carlson
  * @author Stephen Colebourne
diff --git a/src/test/org/apache/commons/collections/iterators/TestLoopingListIterator.java b/src/test/org/apache/commons/collections/iterators/TestLoopingListIterator.java
index 05f7e8ece..350748a8e 100644
--- a/src/test/org/apache/commons/collections/iterators/TestLoopingListIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestLoopingListIterator.java
@@ -27,7 +27,7 @@ import junit.framework.TestSuite;
 /**
  * Tests the LoopingListIterator class.
  *
- * @version $Revision: 1.1 $ $Date: 2004/07/17 21:02:47 $
+ * @version $Revision$ $Date$
  *
  * @author Eric Crampton <ccesc@eonomine.com>
  */
diff --git a/src/test/org/apache/commons/collections/iterators/TestObjectArrayIterator.java b/src/test/org/apache/commons/collections/iterators/TestObjectArrayIterator.java
index 506d6823d..6736cb7d1 100644
--- a/src/test/org/apache/commons/collections/iterators/TestObjectArrayIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestObjectArrayIterator.java
@@ -24,7 +24,7 @@ import junit.framework.TestSuite;
 /**
  * Tests the ObjectArrayIterator.
  * 
- * @version $Revision: 1.5 $ $Date: 2004/02/18 01:20:33 $
+ * @version $Revision$ $Date$
  * 
  * @author James Strachan
  * @author Mauricio S. Moura
diff --git a/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator.java b/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator.java
index f0256b37a..d40e01b84 100644
--- a/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator.java
@@ -26,7 +26,7 @@ import junit.framework.TestSuite;
 /**
  * Tests the ObjectArrayListIterator class.
  * 
- * @version $Revision: 1.5 $ $Date: 2004/02/18 01:20:33 $
+ * @version $Revision$ $Date$
  * 
  * @author Neil O'Toole
  */
diff --git a/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator2.java b/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator2.java
index c3b195e36..209f8a0f1 100644
--- a/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator2.java
+++ b/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator2.java
@@ -23,7 +23,7 @@ import junit.framework.TestSuite;
 /**
  * Tests the ObjectArrayListIterator class.
  * 
- * @version $Revision: 1.3 $ $Date: 2004/02/18 01:20:33 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/iterators/TestObjectGraphIterator.java b/src/test/org/apache/commons/collections/iterators/TestObjectGraphIterator.java
index 5d235b2d3..545636321 100644
--- a/src/test/org/apache/commons/collections/iterators/TestObjectGraphIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestObjectGraphIterator.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.Transformer;
 /**
  * Testcase.
  * 
- * @version $Revision: 1.1 $ $Date: 2004/03/20 00:21:08 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java b/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java
index 83579ebf1..9717429b3 100644
--- a/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.ResettableIterator;
  * Tests the SingletonIterator to ensure that the next() method will actually
  * perform the iteration rather than the hasNext() method.
  *
- * @version $Revision: 1.11 $ $Date: 2004/02/18 01:20:33 $
+ * @version $Revision$ $Date$
  * 
  * @author James Strachan
  */
diff --git a/src/test/org/apache/commons/collections/iterators/TestSingletonIterator2.java b/src/test/org/apache/commons/collections/iterators/TestSingletonIterator2.java
index a757a1e9b..065eb8167 100644
--- a/src/test/org/apache/commons/collections/iterators/TestSingletonIterator2.java
+++ b/src/test/org/apache/commons/collections/iterators/TestSingletonIterator2.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.ResettableIterator;
  * Tests the SingletonIterator to ensure that the next() method will actually
  * perform the iteration rather than the hasNext() method.
  *
- * @version $Revision: 1.1 $ $Date: 2004/04/09 14:38:47 $
+ * @version $Revision$ $Date$
  * 
  * @author James Strachan
  */
diff --git a/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java b/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java
index efdbcea82..a2ae1fbcb 100644
--- a/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java
@@ -26,7 +26,7 @@ import org.apache.commons.collections.ResettableListIterator;
 /**
  * Tests the SingletonListIterator.
  *
- * @version $Revision: 1.11 $ $Date: 2004/02/18 01:20:33 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/iterators/TestUniqueFilterIterator.java b/src/test/org/apache/commons/collections/iterators/TestUniqueFilterIterator.java
index 99d2ff733..88f01eaf6 100644
--- a/src/test/org/apache/commons/collections/iterators/TestUniqueFilterIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestUniqueFilterIterator.java
@@ -26,7 +26,7 @@ import junit.framework.TestSuite;
 /**
  * Tests the UniqueFilterIterator class.
  * 
- * @version $Revision: 1.7 $ $Date: 2004/02/18 01:20:33 $
+ * @version $Revision$ $Date$
  * 
  * @author James Strachan
  * @author Mauricio S. Moura
diff --git a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableIterator.java b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableIterator.java
index 79e92dc20..e21989364 100644
--- a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableIterator.java
@@ -29,7 +29,7 @@ import org.apache.commons.collections.Unmodifiable;
 /**
  * Tests the UnmodifiableIterator.
  * 
- * @version $Revision: 1.3 $ $Date: 2004/02/18 01:20:33 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java
index 1537666c8..0117ae9f7 100644
--- a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java
@@ -29,7 +29,7 @@ import org.apache.commons.collections.Unmodifiable;
 /**
  * Tests the UnmodifiableListIterator.
  * 
- * @version $Revision: 1.3 $ $Date: 2004/02/18 01:20:33 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java
index fe4f37765..250a798a3 100644
--- a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java
@@ -29,7 +29,7 @@ import org.apache.commons.collections.bidimap.DualHashBidiMap;
 /**
  * Tests the UnmodifiableMapIterator.
  * 
- * @version $Revision: 1.8 $ $Date: 2004/02/18 01:20:33 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java
index 1485aaad4..052d06b4c 100644
--- a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.map.ListOrderedMap;
 /**
  * Tests the UnmodifiableOrderedMapIterator.
  * 
- * @version $Revision: 1.5 $ $Date: 2004/02/18 01:20:33 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/keyvalue/AbstractTestMapEntry.java b/src/test/org/apache/commons/collections/keyvalue/AbstractTestMapEntry.java
index f663af41a..a3e752a8e 100644
--- a/src/test/org/apache/commons/collections/keyvalue/AbstractTestMapEntry.java
+++ b/src/test/org/apache/commons/collections/keyvalue/AbstractTestMapEntry.java
@@ -28,7 +28,7 @@ import junit.framework.TestCase;
  * type being tested.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.3 $ $Date: 2004/02/18 01:20:40 $
+ * @version $Revision$ $Date$
  * 
  * @author Neil O'Toole
  */
diff --git a/src/test/org/apache/commons/collections/keyvalue/TestAll.java b/src/test/org/apache/commons/collections/keyvalue/TestAll.java
index f73594449..3ccfbf6d9 100644
--- a/src/test/org/apache/commons/collections/keyvalue/TestAll.java
+++ b/src/test/org/apache/commons/collections/keyvalue/TestAll.java
@@ -23,7 +23,7 @@ import junit.framework.TestSuite;
  * Entry point for key-value test cases.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.3 $ $Date: 2004/02/18 01:20:40 $
+ * @version $Revision$ $Date$
  * 
  * @author Neil O'Toole
  * @author Stephen Colebourne
diff --git a/src/test/org/apache/commons/collections/keyvalue/TestDefaultKeyValue.java b/src/test/org/apache/commons/collections/keyvalue/TestDefaultKeyValue.java
index 916eccf91..706a0bbcb 100644
--- a/src/test/org/apache/commons/collections/keyvalue/TestDefaultKeyValue.java
+++ b/src/test/org/apache/commons/collections/keyvalue/TestDefaultKeyValue.java
@@ -26,7 +26,7 @@ import junit.framework.TestSuite;
  * Test the DefaultKeyValue class.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.3 $ $Date: 2004/02/18 01:20:40 $
+ * @version $Revision$ $Date$
  * 
  * @author Neil O'Toole
  */
diff --git a/src/test/org/apache/commons/collections/keyvalue/TestDefaultMapEntry.java b/src/test/org/apache/commons/collections/keyvalue/TestDefaultMapEntry.java
index 7cf088744..ae68cb36d 100644
--- a/src/test/org/apache/commons/collections/keyvalue/TestDefaultMapEntry.java
+++ b/src/test/org/apache/commons/collections/keyvalue/TestDefaultMapEntry.java
@@ -26,7 +26,7 @@ import org.apache.commons.collections.KeyValue;
  * Test the DefaultMapEntry class.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.3 $ $Date: 2004/02/18 01:20:40 $
+ * @version $Revision$ $Date$
  * 
  * @author Neil O'Toole
  */
diff --git a/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java b/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java
index 56193e8b2..213af1280 100644
--- a/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java
+++ b/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java
@@ -25,7 +25,7 @@ import junit.framework.TestSuite;
 /**
  * Unit tests for {@link org.apache.commons.collections.MultiKey}.
  * 
- * @version $Revision: 1.4 $ $Date: 2004/03/13 12:43:43 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/keyvalue/TestTiedMapEntry.java b/src/test/org/apache/commons/collections/keyvalue/TestTiedMapEntry.java
index d97050273..91b6fcf64 100644
--- a/src/test/org/apache/commons/collections/keyvalue/TestTiedMapEntry.java
+++ b/src/test/org/apache/commons/collections/keyvalue/TestTiedMapEntry.java
@@ -25,7 +25,7 @@ import junit.framework.TestSuite;
  * Test the TiedMapEntry class.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.3 $ $Date: 2004/02/18 01:20:40 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/keyvalue/TestUnmodifiableMapEntry.java b/src/test/org/apache/commons/collections/keyvalue/TestUnmodifiableMapEntry.java
index d14682229..0e51f66d4 100644
--- a/src/test/org/apache/commons/collections/keyvalue/TestUnmodifiableMapEntry.java
+++ b/src/test/org/apache/commons/collections/keyvalue/TestUnmodifiableMapEntry.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.Unmodifiable;
  * Test the UnmodifiableMapEntry class.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.3 $ $Date: 2004/02/18 01:20:40 $
+ * @version $Revision$ $Date$
  * 
  * @author Neil O'Toole
  */
diff --git a/src/test/org/apache/commons/collections/list/AbstractTestList.java b/src/test/org/apache/commons/collections/list/AbstractTestList.java
index 2677a8475..3c8033dd2 100644
--- a/src/test/org/apache/commons/collections/list/AbstractTestList.java
+++ b/src/test/org/apache/commons/collections/list/AbstractTestList.java
@@ -45,7 +45,7 @@ import org.apache.commons.collections.iterators.AbstractTestListIterator;
  * test case (method) your {@link List} fails or override one of the
  * protected methods from AbstractTestCollection.
  *
- * @version $Revision: 1.10 $ $Date: 2004/07/29 22:28:57 $
+ * @version $Revision$ $Date$
  * 
  * @author Rodney Waldhoff
  * @author Paul Jack
diff --git a/src/test/org/apache/commons/collections/list/TestAbstractLinkedList.java b/src/test/org/apache/commons/collections/list/TestAbstractLinkedList.java
index 772dc606f..aca8627c8 100644
--- a/src/test/org/apache/commons/collections/list/TestAbstractLinkedList.java
+++ b/src/test/org/apache/commons/collections/list/TestAbstractLinkedList.java
@@ -20,7 +20,7 @@ import java.util.Arrays;
 /**
  * Test case for {@link AbstractLinkedList}.
  * 
- * @version $Revision: 1.3 $ $Date: 2004/02/18 01:20:34 $
+ * @version $Revision$ $Date$
  * 
  * @author Rich Dougherty
  * @author David Hay
diff --git a/src/test/org/apache/commons/collections/list/TestAll.java b/src/test/org/apache/commons/collections/list/TestAll.java
index 03302ab20..e7e7a9440 100644
--- a/src/test/org/apache/commons/collections/list/TestAll.java
+++ b/src/test/org/apache/commons/collections/list/TestAll.java
@@ -23,7 +23,7 @@ import junit.framework.TestSuite;
  * Entry point for tests.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.8 $ $Date: 2004/06/02 22:07:53 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/list/TestCursorableLinkedList.java b/src/test/org/apache/commons/collections/list/TestCursorableLinkedList.java
index 6479b1c3a..aa24e7f50 100644
--- a/src/test/org/apache/commons/collections/list/TestCursorableLinkedList.java
+++ b/src/test/org/apache/commons/collections/list/TestCursorableLinkedList.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.BulkTest;
 /**
  * Test class.
  * 
- * @version $Revision: 1.3 $ $Date: 2004/02/18 01:20:34 $
+ * @version $Revision$ $Date$
  * 
  * @author Rodney Waldhoff
  * @author Simon Kitching
diff --git a/src/test/org/apache/commons/collections/list/TestFixedSizeList.java b/src/test/org/apache/commons/collections/list/TestFixedSizeList.java
index f62d0ad79..67137a2f5 100644
--- a/src/test/org/apache/commons/collections/list/TestFixedSizeList.java
+++ b/src/test/org/apache/commons/collections/list/TestFixedSizeList.java
@@ -27,7 +27,7 @@ import junit.framework.TestSuite;
  * implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/06/02 22:07:53 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/list/TestNodeCachingLinkedList.java b/src/test/org/apache/commons/collections/list/TestNodeCachingLinkedList.java
index 09ad6814a..c345a5073 100644
--- a/src/test/org/apache/commons/collections/list/TestNodeCachingLinkedList.java
+++ b/src/test/org/apache/commons/collections/list/TestNodeCachingLinkedList.java
@@ -26,7 +26,7 @@ import org.apache.commons.collections.BulkTest;
 /**
  * Test class for NodeCachingLinkedList, a performance optimised LinkedList.
  * 
- * @version $Revision: 1.3 $ $Date: 2004/02/18 01:20:34 $
+ * @version $Revision$ $Date$
  * 
  * @author Jeff Varszegi
  * @author Phil Steitz
diff --git a/src/test/org/apache/commons/collections/list/TestPredicatedList.java b/src/test/org/apache/commons/collections/list/TestPredicatedList.java
index 2ebeef40d..f5f49f061 100644
--- a/src/test/org/apache/commons/collections/list/TestPredicatedList.java
+++ b/src/test/org/apache/commons/collections/list/TestPredicatedList.java
@@ -29,7 +29,7 @@ import org.apache.commons.collections.PredicateUtils;
  * {@link PredicatedList} implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/06/02 22:07:53 $
+ * @version $Revision$ $Date$
  * 
  * @author Phil Steitz
  */
diff --git a/src/test/org/apache/commons/collections/list/TestSetUniqueList.java b/src/test/org/apache/commons/collections/list/TestSetUniqueList.java
index dd431352e..5d49beb8f 100644
--- a/src/test/org/apache/commons/collections/list/TestSetUniqueList.java
+++ b/src/test/org/apache/commons/collections/list/TestSetUniqueList.java
@@ -30,7 +30,7 @@ import junit.textui.TestRunner;
  * JUnit tests.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date$
+ * @version $Revision$ $Date$
  * 
  * @author Matthew Hawthorne
  * @author Tom Dunham
diff --git a/src/test/org/apache/commons/collections/list/TestSynchronizedList.java b/src/test/org/apache/commons/collections/list/TestSynchronizedList.java
index 615b808ae..671991388 100644
--- a/src/test/org/apache/commons/collections/list/TestSynchronizedList.java
+++ b/src/test/org/apache/commons/collections/list/TestSynchronizedList.java
@@ -27,7 +27,7 @@ import junit.framework.TestSuite;
  * implementation.
  *
  * @since Commons Collections 3.1
- * @version $Revision: 1.1 $ $Date: 2004/06/01 23:08:04 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/list/TestTransformedList.java b/src/test/org/apache/commons/collections/list/TestTransformedList.java
index 29e3a4857..51b01cc45 100644
--- a/src/test/org/apache/commons/collections/list/TestTransformedList.java
+++ b/src/test/org/apache/commons/collections/list/TestTransformedList.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.collection.TestTransformedCollection;
  * implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/06/02 22:07:53 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/list/TestTreeList.java b/src/test/org/apache/commons/collections/list/TestTreeList.java
index 5cc5527c8..23a633503 100644
--- a/src/test/org/apache/commons/collections/list/TestTreeList.java
+++ b/src/test/org/apache/commons/collections/list/TestTreeList.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.BulkTest;
  * JUnit tests
  * 
  * @since Commons Collections 3.1
- * @version $Revision: 1.2 $ $Date: 2004/05/12 23:24:44 $
+ * @version $Revision$ $Date$
  *
  * @author Joerg Schmuecker
  */
diff --git a/src/test/org/apache/commons/collections/list/TestTypedList.java b/src/test/org/apache/commons/collections/list/TestTypedList.java
index 9dd7916d3..09739b075 100644
--- a/src/test/org/apache/commons/collections/list/TestTypedList.java
+++ b/src/test/org/apache/commons/collections/list/TestTypedList.java
@@ -27,7 +27,7 @@ import junit.framework.TestSuite;
  * implementation.
  *
  * @since Commons Collections 3.1
- * @version $Revision: 1.1 $ $Date: 2004/06/02 22:07:53 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/list/TestUnmodifiableList.java b/src/test/org/apache/commons/collections/list/TestUnmodifiableList.java
index 6663ff48f..1c152effa 100644
--- a/src/test/org/apache/commons/collections/list/TestUnmodifiableList.java
+++ b/src/test/org/apache/commons/collections/list/TestUnmodifiableList.java
@@ -28,7 +28,7 @@ import junit.framework.TestSuite;
  * {@link UnmodifiableList} implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/06/02 22:07:53 $
+ * @version $Revision$ $Date$
  * 
  * @author Phil Steitz
  */
diff --git a/src/test/org/apache/commons/collections/map/AbstractTestIterableMap.java b/src/test/org/apache/commons/collections/map/AbstractTestIterableMap.java
index c80335aac..439759d5b 100644
--- a/src/test/org/apache/commons/collections/map/AbstractTestIterableMap.java
+++ b/src/test/org/apache/commons/collections/map/AbstractTestIterableMap.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.iterators.AbstractTestMapIterator;
 /**
  * Abstract test class for {@link IterableMap} methods and contracts.
  *
- * @version $Revision: 1.4 $ $Date: 2004/02/18 01:20:38 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/map/AbstractTestMap.java b/src/test/org/apache/commons/collections/map/AbstractTestMap.java
index 262c02330..a854752b0 100644
--- a/src/test/org/apache/commons/collections/map/AbstractTestMap.java
+++ b/src/test/org/apache/commons/collections/map/AbstractTestMap.java
@@ -116,7 +116,7 @@ import org.apache.commons.collections.set.AbstractTestSet;
  * @author Rodney Waldhoff
  * @author Paul Jack
  * @author Stephen Colebourne
- * @version $Revision: 1.16 $ $Date: 2004/06/07 23:14:40 $
+ * @version $Revision$ $Date$
  */
 public abstract class AbstractTestMap extends AbstractTestObject {
 
diff --git a/src/test/org/apache/commons/collections/map/AbstractTestOrderedMap.java b/src/test/org/apache/commons/collections/map/AbstractTestOrderedMap.java
index 2c807e39f..d927f13fa 100644
--- a/src/test/org/apache/commons/collections/map/AbstractTestOrderedMap.java
+++ b/src/test/org/apache/commons/collections/map/AbstractTestOrderedMap.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.iterators.AbstractTestOrderedMapIterator;
 /**
  * Abstract test class for {@link OrderedMap} methods and contracts.
  *
- * @version $Revision: 1.7 $ $Date: 2004/02/18 01:20:38 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/map/AbstractTestSortedMap.java b/src/test/org/apache/commons/collections/map/AbstractTestSortedMap.java
index 64cb02f22..ef5e95d87 100644
--- a/src/test/org/apache/commons/collections/map/AbstractTestSortedMap.java
+++ b/src/test/org/apache/commons/collections/map/AbstractTestSortedMap.java
@@ -28,7 +28,7 @@ import org.apache.commons.collections.BulkTest;
 /**
  * Abstract test class for {@link java.util.SortedMap} methods and contracts.
  *
- * @version $Revision: 1.9 $ $Date: 2004/05/31 22:39:20 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/map/TestAll.java b/src/test/org/apache/commons/collections/map/TestAll.java
index 947f8ad0a..91237d26e 100644
--- a/src/test/org/apache/commons/collections/map/TestAll.java
+++ b/src/test/org/apache/commons/collections/map/TestAll.java
@@ -23,7 +23,7 @@ import junit.framework.TestSuite;
  * Entry point for tests.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.19 $ $Date: 2004/06/07 21:51:39 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/map/TestCaseInsensitiveMap.java b/src/test/org/apache/commons/collections/map/TestCaseInsensitiveMap.java
index f0dd6b94c..49930678b 100644
--- a/src/test/org/apache/commons/collections/map/TestCaseInsensitiveMap.java
+++ b/src/test/org/apache/commons/collections/map/TestCaseInsensitiveMap.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.BulkTest;
 /**
  * Tests for the {@link CaseInsensitiveMap} implementation.
  * 
- * @version $Revision: 1.4 $ $Date: 2004/02/27 00:25:14 $
+ * @version $Revision$ $Date$
  * 
  * @author Commons-Collections team
  */
diff --git a/src/test/org/apache/commons/collections/map/TestCompositeMap.java b/src/test/org/apache/commons/collections/map/TestCompositeMap.java
index 2fb10f6c7..e8f7b7ddf 100644
--- a/src/test/org/apache/commons/collections/map/TestCompositeMap.java
+++ b/src/test/org/apache/commons/collections/map/TestCompositeMap.java
@@ -28,7 +28,7 @@ import java.util.Collection;
  * {@link CompositeMap} implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.3 $ $Date: 2004/02/18 01:20:37 $
+ * @version $Revision$ $Date$
  *
  * @author Brian McCallister
  */
diff --git a/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java b/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java
index 982af6253..cfc3ca6bf 100644
--- a/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java
+++ b/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java
@@ -26,7 +26,7 @@ import junit.framework.TestSuite;
  * implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/04/02 21:15:05 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java b/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java
index 4594f1733..d9f307fa3 100644
--- a/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java
@@ -28,7 +28,7 @@ import org.apache.commons.collections.BulkTest;
  * implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/04/09 09:40:15 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/map/TestFlat3Map.java b/src/test/org/apache/commons/collections/map/TestFlat3Map.java
index 33ae859ad..89ae5f86d 100644
--- a/src/test/org/apache/commons/collections/map/TestFlat3Map.java
+++ b/src/test/org/apache/commons/collections/map/TestFlat3Map.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.iterators.AbstractTestMapIterator;
 /**
  * JUnit tests.
  * 
- * @version $Revision: 1.7 $ $Date: 2004/03/31 23:18:56 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/map/TestHashedMap.java b/src/test/org/apache/commons/collections/map/TestHashedMap.java
index 8b0710499..61df3ebdd 100644
--- a/src/test/org/apache/commons/collections/map/TestHashedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestHashedMap.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.BulkTest;
 /**
  * JUnit tests.
  * 
- * @version $Revision: 1.7 $ $Date: 2004/02/27 00:25:14 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/map/TestIdentityMap.java b/src/test/org/apache/commons/collections/map/TestIdentityMap.java
index a20d1a678..103c51950 100644
--- a/src/test/org/apache/commons/collections/map/TestIdentityMap.java
+++ b/src/test/org/apache/commons/collections/map/TestIdentityMap.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.IterableMap;
 /**
  * JUnit tests.
  * 
- * @version $Revision: 1.7 $ $Date: 2004/02/27 00:25:14 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/map/TestLRUMap.java b/src/test/org/apache/commons/collections/map/TestLRUMap.java
index e6d8b3ec6..5fab0c0d7 100644
--- a/src/test/org/apache/commons/collections/map/TestLRUMap.java
+++ b/src/test/org/apache/commons/collections/map/TestLRUMap.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.ResettableIterator;
 /**
  * JUnit tests.
  * 
- * @version $Revision: 1.8 $ $Date: 2004/05/12 19:51:28 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/map/TestLazyMap.java b/src/test/org/apache/commons/collections/map/TestLazyMap.java
index 42c500395..dcb08f873 100644
--- a/src/test/org/apache/commons/collections/map/TestLazyMap.java
+++ b/src/test/org/apache/commons/collections/map/TestLazyMap.java
@@ -29,7 +29,7 @@ import org.apache.commons.collections.FactoryUtils;
  * {@link LazyMap} implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/04/09 09:39:16 $
+ * @version $Revision$ $Date$
  * 
  * @author Phil Steitz
  */
diff --git a/src/test/org/apache/commons/collections/map/TestLazySortedMap.java b/src/test/org/apache/commons/collections/map/TestLazySortedMap.java
index ed8ac2553..25bfcc36a 100644
--- a/src/test/org/apache/commons/collections/map/TestLazySortedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestLazySortedMap.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.TransformerUtils;
  * {@link LazySortedMap} implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/04/09 09:39:47 $
+ * @version $Revision$ $Date$
  * 
  * @author Phil Steitz
  */
diff --git a/src/test/org/apache/commons/collections/map/TestLinkedMap.java b/src/test/org/apache/commons/collections/map/TestLinkedMap.java
index 0ee09f127..4faa47a7a 100644
--- a/src/test/org/apache/commons/collections/map/TestLinkedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestLinkedMap.java
@@ -32,7 +32,7 @@ import org.apache.commons.collections.list.AbstractTestList;
 /**
  * JUnit tests.
  * 
- * @version $Revision: 1.8 $ $Date: 2004/05/31 22:39:20 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/map/TestListOrderedMap.java b/src/test/org/apache/commons/collections/map/TestListOrderedMap.java
index d348631e3..0f235d15c 100644
--- a/src/test/org/apache/commons/collections/map/TestListOrderedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestListOrderedMap.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.list.AbstractTestList;
  * implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.10 $ $Date: 2004/05/31 22:39:20 $
+ * @version $Revision$ $Date$
  * 
  * @author Henri Yandell
  * @author Stephen Colebourne
diff --git a/src/test/org/apache/commons/collections/map/TestListOrderedMap2.java b/src/test/org/apache/commons/collections/map/TestListOrderedMap2.java
index 3f53bb9bb..d2a8ead12 100644
--- a/src/test/org/apache/commons/collections/map/TestListOrderedMap2.java
+++ b/src/test/org/apache/commons/collections/map/TestListOrderedMap2.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.list.AbstractTestList;
  * implementation.
  *
  * @since Commons Collections 3.1
- * @version $Revision: 1.1 $ $Date: 2004/06/07 21:51:39 $
+ * @version $Revision$ $Date$
  * 
  * @author Henri Yandell
  * @author Stephen Colebourne
diff --git a/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java b/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
index 6a3f09c91..7cd7e780c 100644
--- a/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
+++ b/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.keyvalue.MultiKey;
 /**
  * JUnit tests.
  * 
- * @version $Revision: 1.2 $ $Date: 2004/04/30 23:51:36 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/map/TestPredicatedMap.java b/src/test/org/apache/commons/collections/map/TestPredicatedMap.java
index 3bc8f0bea..62b9ab82b 100644
--- a/src/test/org/apache/commons/collections/map/TestPredicatedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestPredicatedMap.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.PredicateUtils;
  * {@link PredicatedMap} implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/04/09 09:43:09 $
+ * @version $Revision$ $Date$
  * 
  * @author Phil Steitz
  */
diff --git a/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java b/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java
index 88b435d32..fbf4d0b54 100644
--- a/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.PredicateUtils;
  * {@link PredicatedSortedMap} implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/04/09 09:43:09 $
+ * @version $Revision$ $Date$
  * 
  * @author Phil Steitz
  */
diff --git a/src/test/org/apache/commons/collections/map/TestReferenceIdentityMap.java b/src/test/org/apache/commons/collections/map/TestReferenceIdentityMap.java
index 5c4b1fb88..f3e4e7994 100644
--- a/src/test/org/apache/commons/collections/map/TestReferenceIdentityMap.java
+++ b/src/test/org/apache/commons/collections/map/TestReferenceIdentityMap.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.IterableMap;
 /**
  * Tests for ReferenceIdentityMap. 
  * 
- * @version $Revision: 1.3 $
+ * @version $Revision$
  *
  * @author Paul Jack
  * @author Stephen Colebourne
diff --git a/src/test/org/apache/commons/collections/map/TestReferenceMap.java b/src/test/org/apache/commons/collections/map/TestReferenceMap.java
index 0bf81b9ba..2876fdffe 100644
--- a/src/test/org/apache/commons/collections/map/TestReferenceMap.java
+++ b/src/test/org/apache/commons/collections/map/TestReferenceMap.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.BulkTest;
 /**
  * Tests for ReferenceMap. 
  * 
- * @version $Revision: 1.8 $ $Date: 2004/05/03 22:03:06 $
+ * @version $Revision$ $Date$
  *
  * @author Paul Jack
  */
diff --git a/src/test/org/apache/commons/collections/map/TestSingletonMap.java b/src/test/org/apache/commons/collections/map/TestSingletonMap.java
index cf9b303ce..30ee8c3f7 100644
--- a/src/test/org/apache/commons/collections/map/TestSingletonMap.java
+++ b/src/test/org/apache/commons/collections/map/TestSingletonMap.java
@@ -28,7 +28,7 @@ import org.apache.commons.collections.KeyValue;
 /**
  * JUnit tests.
  * 
- * @version $Revision: 1.1 $ $Date: 2004/04/09 14:46:35 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/map/TestStaticBucketMap.java b/src/test/org/apache/commons/collections/map/TestStaticBucketMap.java
index f57465445..543a0b0d4 100644
--- a/src/test/org/apache/commons/collections/map/TestStaticBucketMap.java
+++ b/src/test/org/apache/commons/collections/map/TestStaticBucketMap.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.BulkTest;
  * Unit tests 
  * {@link org.apache.commons.collections.StaticBucketMap}.
  * 
- * @version $Revision: 1.3 $ $Date: 2004/02/18 01:20:38 $
+ * @version $Revision$ $Date$
  * 
  * @author Michael A. Smith
  */
diff --git a/src/test/org/apache/commons/collections/map/TestTransformedMap.java b/src/test/org/apache/commons/collections/map/TestTransformedMap.java
index 063f21552..c6544fe14 100644
--- a/src/test/org/apache/commons/collections/map/TestTransformedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestTransformedMap.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.collection.TestTransformedCollection;
  * implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/04/10 22:22:56 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java b/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java
index 4bd7c8539..2157b8e14 100644
--- a/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.collection.TestTransformedCollection;
  * implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/04/10 22:22:57 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java b/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java
index 22f8c0ccb..c41a7ea84 100644
--- a/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java
+++ b/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java
@@ -28,7 +28,7 @@ import org.apache.commons.collections.Unmodifiable;
  * {@link UnmodifiableMap} implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.10 $ $Date: 2004/04/09 10:46:32 $
+ * @version $Revision$ $Date$
  * 
  * @author Phil Steitz
  */
diff --git a/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java b/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java
index 3adedbf6d..8a662f79b 100644
--- a/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java
@@ -29,7 +29,7 @@ import org.apache.commons.collections.Unmodifiable;
  * {@link UnmodifiableOrderedMap} implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/04/09 10:46:32 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/map/TestUnmodifiableSortedMap.java b/src/test/org/apache/commons/collections/map/TestUnmodifiableSortedMap.java
index 47ade4c55..5a4b3e4c2 100644
--- a/src/test/org/apache/commons/collections/map/TestUnmodifiableSortedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestUnmodifiableSortedMap.java
@@ -29,7 +29,7 @@ import org.apache.commons.collections.Unmodifiable;
  * {@link UnmodifiableSortedMap} implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/04/09 10:46:32 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/overview.html b/src/test/org/apache/commons/collections/overview.html
index bf6b941bf..52e787b64 100644
--- a/src/test/org/apache/commons/collections/overview.html
+++ b/src/test/org/apache/commons/collections/overview.html
@@ -1,4 +1,4 @@
-<!-- $Id: overview.html,v 1.3 2004/02/18 21:39:03 scolebourne Exp $ -->
+<!-- $Id$ -->
  <!--
    Copyright 2003-2004 The Apache Software Foundation
 
diff --git a/src/test/org/apache/commons/collections/set/AbstractTestSet.java b/src/test/org/apache/commons/collections/set/AbstractTestSet.java
index 29a6834b6..7b879f8dd 100644
--- a/src/test/org/apache/commons/collections/set/AbstractTestSet.java
+++ b/src/test/org/apache/commons/collections/set/AbstractTestSet.java
@@ -38,7 +38,7 @@ import org.apache.commons.collections.collection.AbstractTestCollection;
  * elements may be added; see {@link AbstractTestCollection} for more details.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/05/31 19:09:14 $
+ * @version $Revision$ $Date$
  * 
  * @author Paul Jack
  */
diff --git a/src/test/org/apache/commons/collections/set/AbstractTestSortedSet.java b/src/test/org/apache/commons/collections/set/AbstractTestSortedSet.java
index dd6fe6542..21f38ce79 100644
--- a/src/test/org/apache/commons/collections/set/AbstractTestSortedSet.java
+++ b/src/test/org/apache/commons/collections/set/AbstractTestSortedSet.java
@@ -32,7 +32,7 @@ import org.apache.commons.collections.BulkTest;
  * elements may be added; see {@link AbstractTestCollection} for more details.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/05/31 22:39:20 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  * @author Dieter Wimberger
diff --git a/src/test/org/apache/commons/collections/set/TestAll.java b/src/test/org/apache/commons/collections/set/TestAll.java
index 568382c76..677d775e2 100644
--- a/src/test/org/apache/commons/collections/set/TestAll.java
+++ b/src/test/org/apache/commons/collections/set/TestAll.java
@@ -23,7 +23,7 @@ import junit.framework.TestSuite;
  * Entry point for tests.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.9 $ $Date: 2004/06/07 21:42:12 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/set/TestCompositeSet.java b/src/test/org/apache/commons/collections/set/TestCompositeSet.java
index d746dac73..9e4c69371 100644
--- a/src/test/org/apache/commons/collections/set/TestCompositeSet.java
+++ b/src/test/org/apache/commons/collections/set/TestCompositeSet.java
@@ -29,7 +29,7 @@ import java.util.Collection;
  * {@link CompositeSet} implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.3 $ $Date: 2004/02/18 01:20:39 $
+ * @version $Revision$ $Date$
  *
  * @author Brian McCallister
  * @author Phil Steitz
diff --git a/src/test/org/apache/commons/collections/set/TestListOrderedSet.java b/src/test/org/apache/commons/collections/set/TestListOrderedSet.java
index 814356a68..de7da9223 100644
--- a/src/test/org/apache/commons/collections/set/TestListOrderedSet.java
+++ b/src/test/org/apache/commons/collections/set/TestListOrderedSet.java
@@ -29,7 +29,7 @@ import junit.framework.TestSuite;
  * implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/06/07 21:42:12 $
+ * @version $Revision$ $Date$
  * 
  * @author Henning P. Schmiedehausen
  * @author Stephen Colebourne
diff --git a/src/test/org/apache/commons/collections/set/TestListOrderedSet2.java b/src/test/org/apache/commons/collections/set/TestListOrderedSet2.java
index a94f0695b..f2ae46c2b 100644
--- a/src/test/org/apache/commons/collections/set/TestListOrderedSet2.java
+++ b/src/test/org/apache/commons/collections/set/TestListOrderedSet2.java
@@ -28,7 +28,7 @@ import junit.framework.TestSuite;
  * implementation.
  *
  * @since Commons Collections 3.1
- * @version $Revision: 1.1 $ $Date: 2004/06/07 21:42:12 $
+ * @version $Revision$ $Date$
  * 
  * @author Henning P. Schmiedehausen
  * @author Stephen Colebourne
diff --git a/src/test/org/apache/commons/collections/set/TestMapBackedSet.java b/src/test/org/apache/commons/collections/set/TestMapBackedSet.java
index 52ac0e181..a11c1d736 100644
--- a/src/test/org/apache/commons/collections/set/TestMapBackedSet.java
+++ b/src/test/org/apache/commons/collections/set/TestMapBackedSet.java
@@ -26,7 +26,7 @@ import org.apache.commons.collections.map.HashedMap;
  * JUnit test.
  *
  * @since Commons Collections 3.1
- * @version $Revision: 1.2 $ $Date: 2004/06/02 22:12:14 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/set/TestMapBackedSet2.java b/src/test/org/apache/commons/collections/set/TestMapBackedSet2.java
index c47cf78a1..584b5e61e 100644
--- a/src/test/org/apache/commons/collections/set/TestMapBackedSet2.java
+++ b/src/test/org/apache/commons/collections/set/TestMapBackedSet2.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.map.LinkedMap;
  * JUnit test.
  *
  * @since Commons Collections 3.1
- * @version $Revision: 1.2 $ $Date: 2004/06/02 22:12:14 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/set/TestPredicatedSet.java b/src/test/org/apache/commons/collections/set/TestPredicatedSet.java
index 0bb8037f2..3ca6b8626 100644
--- a/src/test/org/apache/commons/collections/set/TestPredicatedSet.java
+++ b/src/test/org/apache/commons/collections/set/TestPredicatedSet.java
@@ -29,7 +29,7 @@ import org.apache.commons.collections.PredicateUtils;
  * {@link PredicatedSet} implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/06/02 22:12:14 $
+ * @version $Revision$ $Date$
  * 
  * @author Phil Steitz
  */
diff --git a/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java b/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java
index 0b4a14457..d8b254bb6 100644
--- a/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java
+++ b/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.map.TestPredicatedSortedMap;
  * {@link PredicatedSortedSet} implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/06/02 22:12:14 $
+ * @version $Revision$ $Date$
  * 
  * @author Phil Steitz
  */
diff --git a/src/test/org/apache/commons/collections/set/TestSynchronizedSet.java b/src/test/org/apache/commons/collections/set/TestSynchronizedSet.java
index 43bd7040b..f3e246095 100644
--- a/src/test/org/apache/commons/collections/set/TestSynchronizedSet.java
+++ b/src/test/org/apache/commons/collections/set/TestSynchronizedSet.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.BulkTest;
  * {@link SynchronizedSet} implementation.
  *
  * @since Commons Collections 3.1
- * @version $Revision: 1.1 $ $Date: 2004/06/01 23:08:50 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/set/TestSynchronizedSortedSet.java b/src/test/org/apache/commons/collections/set/TestSynchronizedSortedSet.java
index 3eeb30218..9f62388c7 100644
--- a/src/test/org/apache/commons/collections/set/TestSynchronizedSortedSet.java
+++ b/src/test/org/apache/commons/collections/set/TestSynchronizedSortedSet.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.BulkTest;
  * {@link SynchronizedSortedSet} implementation.
  *
  * @since Commons Collections 3.1
- * @version $Revision: 1.1 $ $Date: 2004/06/01 23:08:50 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/set/TestTransformedSet.java b/src/test/org/apache/commons/collections/set/TestTransformedSet.java
index 2aca03d1b..fb11d6fe0 100644
--- a/src/test/org/apache/commons/collections/set/TestTransformedSet.java
+++ b/src/test/org/apache/commons/collections/set/TestTransformedSet.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.collection.TestTransformedCollection;
  * implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/06/02 22:12:14 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/set/TestTransformedSortedSet.java b/src/test/org/apache/commons/collections/set/TestTransformedSortedSet.java
index d0265d9c5..20b5d993b 100644
--- a/src/test/org/apache/commons/collections/set/TestTransformedSortedSet.java
+++ b/src/test/org/apache/commons/collections/set/TestTransformedSortedSet.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.collection.TestTransformedCollection;
  * implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/06/02 22:12:14 $
+ * @version $Revision$ $Date$
  * 
  * @author Stephen Colebourne
  */
diff --git a/src/test/org/apache/commons/collections/set/TestTypedSet.java b/src/test/org/apache/commons/collections/set/TestTypedSet.java
index 28477639d..da9ed4fac 100644
--- a/src/test/org/apache/commons/collections/set/TestTypedSet.java
+++ b/src/test/org/apache/commons/collections/set/TestTypedSet.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.BulkTest;
  * {@link TypedSet} implementation.
  *
  * @since Commons Collections 3.1
- * @version $Revision: 1.1 $ $Date: 2004/06/02 22:12:14 $
+ * @version $Revision$ $Date$
  * 
  * @author Phil Steitz
  */
diff --git a/src/test/org/apache/commons/collections/set/TestTypedSortedSet.java b/src/test/org/apache/commons/collections/set/TestTypedSortedSet.java
index b556ee8b3..e6fd6191b 100644
--- a/src/test/org/apache/commons/collections/set/TestTypedSortedSet.java
+++ b/src/test/org/apache/commons/collections/set/TestTypedSortedSet.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.BulkTest;
  * {@link TypedSortedSet} implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/06/02 22:12:14 $
+ * @version $Revision$ $Date$
  * 
  * @author Phil Steitz
  */
diff --git a/src/test/org/apache/commons/collections/set/TestUnmodifiableSet.java b/src/test/org/apache/commons/collections/set/TestUnmodifiableSet.java
index 904fba09a..243a0edf5 100644
--- a/src/test/org/apache/commons/collections/set/TestUnmodifiableSet.java
+++ b/src/test/org/apache/commons/collections/set/TestUnmodifiableSet.java
@@ -28,7 +28,7 @@ import org.apache.commons.collections.BulkTest;
  * {@link UnmodifiableSet} implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/06/02 22:12:14 $
+ * @version $Revision$ $Date$
  * 
  * @author Phil Steitz
  */
diff --git a/src/test/org/apache/commons/collections/set/TestUnmodifiableSortedSet.java b/src/test/org/apache/commons/collections/set/TestUnmodifiableSortedSet.java
index ead891192..f55e0e7db 100644
--- a/src/test/org/apache/commons/collections/set/TestUnmodifiableSortedSet.java
+++ b/src/test/org/apache/commons/collections/set/TestUnmodifiableSortedSet.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.BulkTest;
  * {@link UnmodifiableSortedSet} implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.7 $ $Date: 2004/06/02 22:12:14 $
+ * @version $Revision$ $Date$
  * 
  * @author Phil Steitz
  */