db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r510102 - in /db/derby/code/trunk/java/engine/org/apache/derby: impl/jdbc/EmbedCallableStatement20.java impl/jdbc/EmbedPreparedStatement20.java impl/jdbc/build.xml jdbc/Driver20.java jdbc/build.xml
Date Wed, 21 Feb 2007 17:08:34 GMT
Author: djd
Date: Wed Feb 21 09:08:33 2007
New Revision: 510102

URL: http://svn.apache.org/viewvc?view=rev&rev=510102
Log:
DERBY-1983 (partial) Remove last uses of java13compile.classpath from build.xml files.
Requires making some JDBC 2.0 classes abstract, DERBY-1984 is entered to re-factor
the JDBC 2.0 classes (e.g. merge with JDBC 3).

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement20.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement20.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver20.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement20.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement20.java?view=diff&rev=510102&r1=510101&r2=510102
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement20.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement20.java
Wed Feb 21 09:08:33 2007
@@ -68,7 +68,7 @@
  *
  *	@author francois
  */
-public class EmbedCallableStatement20
+public abstract class EmbedCallableStatement20
 	extends org.apache.derby.impl.jdbc.EmbedCallableStatement 
 {
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement20.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement20.java?view=diff&rev=510102&r1=510101&r2=510102
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement20.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement20.java
Wed Feb 21 09:08:33 2007
@@ -58,7 +58,7 @@
  *
  *	@author francois
  */
-public class EmbedPreparedStatement20
+public abstract class EmbedPreparedStatement20
 	extends org.apache.derby.impl.jdbc.EmbedPreparedStatement {
 
 	//////////////////////////////////////////////////////////////

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml?view=diff&rev=510102&r1=510101&r2=510102
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml Wed Feb 21 09:08:33
2007
@@ -103,8 +103,8 @@
   	</target>
   <target name="compile_jdbc2" depends="compile_jsr169">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -116,13 +116,13 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java13compile.classpath}"/>
+        <pathelement path="${java14compile.classpath}"/>
       </classpath>
 	  <include name="${derby.dir}/impl/jdbc/*20.java"/>
     </javac>
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -134,8 +134,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-		<pathelement path="${jndi}"/>
-        <pathelement path="${java13compile.classpath}"/>
+        <pathelement path="${java14compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/impl/jdbc/authentication/JNDI**"/>
       <include name="${derby.dir}/impl/jdbc/authentication/LDAP**"/>

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=510102&r1=510101&r2=510102
==============================================================================
--- 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 09:08:33
2007
@@ -110,7 +110,7 @@
 	/**
 	 	@exception SQLException if fails to create statement
 	 */
-	public java.sql.PreparedStatement 
+	public abstract java.sql.PreparedStatement 
 	newEmbedPreparedStatement (EmbedConnection conn, 
 							   String stmt, 
 							   boolean forMetaData,
@@ -120,27 +120,18 @@
 							   int autoGeneratedKeys,
 							   int[] columnIndexes,
 							   String[] columnNames)
-		 throws SQLException
-	{
-		return new EmbedPreparedStatement20(conn, stmt, forMetaData,
-										  resultSetType, resultSetConcurrency, resultSetHoldability,
-										  autoGeneratedKeys, columnIndexes, columnNames);
-	}
+		 throws SQLException;
 
 	/**
 	 	@exception SQLException if fails to create statement
 	 */
-	public java.sql.CallableStatement newEmbedCallableStatement(
+	public abstract java.sql.CallableStatement newEmbedCallableStatement(
 				EmbedConnection conn,
 				String stmt, 
 				int resultSetType,
 				int resultSetConcurrency,
 				int resultSetHoldability)
-		throws SQLException
-	{
-		return new EmbedCallableStatement20(conn, stmt,
-										  resultSetType, resultSetConcurrency, resultSetHoldability);
-	}
+		throws SQLException;
   
 	public org.apache.derby.impl.jdbc.EmbedResultSet 
 	newEmbedResultSet(EmbedConnection conn, ResultSet results, boolean forMetaData, org.apache.derby.impl.jdbc.EmbedStatement
statement, boolean isAtomic)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml?view=diff&rev=510102&r1=510101&r2=510102
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml Wed Feb 21 09:08:33 2007
@@ -82,8 +82,8 @@
 	
   <target name="compile_jdbc2" depends="compile_jsr169">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -95,7 +95,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java13compile.classpath}"/>
+        <pathelement path="${java14compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/jdbc/AutoloadedDriver.java"/>
       <include name="${derby.dir}/jdbc/EmbeddedDriver.java"/>
@@ -109,8 +109,8 @@
 
  <target name="compile_jdbc3">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"



Mime
View raw message