Skip to content

Commit

Permalink
Add support for compilation with Java 6 AND Java 7
Browse files Browse the repository at this point in the history
  • Loading branch information
javacruft committed Jun 21, 2012
1 parent 142f030 commit 75492cc
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 1 deletion.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
<configuration>
<rules>
<requireJavaVersion>
<version>(1.6,1.7)</version>
<version>1.6,</version>
</requireJavaVersion>
</rules>
</configuration>
Expand Down
22 changes: 22 additions & 0 deletions src/java/winstone/jndi/resourceFactories/WinstoneConnection.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.sql.Struct;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.Executor;

import winstone.Logger;

Expand Down Expand Up @@ -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();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
}
}

0 comments on commit 75492cc

Please sign in to comment.