Author: rhillegas
Date: Fri May  5 14:11:29 2006
New Revision: 400172

URL: http://svn.apache.org/viewcvs?rev=400172&view=rev
Log:
DERBY-1253: Commit bug1253_verifier4_networkResultSet. This changes the NotSupported exception raised by network ResultSets to be one of the UnimplementedFeature exceptions which are mapped to SQLFeatureNotSupportedException under JDBC4. Also added more excludable methods to the UnsupportedVetter test.

Removed:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/updatableResultSet.out
Modified:
    db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/updatableResultSet.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/UnsupportedVetter.java

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java?rev=400172&r1=400171&r2=400172&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java Fri May  5 14:11:29 2006
@@ -5343,8 +5343,7 @@
     private SQLException jdbc3MethodNotSupported()
     {
         // This will get internationalized in another patch
-        return new SqlException(agent_.logWriter_, 
-            "JDBC 3 method called - not yet supported").getSQLException();
+        return SQLExceptionFactory.notImplemented( "JDBC 3 method called - not yet supported");
     }
     
     // -------------------------- JDBC 4.0 --------------------------

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java?rev=400172&r1=400171&r2=400172&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java Fri May  5 14:11:29 2006
@@ -196,6 +196,9 @@
 			searchStrings.addElement("No suitable driver found for [0-9A-Za-z:]*");			
 			searchStrings.addElement("No suitable driver;[0-9A-Za-z:=]*");			
 			searchStrings.addElement("SQL Exception: No suitable driver");			
+
+			// Timestamp diagnostic looks a little different under jdk16
+			searchStrings.addElement("\\[\\.fffffffff\\]");			
 		}
 		
         Vector subStrings = new Vector();
@@ -257,6 +260,8 @@
 			subStrings.addElement("No suitable driver");
 			subStrings.addElement("No suitable driver");
 			subStrings.addElement("java.sql.SQLException: No suitable driver");
+
+			subStrings.addElement(".fffffffff");
 		}
 
 		doWork(srcFile, dstFile, null, deleteLines, searchStrings, subStrings, isSed, isI18N);