Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Add support for compilation with Java 6 AND Java 7

  • Loading branch information...
commit 75492cccf7d2d4b55440ffed2473271f716a30ea 1 parent 142f030
@javacruft authored
View
2  pom.xml
@@ -126,7 +126,7 @@
<configuration>
<rules>
<requireJavaVersion>
- <version>(1.6,1.7)</version>
+ <version>1.6,</version>
</requireJavaVersion>
</rules>
</configuration>
View
22 src/java/winstone/jndi/resourceFactories/WinstoneConnection.java
@@ -24,6 +24,7 @@
import java.sql.Struct;
import java.util.Map;
import java.util.Properties;
+import java.util.concurrent.Executor;
import winstone.Logger;
@@ -305,4 +306,25 @@ public void setTypeMap(Map<String, Class<?>> map) throws SQLException {
// TODO Auto-generated method stub
}
+
+ public void abort(Executor executor) throws SQLException {
+ throw new SQLFeatureNotSupportedException();
+ }
+
+ public int getNetworkTimeout() throws SQLException {
+ throw new SQLFeatureNotSupportedException();
+ }
+
+ public String getSchema() throws SQLException {
+ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void setNetworkTimeout(Executor executor, int milliseconds)
+ throws SQLException {
+ throw new SQLFeatureNotSupportedException();
+ }
+
+ public void setSchema(String schema) throws SQLException {
+ throw new SQLFeatureNotSupportedException();
+ }
}
View
6 src/java/winstone/jndi/resourceFactories/WinstoneDataSource.java
@@ -11,6 +11,7 @@
import java.sql.Driver;
import java.sql.PreparedStatement;
import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -480,4 +481,9 @@ public boolean isWrapperFor(Class<?> iface) throws SQLException {
// TODO Auto-generated method stub
return false;
}
+
+ public java.util.logging.Logger getParentLogger()
+ throws SQLFeatureNotSupportedException {
+ throw new SQLFeatureNotSupportedException();
+ }
}
Please sign in to comment.
Something went wrong with that request. Please try again.