You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by sc...@apache.org on 2004/01/04 19:04:16 UTC

cvs commit: jakarta-commons/collections .cvsignore build.xml

scolebourne    2004/01/04 10:04:16

  Modified:    collections/src/java/org/apache/commons/collections
                        CursorableLinkedList.java DefaultMapEntry.java
               collections/src/java/org/apache/commons/collections/iterators
                        ProxyListIterator.java ProxyIterator.java
               collections .cvsignore build.xml
  Log:
  Tidy deprecation messages prior to release 3.0
  
  Revision  Changes    Path
  1.20      +4 -4      jakarta-commons/collections/src/java/org/apache/commons/collections/CursorableLinkedList.java
  
  Index: CursorableLinkedList.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/CursorableLinkedList.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- CursorableLinkedList.java	24 Dec 2003 01:19:38 -0000	1.19
  +++ CursorableLinkedList.java	4 Jan 2004 18:04:15 -0000	1.20
  @@ -4,7 +4,7 @@
    *
    * 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,7 +84,7 @@
    * <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$ $Date$
  
  
  
  1.17      +4 -4      jakarta-commons/collections/src/java/org/apache/commons/collections/DefaultMapEntry.java
  
  Index: DefaultMapEntry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/DefaultMapEntry.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- DefaultMapEntry.java	6 Dec 2003 13:03:15 -0000	1.16
  +++ DefaultMapEntry.java	4 Jan 2004 18:04:16 -0000	1.17
  @@ -4,7 +4,7 @@
    *
    * 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,7 +62,7 @@
   /**
    * 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$ $Date$
    * 
  
  
  
  1.7       +4 -4      jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/ProxyListIterator.java
  
  Index: ProxyListIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/ProxyListIterator.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ProxyListIterator.java	2 Nov 2003 16:29:12 -0000	1.6
  +++ ProxyListIterator.java	4 Jan 2004 18:04:16 -0000	1.7
  @@ -4,7 +4,7 @@
    *
    * 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,7 +63,7 @@
    * 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$ $Date$
    * 
  
  
  
  1.7       +4 -4      jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/ProxyIterator.java
  
  Index: ProxyIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/ProxyIterator.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ProxyIterator.java	2 Nov 2003 16:29:12 -0000	1.6
  +++ ProxyIterator.java	4 Jan 2004 18:04:16 -0000	1.7
  @@ -4,7 +4,7 @@
    *
    * 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,7 +62,7 @@
   /** 
    * 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$ $Date$
    * 
  
  
  
  1.8       +1 -0      jakarta-commons/collections/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/.cvsignore,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- .cvsignore	1 Dec 2003 22:37:08 -0000	1.7
  +++ .cvsignore	4 Jan 2004 18:04:16 -0000	1.8
  @@ -8,3 +8,4 @@
   eclipse
   bin
   junit*.properties
  +*.bat
  
  
  
  1.56      +1 -16     jakarta-commons/collections/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/build.xml,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- build.xml	28 Dec 2003 18:00:23 -0000	1.55
  +++ build.xml	4 Jan 2004 18:04:16 -0000	1.56
  @@ -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"/>
  @@ -358,19 +356,6 @@
         
         <jar jarfile="${dest.jardir.jar}" manifest="${source.src}/conf/MANIFEST.MF">
            <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}"/>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org