Create commons-pool-1.6-RC2 tag
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/pool/tags/POOL_1_6_RC2@1226175 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/NOTICE.txt b/NOTICE.txt
index 215f0ed..5e300a8 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
Apache Commons Pool
-Copyright 2001-2011 The Apache Software Foundation
+Copyright 2001-2012 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index df116c9..7adfe4c 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,20 +1,11 @@
-
+commons-pool-1.6 RELEASE NOTES
- commons-pool-1.5.7 RELEASE NOTES
+This release adds support for Java 5 generics and therefore requires Java 5 for source compatibility.
+This release is binary compatible with 1.5.7.
-This is a patch release, including bugfixes only.
+The only change in this version is:
-Changes in this version include:
-
-
-Fixed Bugs:
-o POOL-189: Awaken threads waiting on borrowObject when a pool has been closed and have them throw
- IllegalStateException. Prior to the fix for this issue, threads waiting in borrowObject when
- close was invoked on GOP or GKOP would block indefinitely. Thanks to Bill Speirs.
-o POOL-192: Corrected total internal processing counter update in destroy. Prior to the fix
- for this issue, clear(key) was leaking capacity associated with elements in the
- pool being cleared. Thanks to Helge Dannenberg.
-
+o Support Java 1.5 Generics in version 1.x. Issue: POOL-208.
For complete information on commons-pool, including instructions on how to submit bug reports,
diff --git a/build.xml b/build.xml
index a5e0c20..3a068b4 100644
--- a/build.xml
+++ b/build.xml
@@ -55,7 +55,7 @@
<property name="test.failonerror" value="true" />
<property name="javadoc.dir" value="${dist.dir}/docs/api"/>
- <property name="javadoc.bottom" value="<small>Copyright &copy; 2001-2011 Apache Software Foundation. Documenation generated ${TODAY}</small>."/>
+ <property name="javadoc.bottom" value="<small>Copyright &copy; 2001-2012 Apache Software Foundation. Documenation generated ${TODAY}</small>."/>
<property name="javadoc.overview" value="${src.java.dir}/org/apache/commons/pool/overview.html" />
<property name="javac.optimize" value="false"/>
diff --git a/doap_pool.rdf b/doap_pool.rdf
index 2762b92..ac88165 100644
--- a/doap_pool.rdf
+++ b/doap_pool.rdf
@@ -36,6 +36,11 @@
<release>
<Version>
<name>commons-pool</name>
+ <created>2012-01-03</created>
+ <revision>1.6</revision>
+ </Version>
+ <Version>
+ <name>commons-pool</name>
<created>2011-12-20</created>
<revision>1.5.7</revision>
</Version>
diff --git a/pom.xml b/pom.xml
index e55b134..b4688b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <version>1.6</version>
<name>Commons Pool</name>
<inceptionYear>2001</inceptionYear>
@@ -139,6 +139,24 @@
</distributionManagement>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.0</version>
+ <dependencies>
+ <dependency>
+ <!-- add support for ssh/scp -->
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ <version>2.2</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
<plugins>
@@ -223,7 +241,7 @@
<artifactId>clirr-maven-plugin</artifactId>
<version>2.3</version>
<configuration>
- <comparisonVersion>1.5</comparisonVersion>
+ <comparisonVersion>1.5.7</comparisonVersion>
<minSeverity>info</minSeverity>
</configuration>
</plugin>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 62dd8d3..1a58592 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -20,6 +20,11 @@
<title>Commons Pool Changes</title>
</properties>
<body>
+ <release version="1.6" date="2012-01-03" description="Adds generics and requires Java 5.">
+ <action dev="ggregory" type="add" issue="POOL-208">
+ Support Java 1.5 Generics in version 1.x.
+ </action>
+ </release>
<release version="1.5.7" date="2011-12-20" description="This is a patch release, including bugfixes only.">
<action dev="psteitz" type="fix" issue="POOL-189" due-to="Bill Speirs">
Awaken threads waiting on borrowObject when a pool has been closed and have them throw
diff --git a/src/java/org/apache/commons/pool/PoolUtils.java b/src/java/org/apache/commons/pool/PoolUtils.java
index 163f134..aa30943 100644
--- a/src/java/org/apache/commons/pool/PoolUtils.java
+++ b/src/java/org/apache/commons/pool/PoolUtils.java
@@ -2295,6 +2295,14 @@
}
}
+ /**
+ * Returns the total number of instances currently idle in this pool (optional operation).
+ * Returns a negative value if this information is not available.
+ *
+ * @param key ignored
+ * @return the total number of instances currently idle in this pool or a negative value if unsupported
+ * @throws UnsupportedOperationException <strong>deprecated</strong>: when this implementation doesn't support the operation
+ */
protected int numIdle(final K key) {
return getKeyedPool().getNumIdle();
}
diff --git a/src/java/org/apache/commons/pool/impl/CursorableLinkedList.java b/src/java/org/apache/commons/pool/impl/CursorableLinkedList.java
index 99c134b..1545915 100644
--- a/src/java/org/apache/commons/pool/impl/CursorableLinkedList.java
+++ b/src/java/org/apache/commons/pool/impl/CursorableLinkedList.java
@@ -21,6 +21,7 @@
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
+import java.lang.ref.WeakReference;
import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Collection;
@@ -29,7 +30,6 @@
import java.util.List;
import java.util.ListIterator;
import java.util.NoSuchElementException;
-import java.lang.ref.WeakReference;
/**
* <p>
@@ -51,9 +51,9 @@
* <p>
* <b>Note that this implementation is not synchronized.</b>
*
- * @see java.util.LinkedList
- *
* @param <E> the type of elements held in this collection
+ *
+ * @see java.util.LinkedList
*
* @version $Revision: 480452 $ $Date: 2006-11-29 00:45:14 -0700 (Wed, 29 Nov 2006) $
*
diff --git a/src/java/org/apache/commons/pool/impl/SoftReferenceObjectPool.java b/src/java/org/apache/commons/pool/impl/SoftReferenceObjectPool.java
index f6b24bb..9eb616f 100644
--- a/src/java/org/apache/commons/pool/impl/SoftReferenceObjectPool.java
+++ b/src/java/org/apache/commons/pool/impl/SoftReferenceObjectPool.java
@@ -17,9 +17,9 @@
package org.apache.commons.pool.impl;
-import java.lang.ref.SoftReference;
-import java.lang.ref.ReferenceQueue;
import java.lang.ref.Reference;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.SoftReference;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -27,8 +27,8 @@
import org.apache.commons.pool.BaseObjectPool;
import org.apache.commons.pool.ObjectPool;
-import org.apache.commons.pool.PoolableObjectFactory;
import org.apache.commons.pool.PoolUtils;
+import org.apache.commons.pool.PoolableObjectFactory;
/**
* A {@link java.lang.ref.SoftReference SoftReference} based
diff --git a/src/java/org/apache/commons/pool/impl/StackKeyedObjectPool.java b/src/java/org/apache/commons/pool/impl/StackKeyedObjectPool.java
index b7103aa..e402370 100644
--- a/src/java/org/apache/commons/pool/impl/StackKeyedObjectPool.java
+++ b/src/java/org/apache/commons/pool/impl/StackKeyedObjectPool.java
@@ -17,17 +17,17 @@
package org.apache.commons.pool.impl;
-import org.apache.commons.pool.BaseKeyedObjectPool;
-import org.apache.commons.pool.KeyedObjectPool;
-import org.apache.commons.pool.KeyedPoolableObjectFactory;
-import org.apache.commons.pool.PoolUtils;
-
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Stack;
+import org.apache.commons.pool.BaseKeyedObjectPool;
+import org.apache.commons.pool.KeyedObjectPool;
+import org.apache.commons.pool.KeyedPoolableObjectFactory;
+import org.apache.commons.pool.PoolUtils;
+
/**
* A simple, <code>Stack</code>-based <code>KeyedObjectPool</code> implementation.
* <p>
diff --git a/src/site/site.xml b/src/site/site.xml
index adc5e7a..dfa453b 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -29,6 +29,7 @@
<item name="Javadoc (1.3 release)" href="http://commons.apache.org/pool/api-1.3/index.html"/>
<item name="Javadoc (1.4 release)" href="http://commons.apache.org/pool/api-1.4/index.html"/>
<item name="Javadoc (1.5.7 release)" href="http://commons.apache.org/pool/api-1.5.7/index.html"/>
+ <item name="Javadoc (1.6 release)" href="http://commons.apache.org/pool/api-1.6/index.html"/>
<item name="Developers Guide" href="/guide/index.html" collapse="true">
<item name="Class Diagrams" href="/guide/classdiagrams.html"/>
<item name="Sequence Diagrams" href="/guide/sequencediagrams.html"/>
diff --git a/src/site/xdoc/download_pool.xml b/src/site/xdoc/download_pool.xml
index de06e8e..b26bd63 100644
--- a/src/site/xdoc/download_pool.xml
+++ b/src/site/xdoc/download_pool.xml
@@ -95,32 +95,32 @@
</p>
</subsection>
</section>
- <section name="Commons Pool 1.5.7 ">
+ <section name="Commons Pool 1.6 ">
<subsection name="Binaries">
<table>
<tr>
- <td><a href="[preferred]/commons/pool/binaries/commons-pool-1.5.7-bin.tar.gz">commons-pool-1.5.7-bin.tar.gz</a></td>
- <td><a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool-1.5.7-bin.tar.gz.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool-1.5.7-bin.tar.gz.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/pool/binaries/commons-pool-1.6-bin.tar.gz">commons-pool-1.6-bin.tar.gz</a></td>
+ <td><a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool-1.6-bin.tar.gz.md5">md5</a></td>
+ <td><a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool-1.6-bin.tar.gz.asc">pgp</a></td>
</tr>
<tr>
- <td><a href="[preferred]/commons/pool/binaries/commons-pool-1.5.7-bin.zip">commons-pool-1.5.7-bin.zip</a></td>
- <td><a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool-1.5.7-bin.zip.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool-1.5.7-bin.zip.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/pool/binaries/commons-pool-1.6-bin.zip">commons-pool-1.6-bin.zip</a></td>
+ <td><a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool-1.6-bin.zip.md5">md5</a></td>
+ <td><a href="http://www.apache.org/dist/commons/pool/binaries/commons-pool-1.6-bin.zip.asc">pgp</a></td>
</tr>
</table>
</subsection>
<subsection name="Source">
<table>
<tr>
- <td><a href="[preferred]/commons/pool/source/commons-pool-1.5.7-src.tar.gz">commons-pool-1.5.7-src.tar.gz</a></td>
- <td><a href="http://www.apache.org/dist/commons/pool/source/commons-pool-1.5.7-src.tar.gz.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/commons/pool/source/commons-pool-1.5.7-src.tar.gz.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/pool/source/commons-pool-1.6-src.tar.gz">commons-pool-1.6-src.tar.gz</a></td>
+ <td><a href="http://www.apache.org/dist/commons/pool/source/commons-pool-1.6-src.tar.gz.md5">md5</a></td>
+ <td><a href="http://www.apache.org/dist/commons/pool/source/commons-pool-1.6-src.tar.gz.asc">pgp</a></td>
</tr>
<tr>
- <td><a href="[preferred]/commons/pool/source/commons-pool-1.5.7-src.zip">commons-pool-1.5.7-src.zip</a></td>
- <td><a href="http://www.apache.org/dist/commons/pool/source/commons-pool-1.5.7-src.zip.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/commons/pool/source/commons-pool-1.5.7-src.zip.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/pool/source/commons-pool-1.6-src.zip">commons-pool-1.6-src.zip</a></td>
+ <td><a href="http://www.apache.org/dist/commons/pool/source/commons-pool-1.6-src.zip.md5">md5</a></td>
+ <td><a href="http://www.apache.org/dist/commons/pool/source/commons-pool-1.6-src.zip.asc">pgp</a></td>
</tr>
</table>
</subsection>
diff --git a/src/site/xdoc/downloads.xml b/src/site/xdoc/downloads.xml
index bc6c4dc..8d773c7 100644
--- a/src/site/xdoc/downloads.xml
+++ b/src/site/xdoc/downloads.xml
@@ -29,12 +29,19 @@
<a href="http://commons.apache.org/pool/download_pool.cgi">
Apache Commons Pool Downloads page</a>.
</p>
- <p>
- Versions 1.3-1.5 depend at runtime only on a Java 1.3 or better JVM.
- </p>
- <p>
- Commons-pool 1.2 depends at runtime on
+ <ul>
+ <li>
+ Versions 1.6 adds generics based on the latest 1.5.x release, 1.5.7 at press time. It requires Java 1.5.
+ </li>
+ <li>
+ Versions 1.3 through 1.5 depend at runtime only on a Java 1.3 or better JVM.
+ </li>
+ <li>
+ Version 1.2 depends at runtime on
<a href="http://commons.apache.org/collections/">commons-collections</a>.
+ </li>
+ </ul>
+ <p>
</p>
<p>
Older releases are retained by the Apache Software Foundation but are
diff --git a/src/test/org/apache/commons/pool/MethodCall.java b/src/test/org/apache/commons/pool/MethodCall.java
index 9c04faf..6b31321 100644
--- a/src/test/org/apache/commons/pool/MethodCall.java
+++ b/src/test/org/apache/commons/pool/MethodCall.java
@@ -17,9 +17,9 @@
package org.apache.commons.pool;
-import java.util.List;
-import java.util.Collections;
import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
/**
* Holds method names, parameters, and return values for tracing method calls.
diff --git a/src/test/org/apache/commons/pool/MethodCallPoolableObjectFactory.java b/src/test/org/apache/commons/pool/MethodCallPoolableObjectFactory.java
index 4f5c2cb..1a0e425 100644
--- a/src/test/org/apache/commons/pool/MethodCallPoolableObjectFactory.java
+++ b/src/test/org/apache/commons/pool/MethodCallPoolableObjectFactory.java
@@ -17,8 +17,8 @@
package org.apache.commons.pool;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
/**
* A poolable object factory that tracks how {@link MethodCall methods are called}.
diff --git a/src/test/org/apache/commons/pool/TestKeyedObjectPool.java b/src/test/org/apache/commons/pool/TestKeyedObjectPool.java
index f581eb1..32ddfc6 100644
--- a/src/test/org/apache/commons/pool/TestKeyedObjectPool.java
+++ b/src/test/org/apache/commons/pool/TestKeyedObjectPool.java
@@ -16,12 +16,12 @@
*/
package org.apache.commons.pool;
-import junit.framework.TestCase;
-
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
import java.util.NoSuchElementException;
+import junit.framework.TestCase;
+
import org.apache.commons.pool.impl.GenericKeyedObjectPool;
import org.apache.commons.pool.impl.StackKeyedObjectPool;
diff --git a/src/test/org/apache/commons/pool/TestObjectPool.java b/src/test/org/apache/commons/pool/TestObjectPool.java
index be6a59e..0cbc1ee 100644
--- a/src/test/org/apache/commons/pool/TestObjectPool.java
+++ b/src/test/org/apache/commons/pool/TestObjectPool.java
@@ -16,16 +16,17 @@
*/
package org.apache.commons.pool;
-import junit.framework.TestCase;
-import org.apache.commons.pool.impl.GenericObjectPool;
-import org.apache.commons.pool.impl.StackObjectPool;
-import org.apache.commons.pool.impl.SoftReferenceObjectPool;
-
-import java.util.List;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
import java.util.NoSuchElementException;
+import junit.framework.TestCase;
+
+import org.apache.commons.pool.impl.GenericObjectPool;
+import org.apache.commons.pool.impl.SoftReferenceObjectPool;
+import org.apache.commons.pool.impl.StackObjectPool;
+
/**
* Abstract {@link TestCase} for {@link ObjectPool} implementations.
* @author Rodney Waldhoff
diff --git a/src/test/org/apache/commons/pool/WaiterFactory.java b/src/test/org/apache/commons/pool/WaiterFactory.java
index 462aff4..1ad75f3 100644
--- a/src/test/org/apache/commons/pool/WaiterFactory.java
+++ b/src/test/org/apache/commons/pool/WaiterFactory.java
@@ -18,11 +18,8 @@
package org.apache.commons.pool;
import java.util.HashMap;
-import java.util.Map;
import java.util.Iterator;
-
-import org.apache.commons.pool.PoolableObjectFactory;
-import org.apache.commons.pool.KeyedPoolableObjectFactory;
+import java.util.Map;
/**
* Object factory with configurable latencies for object lifecycle methods.
