You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by bl...@apache.org on 2001/01/10 14:44:00 UTC
cvs commit: xml-cocoon/src/org/apache/cocoon/components/datasource JdbcDataSource.java JdbcConnectionPool.java
bloritsch 01/01/10 05:44:00
Modified: src/org/apache/cocoon/components/datasource Tag: xml-cocoon2
JdbcDataSource.java JdbcConnectionPool.java
Log:
Fixed comments, and made the JdbcDataSource Disposable to take advantage
of Avalon LifeCycle features.
Revision Changes Path
No revision
No revision
1.1.2.5 +8 -5 xml-cocoon/src/org/apache/cocoon/components/datasource/Attic/JdbcDataSource.java
Index: JdbcDataSource.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/datasource/Attic/JdbcDataSource.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- JdbcDataSource.java 2001/01/08 20:20:47 1.1.2.4
+++ JdbcDataSource.java 2001/01/10 13:44:00 1.1.2.5
@@ -9,6 +9,7 @@
import org.apache.avalon.Configuration;
import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.Disposable;
import org.apache.avalon.ThreadSafe;
import org.apache.log.LogKit;
import org.apache.log.Logger;
@@ -21,12 +22,8 @@
* normal <code>java.sql.Connection</code> object and
* <code>java.sql.DriverManager</code>.
*
- * TODO: Implement a configurable closed end Pool, where the Connection
- * acts like JDBC PooledConnections work. That means we can limit the
- * total number of Connection objects that are created.
- *
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/01/08 20:20:47 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/01/10 13:44:00 $
*/
public class JdbcDataSource implements DataSourceComponent, ThreadSafe {
Logger log = LogKit.getLoggerFor("cocoon");
@@ -70,5 +67,11 @@
}
return conn;
+ }
+
+ /** Dispose properly of the pool */
+ public void dispose() {
+ this.pool.dispose();
+ this.pool = null;
}
}
1.1.2.3 +3 -2 xml-cocoon/src/org/apache/cocoon/components/datasource/Attic/JdbcConnectionPool.java
Index: JdbcConnectionPool.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/datasource/Attic/JdbcConnectionPool.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- JdbcConnectionPool.java 2001/01/09 14:15:23 1.1.2.2
+++ JdbcConnectionPool.java 2001/01/10 13:44:00 1.1.2.3
@@ -22,10 +22,11 @@
import java.util.List;
/**
- * The Pool implementation for JdbcConnections.
+ * The Pool implementation for JdbcConnections. It uses a background
+ * thread to manage the number of SQL Connections.
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/01/09 14:15:23 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/01/10 13:44:00 $
*/
public class JdbcConnectionPool implements Pool, Runnable, Disposable {
private final String dburl;