Index: src/main/java/org/wso2/carbon/registry/core/jdbc/dataaccess/JDBCDatabaseTransaction.java
===================================================================
--- src/main/java/org/wso2/carbon/registry/core/jdbc/dataaccess/JDBCDatabaseTransaction.java	(revision 147479)
+++ src/main/java/org/wso2/carbon/registry/core/jdbc/dataaccess/JDBCDatabaseTransaction.java	(working copy)
@@ -35,6 +35,7 @@
 import java.sql.*;
 import java.sql.Date;
 import java.util.*;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -941,6 +942,20 @@
             // This is a JDK6 specific operation that we don't support for JDK5 compatibility
             throw new UnsupportedOperationException("This method is not supported");
         }
+
+        ////////////////////////////////////////////////////////
+        // JDK 7 only methods.
+        ////////////////////////////////////////////////////////
+        
+		public void closeOnCompletion() throws SQLException {
+			// This is a JDK7 specific operation that we don't support for JDK5 and 6 compatibility
+			throw new UnsupportedOperationException("This method is not supported");
+		}
+
+		public boolean isCloseOnCompletion() throws SQLException {
+			// This is a JDK7 specific operation that we don't support for JDK5 and 6 compatibility
+			throw new UnsupportedOperationException("This method is not supported");
+		}
     }
 
     /**
@@ -1606,6 +1621,38 @@
         public void setConnection(Connection connection) {
             this.connection = connection;
         }
+
+		public void setSchema(String schema) throws SQLException {
+			// This is a JDK7 specific operation that we don't support for JDK5 and 6 compatibility
+			throw new UnsupportedOperationException("This method is not supported");
+			
+		}
+		
+        ////////////////////////////////////////////////////////
+        // JDK 7 only methods.
+        ////////////////////////////////////////////////////////
+
+		public String getSchema() throws SQLException {
+			// This is a JDK7 specific operation that we don't support for JDK5 and 6 compatibility
+			throw new UnsupportedOperationException("This method is not supported");
+		}
+
+		public void abort(Executor executor) throws SQLException {
+			// This is a JDK7 specific operation that we don't support for JDK5 and 6 compatibility
+			throw new UnsupportedOperationException("This method is not supported");
+			
+		}
+
+		public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
+			// This is a JDK7 specific operation that we don't support for JDK5 and 6 compatibility
+			throw new UnsupportedOperationException("This method is not supported");
+			
+		}
+
+		public int getNetworkTimeout() throws SQLException {
+			// This is a JDK7 specific operation that we don't support for JDK5 and 6 compatibility
+			throw new UnsupportedOperationException("This method is not supported");
+		}
     }
 
 }
Index: src/main/java/org/wso2/carbon/registry/core/jdbc/utils/RegistryDataSource.java
===================================================================
--- src/main/java/org/wso2/carbon/registry/core/jdbc/utils/RegistryDataSource.java	(revision 147479)
+++ src/main/java/org/wso2/carbon/registry/core/jdbc/utils/RegistryDataSource.java	(working copy)
@@ -24,6 +24,8 @@
 import java.io.PrintWriter;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.logging.Logger;
 
 /**
  * Use {@link DataAccessManager#createDatabase()}.
@@ -110,4 +112,13 @@
     public boolean isWrapperFor(Class<?> i) throws SQLException {
         return false;
     }
+    
+    ////////////////////////////////////////////////////////
+    // JDK 7 only methods.
+    ////////////////////////////////////////////////////////
+
+	public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+		// This is a JDK7 specific operation that we don't support for JDK5 and 6 compatibility
+		throw new UnsupportedOperationException("This method is not supported");
+	}
 }