? build.local.properties
? built
? jdbcbuild.sh
? org/postgresql/test/jdbc2/.GetXXXTest.java.swp
Index: org/postgresql/jdbc2/AbstractJdbc2Connection.java
===================================================================
RCS file: /usr/local/cvsroot/pgjdbc/pgjdbc/org/postgresql/jdbc2/AbstractJdbc2Connection.java,v
retrieving revision 1.9
diff -c -r1.9 AbstractJdbc2Connection.java
*** org/postgresql/jdbc2/AbstractJdbc2Connection.java	11 Jun 2004 11:45:49 -0000	1.9
--- org/postgresql/jdbc2/AbstractJdbc2Connection.java	18 Jun 2004 07:29:58 -0000
***************
*** 47,53 ****
  	}
  
  
! 	public void setTypeMap(java.util.Map map) throws SQLException
  	{
  		typemap = map;
  	}
--- 47,53 ----
  	}
  
  
! 	public void setTypeMap(java.util.Map<String,Class<?>> map) throws SQLException
  	{
  		typemap = map;
  	}
Index: org/postgresql/jdbc2/AbstractJdbc2ResultSet.java
===================================================================
RCS file: /usr/local/cvsroot/pgjdbc/pgjdbc/org/postgresql/jdbc2/AbstractJdbc2ResultSet.java,v
retrieving revision 1.38
diff -c -r1.38 AbstractJdbc2ResultSet.java
*** org/postgresql/jdbc2/AbstractJdbc2ResultSet.java	16 Jun 2004 05:10:15 -0000	1.38
--- org/postgresql/jdbc2/AbstractJdbc2ResultSet.java	18 Jun 2004 07:29:58 -0000
***************
*** 425,431 ****
  	}
  
  
! 	public Object getObject(String columnName, java.util.Map map) throws SQLException
  	{
  		return getObject(findColumn(columnName), map);
  	}
--- 425,431 ----
  	}
  
  
! 	public Object getObject(String columnName, java.util.Map<String,Class<?>> map) throws SQLException
  	{
  		return getObject(findColumn(columnName), map);
  	}
***************
*** 436,442 ****
  	 * an object based on that mapping. The class must implement the SQLData
  	 * interface.
  	 */
! 	public Object getObject(int i, java.util.Map map) throws SQLException
  	{
  		throw org.postgresql.Driver.notImplemented();
  	}
--- 436,442 ----
  	 * an object based on that mapping. The class must implement the SQLData
  	 * interface.
  	 */
! 	public Object getObject(int i, java.util.Map<String,Class<?>> map) throws SQLException
  	{
  		throw org.postgresql.Driver.notImplemented();
  	}
Index: org/postgresql/jdbc2/AbstractJdbc2Statement.java
===================================================================
RCS file: /usr/local/cvsroot/pgjdbc/pgjdbc/org/postgresql/jdbc2/AbstractJdbc2Statement.java,v
retrieving revision 1.23
diff -c -r1.23 AbstractJdbc2Statement.java
*** org/postgresql/jdbc2/AbstractJdbc2Statement.java	8 Jun 2004 00:01:48 -0000	1.23
--- org/postgresql/jdbc2/AbstractJdbc2Statement.java	18 Jun 2004 07:29:58 -0000
***************
*** 447,453 ****
  		throw Driver.notImplemented();
  	}
  
! 	public Object getObject(int i, java.util.Map map) throws SQLException
  	{
  		throw Driver.notImplemented();
  	}
--- 447,453 ----
  		throw Driver.notImplemented();
  	}
  
! 	public Object getObject(int i, java.util.Map<String,Class<?>> map) throws SQLException
  	{
  		throw Driver.notImplemented();
  	}
Index: org/postgresql/jdbc2/Array.java
===================================================================
RCS file: /usr/local/cvsroot/pgjdbc/pgjdbc/org/postgresql/jdbc2/Array.java,v
retrieving revision 1.24
diff -c -r1.24 Array.java
*** org/postgresql/jdbc2/Array.java	13 Jan 2004 03:07:09 -0000	1.24
--- org/postgresql/jdbc2/Array.java	18 Jun 2004 07:29:58 -0000
***************
*** 68,79 ****
  		return getArray( index, count, null );
  	}
  
! 	public Object getArray(Map map) throws SQLException
  	{
  		return getArray( 1, 0, map );
  	}
  
! 	public Object getArray(long index, int count, Map map) throws SQLException
  	{
  		if ( map != null ) // For now maps aren't supported.
  			throw org.postgresql.Driver.notImplemented();
--- 68,79 ----
  		return getArray( index, count, null );
  	}
  
! 	public Object getArray(Map<String,Class<?>> map) throws SQLException
  	{
  		return getArray( 1, 0, map );
  	}
  
! 	public Object getArray(long index, int count, Map<String,Class<?>> map) throws SQLException
  	{
  		if ( map != null ) // For now maps aren't supported.
  			throw org.postgresql.Driver.notImplemented();
***************
*** 218,229 ****
  		return getResultSet( index, count, null );
  	}
  
! 	public java.sql.ResultSet getResultSet(Map map) throws SQLException
  	{
  		return getResultSet( 1, 0, map );
  	}
  
! 	public java.sql.ResultSet getResultSet(long index, int count, java.util.Map map) throws SQLException
  	{
  		Object array = getArray( index, count, map );
  		Vector rows = new Vector();
--- 218,229 ----
  		return getResultSet( index, count, null );
  	}
  
! 	public java.sql.ResultSet getResultSet(Map<String,Class<?>> map) throws SQLException
  	{
  		return getResultSet( 1, 0, map );
  	}
  
! 	public java.sql.ResultSet getResultSet(long index, int count, java.util.Map<String,Class<?>> map) throws SQLException
  	{
  		Object array = getArray( index, count, map );
  		Vector rows = new Vector();
Index: org/postgresql/jdbc2/optional/PGObjectFactory.java
===================================================================
RCS file: /usr/local/cvsroot/pgjdbc/pgjdbc/org/postgresql/jdbc2/optional/PGObjectFactory.java,v
retrieving revision 1.4
diff -c -r1.4 PGObjectFactory.java
*** org/postgresql/jdbc2/optional/PGObjectFactory.java	8 Jun 2004 00:01:48 -0000	1.4
--- org/postgresql/jdbc2/optional/PGObjectFactory.java	18 Jun 2004 07:29:58 -0000
***************
*** 22,28 ****
  	 * ignored.
  	 */
  	public Object getObjectInstance(Object obj, Name name, Context nameCtx,
! 									Hashtable environment) throws Exception
  	{
  		Reference ref = (Reference)obj;
  		if (ref.getClassName().equals(SimpleDataSource.class.getName()))
--- 22,28 ----
  	 * ignored.
  	 */
  	public Object getObjectInstance(Object obj, Name name, Context nameCtx,
! 									Hashtable<String,?> environment) throws Exception
  	{
  		Reference ref = (Reference)obj;
  		if (ref.getClassName().equals(SimpleDataSource.class.getName()))
Index: org/postgresql/jdbc3/AbstractJdbc3Statement.java
===================================================================
RCS file: /usr/local/cvsroot/pgjdbc/pgjdbc/org/postgresql/jdbc3/AbstractJdbc3Statement.java,v
retrieving revision 1.5
diff -c -r1.5 AbstractJdbc3Statement.java
*** org/postgresql/jdbc3/AbstractJdbc3Statement.java	8 Jun 2004 00:01:48 -0000	1.5
--- org/postgresql/jdbc3/AbstractJdbc3Statement.java	18 Jun 2004 07:29:58 -0000
***************
*** 1198,1204 ****
  	 * @see #setObject
  	 * @since 1.4
  	 */
! 	public Object getObject (String parameterName, java.util.Map map) throws SQLException
  	{
  		throw org.postgresql.Driver.notImplemented();
  	}
--- 1198,1204 ----
  	 * @see #setObject
  	 * @since 1.4
  	 */
! 	public Object getObject (String parameterName, java.util.Map<String,Class<?>> map) throws SQLException
  	{
  		throw org.postgresql.Driver.notImplemented();
  	}
Index: org/postgresql/jdbc3/Jdbc3ObjectFactory.java
===================================================================
RCS file: /usr/local/cvsroot/pgjdbc/pgjdbc/org/postgresql/jdbc3/Jdbc3ObjectFactory.java,v
retrieving revision 1.1
diff -c -r1.1 Jdbc3ObjectFactory.java
*** org/postgresql/jdbc3/Jdbc3ObjectFactory.java	25 Sep 2002 07:01:30 -0000	1.1
--- org/postgresql/jdbc3/Jdbc3ObjectFactory.java	18 Jun 2004 07:29:58 -0000
***************
*** 18,24 ****
       * ignored.
       */
      public Object getObjectInstance(Object obj, Name name, Context nameCtx,
!                                     Hashtable environment) throws Exception
      {
          Reference ref = (Reference) obj;
          if (ref.getClassName().equals(Jdbc3SimpleDataSource.class.getName()))
--- 18,24 ----
       * ignored.
       */
      public Object getObjectInstance(Object obj, Name name, Context nameCtx,
!                                     Hashtable<String,?> environment) throws Exception
      {
          Reference ref = (Reference) obj;
          if (ref.getClassName().equals(Jdbc3SimpleDataSource.class.getName()))
Index: org/postgresql/test/util/MiniJndiContextFactory.java
===================================================================
RCS file: /usr/local/cvsroot/pgjdbc/pgjdbc/org/postgresql/test/util/MiniJndiContextFactory.java,v
retrieving revision 1.1
diff -c -r1.1 MiniJndiContextFactory.java
*** org/postgresql/test/util/MiniJndiContextFactory.java	25 Sep 2002 07:01:31 -0000	1.1
--- org/postgresql/test/util/MiniJndiContextFactory.java	18 Jun 2004 07:29:58 -0000
***************
*** 14,20 ****
   */
  public class MiniJndiContextFactory implements InitialContextFactory
  {
!     public Context getInitialContext(Hashtable environment)
              throws NamingException
      {
          return new MiniJndiContext();
--- 14,20 ----
   */
  public class MiniJndiContextFactory implements InitialContextFactory
  {
!     public Context getInitialContext(Hashtable<String,?> environment)
              throws NamingException
      {
          return new MiniJndiContext();