[jBoss-Dev] CVS update: jboss/src/main/org/jboss/jdbcDataSourceImpl.java JDBCDataSourceLoader.java XADataSourceLoader.java

[jBoss CVS Development]

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

  Modified:    src/main/org/jboss/jdbc DataSourceImpl.java
                        JDBCDataSourceLoader.java XADataSourceLoader.java
  Log:
  Logger messages and clean up for binary
  
  Revision  Changes    Path
  1.6       +3 -2      jboss/src/main/org/jboss/jdbc/DataSourceImpl.java
  
  Index: DataSourceImpl.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/jdbc/DataSourceImpl.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DataSourceImpl.java       2000/06/21 11:51:35     1.5
  +++ DataSourceImpl.java       2000/08/18 03:21:04     1.6
  @@ -30,6 +30,7 @@
   import javax.sql.DataSource;
   
   import org.jboss.logging.Log;
  +import org.jboss.logging.Logger;
   import org.jboss.util.ServiceMBeanSupport;
   
   import org.jboss.proxy.Proxy;
  @@ -41,7 +42,7 @@
    *      
    *   @see <related>
    *   @author Rickard �berg ([EMAIL PROTECTED])
  - *   @version $Revision: 1.5 $
  + *   @version $Revision: 1.6 $
    */
   public class DataSourceImpl
      extends ServiceMBeanSupport
  @@ -272,7 +273,7 @@
         try
         {
            con.close();
  -      } catch (Throwable e) { e.printStackTrace(); }
  +      } catch (Throwable e) { Logger.exception(e); }
         con = null;
      }
   }
  
  
  
  1.2       +5 -3      jboss/src/main/org/jboss/jdbc/JDBCDataSourceLoader.java
  
  Index: JDBCDataSourceLoader.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/jdbc/JDBCDataSourceLoader.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JDBCDataSourceLoader.java 2000/06/02 13:48:38     1.1
  +++ JDBCDataSourceLoader.java 2000/08/18 03:21:04     1.2
  @@ -15,11 +15,13 @@
   import org.jboss.logging.LogWriter;
   import org.jboss.minerva.datasource.JDBCPoolDataSource;
   import org.jboss.util.*;
  +import org.jboss.logging.Logger;
   
  +
   /**
    * Service that loads a JDBC 1 connection pool.  The constructors are called by
    * the JMX engine based on your MLET tags.
  - * @version $Revision: 1.1 $
  + * @version $Revision: 1.2 $
    * @author Aaron Mulder ([EMAIL PROTECTED])
    */
   public class JDBCDataSourceLoader extends ServiceMBeanSupport implements 
JDBCDataSourceLoaderMBean {
  @@ -42,7 +44,7 @@
           try {
               source.setLogWriter(new LogWriter(log));
           }catch(java.sql.SQLException e) {
  -            e.printStackTrace();
  +            Logger.exception(e);
           }
           source.initialize();
       }
  @@ -139,7 +141,7 @@
                   setter.invoke(source, new Object[]{arg});
               } catch(Exception e) {
                   log.error("Unable to set pool property '"+property+"' to 
'"+value+"': "+e);
  -                e.printStackTrace();
  +                Logger.exception(e);
               }
           }
       }
  
  
  
  1.5       +7 -3      jboss/src/main/org/jboss/jdbc/XADataSourceLoader.java
  
  Index: XADataSourceLoader.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/jdbc/XADataSourceLoader.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XADataSourceLoader.java   2000/07/04 00:15:59     1.4
  +++ XADataSourceLoader.java   2000/08/18 03:21:04     1.5
  @@ -15,14 +15,18 @@
   import javax.sql.XADataSource;
   import org.jboss.logging.LogWriter;
   import org.jboss.minerva.datasource.XAPoolDataSource;
  +
  +// MF FIXME NO WILDCARD IMPORTS !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  +
   import org.jboss.util.*;
  +import org.jboss.logging.Logger;
   
   /**
    * Service that loads a JDBC 2 std. extension-compliant connection pool.  This
    * pool generates connections that are registered with the current Transaction
    * and support two-phase commit.  The constructors are called by the JMX engine
    * based on your MLET tags.
  - * @version $Revision: 1.4 $
  + * @version $Revision: 1.5 $
    * @author Aaron Mulder ([EMAIL PROTECTED])
    */
   public class XADataSourceLoader extends ServiceMBeanSupport
  @@ -42,7 +46,7 @@
   //            vendorSource.setLogWriter(writer);
   //            source.setLogWriter(writer);
           } catch(Exception e) {
  -            e.printStackTrace();
  +            Logger.exception(e);
               throw new RuntimeException("Unable to initialize XA database pool 
'"+poolName+"': "+e);
           }
           source.setDataSource(vendorSource);
  @@ -295,7 +299,7 @@
                   setter.invoke(source, new Object[]{arg});
               } catch(Exception e) {
                   log.error("Unable to set pool property '"+property+"' to 
'"+value+"': "+e);
  -                e.printStackTrace();
  +                Logger.exception(e);
               }
           }
       }