commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwaldh...@apache.org
Subject cvs commit: jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/jdbc2pool KeyedCPDSConnectionFactory.java CPDSConnectionFactory.java
Date Thu, 06 Mar 2003 19:25:38 GMT
rwaldhoff    2003/03/06 11:25:38

  Modified:    dbcp/src/java/org/apache/commons/dbcp
                        DelegatingPreparedStatement.java
                        DelegatingStatement.java
                        DelegatingCallableStatement.java
                        DelegatingConnection.java AbandonedObjectPool.java
               dbcp/src/test/org/apache/commons/dbcp
                        TestBasicDataSource.java TesterStatement.java
                        TesterPreparedStatement.java
               dbcp/src/java/org/apache/commons/dbcp/cpdsadapter
                        PooledConnectionImpl.java
               dbcp/src/test/org/apache/commons/jocl
                        TestJOCLContentHandler.java
               dbcp/src/java/org/apache/commons/dbcp/jdbc2pool
                        KeyedCPDSConnectionFactory.java
                        CPDSConnectionFactory.java
  Log:
  scrub imports
  
  Revision  Changes    Path
  1.10      +16 -10    jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java
  
  Index: DelegatingPreparedStatement.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DelegatingPreparedStatement.java	6 Mar 2003 00:11:32 -0000	1.9
  +++ DelegatingPreparedStatement.java	6 Mar 2003 19:25:32 -0000	1.10
  @@ -61,13 +61,19 @@
   
   package org.apache.commons.dbcp;
   
  -import java.sql.*;
  -import java.util.Calendar;
  -import java.io.InputStream;
  -import java.io.Reader;
   import java.math.BigDecimal;
  +import java.sql.Array;
  +import java.sql.Blob;
  +import java.sql.Clob;
  +import java.sql.Connection;
  +import java.sql.PreparedStatement;
  +import java.sql.Ref;
  +import java.sql.ResultSet;
  +import java.sql.ResultSetMetaData;
  +import java.sql.SQLException;
  +import java.sql.SQLWarning;
  +import java.util.Calendar;
   import java.util.List;
  -import java.util.Iterator;
   
   /**
    * A base delegating implementation of {@link PreparedStatement}.
  @@ -342,7 +348,7 @@
           _stmt.setURL(parameterIndex, x);
       }
   
  -    public ParameterMetaData getParameterMetaData() throws SQLException {
  +    public java.sql.ParameterMetaData getParameterMetaData() throws SQLException {
           checkOpen();
           return _stmt.getParameterMetaData();
       }
  
  
  
  1.9       +9 -7      jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/DelegatingStatement.java
  
  Index: DelegatingStatement.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/DelegatingStatement.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DelegatingStatement.java	6 Mar 2003 00:11:32 -0000	1.8
  +++ DelegatingStatement.java	6 Mar 2003 19:25:34 -0000	1.9
  @@ -61,10 +61,12 @@
   
   package org.apache.commons.dbcp;
   
  -import java.sql.*;
  -
  +import java.sql.Connection;
  +import java.sql.ResultSet;
  +import java.sql.SQLException;
  +import java.sql.SQLWarning;
  +import java.sql.Statement;
   import java.util.List;
  -import java.util.Iterator;
   
   /**
    * A base delegating implementation of {@link Statement}.
  
  
  
  1.9       +4 -5      jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java
  
  Index: DelegatingCallableStatement.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DelegatingCallableStatement.java	6 Mar 2003 00:11:32 -0000	1.8
  +++ DelegatingCallableStatement.java	6 Mar 2003 19:25:34 -0000	1.9
  @@ -81,7 +81,6 @@
   import java.sql.SQLException;
   
   import java.util.List;
  -import java.util.Iterator;
   
   /**
    * A base delegating implementation of {@link CallableStatement}.
  
  
  
  1.11      +12 -7     jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/DelegatingConnection.java
  
  Index: DelegatingConnection.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/DelegatingConnection.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- DelegatingConnection.java	6 Mar 2003 00:11:33 -0000	1.10
  +++ DelegatingConnection.java	6 Mar 2003 19:25:34 -0000	1.11
  @@ -61,10 +61,15 @@
   
   package org.apache.commons.dbcp;
   
  -import java.sql.*;
  -import java.util.Map;
  +import java.sql.CallableStatement;
  +import java.sql.Connection;
  +import java.sql.DatabaseMetaData;
  +import java.sql.PreparedStatement;
  +import java.sql.SQLException;
  +import java.sql.SQLWarning;
  +import java.sql.Statement;
   import java.util.List;
  -import java.util.Iterator;
  +import java.util.Map;
   
   /**
    * A base delegating implementation of {@link Connection}.
  
  
  
  1.4       +7 -4      jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/AbandonedObjectPool.java
  
  Index: AbandonedObjectPool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/AbandonedObjectPool.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbandonedObjectPool.java	6 Mar 2003 18:59:12 -0000	1.3
  +++ AbandonedObjectPool.java	6 Mar 2003 19:25:34 -0000	1.4
  @@ -115,6 +115,9 @@
                   removeAbandoned();
               }
               Object obj = super.borrowObject();
  +            if(obj instanceof AbandonedTrace) {
  +                ((AbandonedTrace)obj).setStackTrace();
  +            }
               if (obj != null && config != null && config.getRemoveAbandoned())
{
                   trace.add(obj);
               }
  
  
  
  1.2       +4 -10     jakarta-commons/dbcp/src/test/org/apache/commons/dbcp/TestBasicDataSource.java
  
  Index: TestBasicDataSource.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/dbcp/src/test/org/apache/commons/dbcp/TestBasicDataSource.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestBasicDataSource.java	8 Nov 2002 19:17:24 -0000	1.1
  +++ TestBasicDataSource.java	6 Mar 2003 19:25:36 -0000	1.2
  @@ -61,15 +61,9 @@
   package org.apache.commons.dbcp;
   
   import java.sql.Connection;
  -import java.sql.DriverManager;
   
   import junit.framework.Test;
   import junit.framework.TestSuite;
  -
  -import org.apache.commons.pool.ObjectPool;
  -import org.apache.commons.pool.impl.GenericKeyedObjectPool;
  -import org.apache.commons.pool.impl.GenericKeyedObjectPoolFactory;
  -import org.apache.commons.pool.impl.GenericObjectPool;
   
   /**
    * @version $Revision$ $Date$
  
  
  
  1.7       +8 -10     jakarta-commons/dbcp/src/test/org/apache/commons/dbcp/TesterStatement.java
  
  Index: TesterStatement.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/dbcp/src/test/org/apache/commons/dbcp/TesterStatement.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- TesterStatement.java	6 Mar 2003 00:11:32 -0000	1.6
  +++ TesterStatement.java	6 Mar 2003 19:25:36 -0000	1.7
  @@ -61,11 +61,11 @@
   
   package org.apache.commons.dbcp;
   
  -import java.sql.*;
  -import java.util.Calendar;
  -import java.io.InputStream;
  -import java.io.Reader;
  -import java.math.BigDecimal;
  +import java.sql.Connection;
  +import java.sql.ResultSet;
  +import java.sql.SQLException;
  +import java.sql.SQLWarning;
  +import java.sql.Statement;
   
   public class TesterStatement implements Statement {
       public TesterStatement(Connection conn) {
  @@ -235,7 +235,6 @@
       // Will be commented by the build process on a JDBC 2.0 system
   
   /* JDBC_3_ANT_KEY_BEGIN */
  -
       public boolean getMoreResults(int current) throws SQLException {
           throw new SQLException("Not implemented.");
       }
  @@ -278,7 +277,6 @@
           checkOpen();
           throw new SQLException("Not implemented.");
       }
  -
   /* JDBC_3_ANT_KEY_END */
   
   }
  
  
  
  1.6       +14 -9     jakarta-commons/dbcp/src/test/org/apache/commons/dbcp/TesterPreparedStatement.java
  
  Index: TesterPreparedStatement.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/dbcp/src/test/org/apache/commons/dbcp/TesterPreparedStatement.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TesterPreparedStatement.java	6 Mar 2003 00:11:32 -0000	1.5
  +++ TesterPreparedStatement.java	6 Mar 2003 19:25:36 -0000	1.6
  @@ -61,11 +61,17 @@
   
   package org.apache.commons.dbcp;
   
  -import java.sql.*;
  -import java.util.Calendar;
  -import java.io.InputStream;
  -import java.io.Reader;
   import java.math.BigDecimal;
  +import java.sql.Array;
  +import java.sql.Blob;
  +import java.sql.Clob;
  +import java.sql.Connection;
  +import java.sql.PreparedStatement;
  +import java.sql.Ref;
  +import java.sql.ResultSet;
  +import java.sql.ResultSetMetaData;
  +import java.sql.SQLException;
  +import java.util.Calendar;
   
   public class TesterPreparedStatement extends TesterStatement implements PreparedStatement
{
       private ResultSetMetaData _resultSetMetaData = null;
  @@ -257,7 +263,6 @@
           throw new SQLException("Not implemented.");
       }
   
  -
       public int executeUpdate(String sql, int autoGeneratedKeys)
           throws SQLException {
           throw new SQLException("Not implemented.");
  @@ -297,7 +302,7 @@
           throw new SQLException("Not implemented.");
       }
   
  -    public ParameterMetaData getParameterMetaData() throws SQLException {
  +    public java.sql.ParameterMetaData getParameterMetaData() throws SQLException {
           throw new SQLException("Not implemented.");
       }
   
  
  
  
  1.4       +5 -10     jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java
  
  Index: PooledConnectionImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PooledConnectionImpl.java	6 Mar 2003 15:10:19 -0000	1.3
  +++ PooledConnectionImpl.java	6 Mar 2003 19:25:37 -0000	1.4
  @@ -54,22 +54,17 @@
    * <http://www.apache.org/>.
    */
   
  -import java.util.Map;
  -import java.util.Iterator;
  -import java.util.EventObject;
  -import java.util.Vector;
   import java.sql.Connection;
  -import java.sql.DatabaseMetaData;
   import java.sql.PreparedStatement;
  -import java.sql.CallableStatement;
  -import java.sql.Statement;
  -import java.sql.SQLWarning;
   import java.sql.SQLException;
  +import java.util.Iterator;
  +import java.util.Vector;
  +
   import javax.sql.ConnectionEvent;
   import javax.sql.ConnectionEventListener;
   import javax.sql.PooledConnection;
   
  -import org.apache.commons.dbcp.*;
  +import org.apache.commons.dbcp.DelegatingPreparedStatement;
   import org.apache.commons.pool.KeyedObjectPool;
   import org.apache.commons.pool.KeyedPoolableObjectFactory;
   
  
  
  
  1.4       +8 -6      jakarta-commons/dbcp/src/test/org/apache/commons/jocl/TestJOCLContentHandler.java
  
  Index: TestJOCLContentHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/dbcp/src/test/org/apache/commons/jocl/TestJOCLContentHandler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TestJOCLContentHandler.java	30 Oct 2002 23:26:59 -0000	1.3
  +++ TestJOCLContentHandler.java	6 Mar 2003 19:25:37 -0000	1.4
  @@ -61,9 +61,11 @@
   
   package org.apache.commons.jocl;
   
  -import junit.framework.*;
  -import org.xml.sax.*;
  -import org.xml.sax.helpers.*;
  +import junit.framework.Test;
  +import junit.framework.TestCase;
  +import junit.framework.TestSuite;
  +
  +import org.xml.sax.helpers.AttributesImpl;
   
   public class TestJOCLContentHandler extends TestCase {
       public TestJOCLContentHandler(String testName) {
  
  
  
  1.4       +14 -10    jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/jdbc2pool/KeyedCPDSConnectionFactory.java
  
  Index: KeyedCPDSConnectionFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/jdbc2pool/KeyedCPDSConnectionFactory.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- KeyedCPDSConnectionFactory.java	16 Nov 2002 19:18:27 -0000	1.3
  +++ KeyedCPDSConnectionFactory.java	6 Mar 2003 19:25:38 -0000	1.4
  @@ -61,17 +61,21 @@
   
   package org.apache.commons.dbcp.jdbc2pool;
   
  -import java.util.Map;
  +import java.sql.Connection;
  +import java.sql.ResultSet;
  +import java.sql.SQLException;
  +import java.sql.Statement;
   import java.util.HashMap;
  +import java.util.Map;
   import java.util.WeakHashMap;
  -import java.sql.*;
  -import javax.sql.ConnectionPoolDataSource;
  -import javax.sql.PooledConnection;
  +
   import javax.sql.ConnectionEvent;
   import javax.sql.ConnectionEventListener;
  +import javax.sql.ConnectionPoolDataSource;
  +import javax.sql.PooledConnection;
   
  -import org.apache.commons.pool.*;
  -import org.apache.commons.dbcp.*;
  +import org.apache.commons.pool.KeyedObjectPool;
  +import org.apache.commons.pool.KeyedPoolableObjectFactory;
   
   /**
    * A {*link PoolableObjectFactory} that creates
  
  
  
  1.4       +16 -12    jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/jdbc2pool/CPDSConnectionFactory.java
  
  Index: CPDSConnectionFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/jdbc2pool/CPDSConnectionFactory.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CPDSConnectionFactory.java	16 Nov 2002 19:18:27 -0000	1.3
  +++ CPDSConnectionFactory.java	6 Mar 2003 19:25:38 -0000	1.4
  @@ -61,21 +61,25 @@
   
   package org.apache.commons.dbcp.jdbc2pool;
   
  -import java.util.Map;
  +import java.sql.Connection;
  +import java.sql.ResultSet;
  +import java.sql.SQLException;
  +import java.sql.Statement;
   import java.util.HashMap;
  +import java.util.Map;
   import java.util.WeakHashMap;
  -import java.sql.*;
  -import javax.sql.ConnectionPoolDataSource;
  -import javax.sql.PooledConnection;
  +
   import javax.sql.ConnectionEvent;
   import javax.sql.ConnectionEventListener;
  +import javax.sql.ConnectionPoolDataSource;
  +import javax.sql.PooledConnection;
   
  -import org.apache.commons.pool.*;
  -import org.apache.commons.dbcp.*;
  +import org.apache.commons.pool.ObjectPool;
  +import org.apache.commons.pool.PoolableObjectFactory;
   
   /**
  - * A {*link PoolableObjectFactory} that creates
  - * {*link PoolableConnection}s.
  + * A {@link PoolableObjectFactory} that creates
  + * {@link PoolableConnection}s.
    *
    * @author <a href="mailto:jmcnally@collab.net">John D. McNally</a>
    * @version $Id$
  
  
  

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


Mime
View raw message