This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libibatis-java.
commit 47e492193909ef017d4eb06b1b7cfacc125f7018 Author: Emmanuel Bourg <[email protected]> Date: Thu Jul 7 15:57:19 2016 +0200 Build with default-jdk instead of gcj-jdk --- debian/build.xml | 2 +- debian/changelog | 1 + debian/control | 3 +- debian/patches/01-jdbc-compatibility.patch | 238 +++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 4 +- src/com/ibatis/common/jdbc/SimpleDataSource.java | 12 ++ .../engine/type/CallableStatementResultSet.java | 207 ++++++++++++++++++ 8 files changed, 464 insertions(+), 4 deletions(-) diff --git a/debian/build.xml b/debian/build.xml index 769348f..8d72b07 100644 --- a/debian/build.xml +++ b/debian/build.xml @@ -9,7 +9,7 @@ <target name="compile" description="o Compile the source files"> <mkdir dir="${class.dir}"/> <javac srcdir="${source.dir}" destdir="${class.dir}" - debug="true" source="1.5"/> + debug="true" source="1.7" target="1.7"/> <copydir src="${source.dir}" dest="${class.dir}" includes="**/*.dtd"/> </target> diff --git a/debian/changelog b/debian/changelog index d04dea8..603cb80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ libibatis-java (2.3.4.726-6) UNRELEASED; urgency=medium + * Build with default-jdk instead of gcj-jdk * Depend on libcglib-java instead of libcglib3-java * Moved the package to Git * Standards-Version updated to 3.9.8 diff --git a/debian/control b/debian/control index 4f75389..fa534cb 100644 --- a/debian/control +++ b/debian/control @@ -6,10 +6,11 @@ Uploaders: Torsten Werner <[email protected]>, Varun Hiremath <[email protected] Build-Depends: ant, cdbs, debhelper (>= 9), - gcj-jdk, + default-jdk, libcglib-java, libcommons-dbcp-java, libcommons-logging-java, + libgeronimo-jta-1.2-spec-java, liblog4j1.2-java, liboscache-java, maven-debian-helper diff --git a/debian/patches/01-jdbc-compatibility.patch b/debian/patches/01-jdbc-compatibility.patch new file mode 100644 index 0000000..f229e52 --- /dev/null +++ b/debian/patches/01-jdbc-compatibility.patch @@ -0,0 +1,238 @@ +Description: Fixes the compatibility with the latest version of the JDBC API +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/src/com/ibatis/common/jdbc/SimpleDataSource.java ++++ b/src/com/ibatis/common/jdbc/SimpleDataSource.java +@@ -257,6 +257,18 @@ + return DriverManager.getLogWriter(); + } + ++ public java.util.logging.Logger getParentLogger() throws SQLFeatureNotSupportedException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public boolean isWrapperFor(Class<?> iface) throws SQLException { ++ return false; ++ } ++ ++ public <T> T unwrap(Class<T> iface) throws SQLException { ++ throw new UnsupportedOperationException(); ++ } ++ + /** + * If a connection has not been used in this many milliseconds, ping the + * database to make sure the connection is still good. +--- a/src/com/ibatis/sqlmap/engine/type/CallableStatementResultSet.java ++++ b/src/com/ibatis/sqlmap/engine/type/CallableStatementResultSet.java +@@ -595,4 +595,211 @@ + return cs.wasNull(); + } + ++ public RowId getRowId(int columnIndex) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public RowId getRowId(String columnLabel) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateRowId(int columnIndex, RowId x) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateRowId(String columnLabel, RowId x) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public int getHoldability() throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public boolean isClosed() throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateNString(int columnIndex, String nString) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateNString(String columnLabel, String nString) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateNClob(int columnIndex, NClob nClob) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateNClob(String columnLabel, NClob nClob) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public NClob getNClob(int columnIndex) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public NClob getNClob(String columnLabel) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public SQLXML getSQLXML(int columnIndex) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public SQLXML getSQLXML(String columnLabel) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateSQLXML(String columnLabel, SQLXML xmlObject) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public String getNString(int columnIndex) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public String getNString(String columnLabel) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public Reader getNCharacterStream(int columnIndex) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public Reader getNCharacterStream(String columnLabel) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateNCharacterStream(int columnIndex, Reader x, long length) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateCharacterStream(int columnIndex, Reader x, long length) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateClob(int columnIndex, Reader reader, long length) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateClob(String columnLabel, Reader reader, long length) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateCharacterStream(int columnIndex, Reader x) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateClob(int columnIndex, Reader reader) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateClob(String columnLabel, Reader reader) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateNClob(int columnIndex, Reader reader) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public void updateNClob(String columnLabel, Reader reader) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public <T> T unwrap(Class<T> iface) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } ++ ++ public boolean isWrapperFor(Class<?> iface) throws SQLException { ++ throw new UnsupportedOperationException("CallableStatement does not support this method."); ++ } + } diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..eca66d0 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01-jdbc-compatibility.patch diff --git a/debian/rules b/debian/rules index a1a8f4e..b83d80f 100755 --- a/debian/rules +++ b/debian/rules @@ -3,9 +3,9 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -JAVA_HOME := /usr/lib/jvm/java-gcj +JAVA_HOME := /usr/lib/jvm/default-java DEB_ANT_BUILDFILE := debian/build.xml -DEB_JARS := cglib commons-dbcp commons-logging log4j-1.2 oscache +DEB_JARS := cglib commons-dbcp commons-logging geronimo-jta-1.2-spec log4j-1.2 oscache install/libibatis-java:: # compatibility symlink diff --git a/src/com/ibatis/common/jdbc/SimpleDataSource.java b/src/com/ibatis/common/jdbc/SimpleDataSource.java index 85d51ae..576ea8e 100644 --- a/src/com/ibatis/common/jdbc/SimpleDataSource.java +++ b/src/com/ibatis/common/jdbc/SimpleDataSource.java @@ -257,6 +257,18 @@ public class SimpleDataSource implements DataSource { return DriverManager.getLogWriter(); } + public java.util.logging.Logger getParentLogger() throws SQLFeatureNotSupportedException { + throw new SQLFeatureNotSupportedException(); + } + + public boolean isWrapperFor(Class<?> iface) throws SQLException { + return false; + } + + public <T> T unwrap(Class<T> iface) throws SQLException { + throw new UnsupportedOperationException(); + } + /** * If a connection has not been used in this many milliseconds, ping the * database to make sure the connection is still good. diff --git a/src/com/ibatis/sqlmap/engine/type/CallableStatementResultSet.java b/src/com/ibatis/sqlmap/engine/type/CallableStatementResultSet.java index cdcd6e8..b58d16e 100644 --- a/src/com/ibatis/sqlmap/engine/type/CallableStatementResultSet.java +++ b/src/com/ibatis/sqlmap/engine/type/CallableStatementResultSet.java @@ -595,4 +595,211 @@ public class CallableStatementResultSet implements ResultSet { return cs.wasNull(); } + public RowId getRowId(int columnIndex) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public RowId getRowId(String columnLabel) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateRowId(int columnIndex, RowId x) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateRowId(String columnLabel, RowId x) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public int getHoldability() throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public boolean isClosed() throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateNString(int columnIndex, String nString) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateNString(String columnLabel, String nString) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateNClob(int columnIndex, NClob nClob) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateNClob(String columnLabel, NClob nClob) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public NClob getNClob(int columnIndex) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public NClob getNClob(String columnLabel) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public SQLXML getSQLXML(int columnIndex) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public SQLXML getSQLXML(String columnLabel) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateSQLXML(String columnLabel, SQLXML xmlObject) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public String getNString(int columnIndex) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public String getNString(String columnLabel) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public Reader getNCharacterStream(int columnIndex) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public Reader getNCharacterStream(String columnLabel) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateNCharacterStream(int columnIndex, Reader x, long length) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateCharacterStream(int columnIndex, Reader x, long length) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateClob(int columnIndex, Reader reader, long length) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateClob(String columnLabel, Reader reader, long length) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateCharacterStream(int columnIndex, Reader x) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateClob(int columnIndex, Reader reader) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateClob(String columnLabel, Reader reader) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateNClob(int columnIndex, Reader reader) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public void updateNClob(String columnLabel, Reader reader) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public <T> T getObject(int columnIndex, Class<T> type) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public <T> T getObject(String columnLabel, Class<T> type) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public <T> T unwrap(Class<T> iface) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } + + public boolean isWrapperFor(Class<?> iface) throws SQLException { + throw new UnsupportedOperationException("CallableStatement does not support this method."); + } } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libibatis-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
