List:NDB Connectors« Previous MessageNext Message »
From:Monty Taylor Date:December 7 2007 10:03am
Subject:Rev 350: Reverted jdk5 change. JDK6 is now the only supported JDK until further notice. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/...
View as plain text  
At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/devel

------------------------------------------------------------
revno: 350
revision-id: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: devel
timestamp: Fri 2007-12-07 02:03:14 -0800
message:
  Reverted jdk5 change. JDK6 is now the only supported JDK until further notice.
modified:
  java/.classpath                classpath-20071116042946-npnq9g3hwm24x1ga-1
  java/com/mysql/cluster/ndbj/NdbResultSet.java
ndbresultset.java-20070517181935-98huwjarzuh25b30-21
  java/com/mysql/cluster/ndbj/ThrowingResultSet.java
throwingresultset.ja-20071127095043-2ypprut7dyfhjkfy-1
=== modified file 'java/.classpath'
--- a/java/.classpath	2007-12-05 08:20:28 +0000
+++ b/java/.classpath	2007-12-07 10:03:14 +0000
@@ -5,8 +5,8 @@
 			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY"
value="ndbj-devel/.libs"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="/usr/share/java/junit.jar"/>
-	<classpathentry kind="lib" path="/usr/lib/jvm/java-6-sun/jre/lib/rt.jar"/>
 	<classpathentry kind="lib" path="lib/mysql-connector-java-5.1.5-bin.jar"/>
+	<classpathentry kind="lib" path="lib/junit.jar"/>
+	<classpathentry kind="lib"
path="/usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/rt.jar"/>
 	<classpathentry kind="output" path=""/>
 </classpath>

=== modified file 'java/com/mysql/cluster/ndbj/NdbResultSet.java'
--- a/java/com/mysql/cluster/ndbj/NdbResultSet.java	2007-12-07 08:29:57 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbResultSet.java	2007-12-07 10:03:14 +0000
@@ -13,7 +13,7 @@
  * Either access columns by name (String) or id (int).
  * Do not mix usage of access by name and id.
  */
-public interface NdbResultSet //extends java.sql.ResultSet 
+public interface NdbResultSet extends java.sql.ResultSet 
 {
 
     /**

=== modified file 'java/com/mysql/cluster/ndbj/ThrowingResultSet.java'
--- a/java/com/mysql/cluster/ndbj/ThrowingResultSet.java	2007-12-07 08:29:57 +0000
+++ b/java/com/mysql/cluster/ndbj/ThrowingResultSet.java	2007-12-07 10:03:14 +0000
@@ -8,30 +8,27 @@
 import java.sql.Blob;
 import java.sql.Clob;
 import java.sql.Date;
+import java.sql.NClob;
 import java.sql.Ref;
-//import java.sql.ResultSet;
-
+import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
-
-//import java.sql.NClob;
-//import java.sql.RowId;
+import java.sql.RowId;
 import java.sql.SQLException;
 import java.sql.SQLWarning;
-//import java.sql.SQLXML;
+import java.sql.SQLXML;
 import java.sql.Statement;
 import java.sql.Time;
 import java.sql.Timestamp;
 import java.util.Calendar;
 import java.util.Map;
 
-public class ThrowingResultSet { //implements java.sql.ResultSet {
-
-	// TODO: Seriously, figure out the NClob 1.5 vs. 1.6 ResultSet nonsense
-
-
-/*	 (non-Javadoc)
+public class ThrowingResultSet implements ResultSet {
+
+
+
+	/* (non-Javadoc)
 	 * @see java.sql.ResultSet#getNClob(int)
-	 
+	 */
 	public NClob getNClob(int arg0) throws SQLException {
 		// TODO Auto-generated method stub
 		// return null;
@@ -39,9 +36,9 @@
 		
 	}
 
-	 (non-Javadoc)
+	/* (non-Javadoc)
 	 * @see java.sql.ResultSet#getNClob(java.lang.String)
-	 
+	 */
 	public NClob getNClob(String arg0) throws SQLException {
 		// TODO Auto-generated method stub
 		// return null;
@@ -49,9 +46,9 @@
 		
 	}
 
-	 (non-Javadoc)
+	/* (non-Javadoc)
 	 * @see java.sql.ResultSet#getRowId(int)
-	 
+	 */
 	public RowId getRowId(int arg0) throws SQLException {
 		// TODO Auto-generated method stub
 		// return null;
@@ -59,9 +56,9 @@
 		
 	}
 
-	 (non-Javadoc)
+	/* (non-Javadoc)
 	 * @see java.sql.ResultSet#getRowId(java.lang.String)
-	 
+	 */
 	public RowId getRowId(String arg0) throws SQLException {
 		// TODO Auto-generated method stub
 		// return null;
@@ -69,9 +66,9 @@
 		
 	}
 
-	 (non-Javadoc)
+	/* (non-Javadoc)
 	 * @see java.sql.ResultSet#getSQLXML(int)
-	 
+	 */
 	public SQLXML getSQLXML(int arg0) throws SQLException {
 		// TODO Auto-generated method stub
 		// return null;
@@ -79,15 +76,15 @@
 		
 	}
 
-	 (non-Javadoc)
+	/* (non-Javadoc)
 	 * @see java.sql.ResultSet#getSQLXML(java.lang.String)
-	 
+	 */
 	public SQLXML getSQLXML(String arg0) throws SQLException {
 		// TODO Auto-generated method stub
 		// return null;
 		throw new NotImplementedException("getSQLXML");
 		
-	}*/
+	}
 
 	/* (non-Javadoc)
 	 * @see java.sql.ResultSet#updateAsciiStream(int, java.io.InputStream)
@@ -209,9 +206,9 @@
 		
 	}
 
-/*	 (non-Javadoc)
+	/* (non-Javadoc)
 	 * @see java.sql.ResultSet#updateNClob(int, java.sql.NClob)
-	 
+	 */
 	public void updateNClob(int arg0, NClob arg1) throws SQLException {
 		// TODO Auto-generated method stub
 		// 
@@ -219,9 +216,9 @@
 		
 	}
 
-	 (non-Javadoc)
+	/* (non-Javadoc)
 	 * @see java.sql.ResultSet#updateNClob(int, java.io.Reader)
-	 
+	 */
 	public void updateNClob(int arg0, Reader arg1) throws SQLException {
 		// TODO Auto-generated method stub
 		// 
@@ -229,9 +226,9 @@
 		
 	}
 
-	 (non-Javadoc)
+	/* (non-Javadoc)
 	 * @see java.sql.ResultSet#updateNClob(java.lang.String, java.sql.NClob)
-	 
+	 */
 	public void updateNClob(String arg0, NClob arg1) throws SQLException {
 		// TODO Auto-generated method stub
 		// 
@@ -239,9 +236,9 @@
 		
 	}
 
-	 (non-Javadoc)
+	/* (non-Javadoc)
 	 * @see java.sql.ResultSet#updateNClob(java.lang.String, java.io.Reader)
-	 
+	 */
 	public void updateNClob(String arg0, Reader arg1) throws SQLException {
 		// TODO Auto-generated method stub
 		// 
@@ -249,9 +246,9 @@
 		
 	}
 
-	 (non-Javadoc)
+	/* (non-Javadoc)
 	 * @see java.sql.ResultSet#updateRowId(int, java.sql.RowId)
-	 
+	 */
 	public void updateRowId(int arg0, RowId arg1) throws SQLException {
 		// TODO Auto-generated method stub
 		// 
@@ -259,9 +256,9 @@
 		
 	}
 
-	 (non-Javadoc)
+	/* (non-Javadoc)
 	 * @see java.sql.ResultSet#updateRowId(java.lang.String, java.sql.RowId)
-	 
+	 */
 	public void updateRowId(String arg0, RowId arg1) throws SQLException {
 		// TODO Auto-generated method stub
 		// 
@@ -269,9 +266,9 @@
 		
 	}
 
-	 (non-Javadoc)
+	/* (non-Javadoc)
 	 * @see java.sql.ResultSet#updateSQLXML(int, java.sql.SQLXML)
-	 
+	 */
 	public void updateSQLXML(int arg0, SQLXML arg1) throws SQLException {
 		// TODO Auto-generated method stub
 		// 
@@ -279,15 +276,15 @@
 		
 	}
 
-	 (non-Javadoc)
+	/* (non-Javadoc)
 	 * @see java.sql.ResultSet#updateSQLXML(java.lang.String, java.sql.SQLXML)
-	 
+	 */
 	public void updateSQLXML(String arg0, SQLXML arg1) throws SQLException {
 		// TODO Auto-generated method stub
 		// 
 		throw new NotImplementedException("updateSQLXML");
 		
-	}*/
+	}
 
 	/* (non-Javadoc)
 	 * @see java.sql.Wrapper#isWrapperFor(java.lang.Class)

Thread
Rev 350: Reverted jdk5 change. JDK6 is now the only supported JDK until further notice. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/...Monty Taylor7 Dec