db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r440321 - in /db/derby/code/trunk/java: client/ client/org/apache/derby/client/am/ engine/org/apache/derby/impl/jdbc/ engine/org/apache/derby/jdbc/ testing/org/apache/derbyTesting/functionTests/tests/jdbc4/
Date Tue, 05 Sep 2006 11:32:43 GMT
Author: kahatlen
Date: Tue Sep  5 04:32:42 2006
New Revision: 440321

URL: http://svn.apache.org/viewvc?view=rev&rev=440321
Log:
DERBY-1768: Removed empty JDBC 4.0 RowId classes

Removed:
    db/derby/code/trunk/java/client/org/apache/derby/client/am/RowId.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedRowId.java
Modified:
    db/derby/code/trunk/java/client/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver40.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/RowIdNotImplementedTest.java

Modified: db/derby/code/trunk/java/client/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/build.xml?view=diff&rev=440321&r1=440320&r2=440321
==============================================================================
--- db/derby/code/trunk/java/client/build.xml (original)
+++ db/derby/code/trunk/java/client/build.xml Tue Sep  5 04:32:42 2006
@@ -61,7 +61,7 @@
       proceed="${proceed}"
       verbose="${verbose}"
       srcdir="${derby.client.src.dir}"
-      excludes="**/*40.java,**/RowId.java" 
+      excludes="**/*40.java" 
       destdir="${out.dir}">
       <classpath>
           <pathelement path="${jce1_2_1}"/>
@@ -85,7 +85,7 @@
       proceed="${proceed}"
       verbose="${verbose}"
       srcdir="${derby.client.src.dir}"
-      includes="**/*40.java,**/RowId.java" 
+      includes="**/*40.java" 
       destdir="${out.dir}">
       <classpath>
         <pathelement path="${jce1_2_1}"/>

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=440321&r1=440320&r2=440321
==============================================================================
--- 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 Tue Sep  5 04:32:42
2006
@@ -58,7 +58,6 @@
 	  <exclude name="${derby.dir}/impl/jdbc/*20.java"/>
 	  <exclude name="${derby.dir}/impl/jdbc/*30.java"/>
 	  <exclude name="${derby.dir}/impl/jdbc/*40.java"/>
-          <exclude name="${derby.dir}/impl/jdbc/EmbedRowId.java"/>
    </javac>
     <copy file="metadata.properties" tofile="${out.dir}/org/apache/derby/impl/jdbc/metadata.properties"/>
     <javac
@@ -184,7 +183,6 @@
             <pathelement path="${java16compile.classpath}"/>
         </classpath>
         <include name="${derby.dir}/impl/jdbc/*40.java"/>
-        <include name="${derby.dir}/impl/jdbc/EmbedRowId.java"/>
     </javac>
 </target> 
 </project>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver40.java?view=diff&rev=440321&r1=440320&r2=440321
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver40.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver40.java Tue Sep  5 04:32:42
2006
@@ -32,7 +32,6 @@
 import org.apache.derby.impl.jdbc.EmbedConnection30;
 import org.apache.derby.impl.jdbc.EmbedPreparedStatement40;
 import org.apache.derby.impl.jdbc.EmbedCallableStatement40;
-import org.apache.derby.impl.jdbc.EmbedRowId;
 import org.apache.derby.impl.jdbc.EmbedConnection40;
 import org.apache.derby.impl.jdbc.EmbedResultSet;
 import org.apache.derby.impl.jdbc.EmbedResultSet40;
@@ -132,10 +131,6 @@
     public EmbedResultSet newEmbedResultSet(EmbedConnection conn, ResultSet results, boolean
forMetaData, org.apache.derby.impl.jdbc.EmbedStatement statement,boolean isAtomic) throws
SQLException {
         return new EmbedResultSet40(conn, results, forMetaData, statement,
             isAtomic);
-    }
-    
-    public EmbedRowId newEmbedRowId() throws SQLException {
-        return new EmbedRowId();
     }
     
     /**

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/RowIdNotImplementedTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/RowIdNotImplementedTest.java?view=diff&rev=440321&r1=440320&r2=440321
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/RowIdNotImplementedTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/RowIdNotImplementedTest.java
Tue Sep  5 04:32:42 2006
@@ -21,7 +21,6 @@
 package org.apache.derbyTesting.functionTests.tests.jdbc4;
 
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derby.impl.jdbc.EmbedRowId;
 
 import junit.framework.*;
 
@@ -153,46 +152,6 @@
         meta = null;
     }
 
-    public void testRowIdEquals() {
-        RowId rowId = getRowId();
-        try {
-            rowId.equals(rowId);
-            fail("RowId.equals should not be implemented");
-        } catch (UnsupportedOperationException uoe) {
-            // Do nothing, we are fine.
-        }
-    }
-    
-    public void testRowIdGetBytes() {
-        RowId rowId = getRowId();
-        try {
-            rowId.getBytes();
-            fail("RowId.getBytes should not be implemented");
-        } catch (UnsupportedOperationException uoe) {
-            // Do nothing, we are fine.
-        }
-    }
-
-    public void testRowIdToString() {
-        RowId rowId = getRowId();
-        try {
-            rowId.toString();
-            fail("RowId.toString should not be implemented");
-        } catch (UnsupportedOperationException uoe) {
-            // Do nothing, we are fine.
-        }
-    }
-
-    public void testRowIdHashCode() {
-        RowId rowId = getRowId();
-        try {
-            rowId.hashCode();
-            fail("RowId.hashCode should not be implemented");
-        } catch (UnsupportedOperationException uoe) {
-            // Do nothing, we are fine.
-        }
-    }
-
     /**
      * Create a callable statement.
      *
@@ -215,14 +174,6 @@
         throws SQLException {
         // Create a very simple resultset.
         return createStatement().executeQuery("values 1");
-    }
-    
-    /**
-     * Create a <code>RowId</code>-object.
-     */
-    public java.sql.RowId getRowId() {
-        EmbedRowId embRowId = new EmbedRowId();
-        return (java.sql.RowId)embRowId;
     }
     
     /**



Mime
View raw message