diff --git a/gsbase-2.0.1-jdk7.patch b/gsbase-2.0.1-jdk7.patch
new file mode 100644
index 0000000000000000000000000000000000000000..0487ac88271647302d9c1da0763bd25e0dcb2bdc
--- /dev/null
+++ b/gsbase-2.0.1-jdk7.patch
@@ -0,0 +1,853 @@
+diff -Nru gsbase-2.0.1/src/java/com/gargoylesoftware/base/resource/jdbc/CallableStatementWrapper.java gsbase-2.0.1-gil/src/java/com/gargoylesoftware/base/resource/jdbc/CallableStatementWrapper.java
+--- gsbase-2.0.1/src/java/com/gargoylesoftware/base/resource/jdbc/CallableStatementWrapper.java	2004-10-02 13:36:14.000000000 +0200
++++ gsbase-2.0.1-gil/src/java/com/gargoylesoftware/base/resource/jdbc/CallableStatementWrapper.java	2012-05-06 18:22:52.320378801 +0200
+@@ -37,13 +37,19 @@
+  */
+ package com.gargoylesoftware.base.resource.jdbc;
+ 
++import java.io.InputStream;
++import java.io.Reader;
+ import java.math.BigDecimal;
+ import java.sql.Array;
+ import java.sql.Blob;
+ import java.sql.CallableStatement;
+ import java.sql.Clob;
++import java.sql.NClob;
+ import java.sql.Ref;
++import java.sql.RowId;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
++import java.sql.SQLXML;
+ import java.util.Calendar;
+ 
+ /**
+@@ -1694,5 +1700,175 @@
+         checkIsOpen();
+         delegate_.registerOutParameter(parameterName, sqlType, typeName);
+     }
++
++    public <T> T getObject(String parameterName, Class<T> arg0) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public <T> T getObject(int columnIndex, Class<T> arg0) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setNClob(String parameterName, Reader reader) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setBlob(String parameterName, InputStream inputStream) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setClob(String parameterName, Reader reader) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setNCharacterStream(String parameterName, Reader value) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setCharacterStream(String parameterName, Reader reader) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setBinaryStream(String parameterName, InputStream x) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setAsciiStream(String parameterName, InputStream x) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setCharacterStream(String parameterName, Reader reader, long length) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setBinaryStream(String parameterName, InputStream x, long length) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setAsciiStream(String parameterName, InputStream x, long length) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setClob(String parameterName, Clob x) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setBlob(String parameterName, Blob x) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public Reader getCharacterStream(String parameterName) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public Reader getCharacterStream(int parameterIndex) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public Reader getNCharacterStream(String parameterName) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public Reader getNCharacterStream(int parameterIndex) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public String getNString(String parameterName) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public String getNString(int parameterIndex) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public SQLXML getSQLXML(String parameterName) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public SQLXML getSQLXML(int parameterIndex) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setSQLXML(String parameterName, SQLXML xmlObject) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public NClob getNClob(String parameterName) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public NClob getNClob(int parameterIndex) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setNClob(String parameterName, Reader reader, long length) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setBlob(String parameterName, InputStream inputStream, long length) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setClob(String parameterName, Reader reader, long length) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setNClob(String parameterName, NClob value) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setNCharacterStream(String parameterName, Reader value, long length) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setNString(String parameterName, String value) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setRowId(String parameterName, RowId x) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public RowId getRowId(String parameterName) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public RowId getRowId(int parameterIndex) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
+ }
+ 
+diff -Nru gsbase-2.0.1/src/java/com/gargoylesoftware/base/resource/jdbc/ConnectionWrapper.java gsbase-2.0.1-gil/src/java/com/gargoylesoftware/base/resource/jdbc/ConnectionWrapper.java
+--- gsbase-2.0.1/src/java/com/gargoylesoftware/base/resource/jdbc/ConnectionWrapper.java	2004-10-02 13:36:14.000000000 +0200
++++ gsbase-2.0.1-gil/src/java/com/gargoylesoftware/base/resource/jdbc/ConnectionWrapper.java	2012-05-06 16:31:03.598966255 +0200
+@@ -38,19 +38,29 @@
+ package com.gargoylesoftware.base.resource.jdbc;
+ 
+ import com.gargoylesoftware.base.resource.ManagedResource;
++import java.sql.Array;
++import java.sql.Blob;
++import java.sql.Clob;
+ import java.sql.CallableStatement;
+ import java.sql.Connection;
+ import java.sql.DatabaseMetaData;
++import java.sql.NClob;
+ import java.sql.PreparedStatement;
+ import java.sql.Savepoint;
++import java.sql.SQLClientInfoException;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import java.sql.SQLWarning;
+ import java.sql.Statement;
++import java.sql.Struct;
++import java.sql.SQLXML;
+ import java.util.ArrayList;
++import java.util.concurrent.Executor;
+ import java.util.Collections;
+ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Map;
++import java.util.Properties;
+ 
+ /**
+  *  A wrapper for java.sql.Connection objects.<p>
+@@ -1067,5 +1077,95 @@
+         openStatements_.add( statement );
+         return statement;
+     }
++
++    public int getNetworkTimeout() throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setNetworkTimeout(Executor executor, int timeout) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void abort(Executor executor) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public String getSchema() throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setSchema(String schema) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public Struct createStruct(String typeName,Object[] attributes) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public Array createArrayOf(String typeName, Object[] elements)throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public Properties getClientInfo() throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public String getClientInfo(String name) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setClientInfo(Properties properties) throws SQLClientInfoException {
++        // TODO 
++        throw new SQLClientInfoException();
++    }
++
++    public void setClientInfo(String name, String value) throws SQLClientInfoException {
++        // TODO 
++        throw new SQLClientInfoException();
++    }
++
++    public boolean isValid(int timeout) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public SQLXML createSQLXML() throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public NClob createNClob() throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public Blob createBlob() throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public Clob createClob() throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public boolean isWrapperFor(Class<?> iface) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public <T> T unwrap(Class<T> iface) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
+ }
+ 
+diff -Nru gsbase-2.0.1/src/java/com/gargoylesoftware/base/resource/jdbc/DatabaseMetaDataWrapper.java gsbase-2.0.1-gil/src/java/com/gargoylesoftware/base/resource/jdbc/DatabaseMetaDataWrapper.java
+--- gsbase-2.0.1/src/java/com/gargoylesoftware/base/resource/jdbc/DatabaseMetaDataWrapper.java	2004-10-02 13:36:14.000000000 +0200
++++ gsbase-2.0.1-gil/src/java/com/gargoylesoftware/base/resource/jdbc/DatabaseMetaDataWrapper.java	2012-05-05 15:25:44.968605917 +0200
+@@ -40,7 +40,9 @@
+ import java.sql.Connection;
+ import java.sql.DatabaseMetaData;
+ import java.sql.ResultSet;
++import java.sql.RowIdLifetime;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import java.util.ArrayList;
+ import java.util.Iterator;
+ import java.util.List;
+@@ -3217,6 +3219,61 @@
+         checkIsOpen();
+         return delegate_.supportsStatementPooling();
+     }
++
++    public boolean generatedKeyAlwaysReturned() throws SQLException {
++        // TODO
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public ResultSet getPseudoColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) throws SQLException {
++        // TODO
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public ResultSet getFunctionColumns(String catalog, String schemaPattern, String functionNamePattern, String columnNamePattern) throws SQLException {
++        // TODO
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public ResultSet getFunctions(String catalog, String schemaPattern, String functionNamePattern) throws SQLException {
++        // TODO
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public ResultSet getClientInfoProperties() throws SQLException {
++        // TODO
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public boolean autoCommitFailureClosesAllResultSets() throws SQLException {
++        // TODO
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public boolean supportsStoredFunctionsUsingCallSyntax() throws SQLException {
++        // TODO
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public ResultSet getSchemas(String catalog, String schemaPattern) throws SQLException {
++        // TODO
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public RowIdLifetime getRowIdLifetime() throws SQLException {
++        // TODO
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public boolean isWrapperFor(Class<?> iface) throws SQLException {
++        // TODO
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public <T> T unwrap(Class<T> iface) throws SQLException {
++        // TODO
++        throw new SQLFeatureNotSupportedException();
++    }
+ }
+ 
+ 
+diff -Nru gsbase-2.0.1/src/java/com/gargoylesoftware/base/resource/jdbc/PreparedStatementWrapper.java gsbase-2.0.1-gil/src/java/com/gargoylesoftware/base/resource/jdbc/PreparedStatementWrapper.java
+--- gsbase-2.0.1/src/java/com/gargoylesoftware/base/resource/jdbc/PreparedStatementWrapper.java	2004-10-02 13:36:14.000000000 +0200
++++ gsbase-2.0.1-gil/src/java/com/gargoylesoftware/base/resource/jdbc/PreparedStatementWrapper.java	2012-05-06 16:28:25.347956524 +0200
+@@ -44,12 +44,16 @@
+ import java.sql.Blob;
+ import java.sql.Clob;
+ import java.sql.Date;
++import java.sql.NClob;
+ import java.sql.PreparedStatement;
+ import java.sql.Ref;
+ import java.sql.ResultSet;
+ import java.sql.ResultSetMetaData;
++import java.sql.RowId;
+ import java.sql.ParameterMetaData;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
++import java.sql.SQLXML;
+ import java.sql.Time;
+ import java.sql.Timestamp;
+ import java.util.Calendar;
+@@ -790,6 +794,96 @@
+         checkIsOpen();
+         return delegate_.getParameterMetaData();
+     }
++
++    public void setNClob(int parameterIndex, Reader reader) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setClob(int parameterIndex, Reader reader) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setAsciiStream(int parameterIndex, InputStream x) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setBinaryStream(int parameterIndex, InputStream x, long length) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setAsciiStream(int parameterIndex, InputStream x, long length) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setClob(int parameterIndex, Reader reader, long length) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setNClob(int parameterIndex, NClob value) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setNString(int parameterIndex, String value) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setRowId(int parameterIndex, RowId x) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
+ }
+ 
+ 
+diff -Nru gsbase-2.0.1/src/java/com/gargoylesoftware/base/resource/jdbc/ResultSetWrapper.java gsbase-2.0.1-gil/src/java/com/gargoylesoftware/base/resource/jdbc/ResultSetWrapper.java
+--- gsbase-2.0.1/src/java/com/gargoylesoftware/base/resource/jdbc/ResultSetWrapper.java	2004-10-02 13:36:14.000000000 +0200
++++ gsbase-2.0.1-gil/src/java/com/gargoylesoftware/base/resource/jdbc/ResultSetWrapper.java	2012-05-06 18:55:27.994499063 +0200
+@@ -37,15 +37,21 @@
+  */
+ package com.gargoylesoftware.base.resource.jdbc;
+ 
++import java.io.InputStream;
++import java.io.Reader;
+ import java.math.BigDecimal;
+ import java.sql.Array;
+ import java.sql.Blob;
+ import java.sql.Clob;
++import java.sql.NClob;
+ import java.sql.Ref;
+ import java.sql.ResultSet;
+ import java.sql.ResultSetMetaData;
++import java.sql.RowId;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import java.sql.SQLWarning;
++import java.sql.SQLXML;
+ import java.sql.Statement;
+ import java.util.Calendar;
+ 
+@@ -2912,5 +2918,260 @@
+         checkIsOpen();
+         delegate_.updateArray(columnName, x);
+     }
++
++    public <T> T getObject(String columnLabel, Class<T> arg0) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public <T> T getObject(int columnIndex, Class<T> arg0) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateNClob(String columnLabel, Reader reader) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateNClob(int columnIndex, Reader reader) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateClob(String columnLabel, Reader reader) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateClob(int columnIndex, Reader reader) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateCharacterStream(int columnIndex, Reader x) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateClob(String columnLabel, Reader reader, long length) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateClob(int columnIndex, Reader reader, long length) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateCharacterStream(int columnIndex, Reader x, long length) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateNCharacterStream(int columnIndex, Reader x, long length) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public Reader getNCharacterStream(String columnLabel) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public Reader getNCharacterStream(int columnIndex) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public String getNString(String columnLabel) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public String getNString(int columnIndex) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateSQLXML(String columnLabel, SQLXML xmlObject) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public SQLXML getSQLXML(String columnLabel) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public SQLXML getSQLXML(int columnIndex) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public NClob getNClob(String columnLabel) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public NClob getNClob(int columnIndex) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateNClob(String columnLabel, NClob nClob) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateNClob(int columnIndex, NClob nClob) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateNString(String columnLabel, String nString) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateNString(int columnIndex, String nString) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public int getHoldability() throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateRowId(String columnLabel, RowId x) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void updateRowId(int columnIndex, RowId x) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public RowId getRowId(String columnLabel) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public RowId getRowId(int columnIndex) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public boolean isWrapperFor(Class<?> iface) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public <T> T unwrap(Class<T> iface) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
+ }
+ 
+diff -Nru gsbase-2.0.1/src/java/com/gargoylesoftware/base/resource/jdbc/StatementWrapper.java gsbase-2.0.1-gil/src/java/com/gargoylesoftware/base/resource/jdbc/StatementWrapper.java
+--- gsbase-2.0.1/src/java/com/gargoylesoftware/base/resource/jdbc/StatementWrapper.java	2004-10-02 13:36:14.000000000 +0200
++++ gsbase-2.0.1-gil/src/java/com/gargoylesoftware/base/resource/jdbc/StatementWrapper.java	2012-05-05 14:23:43.623402725 +0200
+@@ -40,6 +40,7 @@
+ import java.sql.Connection;
+ import java.sql.ResultSet;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import java.sql.SQLWarning;
+ import java.sql.Statement;
+ import java.util.ArrayList;
+@@ -961,5 +962,35 @@
+         checkIsOpen();
+         return delegate_.getResultSetHoldability();
+     }
++
++    public boolean isCloseOnCompletion() throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void closeOnCompletion() throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public boolean isPoolable() throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public void setPoolable(boolean poolable) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public boolean isWrapperFor(Class<?> iface) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
++
++    public <T> T unwrap(Class<T> iface) throws SQLException {
++        // TODO 
++        throw new SQLFeatureNotSupportedException();
++    }
+ }
+ 
diff --git a/gsbase-2.0.1.pom b/gsbase-2.0.1.pom
new file mode 100644
index 0000000000000000000000000000000000000000..4a4289ff9b076ab9f0369ca1512559b906feeb97
--- /dev/null
+++ b/gsbase-2.0.1.pom
@@ -0,0 +1,80 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>gsbase</groupId>
+  <artifactId>gsbase</artifactId>
+  <name>gsbase</name>
+  <version>2.0.1</version>
+  <description>A collection of java utility classes</description>
+  <url>http://gsbase.sourceforge.net</url>
+  <issueManagement>
+    <url>http://sourceforge.net/tracker/?group_id=13111</url>
+  </issueManagement>
+  <ciManagement>
+    <notifiers>
+      <notifier>
+        <address>gsbase@GargoyleSoftware.com</address>
+      </notifier>
+    </notifiers>
+  </ciManagement>
+  <inceptionYear>1998</inceptionYear>
+  <developers>
+    <developer>
+      <id>mbowler</id>
+      <name>Mike Bowler</name>
+      <email>mbowler@GargoyleSoftware.com</email>
+      <organization>Gargoyle Software Inc.</organization>
+      <roles>
+        <role>Release Manager</role>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+  </developers>
+  <licenses>
+    <license>
+      <name>The GSBase Software License</name>
+      <url>http://gsbase.sourceforge.net/license.html</url>
+    </license>
+  </licenses>
+  <scm>
+    <connection>scm:cvs:ext:mbowler@cvs.gsbase.sourceforge.net:/cvsroot/gsbase:gsbase2</connection>
+    <developerConnection></developerConnection>
+    <url>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/gsbase</url>
+  </scm>
+  <organization>
+    <name>Gargoyle Software Inc.</name>
+    <url>http://www.GargoyleSoftware.com/</url>
+  </organization>
+  <build>
+    <sourceDirectory>src/java</sourceDirectory>
+    <testSourceDirectory>src/test</testSourceDirectory>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>**/*Test.java</include>
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+    </dependency>
+    <dependency>
+      <groupId>junitperf</groupId>
+      <artifactId>junitperf</artifactId>
+      <version>1.8</version>
+    </dependency>
+  </dependencies>
+  <distributionManagement>
+    <site>
+      <id>default</id>
+      <name>Default Site</name>
+      <url>scp://gsbase.sourceforge.net//home/groups/g/gs/gsbase/htdocs</url>
+    </site>
+  </distributionManagement>
+</project>
\ No newline at end of file
diff --git a/gsbase-2.0.1.zip b/gsbase-2.0.1.zip
new file mode 100644
index 0000000000000000000000000000000000000000..e9a2b61c7e4019406a92f21e1cc9bf4acb005d6e
Binary files /dev/null and b/gsbase-2.0.1.zip differ
diff --git a/gsbase.spec b/gsbase.spec
new file mode 100644
index 0000000000000000000000000000000000000000..14198fa4152cd167d42abc9331f56b0282f14dad
--- /dev/null
+++ b/gsbase.spec
@@ -0,0 +1,55 @@
+Name:                gsbase
+Version:             2.0.1
+Release:             1
+Summary:             A collection of java utility classes
+License:             ASL 2.0
+Url:                 http://sourceforge.net/projects/gsbase/
+Source0:             http://downloads.sourceforge.net/gsbase/%{name}-%{version}.zip
+Source1:             https://repo1.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom
+Patch0:              %{name}-%{version}-jdk7.patch
+BuildRequires:       junit junitperf maven-local
+BuildArch:           noarch
+%description
+A collection of classes that are helpful
+when writing JUnit test cases. Classes
+include things like a logging subsystem and
+a complex layout manager.
+
+%package javadoc
+Summary:             Javadoc for %{name}
+%description javadoc
+This package contains javadoc for %{name}.
+
+%prep
+%setup -q -c
+find . -name '*.jar' -delete
+find . -name '*.class' -delete
+rm -r docs/*
+%patch0 -p1
+cp -pr %{SOURCE1} pom.xml
+%pom_xpath_inject "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-surefire-plugin']" "<version>2.14.2</version>"
+rm -r src/test/com/gargoylesoftware/base/resource/jdbc/WrapperTestCase.java \
+ src/test/com/gargoylesoftware/base/resource/jdbc/CallableStatementWrapperTest.java \
+ src/test/com/gargoylesoftware/base/resource/jdbc/ConnectionWrapperTest.java \
+ src/test/com/gargoylesoftware/base/resource/jdbc/DatabaseMetaDataWrapperTest.java \
+ src/test/com/gargoylesoftware/base/resource/jdbc/PreparedStatementWrapperTest.java \
+ src/test/com/gargoylesoftware/base/resource/jdbc/ResultSetWrapperTest.java \
+ src/test/com/gargoylesoftware/base/resource/jdbc/StatementWrapperTest.java
+rm -r src/test/com/gargoylesoftware/base/gui/TableLayoutTest.java
+%mvn_file :%{name} %{name}
+
+%build
+%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
+
+%install
+%mvn_install
+
+%files -f .mfiles
+%license LICENSE.txt
+
+%files javadoc -f .mfiles-javadoc
+%license LICENSE.txt
+
+%changelog
+* Sat Aug 15 2020 Ge Wang <wangge20@huawei.com> - 2.0.1-1
+- Package init
diff --git a/gsbase.yaml b/gsbase.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..00bbaf050db91e87f0ad529e5c29027a1bf150ae
--- /dev/null
+++ b/gsbase.yaml
@@ -0,0 +1,4 @@
+version_control: NA
+src_repo: NA
+tag_prefix: NA
+seperator: NA