*** pgsnap0611200-orig/src/interfaces/jdbc/org/postgresql/PostgresqlDataSource.java	Thu Oct 12 10:55:24 2000
--- pgsnap0611200/src/interfaces/jdbc/org/postgresql/PostgresqlDataSource.java	Tue Nov  7 11:05:21 2000
***************
*** 64,72 ****
  import javax.naming.Name;
  import javax.naming.NamingException;
  import javax.naming.spi.ObjectFactory;
! import postgresql.util.PSQLException;
! import postgresql.xa.XADataSourceImpl;
! 
  
  /**
   * Implements a JDBC 2.0 {@link javax.sql.DataSource} for the
--- 64,75 ----
  import javax.naming.Name;
  import javax.naming.NamingException;
  import javax.naming.spi.ObjectFactory;
! // FIXME
! //import postgresql.util.PSQLException;
! //import postgresql.xa.XADataSourceImpl;
! import org.postgresql.util.PSQLException;
! import org.postgresql.xa.XADataSourceImpl;
! //---------
  
  /**
   * Implements a JDBC 2.0 {@link javax.sql.DataSource} for the
***************
*** 191,198 ****
       * Each datasource maintains it's own driver, in case of
       * driver-specific setup (e.g. pools, log writer).
       */
!     private transient postgresql.Driver _driver;
! 
  
  
  
--- 194,203 ----
       * Each datasource maintains it's own driver, in case of
       * driver-specific setup (e.g. pools, log writer).
       */
! // FIXME
! //    private transient postgresql.Driver _driver;
! private transient org.postgresql.Driver _driver;
! //---------
  
  
  
***************
*** 223,230 ****
  		// Constructs a driver for use just by this data source
  		// which will produce TwoPhaseConnection-s. This driver
  		// is not registered with the driver manager.
! 		_driver = new postgresql.Driver();
! 		_driver.setLogWriter( _logWriter );
  	    } catch ( SQLException except ) {
  		if ( _logWriter != null )
  		    _logWriter.println( "DataSource: Failed to initialize JDBC driver: " + except );
--- 228,242 ----
  		// Constructs a driver for use just by this data source
  		// which will produce TwoPhaseConnection-s. This driver
  		// is not registered with the driver manager.
! // FIXME
! //		_driver = new postgresql.Driver();
! _driver = new org.postgresql.Driver();
! //-----------
! 
! //FIXME
! //		_driver.setLogWriter( _logWriter );
! // Method seems to be unavailable. Just commented it out.
! //----------
  	    } catch ( SQLException except ) {
  		if ( _logWriter != null )
  		    _logWriter.println( "DataSource: Failed to initialize JDBC driver: " + except );
***************
*** 260,266 ****
  	// attempt or a failure.
  	try {
  	    conn = _driver.connect( url, info );
! 	    if ( ! ( conn instanceof postgresql.jdbc2.Connection ) ) {
  		if ( _logWriter != null )
  		    _logWriter.println( "DataSource: JDBC 1 connections not supported" );
  		throw new PSQLException( "postgresql.ds.onlyjdbc2" );
--- 272,281 ----
  	// attempt or a failure.
  	try {
  	    conn = _driver.connect( url, info );
! // FIXME
! //	    if ( ! ( conn instanceof postgresql.jdbc2.Connection ) ) {
! if ( ! ( conn instanceof org.postgresql.jdbc2.Connection ) ) {
! //--------
  		if ( _logWriter != null )
  		    _logWriter.println( "DataSource: JDBC 1 connections not supported" );
  		throw new PSQLException( "postgresql.ds.onlyjdbc2" );
***************
*** 289,295 ****
  	// synchronizing.
  	if ( writer != null ) {
  	    if ( _driver != null )
! 		_driver.setLogWriter( writer );
  	    _logWriter = writer;
  	}
      }
--- 304,313 ----
  	// synchronizing.
  	if ( writer != null ) {
  	    if ( _driver != null )
! // FIXME
! //		_driver.setLogWriter( writer );
! // Method seems to be unavailable. Commented it out.
! //----------
  	    _logWriter = writer;
  	}
      }