[jBoss-Dev] CVS update:jboss/src/main/org/jboss/minerva/datasource JDBCPoolDataSource.javaPoolDriver.java XAPoolDataSource.ja

[jBoss CVS Development]

  User: fleury  
  Date: 00/08/17 20:21:08

  Modified:    src/main/org/jboss/minerva/datasource
                        JDBCPoolDataSource.java PoolDriver.java
                        XAPoolDataSource.java
  Log:
  Logger messages and clean up for binary
  
  Revision  Changes    Path
  1.2       +3 -2      
jboss/src/main/org/jboss/minerva/datasource/JDBCPoolDataSource.java
  
  Index: JDBCPoolDataSource.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/minerva/datasource/JDBCPoolDataSource.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JDBCPoolDataSource.java   2000/06/02 13:48:41     1.1
  +++ JDBCPoolDataSource.java   2000/08/18 03:21:07     1.2
  @@ -14,6 +14,7 @@
   import javax.naming.spi.*;
   import org.jboss.minerva.factories.JDBCConnectionFactory;
   import org.jboss.minerva.pools.ObjectPool;
  +import org.jboss.logging.Logger;
   
   /**
    * DataSource for non-transactional JDBC pools.  This handles configuration
  @@ -24,7 +25,7 @@
    * and JDBCConnectionFactory.
    * @see org.jboss.minerva.pools.ObjectPool
    * @see org.jboss.minerva.factories.JDBCConnectionFactory
  - * @version $Revision: 1.1 $
  + * @version $Revision: 1.2 $
    * @author Aaron Mulder ([EMAIL PROTECTED])
    */
   public class JDBCPoolDataSource implements DataSource, Referenceable, ObjectFactory 
{
  @@ -145,7 +146,7 @@
           try {
               setJNDIName(null);
           } catch(NamingException e) {
  -            e.printStackTrace();
  +            Logger.exception(e);
           }
           sources.remove(pool.getName());
           pool.shutDown();
  
  
  
  1.3       +6 -5      jboss/src/main/org/jboss/minerva/datasource/PoolDriver.java
  
  Index: PoolDriver.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/minerva/datasource/PoolDriver.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PoolDriver.java   2000/08/07 14:28:34     1.2
  +++ PoolDriver.java   2000/08/18 03:21:07     1.3
  @@ -9,6 +9,7 @@
   import java.sql.*;
   import java.util.Properties;
   import javax.sql.*;
  +import org.jboss.logging.Logger;
   
   /**
    * JDBC Driver to access pooled JDBC connections.  Supports both JDBC 1.0
  @@ -25,7 +26,7 @@
    * <CODE>Class.forName("org.minerva.datasource.PoolDriver");</CODE></P>
    * @see org.jboss.minerva.datasource.JDBCPoolDataSource
    * @see org.jboss.minerva.datasource.XAPoolDataSource
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    * @author Aaron Mulder ([EMAIL PROTECTED])
    */
   public class PoolDriver implements Driver {
  @@ -37,8 +38,8 @@
           try {
               DriverManager.registerDriver(PoolDriver.instance());
           } catch(SQLException e) {
  -            System.out.println("Unable to register Minerva DB pool driver!");
  -            e.printStackTrace();
  +            Logger.log("Unable to register Minerva DB pool driver!");
  +            Logger.exception(e);
           }
       }
   
  @@ -77,7 +78,7 @@
               DataSource source = JDBCPoolDataSource.getDataSource(name);
               con = source.getConnection();
           } catch(Exception e) {
  -            e.printStackTrace();
  +            Logger.exception(e);
           }
           return con;
       }
  @@ -88,7 +89,7 @@
               DataSource source = XAPoolDataSource.getDataSource(name);
               con = source.getConnection();
           } catch(Exception e) {
  -            e.printStackTrace();
  +            Logger.exception(e);
           }
           return con;
       }
  
  
  
  1.2       +4 -3      
jboss/src/main/org/jboss/minerva/datasource/XAPoolDataSource.java
  
  Index: XAPoolDataSource.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/minerva/datasource/XAPoolDataSource.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XAPoolDataSource.java     2000/06/02 13:48:41     1.1
  +++ XAPoolDataSource.java     2000/08/18 03:21:07     1.2
  @@ -14,6 +14,7 @@
   import javax.naming.spi.*;
   import org.jboss.minerva.factories.XAConnectionFactory;
   import org.jboss.minerva.pools.ObjectPool;
  +import org.jboss.logging.Logger;
   
   /**
    * DataSource for transactional JDBC pools.  This handles configuration
  @@ -24,7 +25,7 @@
    * and XAConnectionFactory.
    * @see org.jboss.minerva.pools.ObjectPool
    * @see org.jboss.minerva.factories.XAConnectionFactory
  - * @version $Revision: 1.1 $
  + * @version $Revision: 1.2 $
    * @author Aaron Mulder ([EMAIL PROTECTED])
    */
   public class XAPoolDataSource implements DataSource, Referenceable, ObjectFactory {
  @@ -59,7 +60,7 @@
           try {
               factory = new XAConnectionFactory();
           } catch(NamingException e) {
  -            e.printStackTrace();
  +            Logger.exception(e);
           }
           PoolDriver.instance();
       }
  @@ -150,7 +151,7 @@
           try {
               setJNDIName(null);
           } catch(NamingException e) {
  -            e.printStackTrace();
  +            Logger.exception(e);
           }
           sources.remove(pool.getName());
           pool.shutDown();