? src/interfaces/jdbc/org/postgresql/test/jdbc3/.Jdbc3TestSuite.java.swp
Index: src/interfaces/jdbc/build.xml
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/interfaces/jdbc/build.xml,v
retrieving revision 1.36
diff -c -r1.36 build.xml
*** src/interfaces/jdbc/build.xml	24 Aug 2003 22:10:09 -0000	1.36
--- src/interfaces/jdbc/build.xml	3 Nov 2003 06:13:05 -0000
***************
*** 305,311 ****
    <!-- This compiles and executes the JUnit tests -->
  
    <!-- defaults for the tests - override these if required -->
!   <property name="database" value="jdbc:postgresql:test" />
    <property name="username" value="test" />
    <!-- Password must be something.  Doesn't matter if trust is used! -->
    <property name="password" value="password" />
--- 305,313 ----
    <!-- This compiles and executes the JUnit tests -->
  
    <!-- defaults for the tests - override these if required -->
!   <property name="server" value="localhost" />
!   <property name="port" value="${def_pgport}" />
!   <property name="database" value="test" />
    <property name="username" value="test" />
    <!-- Password must be something.  Doesn't matter if trust is used! -->
    <property name="password" value="password" />
***************
*** 337,342 ****
--- 339,346 ----
      <junit>
        <formatter type="brief" usefile="false"/>
  
+       <sysproperty key="server" value="${server}" />
+       <sysproperty key="port" value="${port}" />
        <sysproperty key="database" value="${database}" />
        <sysproperty key="username" value="${username}" />
        <sysproperty key="password" value="${password}" />
Index: src/interfaces/jdbc/org/postgresql/test/jdbc2/optional/ConnectionPoolTest.java
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/interfaces/jdbc/org/postgresql/test/jdbc2/optional/ConnectionPoolTest.java,v
retrieving revision 1.6
diff -c -r1.6 ConnectionPoolTest.java
*** src/interfaces/jdbc/org/postgresql/test/jdbc2/optional/ConnectionPoolTest.java	14 Jan 2003 05:05:26 -0000	1.6
--- src/interfaces/jdbc/org/postgresql/test/jdbc2/optional/ConnectionPoolTest.java	3 Nov 2003 06:13:05 -0000
***************
*** 31,46 ****
  		if (bds == null)
  		{
  			bds = new ConnectionPool();
! 			String db = TestUtil.getURL();
! 			if (db.indexOf('/') > -1)
! 			{
! 				db = db.substring(db.lastIndexOf('/') + 1);
! 			}
! 			else if (db.indexOf(':') > -1)
! 			{
! 				db = db.substring(db.lastIndexOf(':') + 1);
! 			}
! 			bds.setDatabaseName(db);
  			bds.setUser(TestUtil.getUser());
  			bds.setPassword(TestUtil.getPassword());
  		}
--- 31,39 ----
  		if (bds == null)
  		{
  			bds = new ConnectionPool();
! 			bds.setServerName(TestUtil.getServer());
! 			bds.setPortNumber(TestUtil.getPort());
! 			bds.setDatabaseName(TestUtil.getDatabase());
  			bds.setUser(TestUtil.getUser());
  			bds.setPassword(TestUtil.getPassword());
  		}
Index: src/interfaces/jdbc/org/postgresql/test/jdbc2/optional/PoolingDataSourceTest.java
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/interfaces/jdbc/org/postgresql/test/jdbc2/optional/PoolingDataSourceTest.java,v
retrieving revision 1.1
diff -c -r1.1 PoolingDataSourceTest.java
*** src/interfaces/jdbc/org/postgresql/test/jdbc2/optional/PoolingDataSourceTest.java	25 Sep 2002 07:01:30 -0000	1.1
--- src/interfaces/jdbc/org/postgresql/test/jdbc2/optional/PoolingDataSourceTest.java	3 Nov 2003 06:13:05 -0000
***************
*** 40,55 ****
          if (bds == null)
          {
              bds = new PoolingDataSource();
!             String db = TestUtil.getURL();
!             if (db.indexOf('/') > -1)
!             {
!                 db = db.substring(db.lastIndexOf('/') + 1);
!             }
!             else if (db.indexOf(':') > -1)
!             {
!                 db = db.substring(db.lastIndexOf(':') + 1);
!             }
!             bds.setDatabaseName(db);
              bds.setUser(TestUtil.getUser());
              bds.setPassword(TestUtil.getPassword());
              ((PoolingDataSource) bds).setDataSourceName(DS_NAME);
--- 40,48 ----
          if (bds == null)
          {
              bds = new PoolingDataSource();
!             bds.setServerName(TestUtil.getServer());
!             bds.setPortNumber(TestUtil.getPort());
!             bds.setDatabaseName(TestUtil.getDatabase());
              bds.setUser(TestUtil.getUser());
              bds.setPassword(TestUtil.getPassword());
              ((PoolingDataSource) bds).setDataSourceName(DS_NAME);
Index: src/interfaces/jdbc/org/postgresql/test/jdbc2/optional/SimpleDataSourceTest.java
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/interfaces/jdbc/org/postgresql/test/jdbc2/optional/SimpleDataSourceTest.java,v
retrieving revision 1.3
diff -c -r1.3 SimpleDataSourceTest.java
*** src/interfaces/jdbc/org/postgresql/test/jdbc2/optional/SimpleDataSourceTest.java	11 Sep 2002 05:38:45 -0000	1.3
--- src/interfaces/jdbc/org/postgresql/test/jdbc2/optional/SimpleDataSourceTest.java	3 Nov 2003 06:13:05 -0000
***************
*** 28,43 ****
  		if (bds == null)
  		{
  			bds = new SimpleDataSource();
! 			String db = TestUtil.getURL();
! 			if (db.indexOf('/') > -1)
! 			{
! 				db = db.substring(db.lastIndexOf('/') + 1);
! 			}
! 			else if (db.indexOf(':') > -1)
! 			{
! 				db = db.substring(db.lastIndexOf(':') + 1);
! 			}
! 			bds.setDatabaseName(db);
  			bds.setUser(TestUtil.getUser());
  			bds.setPassword(TestUtil.getPassword());
  		}
--- 28,36 ----
  		if (bds == null)
  		{
  			bds = new SimpleDataSource();
! 			bds.setServerName(TestUtil.getServer());
! 			bds.setPortNumber(TestUtil.getPort());
! 			bds.setDatabaseName(TestUtil.getDatabase());
  			bds.setUser(TestUtil.getUser());
  			bds.setPassword(TestUtil.getPassword());
  		}
Index: src/interfaces/jdbc/org/postgresql/test/jdbc3/Jdbc3ConnectionPoolTest.java
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/interfaces/jdbc/org/postgresql/test/jdbc3/Jdbc3ConnectionPoolTest.java,v
retrieving revision 1.2
diff -c -r1.2 Jdbc3ConnectionPoolTest.java
*** src/interfaces/jdbc/org/postgresql/test/jdbc3/Jdbc3ConnectionPoolTest.java	29 May 2003 04:39:51 -0000	1.2
--- src/interfaces/jdbc/org/postgresql/test/jdbc3/Jdbc3ConnectionPoolTest.java	3 Nov 2003 06:13:05 -0000
***************
*** 29,44 ****
          if (bds == null)
          {
              bds = new Jdbc3ConnectionPool();
!             String db = TestUtil.getURL();
!             if (db.indexOf('/') > -1)
!             {
!                 db = db.substring(db.lastIndexOf('/') + 1);
!             }
!             else if (db.indexOf(':') > -1)
!             {
!                 db = db.substring(db.lastIndexOf(':') + 1);
!             }
!             bds.setDatabaseName(db);
              bds.setUser(TestUtil.getUser());
              bds.setPassword(TestUtil.getPassword());
          }
--- 29,37 ----
          if (bds == null)
          {
              bds = new Jdbc3ConnectionPool();
!             bds.setServerName(TestUtil.getServer());
!             bds.setPortNumber(TestUtil.getPort());
!             bds.setDatabaseName(TestUtil.getDatabase());
              bds.setUser(TestUtil.getUser());
              bds.setPassword(TestUtil.getPassword());
          }
Index: src/interfaces/jdbc/org/postgresql/test/jdbc3/Jdbc3PoolingDataSourceTest.java
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/interfaces/jdbc/org/postgresql/test/jdbc3/Jdbc3PoolingDataSourceTest.java,v
retrieving revision 1.1
diff -c -r1.1 Jdbc3PoolingDataSourceTest.java
*** src/interfaces/jdbc/org/postgresql/test/jdbc3/Jdbc3PoolingDataSourceTest.java	25 Sep 2002 07:01:31 -0000	1.1
--- src/interfaces/jdbc/org/postgresql/test/jdbc3/Jdbc3PoolingDataSourceTest.java	3 Nov 2003 06:13:05 -0000
***************
*** 42,56 ****
      private void configureDataSource(PoolingDataSource source)
      {
          String db = TestUtil.getURL();
!         if (db.indexOf('/') > -1)
!         {
!             db = db.substring(db.lastIndexOf('/') + 1);
!         }
!         else if (db.indexOf(':') > -1)
!         {
!             db = db.substring(db.lastIndexOf(':') + 1);
!         }
!         source.setDatabaseName(db);
          source.setUser(TestUtil.getUser());
          source.setPassword(TestUtil.getPassword());
          source.setDataSourceName(DS_NAME);
--- 42,50 ----
      private void configureDataSource(PoolingDataSource source)
      {
          String db = TestUtil.getURL();
!         source.setServerName(TestUtil.getServer());
!         source.setPortNumber(TestUtil.getPort());
!         source.setDatabaseName(TestUtil.getDatabase());
          source.setUser(TestUtil.getUser());
          source.setPassword(TestUtil.getPassword());
          source.setDataSourceName(DS_NAME);
Index: src/interfaces/jdbc/org/postgresql/test/jdbc3/Jdbc3SimpleDataSourceTest.java
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/interfaces/jdbc/org/postgresql/test/jdbc3/Jdbc3SimpleDataSourceTest.java,v
retrieving revision 1.1
diff -c -r1.1 Jdbc3SimpleDataSourceTest.java
*** src/interfaces/jdbc/org/postgresql/test/jdbc3/Jdbc3SimpleDataSourceTest.java	25 Sep 2002 07:01:31 -0000	1.1
--- src/interfaces/jdbc/org/postgresql/test/jdbc3/Jdbc3SimpleDataSourceTest.java	3 Nov 2003 06:13:05 -0000
***************
*** 29,44 ****
          if (bds == null)
          {
              bds = new Jdbc3SimpleDataSource();
!             String db = TestUtil.getURL();
!             if (db.indexOf('/') > -1)
!             {
!                 db = db.substring(db.lastIndexOf('/') + 1);
!             }
!             else if (db.indexOf(':') > -1)
!             {
!                 db = db.substring(db.lastIndexOf(':') + 1);
!             }
!             bds.setDatabaseName(db);
              bds.setUser(TestUtil.getUser());
              bds.setPassword(TestUtil.getPassword());
          }
--- 29,37 ----
          if (bds == null)
          {
              bds = new Jdbc3SimpleDataSource();
!             bds.setServerName(TestUtil.getServer());
!             bds.setPortNumber(TestUtil.getPort());
!             bds.setDatabaseName(TestUtil.getDatabase());
              bds.setUser(TestUtil.getUser());
              bds.setPassword(TestUtil.getPassword());
          }