mpoeschl 2003/08/18 14:48:11
Modified: src/java/org/apache/torque/dsfactory
TorqueDataSourceFactory.java
xdocs changes.xml
src/java/org/apache/torque/pool TorqueClassicDataSource.java
ConnectionWaitTimeoutException.java
ConnectionPool.java
Log:
deprecate the old torque pool. commons-dbcp should be used
Revision Changes Path
1.12 +2 -1
db-torque/src/java/org/apache/torque/dsfactory/TorqueDataSourceFactory.java
Index: TorqueDataSourceFactory.java
===================================================================
RCS file:
/home/cvs/db-torque/src/java/org/apache/torque/dsfactory/TorqueDataSourceFactory.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TorqueDataSourceFactory.java 14 May 2003 19:38:04 -0000 1.11
+++ TorqueDataSourceFactory.java 18 Aug 2003 21:48:11 -0000 1.12
@@ -74,6 +74,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">John McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Henning P. Schmiedehausen</a>
* @version $Id$
+ * @deprecated as of version 3.1, use Jdbc2PoolDataSourceFactory
*/
public class TorqueDataSourceFactory
extends AbstractDataSourceFactory
1.102 +3 -0 db-torque/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/db-torque/xdocs/changes.xml,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- changes.xml 8 Aug 2003 09:49:11 -0000 1.101
+++ changes.xml 18 Aug 2003 21:48:11 -0000 1.102
@@ -26,6 +26,9 @@
The generated schema-data.dtd has been changed to allow any order of
table data entries.
</li>
+ <li>
+ The old Torque connection pool is deprecated. You should use the commons-dbcp
pool.
+ </li>
</ul>
</p>
</subsection>
1.11 +2 -1
db-torque/src/java/org/apache/torque/pool/TorqueClassicDataSource.java
Index: TorqueClassicDataSource.java
===================================================================
RCS file:
/home/cvs/db-torque/src/java/org/apache/torque/pool/TorqueClassicDataSource.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TorqueClassicDataSource.java 20 Jan 2003 21:51:05 -0000 1.10
+++ TorqueClassicDataSource.java 18 Aug 2003 21:48:11 -0000 1.11
@@ -82,6 +82,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Henning P. Schmiedehausen</a>
* @version $Id$
+ * @deprecated as of version 3.1
*/
public class TorqueClassicDataSource
implements DataSource, Referenceable, Serializable, ObjectFactory
1.6 +2 -1
db-torque/src/java/org/apache/torque/pool/ConnectionWaitTimeoutException.java
Index: ConnectionWaitTimeoutException.java
===================================================================
RCS file:
/home/cvs/db-torque/src/java/org/apache/torque/pool/ConnectionWaitTimeoutException.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ConnectionWaitTimeoutException.java 26 Nov 2002 23:46:56 -0000 1.5
+++ ConnectionWaitTimeoutException.java 18 Aug 2003 21:48:11 -0000 1.6
@@ -60,6 +60,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Daniel Rall</a>
* @version $Id$
+ * @deprecated as of version 3.1
*/
public class ConnectionWaitTimeoutException extends Exception
{
1.27 +2 -1 db-torque/src/java/org/apache/torque/pool/ConnectionPool.java
Index: ConnectionPool.java
===================================================================
RCS file: /home/cvs/db-torque/src/java/org/apache/torque/pool/ConnectionPool.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ConnectionPool.java 24 Jun 2003 14:04:25 -0000 1.26
+++ ConnectionPool.java 18 Aug 2003 21:48:11 -0000 1.27
@@ -81,6 +81,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">John McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Henning P. Schmiedehausen</a>
* @version $Id$
+ * @deprecated as of version 3.1
*/
class ConnectionPool implements ConnectionEventListener
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
