db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r510093 - in /db/derby/code/trunk/java/engine/org/apache/derby: iapi/jdbc/BrokeredCallableStatement.java iapi/jdbc/BrokeredConnection.java iapi/jdbc/BrokeredPreparedStatement.java iapi/jdbc/build.xml jdbc/Driver20.java modules.properties
Date Wed, 21 Feb 2007 16:40:22 GMT
Author: djd
Date: Wed Feb 21 08:40:21 2007
New Revision: 510093

URL: http://svn.apache.org/viewvc?view=rev&rev=510093
Log:
DERBY-1983 (partial) Change the iapi.jdbc build to use java14compile.classpath, which then
requires a number of JDBC 2.0 classes to become abstract. DERBY-1984 is entered for re-factoring
the JDBC classes so that the abstract and concrete JDBC 3 classes could be combined.
Removes embedded support for JDBC 2 (JDK 1.3) as there is no longer a non-abstract driver
for JDBC 2.0.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver20.java
    db/derby/code/trunk/java/engine/org/apache/derby/modules.properties

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java?view=diff&rev=510093&r1=510092&r2=510093
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java
Wed Feb 21 08:40:21 2007
@@ -31,7 +31,7 @@
 /**
 	JDBC 2 brokered CallableStatement
  */
-public class BrokeredCallableStatement extends BrokeredPreparedStatement
+public abstract class BrokeredCallableStatement extends BrokeredPreparedStatement
           implements CallableStatement
 {
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java?view=diff&rev=510093&r1=510092&r2=510093
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java Wed
Feb 21 08:40:21 2007
@@ -46,7 +46,7 @@
  * This is a rudimentary connection that delegates
  * EVERYTHING to Connection.
  */
-public class BrokeredConnection implements EngineConnection
+public abstract class BrokeredConnection implements EngineConnection
 {
 	
 	// default for Derby
@@ -449,12 +449,12 @@
 	public BrokeredStatement newBrokeredStatement(BrokeredStatementControl statementControl)
throws SQLException {
 		return new BrokeredStatement(statementControl, getJDBCLevel());
 	}
-	public BrokeredPreparedStatement newBrokeredStatement(BrokeredStatementControl statementControl,
String sql, Object generatedKeys) throws SQLException {
-		return new BrokeredPreparedStatement(statementControl, getJDBCLevel(), sql);
-	}
-	public BrokeredCallableStatement newBrokeredStatement(BrokeredStatementControl statementControl,
String sql) throws SQLException {
-		return new BrokeredCallableStatement(statementControl, getJDBCLevel(), sql);
-	}
+	public abstract BrokeredPreparedStatement
+        newBrokeredStatement(BrokeredStatementControl statementControl,
+                String sql, Object generatedKeys) throws SQLException;
+	public abstract BrokeredCallableStatement
+        newBrokeredStatement(BrokeredStatementControl statementControl,
+                String sql) throws SQLException;
 
 	/**
 	 *  set the DrdaId for this connection. The drdaID prints with the 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java?view=diff&rev=510093&r1=510092&r2=510093
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java
Wed Feb 21 08:40:21 2007
@@ -32,7 +32,7 @@
 	JDBC 2 brokered PreparedStatement. Forwards calls off to a real prepared statement
 	obtained through the BrokeredStatementControl getRealPreparedStatement method.
  */
-public class BrokeredPreparedStatement extends BrokeredStatement
+public abstract class BrokeredPreparedStatement extends BrokeredStatement
 	implements EnginePreparedStatement
 {
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml?view=diff&rev=510093&r1=510092&r2=510093
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml Wed Feb 21 08:40:21
2007
@@ -75,8 +75,8 @@
 
   <target name="compile_iapi_jdbc_jdbc2" depends="compile_iapi_jdbc_stmt,compile_iapi_jdbc_jsr169">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -88,7 +88,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java13compile.classpath}"/>
+        <pathelement path="${java14compile.classpath}"/>
       </classpath>
 	  <include name="${derby.dir}/${cur.dir}/BrokeredConnection.java"/>
 	  <include name="${derby.dir}/${cur.dir}/BrokeredPreparedStatement.java"/>
@@ -98,8 +98,8 @@
 
   <target name="compile_iapi_jdbc_stmt">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver20.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver20.java?view=diff&rev=510093&r1=510092&r2=510093
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver20.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver20.java Wed Feb 21 08:40:21
2007
@@ -54,7 +54,7 @@
 	methods and sql types.
 */
 
-public class Driver20 extends InternalDriver implements Driver {
+public abstract class Driver20 extends InternalDriver implements Driver {
 
 	private static final String[] BOOLEAN_CHOICES = {"false", "true"};
 
@@ -149,10 +149,7 @@
 		return new EmbedResultSet20(conn, results, forMetaData, statement,
 								 isAtomic); 
 	}
-	public BrokeredConnection newBrokeredConnection(BrokeredConnectionControl control) {
-
-		return new BrokeredConnection(control);
-	}
+	public abstract BrokeredConnection newBrokeredConnection(BrokeredConnectionControl control);
     /**
      * <p>The getPropertyInfo method is intended to allow a generic GUI tool to 
      * discover what properties it should prompt a human for in order to get 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/modules.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/modules.properties?view=diff&rev=510093&r1=510092&r2=510093
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/modules.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/modules.properties Wed Feb 21 08:40:21
2007
@@ -155,13 +155,6 @@
 # Connectivity
 ######################
 
-# jdbc20 - requires JDK 1.2
-#
-derby.module.jdbcJ2=org.apache.derby.jdbc.Driver20
-derby.env.jdk.jdbcJ2=2
-derby.env.classes.jdbcJ2=java.sql.Driver
-cloudscape.config.jdbcJ2=derby
-
 # jdbc30 - requires JDK 1.4
 #
 derby.module.jdbcJ4=org.apache.derby.jdbc.Driver30



Mime
View raw message