[jboss-cvs] JBossAS SVN: r112167 - in projects/jboss-jca/branches/Branch_1_0/adapters/src/test/java/org/jboss/jca/adapters/jdbc: unit/support and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: jesper.pedersen
Date: 2011-08-30 12:00:18 -0400 (Tue, 30 Aug 2011)
New Revision: 112167

Modified:
   projects/jboss-jca/branches/Branch_1_0/adapters/src/test/java/org/jboss/jca/adapters/jdbc/deadlock/DeadlockDriver.java
   projects/jboss-jca/branches/Branch_1_0/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/support/TestConnection.java
   projects/jboss-jca/branches/Branch_1_0/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/support/TestDriver.java
Log:
More JDK7 fixes

Modified: projects/jboss-jca/branches/Branch_1_0/adapters/src/test/java/org/jboss/jca/adapters/jdbc/deadlock/DeadlockDriver.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/adapters/src/test/java/org/jboss/jca/adapters/jdbc/deadlock/DeadlockDriver.java	2011-08-30 15:59:34 UTC (rev 112166)
+++ projects/jboss-jca/branches/Branch_1_0/adapters/src/test/java/org/jboss/jca/adapters/jdbc/deadlock/DeadlockDriver.java	2011-08-30 16:00:18 UTC (rev 112167)
@@ -28,7 +28,9 @@
 import java.sql.DriverManager;
 import java.sql.DriverPropertyInfo;
 import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
 import java.util.Properties;
+import java.util.logging.Logger;
 
 /**
  * Deadlock JDBC driver
@@ -102,6 +104,14 @@
       return true;
    }
 
+   /**
+    * {@inheritDoc}
+    */
+   public Logger getParentLogger() throws SQLFeatureNotSupportedException
+   {
+      throw new SQLFeatureNotSupportedException();
+   }
+
    private boolean isOurUrl(final String url)
    {
       return url.startsWith(PREFIX);

Modified: projects/jboss-jca/branches/Branch_1_0/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/support/TestConnection.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/support/TestConnection.java	2011-08-30 15:59:34 UTC (rev 112166)
+++ projects/jboss-jca/branches/Branch_1_0/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/support/TestConnection.java	2011-08-30 16:00:18 UTC (rev 112167)
@@ -39,6 +39,7 @@
 import java.sql.Struct;
 import java.util.Map;
 import java.util.Properties;
+import java.util.concurrent.Executor;
 
 /**
  * Test connection.
@@ -481,4 +482,41 @@
    {
       return null;
    }
+
+   /**
+    * {@inheritDoc}
+    */
+   public void setSchema(String schema) throws SQLException
+   {
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   public String getSchema() throws SQLException
+   {
+      return null;
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   public void abort(Executor executor) throws SQLException
+   {
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException
+   {
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   public int getNetworkTimeout() throws SQLException
+   {
+      return 0;
+   }
 }

Modified: projects/jboss-jca/branches/Branch_1_0/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/support/TestDriver.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/support/TestDriver.java	2011-08-30 15:59:34 UTC (rev 112166)
+++ projects/jboss-jca/branches/Branch_1_0/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/support/TestDriver.java	2011-08-30 16:00:18 UTC (rev 112167)
@@ -27,7 +27,9 @@
 import java.sql.DriverManager;
 import java.sql.DriverPropertyInfo;
 import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
 import java.util.Properties;
+import java.util.logging.Logger;
 
 /**
  * Test JDBC driver
@@ -82,4 +84,12 @@
    {
       return false;
    }
+
+   /**
+    * {@inheritDoc}
+    */
+   public Logger getParentLogger() throws SQLFeatureNotSupportedException
+   {
+      throw new SQLFeatureNotSupportedException();
+   }
 }