From c2d1c560e7af66bb0c8b0534be094cbd0bbbe5ae Mon Sep 17 00:00:00 2001
From: Stephen Colebourne <scolebourne@apache.org>
Date: Sun, 4 Jan 2004 18:04:16 +0000
Subject: [PATCH] Tidy deprecation messages prior to release 3.0

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@131508 13f79535-47bb-0310-9956-ffa450edef68
---
 .cvsignore                                      |  1 +
 build.xml                                       | 17 +----------------
 .../collections/CursorableLinkedList.java       |  8 ++++----
 .../commons/collections/DefaultMapEntry.java    |  8 ++++----
 .../collections/iterators/ProxyIterator.java    |  8 ++++----
 .../iterators/ProxyListIterator.java            |  8 ++++----
 6 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 893f6aa98..324ab28a0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -8,3 +8,4 @@ target
 eclipse
 bin
 junit*.properties
+*.bat
diff --git a/build.xml b/build.xml
index f2862c471..12633e12a 100644
--- a/build.xml
+++ b/build.xml
@@ -1,4 +1,4 @@
-<!-- $Id: build.xml,v 1.55 2003/12/28 18:00:23 scolebourne Exp $ -->
+<!-- $Id: build.xml,v 1.56 2004/01/04 18:04:16 scolebourne Exp $ -->
 <project name="commons-collections" default="test" basedir=".">
 
    <!-- patternset describing files to be copied from the doc directory -->
@@ -117,8 +117,6 @@
       <property name="dest.jardir" value="${dest}"/>
       <property name="dest.jardir.jar" value="${dest.jardir}/${name}.jar"/>
       <property name="dest.jardir.testframework.jar" value="${dest.jardir}/${name}-testframework.jar"/>
-      <property name="dest.jardir.object-jar" value="${dest.jardir}/${name}-object.jar"/>
-      <property name="dest.jardir.primitive-jar" value="${dest.jardir}/${name}-primitive.jar"/>
       
       <property name="bin.name" value="${name}-${component.version}"/>
       <property name="dest.bin.tar" value="${dest}/${bin.name}.tar"/>
@@ -360,19 +358,6 @@
          <fileset dir="${workdir}"/>
       </jar>
       
-      <jar jarfile="${dest.jardir.object-jar}" manifest="${source.src}/conf/MANIFEST.MF">
-         <fileset dir="${workdir}">
-            <exclude name="org/apache/commons/collections/primitives/**"/>
-         </fileset>
-      </jar>
-
-      <jar jarfile="${dest.jardir.primitive-jar}" manifest="${source.src}/conf/MANIFEST.MF">
-         <fileset dir="${workdir}">
-            <include name="META-INF/**"/>
-            <include name="org/apache/commons/collections/primitives/**"/>
-         </fileset>
-      </jar>
-      
       <delete dir="${workdir}"/>
    </target>
          
diff --git a/src/java/org/apache/commons/collections/CursorableLinkedList.java b/src/java/org/apache/commons/collections/CursorableLinkedList.java
index 4c4c57b6a..14d57487d 100644
--- a/src/java/org/apache/commons/collections/CursorableLinkedList.java
+++ b/src/java/org/apache/commons/collections/CursorableLinkedList.java
@@ -1,10 +1,10 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/CursorableLinkedList.java,v 1.19 2003/12/24 01:19:38 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/CursorableLinkedList.java,v 1.20 2004/01/04 18:04:15 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
+ * Copyright (c) 2002-2004 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -84,10 +84,10 @@ import java.lang.ref.WeakReference;
  * <b>Note that this implementation is not synchronized.</b>
  *
  * @deprecated Use new version in list subpackage, which has been rewritten
- *  and now returns the cursor from the listIterator method
+ *  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.19 $ $Date: 2003/12/24 01:19:38 $
+ * @version $Revision: 1.20 $ $Date: 2004/01/04 18:04:15 $
  * 
  * @author Rodney Waldhoff
  * @author Janek Bogucki
diff --git a/src/java/org/apache/commons/collections/DefaultMapEntry.java b/src/java/org/apache/commons/collections/DefaultMapEntry.java
index c1a6a275b..8bb3ba847 100644
--- a/src/java/org/apache/commons/collections/DefaultMapEntry.java
+++ b/src/java/org/apache/commons/collections/DefaultMapEntry.java
@@ -1,10 +1,10 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/DefaultMapEntry.java,v 1.16 2003/12/06 13:03:15 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/DefaultMapEntry.java,v 1.17 2004/01/04 18:04:16 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
+ * Copyright (c) 2001-2004 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -62,9 +62,9 @@ import java.util.Map;
 /**
  * A default implementation of {@link java.util.Map.Entry}
  *
- * @deprecated Use the version in the keyvalue subpackage.
+ * @deprecated Use the version in the keyvalue subpackage. Will be removed in v4.0
  * @since Commons Collections 1.0
- * @version $Revision: 1.16 $ $Date: 2003/12/06 13:03:15 $
+ * @version $Revision: 1.17 $ $Date: 2004/01/04 18:04:16 $
  * 
  * @author James Strachan
  * @author Michael A. Smith
diff --git a/src/java/org/apache/commons/collections/iterators/ProxyIterator.java b/src/java/org/apache/commons/collections/iterators/ProxyIterator.java
index 0179a4edb..70407b3d0 100644
--- a/src/java/org/apache/commons/collections/iterators/ProxyIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/ProxyIterator.java
@@ -1,10 +1,10 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/ProxyIterator.java,v 1.6 2003/11/02 16:29:12 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/ProxyIterator.java,v 1.7 2004/01/04 18:04:16 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
+ * Copyright (c) 1999-2004 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -62,9 +62,9 @@ import java.util.Iterator;
 /** 
  * A Proxy {@link Iterator Iterator} which delegates its methods to a proxy instance.
  *
- * @deprecated Use AbstractIteratorDecorator
+ * @deprecated Use AbstractIteratorDecorator. Will be removed in v4.0
  * @since Commons Collections 1.0
- * @version $Revision: 1.6 $ $Date: 2003/11/02 16:29:12 $
+ * @version $Revision: 1.7 $ $Date: 2004/01/04 18:04:16 $
  * 
  * @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 c8e56c986..bfe38995c 100644
--- a/src/java/org/apache/commons/collections/iterators/ProxyListIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/ProxyListIterator.java
@@ -1,10 +1,10 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/ProxyListIterator.java,v 1.6 2003/11/02 16:29:12 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/ProxyListIterator.java,v 1.7 2004/01/04 18:04:16 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
+ * Copyright (c) 1999-2004 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -63,9 +63,9 @@ import java.util.ListIterator;
  * A proxy {@link ListIterator ListIterator} which delegates its
  * methods to a proxy instance.
  *
- * @deprecated Use AbstractListIteratorDecorator
+ * @deprecated Use AbstractListIteratorDecorator. Will be removed in v4.0
  * @since Commons Collections 2.0
- * @version $Revision: 1.6 $ $Date: 2003/11/02 16:29:12 $
+ * @version $Revision: 1.7 $ $Date: 2004/01/04 18:04:16 $
  * 
  * @author Rodney Waldhoff
  */