Build for IKVM.OpenJDK.Jdbc.dll added

5 files changed, 27 insertions, 9 deletions

diff --git a/ikvm.build b/ikvm.build
index b01d655e..3a7fd2d5 100644
--- a/ikvm.build
+++ b/ikvm.build
@@ -31,6 +31,7 @@
                 <include name="bin/IKVM.OpenJDK.Charsets.dll" />
                 <include name="bin/IKVM.OpenJDK.Corba.dll" />
                 <include name="bin/IKVM.OpenJDK.Core.dll" />
+                <include name="bin/IKVM.OpenJDK.Jdbc.dll" />
                 <include name="bin/IKVM.OpenJDK.Management.dll" />
                 <include name="bin/IKVM.OpenJDK.Misc.dll" />
                 <include name="bin/IKVM.OpenJDK.Security.dll" />
diff --git a/openjdk/allsources.lst b/openjdk/allsources.lst
index 622822de..6b557163 100644
--- a/openjdk/allsources.lst
+++ b/openjdk/allsources.lst
@@ -1096,6 +1096,18 @@ sun/awt/image/IntegerComponentRaster.java
 sun/awt/image/OffScreenImageSource.java
 sun/awt/image/ShortComponentRaster.java
 sun/awt/image/SunWritableRaster.java
+sun/jdbc/odbc/JdbcOdbcCallableStatement.java
+sun/jdbc/odbc/JdbcOdbcConnection.java
+sun/jdbc/odbc/JdbcOdbcDatabaseMetaData.java
+sun/jdbc/odbc/JdbcOdbcDriver.java
+sun/jdbc/odbc/JdbcOdbcDTResultSet.java
+sun/jdbc/odbc/JdbcOdbcDTResultSetMetaData.java
+sun/jdbc/odbc/JdbcOdbcObject.java
+sun/jdbc/odbc/JdbcOdbcPreparedStatement.java
+sun/jdbc/odbc/JdbcOdbcResultSet.java
+sun/jdbc/odbc/JdbcOdbcResultSetMetaData.java
+sun/jdbc/odbc/JdbcOdbcStatement.java
+sun/jdbc/odbc/JdbcOdbcUtils.java
 sun/management/ManagementFactory.java
 sun/misc/FileURLMapper.java
 sun/misc/Launcher.java
diff --git a/openjdk/openjdk.build b/openjdk/openjdk.build
index 4700a529..60a8af93 100644
--- a/openjdk/openjdk.build
+++ b/openjdk/openjdk.build
@@ -55,7 +55,7 @@
                 </replacetokens>
             </filterchain>
         </copy>
-        <exec program="javac" commandline="-J-Xmx1536M -g -nowarn -bootclasspath ../classpath/mscorlib.jar${pathsep}../classpath/System.jar${pathsep}../classpath/System.Core.jar${pathsep}../classpath/System.Drawing.jar${pathsep}../classpath/IKVM.Runtime.jar @allsources.lst" useruntimeengine="false" />
+        <exec program="javac" commandline="-J-Xmx1536M -g -nowarn -bootclasspath ../classpath/mscorlib.jar${pathsep}../classpath/System.jar${pathsep}../classpath/System.Core.jar${pathsep}../classpath/System.Data.jar${pathsep}../classpath/System.Drawing.jar${pathsep}../classpath/IKVM.Runtime.jar @allsources.lst" useruntimeengine="false" />
     </target>
 
     <target name="vfs">
@@ -101,6 +101,7 @@
             <exec program="peverify" commandline="-quiet IKVM.OpenJDK.Charsets.dll" />
             <exec program="peverify" commandline="-quiet IKVM.OpenJDK.Corba.dll" />
             <exec program="peverify" commandline="-quiet IKVM.OpenJDK.Core.dll" />
+            <exec program="peverify" commandline="-quiet IKVM.OpenJDK.Jdbc.dll" />
             <exec program="peverify" commandline="-quiet IKVM.OpenJDK.Management.dll" />
             <exec program="peverify" commandline="-quiet IKVM.OpenJDK.Misc.dll" />
             <exec program="peverify" commandline="-quiet IKVM.OpenJDK.Security.dll" />
diff --git a/openjdk/response.txt b/openjdk/response.txt
index 107c4781..b1591b3f 100644
--- a/openjdk/response.txt
+++ b/openjdk/response.txt
@@ -765,13 +765,11 @@ assembly.class
     -recurse:../../openjdk6-b12/control/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/jndi/cosnaming/jndiprovider.properties
     -recurse:../../openjdk6-b12/control/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/jndi/ldap/jndiprovider.properties
     -recurse:../../openjdk6-b12/control/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/rowset/*
-    -recurse:../../openjdk6-b12/control/build/linux-amd64/j2re-image/lib/resources.jar/javax/sql/*
     -recurse:../../openjdk6-b12/control/build/linux-amd64/j2re-image/lib/resources.jar/sun/print/*
     -recurse:../../openjdk6-b12/control/build/linux-amd64/j2re-image/lib/resources.jar/sun/rmi/*
 	-r:System.Drawing
     com/sun/imageio/plugins/jpeg/*.class
     icedtea/rt/com/sun/media/sound/*.class
-    java/sql/*.class
     sun/net/dns/*.class
     ServiceUI.class
     ../../openjdk6-b12/control/build/linux-amd64/impsrc/com/sun/activation/registries/*.class
@@ -839,7 +837,6 @@ assembly.class
     ../../openjdk6-b12/jdk/src/share/classes/java/rmi/dgc/*.class
     ../../openjdk6-b12/jdk/src/share/classes/java/rmi/registry/*.class
     ../../openjdk6-b12/jdk/src/share/classes/java/rmi/server/*.class
-    ../../openjdk6-b12/jdk/src/share/classes/java/sql/*.class
     ../../openjdk6-b12/jdk/src/share/classes/javax/accessibility/*.class
     ../../openjdk6-b12/jdk/src/share/classes/javax/imageio/*.class
     ../../openjdk6-b12/jdk/src/share/classes/javax/imageio/event/*.class
@@ -864,10 +861,6 @@ assembly.class
     ../../openjdk6-b12/jdk/src/share/classes/javax/sound/midi/spi/*.class
     ../../openjdk6-b12/jdk/src/share/classes/javax/sound/sampled/*.class
     ../../openjdk6-b12/jdk/src/share/classes/javax/sound/sampled/spi/*.class
-    ../../openjdk6-b12/jdk/src/share/classes/javax/sql/*.class
-    ../../openjdk6-b12/jdk/src/share/classes/javax/sql/rowset/*.class
-    ../../openjdk6-b12/jdk/src/share/classes/javax/sql/rowset/serial/*.class
-    ../../openjdk6-b12/jdk/src/share/classes/javax/sql/rowset/spi/*.class
     ../../openjdk6-b12/jdk/src/share/classes/sun/beans/editors/*.class
     ../../openjdk6-b12/jdk/src/share/classes/sun/beans/infos/*.class
     ../../openjdk6-b12/jdk/src/share/classes/sun/io/ByteToCharASCII.class
@@ -944,3 +937,14 @@ assembly.class
     ../../openjdk6-b12/jdk/src/share/classes/sunw/io/*.class
     ../../openjdk6-b12/jdk/src/share/classes/sunw/util/*.class
 }
+{
+    -out:IKVM.OpenJDK.Jdbc.dll
+    -recurse:../../openjdk6-b12/control/build/linux-amd64/j2re-image/lib/resources.jar/javax/sql/*
+    -r:System.Drawing
+    java/sql/*.class
+    ../../openjdk6-b12/jdk/src/share/classes/java/sql/*.class
+    ../../openjdk6-b12/jdk/src/share/classes/javax/sql/*.class
+    ../../openjdk6-b12/jdk/src/share/classes/javax/sql/rowset/*.class
+    ../../openjdk6-b12/jdk/src/share/classes/javax/sql/rowset/serial/*.class
+    ../../openjdk6-b12/jdk/src/share/classes/javax/sql/rowset/spi/*.class
+}
diff --git a/openjdk/sun/jdbc/odbc/JdbcOdbcCallableStatement.java b/openjdk/sun/jdbc/odbc/JdbcOdbcCallableStatement.java
index 6a890c4c..39ca89d7 100644
--- a/openjdk/sun/jdbc/odbc/JdbcOdbcCallableStatement.java
+++ b/openjdk/sun/jdbc/odbc/JdbcOdbcCallableStatement.java
@@ -333,7 +333,7 @@ public class JdbcOdbcCallableStatement extends JdbcOdbcPreparedStatement impleme
     }
 
 
-    public final URL getURL(int parameterIndex){
+    public final URL getURL(int parameterIndex) throws SQLException{
         return parameters.getURL(parameterIndex);
     }