From 0e23ffcd8f4ae01aff8cec64dc1aea79f7c955580dbbe71a16cd0d4c9a35ad88 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 7 Aug 2008 09:59:22 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mysql-connector-java?expand=0&rev=3 --- mysql-connector-java-3.1.12.tar.gz | 3 - ...ector-java-5.0.8-java6-compatibility.patch | 1659 +++++++++++++++++ mysql-connector-java-5.0.8.tar.bz2 | 3 + mysql-connector-java-build_xml.patch | 68 + mysql-connector-java-java14compat.patch | 58 - mysql-connector-java-target-javadoc.patch | 34 + mysql-connector-java.changes | 10 + mysql-connector-java.spec | 160 +- patch-build.xml | 13 - 9 files changed, 1904 insertions(+), 104 deletions(-) delete mode 100644 mysql-connector-java-3.1.12.tar.gz create mode 100644 mysql-connector-java-5.0.8-java6-compatibility.patch create mode 100644 mysql-connector-java-5.0.8.tar.bz2 create mode 100644 mysql-connector-java-build_xml.patch delete mode 100644 mysql-connector-java-java14compat.patch create mode 100644 mysql-connector-java-target-javadoc.patch delete mode 100644 patch-build.xml diff --git a/mysql-connector-java-3.1.12.tar.gz b/mysql-connector-java-3.1.12.tar.gz deleted file mode 100644 index 053c0a9..0000000 --- a/mysql-connector-java-3.1.12.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a23c73462260c6fad956c60ad814e3a48891ee601ae3cbeb0b9d94a2dd0ad726 -size 8014757 diff --git a/mysql-connector-java-5.0.8-java6-compatibility.patch b/mysql-connector-java-5.0.8-java6-compatibility.patch new file mode 100644 index 0000000..0449708 --- /dev/null +++ b/mysql-connector-java-5.0.8-java6-compatibility.patch @@ -0,0 +1,1659 @@ +--- src/com/mysql/jdbc/Blob.java ++++ src/com/mysql/jdbc/Blob.java +@@ -27,8 +27,11 @@ + import java.io.ByteArrayInputStream; + import java.io.IOException; + import java.io.OutputStream; ++import java.io.InputStream; + + import java.sql.SQLException; ++import java.sql.RowId; ++import java.sql.SQLFeatureNotSupportedException; + + /** + * The representation (mapping) in the JavaTM programming language of an SQL +@@ -244,4 +247,14 @@ + public void truncate(long arg0) throws SQLException { + throw new NotImplemented(); + } ++ ++ // Java6 build - interface java.sql.Blob ++ ++ public void free() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public InputStream getBinaryStream(long pos, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } + } +--- src/com/mysql/jdbc/BlobFromLocator.java ++++ src/com/mysql/jdbc/BlobFromLocator.java +@@ -29,6 +29,7 @@ + import java.io.InputStream; + import java.io.OutputStream; + import java.sql.SQLException; ++import java.sql.SQLFeatureNotSupportedException; + import java.util.ArrayList; + import java.util.List; + +@@ -667,4 +668,13 @@ + super.close(); + } + } ++ // Java6 build - interface java.sql.Blob ++ ++ public void free() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public InputStream getBinaryStream(long pos, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } + } +--- src/com/mysql/jdbc/CallableStatement.java ++++ src/com/mysql/jdbc/CallableStatement.java +@@ -40,6 +40,11 @@ + import java.sql.Time; + import java.sql.Timestamp; + import java.sql.Types; ++import java.sql.RowId; ++import java.sql.Blob; ++import java.sql.NClob; ++import java.sql.SQLXML; ++import java.sql.SQLFeatureNotSupportedException; + + import java.util.ArrayList; + import java.util.Calendar; +@@ -346,6 +351,16 @@ + public CallableStatementParamInfoJDBC3(CallableStatementParamInfo paramInfo) { + super(paramInfo); + } ++ ++ // Java6 build - interface java.sql.Wrapper ++ ++ public T unwrap(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } + } + + private final static int NOT_OUTPUT_PARAMETER_INDICATOR = Integer.MIN_VALUE; +@@ -2178,4 +2193,144 @@ + + return super.getParameterIndexOffset(); + } ++ ++ // Java6 build - interface java.sql.CallableStatement ++ ++ public RowId getRowId(int parameterIndex) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public RowId getRowId(String parameterName) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setRowId(String parameterName, RowId x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNString(String parameterName, String value) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNCharacterStream(String parameterName, Reader value, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNClob(String parameterName, NClob value) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setClob(String parameterName, Reader reader, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setBlob(String parameterName, InputStream inputStream, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNClob(String parameterName, Reader reader, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public NClob getNClob (int parameterIndex) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public NClob getNClob (String parameterName) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setSQLXML(String parameterName, SQLXML xmlObject) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public SQLXML getSQLXML(int parameterIndex) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public SQLXML getSQLXML(String parameterName) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public String getNString(int parameterIndex) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public String getNString(String parameterName) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public java.io.Reader getNCharacterStream(int parameterIndex) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public java.io.Reader getNCharacterStream(String parameterName) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public java.io.Reader getCharacterStream(int parameterIndex) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public java.io.Reader getCharacterStream(String parameterName) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setBlob (String parameterName, Blob x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setClob (String parameterName, Clob x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setAsciiStream(String parameterName, java.io.InputStream x, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setBinaryStream(String parameterName, java.io.InputStream x, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setCharacterStream(String parameterName, java.io.Reader reader, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setAsciiStream(String parameterName, java.io.InputStream x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setBinaryStream(String parameterName, java.io.InputStream x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setCharacterStream(String parameterName, java.io.Reader reader) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNCharacterStream(String parameterName, Reader value) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setClob(String parameterName, Reader reader) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setBlob(String parameterName, InputStream inputStream) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNClob(String parameterName, Reader reader) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ // Java6 build - interface java.sql.Wrapper ++ ++ public T unwrap(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } + } +--- src/com/mysql/jdbc/Clob.java ++++ src/com/mysql/jdbc/Clob.java +@@ -32,6 +32,7 @@ + import java.io.Writer; + + import java.sql.SQLException; ++import java.sql.SQLFeatureNotSupportedException; + + /** + * Simplistic implementation of java.sql.Clob for MySQL Connector/J +@@ -287,4 +288,13 @@ + + this.charData = out.toString(); + } ++ // Java6 build - interface java.sql.Clob ++ ++ public void free() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public Reader getCharacterStream(long pos, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } + } +--- src/com/mysql/jdbc/Connection.java ++++ src/com/mysql/jdbc/Connection.java +@@ -53,6 +53,12 @@ + import java.sql.Savepoint; + import java.sql.Time; + import java.sql.Timestamp; ++import java.sql.NClob; ++import java.sql.SQLXML; ++import java.sql.SQLClientInfoException; ++import java.sql.SQLFeatureNotSupportedException; ++import java.sql.Struct; ++import java.sql.RowId; + + import java.util.ArrayList; + import java.util.Calendar; +@@ -1020,6 +1026,238 @@ + public boolean wasNull() throws SQLException { + throw SQLError.createSQLException("Not supported"); + } ++ ++ // Java6 build - interface java.sql.CallableStatement ++ ++ public RowId getRowId(int parameterIndex) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public RowId getRowId(String parameterName) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setRowId(String parameterName, RowId x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNString(String parameterName, String value) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNCharacterStream(String parameterName, Reader value, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNClob(String parameterName, NClob value) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setClob(String parameterName, Reader reader, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setBlob(String parameterName, InputStream inputStream, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNClob(String parameterName, Reader reader, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public NClob getNClob (int parameterIndex) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public NClob getNClob (String parameterName) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setSQLXML(String parameterName, SQLXML xmlObject) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public SQLXML getSQLXML(int parameterIndex) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public SQLXML getSQLXML(String parameterName) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public String getNString(int parameterIndex) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public String getNString(String parameterName) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public java.io.Reader getNCharacterStream(int parameterIndex) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public java.io.Reader getNCharacterStream(String parameterName) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public java.io.Reader getCharacterStream(int parameterIndex) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public java.io.Reader getCharacterStream(String parameterName) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setBlob (String parameterName, Blob x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setClob (String parameterName, Clob x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setAsciiStream(String parameterName, java.io.InputStream x, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setBinaryStream(String parameterName, java.io.InputStream x, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setCharacterStream(String parameterName, java.io.Reader reader, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setAsciiStream(String parameterName, java.io.InputStream x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setBinaryStream(String parameterName, java.io.InputStream x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setCharacterStream(String parameterName, java.io.Reader reader) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNCharacterStream(String parameterName, Reader value) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setClob(String parameterName, Reader reader) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setBlob(String parameterName, InputStream inputStream) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNClob(String parameterName, Reader reader) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ // Java6 build - interface java.sql.Wrapper ++ ++ public T unwrap(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ // Java6 build - interface java.sql.PreparedStatement ++ ++ public void setRowId(int parameterIndex, RowId x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNString(int parameterIndex, String value) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNClob(int parameterIndex, NClob value) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setClob(int parameterIndex, Reader reader, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ /*public void setObject(int parameterIndex, Object x, int targetSqlType, int scaleOrLength) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ }*/ ++ ++ public void setAsciiStream(int parameterIndex, java.io.InputStream x, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setBinaryStream(int parameterIndex, java.io.InputStream x, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setCharacterStream(int parameterIndex, java.io.Reader reader, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setAsciiStream(int parameterIndex, java.io.InputStream x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setBinaryStream(int parameterIndex, java.io.InputStream x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setCharacterStream(int parameterIndex, java.io.Reader reader) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setClob(int parameterIndex, Reader reader) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNClob(int parameterIndex, Reader reader) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ // Java6 build - interface java.sql.Statement ++ ++ public boolean isClosed() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setPoolable(boolean poolable) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public boolean isPoolable() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } + } + + /** +@@ -5991,4 +6229,60 @@ + } + } + } +-} +\ No newline at end of file ++ ++ // Java6 build - interface java.sql.Connection ++ ++ public Clob createClob() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public Blob createBlob() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public NClob createNClob() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public SQLXML createSQLXML() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public boolean isValid(int timeout) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setClientInfo(String name, String value) throws SQLClientInfoException { ++ throw new SQLClientInfoException(); ++ } ++ ++ public void setClientInfo(Properties properties) throws SQLClientInfoException { ++ throw new SQLClientInfoException(); ++ } ++ ++ public String getClientInfo(String name) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public Properties getClientInfo() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public java.sql.Array createArrayOf(String typeName, Object[] elements) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public Struct createStruct(String typeName, Object[] attributes) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ // Java6 build - interface java.sql.Wrapper ++ ++ public T unwrap(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++} +--- src/com/mysql/jdbc/DatabaseMetaData.java ++++ src/com/mysql/jdbc/DatabaseMetaData.java +@@ -30,6 +30,8 @@ + import java.sql.SQLException; + import java.sql.Statement; + import java.sql.Types; ++import java.sql.RowIdLifetime; ++import java.sql.SQLFeatureNotSupportedException; + + import java.util.ArrayList; + import java.util.Collections; +@@ -7937,4 +7939,43 @@ + public boolean usesLocalFiles() throws SQLException { + return false; + } ++ // Java6 build - interface java.sql.DatabaseMetaData ++ ++ public RowIdLifetime getRowIdLifetime() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public ResultSet getSchemas(String catalog, String schemaPattern) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public boolean supportsStoredFunctionsUsingCallSyntax() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public boolean autoCommitFailureClosesAllResultSets() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public ResultSet getClientInfoProperties() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public ResultSet getFunctions(String catalog, String schemaPattern, String functionNamePattern) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public ResultSet getFunctionColumns(String catalog, String schemaPattern, String functionNamePattern, String columnNamePattern) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ // Java6 build - interface java.sql.Wrapper ++ ++ public T unwrap(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } + } +--- src/com/mysql/jdbc/MysqlParameterMetadata.java ++++ src/com/mysql/jdbc/MysqlParameterMetadata.java +@@ -26,6 +26,7 @@ + import java.sql.ParameterMetaData; + import java.sql.SQLException; + import java.sql.Types; ++import java.sql.SQLFeatureNotSupportedException; + + public class MysqlParameterMetadata implements ParameterMetaData { + boolean returnSimpleMetadata = false; +@@ -159,4 +160,14 @@ + + } + } ++ ++ // Java6 build - interface java.sql.Wrapper ++ ++ public T unwrap(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } + } +--- src/com/mysql/jdbc/PreparedStatement.java ++++ src/com/mysql/jdbc/PreparedStatement.java +@@ -43,6 +43,11 @@ + import java.sql.Time; + import java.sql.Timestamp; + import java.sql.Types; ++import java.sql.RowId; ++import java.sql.Blob; ++import java.sql.NClob; ++import java.sql.SQLFeatureNotSupportedException; ++import java.sql.SQLXML; + import java.text.ParsePosition; + import java.text.SimpleDateFormat; + import java.util.ArrayList; +@@ -4083,4 +4088,92 @@ + protected int getParameterIndexOffset() { + return 0; + } ++ ++ // Java6 build - interface java.sql.PreparedStatement ++ ++ public void setRowId(int parameterIndex, RowId x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNString(int parameterIndex, String value) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNClob(int parameterIndex, NClob value) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setClob(int parameterIndex, Reader reader, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ /*public void setObject(int parameterIndex, Object x, int targetSqlType, int scaleOrLength) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ }*/ ++ ++ public void setAsciiStream(int parameterIndex, java.io.InputStream x, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setBinaryStream(int parameterIndex, java.io.InputStream x, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setCharacterStream(int parameterIndex, java.io.Reader reader, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setAsciiStream(int parameterIndex, java.io.InputStream x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setBinaryStream(int parameterIndex, java.io.InputStream x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setCharacterStream(int parameterIndex, java.io.Reader reader) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setClob(int parameterIndex, Reader reader) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNClob(int parameterIndex, Reader reader) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ // Java6 build - interface java.sql.Wrapper ++ ++ public T unwrap(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } + } +--- src/com/mysql/jdbc/ReplicationConnection.java ++++ src/com/mysql/jdbc/ReplicationConnection.java +@@ -28,6 +28,13 @@ + import java.sql.SQLWarning; + import java.sql.Savepoint; + import java.sql.Statement; ++import java.sql.Clob; ++import java.sql.NClob; ++import java.sql.Blob; ++import java.sql.SQLXML; ++import java.sql.SQLFeatureNotSupportedException; ++import java.sql.Struct; ++import java.sql.SQLClientInfoException; + import java.util.Map; + import java.util.Properties; + +@@ -557,4 +564,58 @@ + this.slavesConnection.ping(); + } + } +-} +\ No newline at end of file ++ // Java6 build - interface java.sql.Connection ++ ++ public Clob createClob() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public Blob createBlob() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public NClob createNClob() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public SQLXML createSQLXML() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public boolean isValid(int timeout) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setClientInfo(String name, String value) throws SQLClientInfoException { ++ throw new SQLClientInfoException(); ++ } ++ ++ public void setClientInfo(Properties properties) throws SQLClientInfoException { ++ throw new SQLClientInfoException(); ++ } ++ ++ public String getClientInfo(String name) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public Properties getClientInfo() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public java.sql.Array createArrayOf(String typeName, Object[] elements) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public Struct createStruct(String typeName, Object[] attributes) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ // Java6 build - interface java.sql.Wrapper ++ ++ public T unwrap(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++} +--- src/com/mysql/jdbc/ResultSet.java ++++ src/com/mysql/jdbc/ResultSet.java +@@ -33,6 +33,7 @@ + import java.io.ObjectInputStream; + import java.io.StringReader; + import java.io.UnsupportedEncodingException; ++import java.io.Reader; + + import java.math.BigDecimal; + import java.math.BigInteger; +@@ -49,6 +50,10 @@ + import java.sql.Time; + import java.sql.Timestamp; + import java.sql.Types; ++import java.sql.RowId; ++import java.sql.NClob; ++import java.sql.SQLXML; ++import java.sql.SQLFeatureNotSupportedException; + + import java.util.Calendar; + import java.util.GregorianCalendar; +@@ -9087,4 +9092,207 @@ + SQLError.SQL_STATE_GENERAL_ERROR); + } + } ++ ++ // Java6 build - interface java.sql.ResultSet ++ public RowId getRowId(int columnIndex) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public RowId getRowId(String columnLabel) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateRowId(int columnIndex, RowId x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateRowId(String columnLabel, RowId x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public int getHoldability() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public boolean isClosed() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateNString(int columnIndex, String nString) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateNString(String columnLabel, String nString) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateNClob(int columnIndex, NClob nClob) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateNClob(String columnLabel, NClob nClob) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public NClob getNClob(int columnIndex) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public NClob getNClob(String columnLabel) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public SQLXML getSQLXML(int columnIndex) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public SQLXML getSQLXML(String columnLabel) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateSQLXML(String columnLabel, SQLXML xmlObject) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public String getNString(int columnIndex) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public String getNString(String columnLabel) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public java.io.Reader getNCharacterStream(int columnIndex) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public java.io.Reader getNCharacterStream(String columnLabel) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateNCharacterStream(int columnIndex, java.io.Reader x, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateNCharacterStream(String columnLabel, java.io.Reader reader, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateAsciiStream(int columnIndex, java.io.InputStream x, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateBinaryStream(int columnIndex, java.io.InputStream x, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateCharacterStream(int columnIndex, java.io.Reader x, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateAsciiStream(String columnLabel, java.io.InputStream x, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateBinaryStream(String columnLabel, java.io.InputStream x, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateCharacterStream(String columnLabel, java.io.Reader reader, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateClob(int columnIndex, Reader reader, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateClob(String columnLabel, Reader reader, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateNCharacterStream(int columnIndex, java.io.Reader x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateNCharacterStream(String columnLabel, java.io.Reader reader) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateAsciiStream(int columnIndex, java.io.InputStream x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateBinaryStream(int columnIndex, java.io.InputStream x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateCharacterStream(int columnIndex, java.io.Reader x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateAsciiStream(String columnLabel, java.io.InputStream x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateBinaryStream(String columnLabel, java.io.InputStream x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateCharacterStream(String columnLabel, java.io.Reader reader) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateClob(int columnIndex, Reader reader) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateClob(String columnLabel, Reader reader) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateNClob(int columnIndex, Reader reader) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void updateNClob(String columnLabel, Reader reader) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ // Java6 build - interface java.sql.Wrapper ++ ++ public T unwrap(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } + } +--- src/com/mysql/jdbc/ResultSetMetaData.java ++++ src/com/mysql/jdbc/ResultSetMetaData.java +@@ -29,6 +29,7 @@ + import java.io.ObjectInputStream; + import java.sql.SQLException; + import java.sql.Types; ++import java.sql.SQLFeatureNotSupportedException; + + /** + * A ResultSetMetaData object can be used to find out about the types and +@@ -806,4 +807,13 @@ + return "java.lang.Object"; //$NON-NLS-1$ + } + } ++ // Java6 build - interface java.sql.Wrapper ++ ++ public T unwrap(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } + } +--- src/com/mysql/jdbc/Statement.java ++++ src/com/mysql/jdbc/Statement.java +@@ -33,6 +33,7 @@ + import java.sql.SQLException; + import java.sql.SQLWarning; + import java.sql.Types; ++import java.sql.SQLFeatureNotSupportedException; + + import java.util.ArrayList; + import java.util.Calendar; +@@ -2365,4 +2366,28 @@ + protected synchronized void setPingTarget(PingTarget pingTarget) { + this.pingTarget = pingTarget; + } ++ ++ // Java6 build - interface java.sql.Statement ++ ++ public boolean isClosed() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setPoolable(boolean poolable) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public boolean isPoolable() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ // Java6 build - interface java.sql.Wrapper ++ ++ public T unwrap(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } + } +--- src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java ++++ src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java +@@ -38,6 +38,11 @@ + import java.sql.SQLException; + import java.sql.Time; + import java.sql.Timestamp; ++import java.sql.RowId; ++import java.sql.Blob; ++import java.sql.NClob; ++import java.sql.SQLXML; ++import java.sql.SQLFeatureNotSupportedException; + import java.util.Calendar; + import java.util.Map; + +@@ -1762,4 +1767,155 @@ + return null; + } + ++ // Java6 build - interface java.sql.CallableStatement ++ ++ public RowId getRowId(int parameterIndex) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public RowId getRowId(String parameterName) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setRowId(String parameterName, RowId x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNString(String parameterName, String value) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNCharacterStream(String parameterName, Reader value, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNClob(String parameterName, NClob value) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setClob(String parameterName, Reader reader, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setBlob(String parameterName, InputStream inputStream, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNClob(String parameterName, Reader reader, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public NClob getNClob (int parameterIndex) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public NClob getNClob (String parameterName) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setSQLXML(String parameterName, SQLXML xmlObject) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public SQLXML getSQLXML(int parameterIndex) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public SQLXML getSQLXML(String parameterName) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public String getNString(int parameterIndex) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public String getNString(String parameterName) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public java.io.Reader getNCharacterStream(int parameterIndex) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public java.io.Reader getNCharacterStream(String parameterName) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public java.io.Reader getCharacterStream(int parameterIndex) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public java.io.Reader getCharacterStream(String parameterName) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setBlob (String parameterName, Blob x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setClob (String parameterName, Clob x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setAsciiStream(String parameterName, java.io.InputStream x, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setBinaryStream(String parameterName, java.io.InputStream x, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setCharacterStream(String parameterName, java.io.Reader reader, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setAsciiStream(String parameterName, java.io.InputStream x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setBinaryStream(String parameterName, java.io.InputStream x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setCharacterStream(String parameterName, java.io.Reader reader) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNCharacterStream(String parameterName, Reader value) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setClob(String parameterName, Reader reader) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setBlob(String parameterName, InputStream inputStream) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNClob(String parameterName, Reader reader) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ // Java6 build - interface java.sql.Statement ++ ++ public boolean isClosed() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setPoolable(boolean poolable) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public boolean isPoolable() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ // Java6 build - interface java.sql.Wrapper ++ ++ public T unwrap(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } + } +--- src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java ++++ src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java +@@ -24,10 +24,18 @@ + */ + package com.mysql.jdbc.jdbc2.optional; + ++import java.util.Properties; + import java.sql.Connection; + import java.sql.SQLException; + import java.sql.Savepoint; + import java.sql.Statement; ++import java.sql.Clob; ++import java.sql.Blob; ++import java.sql.NClob; ++import java.sql.SQLXML; ++import java.sql.SQLFeatureNotSupportedException; ++import java.sql.SQLClientInfoException; ++import java.sql.Struct; + + import com.mysql.jdbc.MysqlErrorNumbers; + import com.mysql.jdbc.SQLError; +@@ -836,4 +844,58 @@ + this.mc.ping(); + } + } ++ // Java6 build - interface java.sql.Connection ++ ++ public Clob createClob() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public Blob createBlob() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public NClob createNClob() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public SQLXML createSQLXML() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public boolean isValid(int timeout) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setClientInfo(String name, String value) throws SQLClientInfoException { ++ throw new SQLClientInfoException(); ++ } ++ ++ public void setClientInfo(Properties properties) throws SQLClientInfoException { ++ throw new SQLClientInfoException(); ++ } ++ ++ public String getClientInfo(String name) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public Properties getClientInfo() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public java.sql.Array createArrayOf(String typeName, Object[] elements) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public Struct createStruct(String typeName, Object[] attributes) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ // Java6 build - interface java.sql.Wrapper ++ ++ public T unwrap(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } + } +--- src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java ++++ src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java +@@ -31,6 +31,7 @@ + import java.io.Serializable; + + import java.sql.SQLException; ++import java.sql.SQLFeatureNotSupportedException; + + import java.util.Properties; + +@@ -424,4 +425,13 @@ + + return mysqlDriver.connect(jdbcUrlToUse, props); + } ++ // Java6 build - interface java.sql.Wrapper ++ ++ public T unwrap(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } + } +--- src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java ++++ src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java +@@ -26,6 +26,7 @@ + + import java.sql.Connection; + import java.sql.SQLException; ++import java.sql.SQLFeatureNotSupportedException; + + import java.util.Enumeration; + import java.util.Hashtable; +@@ -33,6 +34,7 @@ + import javax.sql.ConnectionEvent; + import javax.sql.ConnectionEventListener; + import javax.sql.PooledConnection; ++import javax.sql.StatementEventListener; + + import com.mysql.jdbc.SQLError; + +@@ -209,4 +211,11 @@ + } + } + } +-} +\ No newline at end of file ++ // Java6 build - interface javax.sql.PooledConnection ++ ++ public void addStatementEventListener(StatementEventListener listener) { ++ } ++ ++ public void removeStatementEventListener(StatementEventListener listener) { ++ } ++} +--- src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java ++++ src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java +@@ -26,6 +26,7 @@ + import java.sql.ResultSet; + import java.sql.SQLException; + import java.sql.Statement; ++import java.sql.SQLFeatureNotSupportedException; + import java.util.ArrayList; + import java.util.Collections; + import java.util.HashMap; +@@ -33,6 +34,7 @@ + import java.util.Map; + + import javax.sql.XAConnection; ++import javax.sql.StatementEventListener; + import javax.transaction.xa.XAException; + import javax.transaction.xa.XAResource; + import javax.transaction.xa.Xid; +@@ -636,4 +638,11 @@ + + return connToWrap; + } ++ // Java6 build - interface javax.sql.PooledConnection ++ ++ public void addStatementEventListener(StatementEventListener listener) { ++ } ++ ++ public void removeStatementEventListener(StatementEventListener listener) { ++ } + } +--- src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java ++++ src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java +@@ -45,6 +45,12 @@ + import java.sql.SQLException; + import java.sql.Time; + import java.sql.Timestamp; ++import java.sql.RowId; ++import java.sql.Clob; ++import java.sql.NClob; ++import java.sql.Blob; ++import java.sql.SQLXML; ++import java.sql.SQLFeatureNotSupportedException; + + import java.util.Calendar; + +@@ -851,4 +857,103 @@ + + // that out + } ++ // Java6 build - interface java.sql.PreparedStatement ++ ++ public void setRowId(int parameterIndex, RowId x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNString(int parameterIndex, String value) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNClob(int parameterIndex, NClob value) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setClob(int parameterIndex, Reader reader, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ /*public void setObject(int parameterIndex, Object x, int targetSqlType, int scaleOrLength) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ }*/ ++ ++ public void setAsciiStream(int parameterIndex, java.io.InputStream x, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setBinaryStream(int parameterIndex, java.io.InputStream x, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setCharacterStream(int parameterIndex, java.io.Reader reader, long length) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setAsciiStream(int parameterIndex, java.io.InputStream x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setBinaryStream(int parameterIndex, java.io.InputStream x) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setCharacterStream(int parameterIndex, java.io.Reader reader) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setClob(int parameterIndex, Reader reader) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setNClob(int parameterIndex, Reader reader) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ // Java6 build - interface java.sql.Statement ++ ++ public boolean isClosed() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setPoolable(boolean poolable) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public boolean isPoolable() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ // Java6 build - interface java.sql.Wrapper ++ ++ public T unwrap(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } + } +--- src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java ++++ src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java +@@ -31,6 +31,7 @@ + import java.sql.SQLException; + import java.sql.SQLWarning; + import java.sql.Statement; ++import java.sql.SQLFeatureNotSupportedException; + + /** + * Wraps statements so that errors can be reported correctly to +@@ -826,4 +827,26 @@ + checkAndFireConnectionError(sqlEx); + } + } ++ // Java6 build - interface java.sql.Statement ++ ++ public boolean isClosed() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public void setPoolable(boolean poolable) throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public boolean isPoolable() throws SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ // Java6 build - interface java.sql.Wrapper ++ ++ public T unwrap(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ ++ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { ++ throw new SQLFeatureNotSupportedException(); ++ } + } +--- src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java ++++ src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java +@@ -6,6 +6,7 @@ + import java.util.Map; + + import javax.sql.XAConnection; ++import javax.sql.StatementEventListener; + import javax.transaction.xa.XAException; + import javax.transaction.xa.XAResource; + import javax.transaction.xa.Xid; +@@ -151,4 +152,12 @@ + this.currentXAConnection.close(); + } + } ++ ++ // Java6 build - interface javax.sql.PooledConnection ++ ++ public void addStatementEventListener(StatementEventListener listener) { ++ } ++ ++ public void removeStatementEventListener(StatementEventListener listener) { ++ } + } +--- src/testsuite/regression/StatementRegressionTest.java ++++ src/testsuite/regression/StatementRegressionTest.java +@@ -2518,7 +2518,7 @@ + try { + pStmt = this.conn + .prepareStatement("INSERT INTO testNullClob VALUES (?)"); +- pStmt.setClob(1, null); ++ pStmt.setClob(1, (java.io.Reader)null); + pStmt.executeUpdate(); + } finally { + if (pStmt != null) { +@@ -4220,4 +4220,4 @@ + closeMemberJDBCResources(); + } + } +-} +\ No newline at end of file ++} diff --git a/mysql-connector-java-5.0.8.tar.bz2 b/mysql-connector-java-5.0.8.tar.bz2 new file mode 100644 index 0000000..d6806e2 --- /dev/null +++ b/mysql-connector-java-5.0.8.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21573cd86a4bad30a914760fea995082fb2643e65382580ca8cd2acde3605cb0 +size 8516069 diff --git a/mysql-connector-java-build_xml.patch b/mysql-connector-java-build_xml.patch new file mode 100644 index 0000000..3a0e76e --- /dev/null +++ b/mysql-connector-java-build_xml.patch @@ -0,0 +1,68 @@ +--- build.xml ++++ build.xml +@@ -60,10 +60,6 @@ + + + +- +- +- +- + + + +@@ -652,7 +648,9 @@ + debug="${debug.enable}" + excludes="testsuite/**, + com/mysql/jdbc/integration/**, +- com/mysql/jdbc/log/Log4JLogger.java"> ++ com/mysql/jdbc/log/Log4JLogger.java" ++ source="1.5" ++ target="1.5"> + + + +@@ -694,7 +692,9 @@ + destdir="${buildDir}/${fullProdName}" + deprecation="off" + debug="${debug.enable}" +- includes="com/mysql/jdbc/integration/c3p0/**"> ++ includes="com/mysql/jdbc/integration/c3p0/**" ++ source="1.5" ++ target="1.5" > + + + +@@ -706,7 +706,9 @@ + destdir="${buildDir}/${fullProdName}" + deprecation="off" + debug="${debug.enable}" +- includes="com/mysql/jdbc/integration/jboss/**"> ++ includes="com/mysql/jdbc/integration/jboss/**" ++ source="1.5" ++ target="1.5" > + + + +@@ -718,7 +720,9 @@ + destdir="${buildDir}/${fullProdName}" + deprecation="off" + debug="${debug.enable}" +- includes="com/mysql/jdbc/log/Log4JLogger.java"> ++ includes="com/mysql/jdbc/log/Log4JLogger.java" ++ source="1.5" ++ target="1.5" > + + + +@@ -732,7 +736,9 @@ + deprecation="off" + debug="${debug.enable}" + includes="testsuite/**" +- excludes="testsuite/requiresNonRedists/**"> ++ excludes="testsuite/requiresNonRedists/**" ++ target="1.5" ++ source="1.5" > + + + diff --git a/mysql-connector-java-java14compat.patch b/mysql-connector-java-java14compat.patch deleted file mode 100644 index 799ea66..0000000 --- a/mysql-connector-java-java14compat.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -Naur ../mysql-connector-java-3.1.12.orig/build.xml ./build.xml ---- ../mysql-connector-java-3.1.12.orig/build.xml 2005-12-01 03:02:01.000000000 +0100 -+++ ./build.xml 2006-09-27 15:39:20.000000000 +0200 -@@ -536,7 +536,9 @@ - debug="${debug.enable}" - excludes="testsuite/**, - com/mysql/jdbc/integration/**, -- com/mysql/jdbc/log/Log4JLogger.java"> -+ com/mysql/jdbc/log/Log4JLogger.java" -+ source="1.4" -+ target="1.4" > - - - -@@ -578,7 +580,9 @@ - destdir="${buildDir}/${fullProdName}" - deprecation="off" - debug="${debug.enable}" -- includes="com/mysql/jdbc/integration/c3p0/**"> -+ includes="com/mysql/jdbc/integration/c3p0/**" -+ source="1.4" -+ target="1.4" > - - - -@@ -590,7 +594,9 @@ - destdir="${buildDir}/${fullProdName}" - deprecation="off" - debug="${debug.enable}" -- includes="com/mysql/jdbc/integration/jboss/**"> -+ includes="com/mysql/jdbc/integration/jboss/**" -+ source="1.4" -+ target="1.4"> - - - -@@ -602,7 +608,9 @@ - destdir="${buildDir}/${fullProdName}" - deprecation="off" - debug="${debug.enable}" -- includes="com/mysql/jdbc/log/Log4JLogger.java"> -+ includes="com/mysql/jdbc/log/Log4JLogger.java" -+ source="1.4" -+ target="1.4"> - - - -@@ -616,7 +624,9 @@ - deprecation="off" - debug="${debug.enable}" - includes="testsuite/**" -- excludes="testsuite/requiresNonRedists/**"> -+ excludes="testsuite/requiresNonRedists/**" -+ source="1.4" -+ target="1.4"> - - - diff --git a/mysql-connector-java-target-javadoc.patch b/mysql-connector-java-target-javadoc.patch new file mode 100644 index 0000000..294d5d0 --- /dev/null +++ b/mysql-connector-java-target-javadoc.patch @@ -0,0 +1,34 @@ +--- build.xml ++++ build.xml +@@ -361,7 +361,7 @@ + + + +- ++ + + + +@@ -1175,4 +1175,22 @@ + + + ++ ++ ++ ++ ++ ++ ++ + diff --git a/mysql-connector-java.changes b/mysql-connector-java.changes index a89bf08..17f55f7 100644 --- a/mysql-connector-java.changes +++ b/mysql-connector-java.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Aug 7 09:46:22 CEST 2008 - mvyskocil@suse.cz + +- update to the 5.0.8 (improved spec from jpackage.org) + - fix of [bnc#99151] +- added two new subpackages (javadoc and manual) +- removed the dependency on jboss4 +- add a support for build with java6 and java5 together (ia64 build fix) +- use source="1.5" and target="1.5" + ------------------------------------------------------------------- Thu Jul 17 07:54:00 CEST 2008 - coolo@suse.de diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index c08e91d..1643634 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -1,41 +1,53 @@ # -# spec file for package mysql-connector-java (Version 3.1.12) +# spec file for package mysql-connector-java (Version 5.0.8) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild # icecream 0 +%define section free +%define builddir build-mysql-jdbc +%define distdir dist-mysql-jdbc +%define with_jboss4 0 Name: mysql-connector-java -%define builddir build-mysql-jdbc -%define distdir dist-mysql-jdbc Summary: Official JDBC Driver for MySQL -BuildRequires: ant java2-devel-packages jta junit log4j-mini -Version: 3.1.12 -Release: 265 +Version: 5.0.8 +Release: 1 License: GPL v2 or later Group: Development/Libraries/Java -Source0: %{name}-%{version}.tar.gz -Patch0: patch-build.xml -Patch1: %{name}-java14compat.patch +Source0: %{name}-%{version}.tar.bz2 +Patch0: %{name}-build_xml.patch +Patch1: %{name}-target-javadoc.patch +Patch2: %{name}-%{version}-java6-compatibility.patch Url: http://www.mysql.com/downloads/api-jdbc-stable.html BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -Requires: jta >= 1.0.1-0.a.1 +BuildRequires: ant +BuildRequires: ant-contrib +BuildRequires: java-devel +BuildRequires: jakarta-commons-logging +%if %{with_jboss4} +BuildRequires: jboss4-common +BuildRequires: jboss4-connector +%endif +BuildRequires: jpackage-utils +BuildRequires: junit +BuildRequires: log4j-mini Requires: log4j -#BuildRequires: ant >= 1.6.0 -#BuildRequires: ant-contrib -#BuildRequires: java-devel >= 1.4.0 -#BuildRequires: jpackage-utils >= 1.6 -#BuildRequires: jta >= 1.0.1-0.a.1 -#BuildRequires: junit -#BuildRequires: log4j Provides: mm.mysql Obsoletes: mm.mysql @@ -50,32 +62,120 @@ set that supports the capabilities of MySQL. +%package javadoc +License: GPL v2 or later +Summary: Official JDBC Driver for MySQL +Group: Development/Libraries/Java +Requires(post): /bin/ln +Requires(post): /bin/rm +Requires(postun): /bin/rm + +%description javadoc +MySQL Connector/J is a native Java driver that converts JDBC (Java +Database Connectivity) calls into the network protocol used by the +MySQL database. It lets developers working with the Java programming +language easily build programs and applets that interact with MySQL and +connect all corporate data, even in a heterogeneous environment. MySQL +Connector/J is a Type IV JDBC driver and has a complete JDBC feature +set that supports the capabilities of MySQL. + + + +%package manual +License: GPL v2 or later +Summary: Official JDBC Driver for MySQL +Group: Development/Libraries/Java +Requires(post): /bin/ln +Requires(post): /bin/rm +Requires(postun): /bin/rm + +%description manual +MySQL Connector/J is a native Java driver that converts JDBC (Java +Database Connectivity) calls into the network protocol used by the +MySQL database. It lets developers working with the Java programming +language easily build programs and applets that interact with MySQL and +connect all corporate data, even in a heterogeneous environment. MySQL +Connector/J is a Type IV JDBC driver and has a complete JDBC feature +set that supports the capabilities of MySQL. + + + %prep %setup -q -n %{name}-%{version} -%patch0 -%patch1 +%patch0 -b .sav0 +%patch1 -b .sav1 +# patch only for javac 1.6.0 +if [[ "$(javac -version 2>&1 | grep '1\.6\.0')" != "" ]]; then +%patch2 -b .sav2 +fi # remove all binary libs -find . \( -name "*.jar" -o -name "*.class" \) | xargs -t rm -f +find . \( -name "*.jar" -o -name "*.class" \) | xargs -t %{__rm} -f +%if ! %{with_jboss4} +rm -r src/com/mysql/jdbc/integration/jboss/ +rm -r src/testsuite/regression/DataSourceRegressionTest.java +%endif +# duplicate-waste +rm docs/README.txt README +# wrong end of line necoding +sed -i -e 's/.$//' README.txt EXCEPTIONS-CONNECTOR-J %build -export CLASSPATH=$(build-classpath ant-contrib jdbc-stdext jta junit log4j) -ant -DbuildDir=%{builddir} -DdistDir=%{distdir} +# jboss jars needed for test suite +export CLASSPATH="$(build-classpath ant-contrib \ + jakarta-commons-logging \ +%if %{with_jboss4} + jboss4/jboss-common-jdbc-wrapper \ +%endif + jdbc-stdext jta \ + junit log4j xml-commons-jaxp-1.3-apis)" +ant -Dant.build.javac.source=1.5 \ + -Dant.build.javac.target=1.5 \ + -DbuildDir="%{builddir}" \ + -DdistDir="%{distdir}" \ + dist javadoc %install -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -m 644 %{builddir}/%{name}-%{version}/%{name}-%{version}-bin.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_javadir} +%{__install} -m 644 %{builddir}/%{name}-%{version}/%{name}-%{version}-bin.jar \ + ${RPM_BUILD_ROOT}%{_javadir}/%{name}-%{version}.jar +( + cd ${RPM_BUILD_ROOT}%{_javadir} && \ + for jar in *-%{version}*.jar; do + %{__ln_s} -f ${jar} `echo $jar | %{__sed} "s|-%{version}||g"` + done +) +%{__rm} -rf ${RPM_BUILD_DIR}%{name}-%{version}/docs/release-test-output +# javadoc +%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-%{version} +%{__cp} -pr build-mysql-jdbc/javadoc/* \ + ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-%{version} +%{__ln_s} %{name}-%{version} ${RPM_BUILD_ROOT}%{_javadocdir}/%{name} %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT %files %defattr(0644,root,root,0755) -%doc CHANGES COPYING EXCEPTIONS-CONNECTOR-J README README.txt docs +%doc CHANGES COPYING EXCEPTIONS-CONNECTOR-J README.txt %attr(0644,root,root) %{_javadir}/*.jar +%files manual +%defattr(0644,root,root,0755) +%doc docs + +%files javadoc +%defattr(0644,root,root,0755) +%ghost %doc %{_javadocdir}/%{name} +%doc %{_javadocdir}/%{name}-%{version} + %changelog +* Thu Aug 07 2008 mvyskocil@suse.cz +- update to the 5.0.8 (improved spec from jpackage.org) + - fix of [bnc#99151] +- added two new subpackages (javadoc and manual) +- removed the dependency on jboss4 +- add a support for build with java6 and java5 together (ia64 build fix) +- use source="1.5" and target="1.5" * Thu Jul 17 2008 coolo@suse.de - trying to avoid another build cycle * Wed Sep 27 2006 skh@suse.de diff --git a/patch-build.xml b/patch-build.xml deleted file mode 100644 index ca7f883..0000000 --- a/patch-build.xml +++ /dev/null @@ -1,13 +0,0 @@ ---- build.xml.orig 2006-01-31 15:27:27.000000000 -0800 -+++ build.xml 2006-01-31 15:28:05.000000000 -0800 -@@ -60,10 +60,6 @@ - - - -- -- -- -- - - -