db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r453918 - in /db/derby/code/branches/10.2: java/client/org/apache/derby/client/am/ java/client/org/apache/derby/client/net/ java/client/org/apache/derby/jdbc/ java/engine/org/apache/derby/iapi/jdbc/ java/engine/org/apache/derby/impl/jdbc/ j...
Date Sat, 07 Oct 2006 14:24:46 GMT
Author: rhillegas
Date: Sat Oct  7 07:24:44 2006
New Revision: 453918

URL: http://svn.apache.org/viewvc?view=rev&rev=453918
Log:
DERBY-1940: Port 453913 from trunk to the 10.2 branch.

Removed:
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestData.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestQuery.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestQueryObject.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestQueryObject_app.properties
Modified:
    db/derby/code/branches/10.2/java/client/org/apache/derby/client/am/LogicalConnection40.java
    db/derby/code/branches/10.2/java/client/org/apache/derby/client/net/NetConnection40.java
    db/derby/code/branches/10.2/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource40.java
    db/derby/code/branches/10.2/java/client/org/apache/derby/jdbc/ClientDataSource40.java
    db/derby/code/branches/10.2/java/client/org/apache/derby/jdbc/ClientXADataSource40.java
    db/derby/code/branches/10.2/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection40.java
    db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/jdbc/EmbedConnection40.java
    db/derby/code/branches/10.2/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java
    db/derby/code/branches/10.2/java/engine/org/apache/derby/jdbc/EmbeddedDataSource40.java
    db/derby/code/branches/10.2/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource40.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/suites/jdbc40.runall
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestDbMetaData.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/VerifySignatures.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/copyfiles.ant
    db/derby/code/branches/10.2/maven/project.properties
    db/derby/code/branches/10.2/maven/project.xml

Modified: db/derby/code/branches/10.2/java/client/org/apache/derby/client/am/LogicalConnection40.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/client/org/apache/derby/client/am/LogicalConnection40.java?view=diff&rev=453918&r1=453917&r2=453918
==============================================================================
--- db/derby/code/branches/10.2/java/client/org/apache/derby/client/am/LogicalConnection40.java
(original)
+++ db/derby/code/branches/10.2/java/client/org/apache/derby/client/am/LogicalConnection40.java
Sat Oct  7 07:24:44 2006
@@ -22,7 +22,6 @@
 package org.apache.derby.client.am;
 
 import java.sql.Array;
-import java.sql.BaseQuery;
 import java.sql.Blob;
 import java.sql.SQLClientInfoException;
 import java.sql.Clob;
@@ -77,18 +76,6 @@
         return physicalConnection_.createNClob();
     }
 
-    public <T extends BaseQuery>T createQueryObject(Class<T> ifc)
-        throws SQLException {
-		checkForNullPhysicalConnection();
-		return physicalConnection_.createQueryObject( ifc );
-    }
-    
-    public <T extends BaseQuery>T createQueryObject(Class<T> ifc, java.sql.Connection
conn)
-        throws SQLException {
-		checkForNullPhysicalConnection();
-		return physicalConnection_.createQueryObject( ifc, conn );
-    }
-    
     public SQLXML createSQLXML()
         throws SQLException {
 		checkForNullPhysicalConnection();

Modified: db/derby/code/branches/10.2/java/client/org/apache/derby/client/net/NetConnection40.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/client/org/apache/derby/client/net/NetConnection40.java?view=diff&rev=453918&r1=453917&r2=453918
==============================================================================
--- db/derby/code/branches/10.2/java/client/org/apache/derby/client/net/NetConnection40.java
(original)
+++ db/derby/code/branches/10.2/java/client/org/apache/derby/client/net/NetConnection40.java
Sat Oct  7 07:24:44 2006
@@ -22,8 +22,6 @@
 package org.apache.derby.client.net;
 
 import java.sql.Array;
-import java.sql.BaseQuery;
-import java.sql.QueryObjectFactory;
 import org.apache.derby.client.am.SQLExceptionFactory;
 import org.apache.derby.client.am.SqlException;
 import java.sql.Blob;
@@ -386,39 +384,6 @@
         return genericTypeMap;
     }
 
-    /**
-     * This method forwards all the calls to default query object provided by 
-     * the jdk.
-     * @param ifc interface to generated concreate class
-     * @return concreat class generated by default qury object generator
-     */
-    public <T extends BaseQuery> T createQueryObject(Class<T> ifc) 
-                                                    throws SQLException {
-        try {
-            checkForClosedConnection();
-        } catch (SqlException se) {
-            throw se.getSQLException();
-        }
-        return QueryObjectFactory.createDefaultQueryObject (ifc, this);
-    } 
-    
-    /**
-     * This method forwards all the calls to default query object provided by 
-     * the jdk.
-     * @param ifc interface to generated concreate class
-     * @param conn Connection to use when invoking methods that access the Data Source
-     * @return concreat class generated by default qury object generator
-     */
-    public <T extends BaseQuery> T createQueryObject(Class<T> ifc, Connection
conn ) 
-                                                    throws SQLException {
-        try {
-            checkForClosedConnection();
-        } catch (SqlException se) {
-            throw se.getSQLException();
-        }
-        return QueryObjectFactory.createDefaultQueryObject (ifc, conn);
-    } 
-    
     /**
      * Returns false unless <code>interfaces</code> is implemented 
      * 

Modified: db/derby/code/branches/10.2/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource40.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource40.java?view=diff&rev=453918&r1=453917&r2=453918
==============================================================================
--- db/derby/code/branches/10.2/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource40.java
(original)
+++ db/derby/code/branches/10.2/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource40.java
Sat Oct  7 07:24:44 2006
@@ -21,9 +21,6 @@
 
 package org.apache.derby.jdbc;
 
-import java.sql.BaseQuery;
-import java.sql.QueryObjectFactory;
-import java.sql.QueryObjectGenerator;
 import java.sql.SQLException;
 import javax.sql.DataSource;
 import org.apache.derby.client.am.ClientMessageId;
@@ -47,42 +44,6 @@
  */
 public class ClientConnectionPoolDataSource40
         extends ClientConnectionPoolDataSource {
-    /**
-     * Retrieves the QueryObjectGenerator for the given JDBC driver.  If the
-     * JDBC driver does not provide its own QueryObjectGenerator, NULL is
-     * returned.
-     *
-     * @return The QueryObjectGenerator for this JDBC Driver or NULL if the 
-     * driver does not provide its own implementation
-     * @exception SQLException if a database access error occurs
-     */
-    public QueryObjectGenerator getQueryObjectGenerator() throws SQLException {
-        return null;
-    }    
-    
-    /**
-     * This method forwards all the calls to default query object provided by 
-     * the jdk.
-     * @param ifc interface to generated concreate class
-     * @return concreat class generated by default qury object generator
-     */
-    public <T extends BaseQuery> T createQueryObject(Class<T> ifc) 
-                                                    throws SQLException {
-        return QueryObjectFactory.createDefaultQueryObject (ifc, this);
-    }   
-    
-    /**
-     * This method forwards all the calls to default query object provided by 
-     * the jdk.
-     * @param ifc interface to generated concreate class
-     * @param dataSource DataSource to use when invoking methods that access the Data Source
-     * @return concreat class generated by default qury object generator
-     */
-    public <T extends BaseQuery> T createQueryObject(Class<T> ifc, DataSource
dataSource ) 
-                                                    throws SQLException {
-        return QueryObjectFactory.createDefaultQueryObject (ifc, dataSource);
-    }   
-    
     /**
      * Returns false unless <code>interfaces</code> is implemented 
      * 

Modified: db/derby/code/branches/10.2/java/client/org/apache/derby/jdbc/ClientDataSource40.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/client/org/apache/derby/jdbc/ClientDataSource40.java?view=diff&rev=453918&r1=453917&r2=453918
==============================================================================
--- db/derby/code/branches/10.2/java/client/org/apache/derby/jdbc/ClientDataSource40.java
(original)
+++ db/derby/code/branches/10.2/java/client/org/apache/derby/jdbc/ClientDataSource40.java
Sat Oct  7 07:24:44 2006
@@ -21,9 +21,6 @@
 
 package org.apache.derby.jdbc;
 
-import java.sql.BaseQuery;
-import java.sql.QueryObjectFactory;
-import java.sql.QueryObjectGenerator;
 import java.sql.SQLException;
 import javax.sql.DataSource;
 import org.apache.derby.client.am.ClientMessageId;
@@ -107,38 +104,6 @@
     
     public ClientDataSource40() {
         super();
-    }   
-    
-    /**
-     * returns null indicating that no driver specific implementation for 
-     * QueryObjectGenerator available
-     * @return null
-     */
-    public QueryObjectGenerator getQueryObjectGenerator() throws SQLException {
-        return null;
-    }
-    
-    /**
-     * This method forwards all the calls to default query object provided by 
-     * the jdk.
-     * @param ifc interface to generated concreate class
-     * @return concreat class generated by default qury object generator
-     */
-    public <T extends BaseQuery> T createQueryObject(Class<T> ifc) 
-                                                    throws SQLException {
-        return QueryObjectFactory.createDefaultQueryObject (ifc, this);
-    }   
-    
-    /**
-     * This method forwards all the calls to default query object provided by 
-     * the jdk.
-     * @param ifc interface to generated concreate class
-     * @param dataSource DataSource to use when invoking methods that access the Data Source
-     * @return concreat class generated by default qury object generator
-     */
-    public <T extends BaseQuery> T createQueryObject(Class<T> ifc, DataSource
dataSource ) 
-                                                    throws SQLException {
-        return QueryObjectFactory.createDefaultQueryObject (ifc, dataSource);
     }   
     
     /**

Modified: db/derby/code/branches/10.2/java/client/org/apache/derby/jdbc/ClientXADataSource40.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/client/org/apache/derby/jdbc/ClientXADataSource40.java?view=diff&rev=453918&r1=453917&r2=453918
==============================================================================
--- db/derby/code/branches/10.2/java/client/org/apache/derby/jdbc/ClientXADataSource40.java
(original)
+++ db/derby/code/branches/10.2/java/client/org/apache/derby/jdbc/ClientXADataSource40.java
Sat Oct  7 07:24:44 2006
@@ -21,9 +21,6 @@
 
 package org.apache.derby.jdbc;
 
-import java.sql.BaseQuery;
-import java.sql.QueryObjectFactory;
-import java.sql.QueryObjectGenerator;
 import java.sql.SQLException;
 import javax.sql.DataSource;
 import javax.sql.XAConnection;
@@ -54,18 +51,6 @@
  * <P>See ClientDataSource40 for DataSource properties.</p>
  */
 public class ClientXADataSource40 extends ClientXADataSource {
-    /**
-     * Retrieves the QueryObjectGenerator for the given JDBC driver.  If the
-     * JDBC driver does not provide its own QueryObjectGenerator, NULL is
-     * returned.
-     *
-     * @return The QueryObjectGenerator for this JDBC Driver or NULL if the
-     * driver does not provide its own implementation
-     * @exception SQLException if a database access error occurs
-     */
-    public QueryObjectGenerator getQueryObjectGenerator() throws SQLException {
-        return null;
-    }
     
     /**
      * creates a jdbc4.0 XAConnection
@@ -82,29 +67,6 @@
             throw se.getSQLException();
         }
     }
-    
-    /**
-     * This method forwards all the calls to default query object provided by 
-     * the jdk.
-     * @param ifc interface to generated concreate class
-     * @return concreat class generated by default qury object generator
-     */
-    public <T extends BaseQuery> T createQueryObject(Class<T> ifc) 
-                                                    throws SQLException {
-        return QueryObjectFactory.createDefaultQueryObject (ifc, this);
-    }   
-    
-    /**
-     * This method forwards all the calls to default query object provided by 
-     * the jdk.
-     * @param ifc interface to generated concreate class
-     * @param dataSource DataSource to use when invoking methods that access the Data Source
-     * @return concrete class generated by default qury object generator
-     */
-    public <T extends BaseQuery> T createQueryObject(Class<T> ifc, DataSource
dataSource ) 
-                                                    throws SQLException {
-        return QueryObjectFactory.createDefaultQueryObject (ifc, dataSource);
-    }   
     
 	/**
      * Returns false unless <code>interfaces</code> is implemented 

Modified: db/derby/code/branches/10.2/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection40.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection40.java?view=diff&rev=453918&r1=453917&r2=453918
==============================================================================
--- db/derby/code/branches/10.2/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection40.java
(original)
+++ db/derby/code/branches/10.2/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection40.java
Sat Oct  7 07:24:44 2006
@@ -22,7 +22,6 @@
 package org.apache.derby.iapi.jdbc;
 
 import java.sql.Array;
-import java.sql.BaseQuery;
 import java.sql.Blob;
 import java.sql.Clob;
 import java.sql.Connection;
@@ -251,47 +250,6 @@
         }
     }
     
-    /**
-     *
-     * This method forwards all the calls to default query object provided by 
-     * the jdk.
-     * @param ifc interface to generated concreate class
-     * @return concrete class generated by default qury object generator
-     *
-     */
-    public <T extends BaseQuery>T createQueryObject(Class<T> ifc) 
-        throws SQLException {
-        if (isClosed()) {
-            throw Util.noCurrentConnection();
-        }
-        try {
-            return getRealConnection().createQueryObject(ifc);
-        } catch (SQLException sqle) {
-            notifyException(sqle);
-            throw sqle;
-        }
-    }
-    
-    /**
-     * This method forwards all the calls to default query object provided by 
-     * the jdk.
-     * @param ifc interface to generated concreate class
-     * @param conn Connection to use when invoking methods that access the Data Source
-     * @return concrete class generated by default qury object generator
-     */
-    public <T extends BaseQuery> T createQueryObject(Class<T> ifc, Connection
conn ) 
-		throws SQLException {
-        if (isClosed()) {
-            throw Util.noCurrentConnection();
-        }
-        try {
-            return getRealConnection().createQueryObject(ifc, conn);
-        } catch (SQLException sqle) {
-            notifyException(sqle);
-            throw sqle;
-        }
-    }
-
     /**
      * returns an instance of JDBC4.0 speccific class BrokeredStatement40
      * @param  statementControl BrokeredStatementControl

Modified: db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/jdbc/EmbedConnection40.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/jdbc/EmbedConnection40.java?view=diff&rev=453918&r1=453917&r2=453918
==============================================================================
--- db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/jdbc/EmbedConnection40.java
(original)
+++ db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/jdbc/EmbedConnection40.java
Sat Oct  7 07:24:44 2006
@@ -22,13 +22,11 @@
 package org.apache.derby.impl.jdbc;
 
 import java.sql.Array;
-import java.sql.BaseQuery;
 import java.sql.Blob;
 import java.sql.SQLClientInfoException;
 import java.sql.Clob;
 import java.sql.Connection;
 import java.sql.NClob;
-import java.sql.QueryObjectFactory;
 import java.sql.SQLException;
 import java.sql.SQLXML;
 import java.sql.Struct;
@@ -259,31 +257,6 @@
         }
         return genericTypeMap;
     }
-    
-    /**
-     * This method forwards all the calls to default query object provided by 
-     * the jdk.
-     * @param ifc interface to generated concreate class
-     * @return concreat class generated by default qury object generator
-     */
-    public <T extends BaseQuery> T createQueryObject(Class<T> ifc) 
-                                                    throws SQLException {
-        checkIfClosed();
-        return QueryObjectFactory.createDefaultQueryObject (ifc, this);
-    } 
-    
-    /**
-     * This method forwards all the calls to default query object provided by 
-     * the jdk.
-     * @param ifc interface to generated concreate class
-     * @param conn Connection to use when invoking methods that access the Data Source
-     * @return concrete class generated by default qury object generator
-     */
-    public <T extends BaseQuery> T createQueryObject(Class<T> ifc, Connection
conn ) 
-                                                    throws SQLException {
-        checkIfClosed();
-        return QueryObjectFactory.createDefaultQueryObject (ifc, conn);
-    } 
     
     /**
      * Returns false unless <code>interfaces</code> is implemented 

Modified: db/derby/code/branches/10.2/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java?view=diff&rev=453918&r1=453917&r2=453918
==============================================================================
--- db/derby/code/branches/10.2/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java
(original)
+++ db/derby/code/branches/10.2/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java
Sat Oct  7 07:24:44 2006
@@ -20,9 +20,6 @@
  */
 package org.apache.derby.jdbc;
 
-import java.sql.BaseQuery;
-import java.sql.QueryObjectFactory;
-import java.sql.QueryObjectGenerator;
 import java.sql.SQLException;
 import javax.sql.ConnectionPoolDataSource;
 import javax.sql.DataSource;
@@ -94,38 +91,6 @@
                     interfaces);
         }
     }
-
-    /**
-     * returns null indicating that no driver specific implementation for 
-     * QueryObjectGenerator available
-     * @return null
-     */
-    public QueryObjectGenerator getQueryObjectGenerator() throws SQLException {
-        return null;
-    }
-    
-    /**
-     * This method forwards all the calls to default query object provided by 
-     * the jdk.
-     * @param ifc interface to generated concreate class
-     * @return concrete class generated by default qury object generator
-     */
-    public <T extends BaseQuery> T createQueryObject(Class<T> ifc) 
-                                                    throws SQLException {
-        return QueryObjectFactory.createDefaultQueryObject (ifc, this);
-    }
-    
-    /**
-     * This method forwards all the calls to default query object provided by 
-     * the jdk.
-     * @param ifc interface to generated concreate class
-     * @param dataSource DataSource to use when invoking methods that access the Data Source
-     * @return concrete class generated by default qury object generator
-     */
-    public <T extends BaseQuery> T createQueryObject(Class<T> ifc, DataSource
dataSource ) 
-                                                    throws SQLException {
-        return QueryObjectFactory.createDefaultQueryObject (ifc, dataSource);
-    }   
 
     /**
      * create and returns EmbedPooledConnection.

Modified: db/derby/code/branches/10.2/java/engine/org/apache/derby/jdbc/EmbeddedDataSource40.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/engine/org/apache/derby/jdbc/EmbeddedDataSource40.java?view=diff&rev=453918&r1=453917&r2=453918
==============================================================================
--- db/derby/code/branches/10.2/java/engine/org/apache/derby/jdbc/EmbeddedDataSource40.java
(original)
+++ db/derby/code/branches/10.2/java/engine/org/apache/derby/jdbc/EmbeddedDataSource40.java
Sat Oct  7 07:24:44 2006
@@ -21,9 +21,6 @@
 
 package org.apache.derby.jdbc;
 
-import java.sql.BaseQuery;
-import java.sql.QueryObjectFactory;
-import java.sql.QueryObjectGenerator;
 import java.sql.SQLException;
 import javax.sql.DataSource;
 
@@ -187,38 +184,6 @@
     public EmbeddedDataSource40() {
     }
        
-    /**
-     * returns null indicating that no driver specific implementation for 
-     * QueryObjectGenerator available
-     * @return null
-     */
-    public QueryObjectGenerator getQueryObjectGenerator() throws SQLException {
-        return null;
-    }
-    
-    /**
-     * This method forwards all the calls to default query object provided by 
-     * the jdk.
-     * @param ifc interface to generated concreate class
-     * @return concreat class generated by default qury object generator
-     */
-    public <T extends BaseQuery> T createQueryObject(Class<T> ifc) 
-                                                    throws SQLException {
-        return QueryObjectFactory.createDefaultQueryObject (ifc, this);
-    }        
-    
-    /**
-     * This method forwards all the calls to default query object provided by 
-     * the jdk.
-     * @param ifc interface to generated concreate class
-     * @param dataSource DataSource to use when invoking methods that access the Data Source
-     * @return concrete class generated by default qury object generator
-     */
-    public <T extends BaseQuery> T createQueryObject(Class<T> ifc, DataSource
dataSource ) 
-                                                    throws SQLException {
-        return QueryObjectFactory.createDefaultQueryObject (ifc, dataSource);
-    }   
-
     /**
      * Returns false unless <code>interfaces</code> is implemented 
      * 

Modified: db/derby/code/branches/10.2/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource40.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource40.java?view=diff&rev=453918&r1=453917&r2=453918
==============================================================================
--- db/derby/code/branches/10.2/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource40.java
(original)
+++ db/derby/code/branches/10.2/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource40.java
Sat Oct  7 07:24:44 2006
@@ -21,9 +21,6 @@
 
 package org.apache.derby.jdbc;
 
-import java.sql.BaseQuery;
-import java.sql.QueryObjectFactory;
-import java.sql.QueryObjectGenerator;
 import org.apache.derby.iapi.jdbc.ResourceAdapter;
 
 import java.sql.SQLException;
@@ -103,38 +100,6 @@
         }
     }
 	
-    /**
-     * returns null indicating that no driver specific implementation for 
-     * QueryObjectGenerator available
-     * @return null
-     */
-    public QueryObjectGenerator getQueryObjectGenerator() throws SQLException {
-        return null;
-    }
-    
-    /**
-     * This method forwards all the calls to default query object provided by 
-     * the jdk.
-     * @param ifc interface to generated concreate class
-     * @return concreat class generated by default qury object generator
-     */
-    public <T extends BaseQuery> T createQueryObject(Class<T> ifc) 
-                                                    throws SQLException {
-        return QueryObjectFactory.createDefaultQueryObject (ifc, this);
-    } 
-    
-    /**
-     * This method forwards all the calls to default query object provided by 
-     * the jdk.
-     * @param ifc interface to generated concreate class
-     * @param dataSource DataSource to use when invoking methods that access the Data Source
-     * @return concrete class generated by default qury object generator
-     */
-    public <T extends BaseQuery> T createQueryObject(Class<T> ifc, DataSource
dataSource ) 
-                                                    throws SQLException {
-        return QueryObjectFactory.createDefaultQueryObject (ifc, dataSource);
-    }   
-
     /**
      * Intantiate and returns EmbedXAConnection.
      * @param user 

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/suites/jdbc40.runall
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/suites/jdbc40.runall?view=diff&rev=453918&r1=453917&r2=453918
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/suites/jdbc40.runall
(original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/suites/jdbc40.runall
Sat Oct  7 07:24:44 2006
@@ -2,7 +2,6 @@
 jdbc4/TestConnectionMethods.java
 jdbc4/TestDbMetaData.java
 jdbc4/TestJDBC40Exception.java
-jdbc4/TestQueryObject.java
 jdbc4/TestPreparedStatementMethods.java
 jdbc4/TestResultSetMethods.java
 

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java?view=diff&rev=453918&r1=453917&r2=453918
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java
(original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java
Sat Oct  7 07:24:44 2006
@@ -120,19 +120,6 @@
         }
     }
 
-    /**
-     * Simply test that the method is implemented.
-     * [TODO] Write a better test when some (believed to be) JDK bugs have
-     *        been resolved. Currently fails during query execution with 
-     *        JDK 1.6.0_b85 because of some security manager problems. May be 
-     *        fixed in a couple of beta releases.
-     */
-    public void testCreateQueryObjectIsImplemented()
-        throws SQLException {
-        getConnection().createQueryObject(TestQuery.class);
-        getConnection().createQueryObject(TestQuery.class, getConnection());
-    }
-
     public void testCreateSQLXMLNotImplemented()
         throws SQLException {
         try {

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestDbMetaData.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestDbMetaData.java?view=diff&rev=453918&r1=453917&r2=453918
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestDbMetaData.java
(original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestDbMetaData.java
Sat Oct  7 07:24:44 2006
@@ -86,12 +86,6 @@
                  "should return false");
         }
 
-        if (met.providesQueryObjectGenerator()) {
-            System.out.println
-                ("FAIL: providesQueryObjectGenerator() should " +
-                 "return false");
-        }
-
         checkEmptyRS(met.getClientInfoProperties());
 
 		// Make sure the constants provided in JDBC40Translation is correct

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/VerifySignatures.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/VerifySignatures.java?view=diff&rev=453918&r1=453917&r2=453918
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/VerifySignatures.java
(original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/VerifySignatures.java
Sat Oct  7 07:24:44 2006
@@ -48,20 +48,15 @@
      */
     private final static Class[] JDBC_INTERFACES = {
         java.sql.Array.class,
-        java.sql.BaseQuery.class,
         java.sql.Blob.class,
         java.sql.CallableStatement.class,
         java.sql.Clob.class,
-        java.sql.ConflictingRow.class,
         java.sql.Connection.class,
         java.sql.DatabaseMetaData.class,
-        java.sql.DataSet.class,
-        java.sql.DataSetResolver.class,
         java.sql.Driver.class,
         java.sql.NClob.class,
         java.sql.ParameterMetaData.class,
         java.sql.PreparedStatement.class,
-        java.sql.QueryObjectGenerator.class,
         java.sql.Ref.class,
         java.sql.ResultSet.class,
         java.sql.ResultSetMetaData.class,
@@ -453,12 +448,7 @@
 
             // Interfaces that Derby doesn't implement:
             jdbcInterfaces.remove(java.sql.Array.class);
-            jdbcInterfaces.remove(java.sql.BaseQuery.class);
-            jdbcInterfaces.remove(java.sql.ConflictingRow.class);
-            jdbcInterfaces.remove(java.sql.DataSet.class);
-            jdbcInterfaces.remove(java.sql.DataSetResolver.class);
             jdbcInterfaces.remove(java.sql.NClob.class);
-            jdbcInterfaces.remove(java.sql.QueryObjectGenerator.class);
             jdbcInterfaces.remove(java.sql.Ref.class);
             jdbcInterfaces.remove(java.sql.SQLData.class);
             jdbcInterfaces.remove(java.sql.SQLInput.class);

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/copyfiles.ant
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/copyfiles.ant?view=diff&rev=453918&r1=453917&r2=453918
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/copyfiles.ant
(original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/copyfiles.ant
Sat Oct  7 07:24:44 2006
@@ -1,7 +1,6 @@
 default_app.properties
 TestRowId_app.properties
 TestConnectionMethods_app.properties
-TestQueryObject_app.properties
 TestPreparedStatementMethods_app.properties
 aclob.txt
 littleclob.txt

Modified: db/derby/code/branches/10.2/maven/project.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/maven/project.properties?view=diff&rev=453918&r1=453917&r2=453918
==============================================================================
--- db/derby/code/branches/10.2/maven/project.properties (original)
+++ db/derby/code/branches/10.2/maven/project.properties Sat Oct  7 07:24:44 2006
@@ -21,9 +21,9 @@
 sanity=insane
 derby.jars=../../jars/${sanity}
 
-#maven.repo.list=apache
-maven.repo.apache=scpexe://svn.apache.org
-maven.repo.apache.directory=/www/www.apache.org/dist/java-repository
-maven.repo.apache.username=
-maven.repo.apache.password=
-maven.repo.apache.group=db
+maven.repo.list=apache
+maven.repo.apache=file://~/zdir
+maven.repo.apache.directory=garbage
+maven.repo.apache.username=garbage
+maven.repo.apache.password=garbage
+maven.repo.apache.group=garbage

Modified: db/derby/code/branches/10.2/maven/project.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/maven/project.xml?view=diff&rev=453918&r1=453917&r2=453918
==============================================================================
--- db/derby/code/branches/10.2/maven/project.xml (original)
+++ db/derby/code/branches/10.2/maven/project.xml Sat Oct  7 07:24:44 2006
@@ -24,7 +24,7 @@
     <groupId>org.apache.derby</groupId>
     <name>Derby Project</name>
     <id>derby-project</id>
-    <currentVersion>10.1-SNAPSHOT</currentVersion>
+    <currentVersion>10.2.1.6</currentVersion>
     <organization>
         <name>Apache Software Foundation</name>
         <url>http://db.apache.org/</url>



Mime
View raw message