[jboss-svn-commits] JBL Code SVN: r37485 - in labs/jbosstm/trunk: ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/resources/mock and 2 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Sep 26 10:39:22 EDT 2011


Author: jhalliday
Date: 2011-09-26 10:39:22 -0400 (Mon, 26 Sep 2011)
New Revision: 37485

Modified:
   labs/jbosstm/trunk/
   labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/resources/mock/MockConnection.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/resources/mock/MockPreparedStatement.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/resources/mock/MockResultSet.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/resources/mock/MockStatement.java
   labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/ConnectionImple.java
   labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/TransactionalDriver.java
Log:
stub new jdbc methods for build on jdk7. JBTM-906



Property changes on: labs/jbosstm/trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /labs/jbosstm/branches/JBOSSTS_4_15_0_Final:37308,37480
   + /labs/jbosstm/branches/JBOSSTS_4_15_0_Final:37308,37480,37484

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/resources/mock/MockConnection.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/resources/mock/MockConnection.java	2011-09-26 14:25:37 UTC (rev 37484)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/resources/mock/MockConnection.java	2011-09-26 14:39:22 UTC (rev 37485)
@@ -48,6 +48,7 @@
 import java.sql.Struct;
 import java.util.Map;
 import java.util.Properties;
+import java.util.concurrent.Executor;
 
 public class MockConnection implements Connection
 {
@@ -55,21 +56,21 @@
     public void clearWarnings () throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void close () throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void commit () throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -304,35 +305,35 @@
     public void releaseSavepoint (Savepoint savepoint) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void rollback () throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void rollback (Savepoint savepoint) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setAutoCommit (boolean autoCommit) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setCatalog (String catalog) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -340,7 +341,7 @@
             throws SQLClientInfoException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -348,21 +349,21 @@
             throws SQLClientInfoException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setHoldability (int holdability) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setReadOnly (boolean readOnly) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -383,14 +384,14 @@
     public void setTransactionIsolation (int level) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setTypeMap (Map<String, Class<?>> map) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -406,5 +407,34 @@
         // TODO Auto-generated method stub
         return null;
     }
+
+
+
+    //@Override
+    public void setSchema(String schema) throws SQLException
+    {
+    }
+
+    //@Override
+    public String getSchema() throws SQLException
+    {
+        return null;
+    }
+
+    //@Override
+    public void abort(Executor executor) throws SQLException
+    {
+    }
+
+    //@Override
+    public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException
+    {
+    }
+
+    //@Override
+    public int getNetworkTimeout() throws SQLException
+    {
+        return 0;
+    }
 }
 

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/resources/mock/MockPreparedStatement.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/resources/mock/MockPreparedStatement.java	2011-09-26 14:25:37 UTC (rev 37484)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/resources/mock/MockPreparedStatement.java	2011-09-26 14:39:22 UTC (rev 37485)
@@ -61,24 +61,24 @@
     {
         this(true);
     }
-    
+
     public MockPreparedStatement (boolean n)
     {
         _next = n;
     }
-    
+
     @Override
     public void addBatch () throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void clearParameters () throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -118,7 +118,7 @@
     public void setArray (int parameterIndex, Array x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -126,7 +126,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -134,7 +134,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -142,7 +142,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -150,7 +150,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -158,7 +158,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -166,7 +166,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -174,14 +174,14 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setBlob (int parameterIndex, Blob x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -189,7 +189,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -197,28 +197,28 @@
             long length) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setBoolean (int parameterIndex, boolean x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setByte (int parameterIndex, byte x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setBytes (int parameterIndex, byte[] x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -226,7 +226,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -234,7 +234,7 @@
             int length) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -242,21 +242,21 @@
             long length) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setClob (int parameterIndex, Clob x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setClob (int parameterIndex, Reader reader) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -264,14 +264,14 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setDate (int parameterIndex, Date x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -279,35 +279,35 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setDouble (int parameterIndex, double x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setFloat (int parameterIndex, float x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setInt (int parameterIndex, int x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setLong (int parameterIndex, long x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -315,7 +315,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -323,14 +323,14 @@
             long length) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setNClob (int parameterIndex, NClob value) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -338,7 +338,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -346,7 +346,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -354,14 +354,14 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setNull (int parameterIndex, int sqlType) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -369,14 +369,14 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setObject (int parameterIndex, Object x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -384,7 +384,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -392,21 +392,21 @@
             int scaleOrLength) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setRef (int parameterIndex, Ref x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setRowId (int parameterIndex, RowId x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -414,28 +414,28 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setShort (int parameterIndex, short x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setString (int parameterIndex, String x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setTime (int parameterIndex, Time x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -443,7 +443,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -451,7 +451,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -459,14 +459,14 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setURL (int parameterIndex, URL x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -474,42 +474,42 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void addBatch (String sql) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void cancel () throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void clearBatch () throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void clearWarnings () throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void close () throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -711,56 +711,56 @@
     public void setCursorName (String name) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setEscapeProcessing (boolean enable) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setFetchDirection (int direction) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setFetchSize (int rows) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setMaxFieldSize (int max) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setMaxRows (int max) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setPoolable (boolean poolable) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setQueryTimeout (int seconds) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -776,7 +776,19 @@
         // TODO Auto-generated method stub
         return null;
     }
-    
+
     private boolean _next;
+
+
+    //@Override
+    public void closeOnCompletion() throws SQLException
+    {
+    }
+
+    //@Override
+    public boolean isCloseOnCompletion() throws SQLException
+    {
+        return false;
+    }
 }
 

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/resources/mock/MockResultSet.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/resources/mock/MockResultSet.java	2011-09-26 14:25:37 UTC (rev 37484)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/resources/mock/MockResultSet.java	2011-09-26 14:39:22 UTC (rev 37485)
@@ -60,7 +60,7 @@
     {
         _next = nxt;
     }
-    
+
     @Override
     public boolean absolute (int row) throws SQLException
     {
@@ -72,42 +72,42 @@
     public void afterLast () throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void beforeFirst () throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void cancelRowUpdates () throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void clearWarnings () throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void close () throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void deleteRow () throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -665,7 +665,7 @@
     public void insertRow () throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -714,14 +714,14 @@
     public void moveToCurrentRow () throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void moveToInsertRow () throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -741,7 +741,7 @@
     public void refreshRow () throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -776,28 +776,28 @@
     public void setFetchDirection (int direction) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setFetchSize (int rows) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateArray (int columnIndex, Array x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateArray (String columnLabel, Array x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -805,7 +805,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -813,7 +813,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -821,7 +821,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -829,7 +829,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -837,7 +837,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -845,7 +845,7 @@
             long length) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -853,7 +853,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -861,7 +861,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -869,7 +869,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -877,7 +877,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -885,7 +885,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -893,7 +893,7 @@
             int length) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -901,7 +901,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -909,21 +909,21 @@
             long length) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateBlob (int columnIndex, Blob x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateBlob (String columnLabel, Blob x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -931,7 +931,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -939,7 +939,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -947,7 +947,7 @@
             long length) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -955,14 +955,14 @@
             long length) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateBoolean (int columnIndex, boolean x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -970,35 +970,35 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateByte (int columnIndex, byte x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateByte (String columnLabel, byte x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateBytes (int columnIndex, byte[] x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateBytes (String columnLabel, byte[] x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -1006,7 +1006,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -1014,7 +1014,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -1022,7 +1022,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -1030,7 +1030,7 @@
             int length) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -1038,7 +1038,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -1046,28 +1046,28 @@
             long length) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateClob (int columnIndex, Clob x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateClob (String columnLabel, Clob x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateClob (int columnIndex, Reader reader) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -1075,7 +1075,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -1083,7 +1083,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -1091,77 +1091,77 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateDate (int columnIndex, Date x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateDate (String columnLabel, Date x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateDouble (int columnIndex, double x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateDouble (String columnLabel, double x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateFloat (int columnIndex, float x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateFloat (String columnLabel, float x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateInt (int columnIndex, int x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateInt (String columnLabel, int x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateLong (int columnIndex, long x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateLong (String columnLabel, long x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -1169,7 +1169,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -1177,7 +1177,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -1185,7 +1185,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -1193,14 +1193,14 @@
             long length) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateNClob (int columnIndex, NClob clob) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -1208,7 +1208,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -1216,7 +1216,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -1224,7 +1224,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -1232,7 +1232,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -1240,7 +1240,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -1248,7 +1248,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -1256,35 +1256,35 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateNull (int columnIndex) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateNull (String columnLabel) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateObject (int columnIndex, Object x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateObject (String columnLabel, Object x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -1292,7 +1292,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -1300,42 +1300,42 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateRef (int columnIndex, Ref x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateRef (String columnLabel, Ref x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateRow () throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateRowId (int columnIndex, RowId x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateRowId (String columnLabel, RowId x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -1343,7 +1343,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -1351,49 +1351,49 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateShort (int columnIndex, short x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateShort (String columnLabel, short x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateString (int columnIndex, String x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateString (String columnLabel, String x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateTime (int columnIndex, Time x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void updateTime (String columnLabel, Time x) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -1401,7 +1401,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -1409,7 +1409,7 @@
             throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -1432,7 +1432,21 @@
         // TODO Auto-generated method stub
         return null;
     }
-    
+
     private boolean _next;
+
+
+
+    //@Override
+    public <T> T getObject(int columnIndex, Class<T> type) throws SQLException
+    {
+        return null;
+    }
+
+    //@Override
+    public <T> T getObject(String columnLabel, Class<T> type) throws SQLException
+    {
+        return null;
+    }
 }
 

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/resources/mock/MockStatement.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/resources/mock/MockStatement.java	2011-09-26 14:25:37 UTC (rev 37484)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/resources/mock/MockStatement.java	2011-09-26 14:39:22 UTC (rev 37485)
@@ -44,35 +44,35 @@
     public void addBatch (String arg0) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void cancel () throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void clearBatch () throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void clearWarnings () throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void close () throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -268,56 +268,56 @@
     public void setCursorName (String arg0) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setEscapeProcessing (boolean arg0) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setFetchDirection (int arg0) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setFetchSize (int arg0) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setMaxFieldSize (int arg0) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setMaxRows (int arg0) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setPoolable (boolean arg0) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
     public void setQueryTimeout (int arg0) throws SQLException
     {
         // TODO Auto-generated method stub
-        
+
     }
 
     @Override
@@ -333,5 +333,17 @@
         // TODO Auto-generated method stub
         return null;
     }
+
+
+    //@Override
+    public void closeOnCompletion() throws SQLException
+    {
+    }
+
+    //@Override
+    public boolean isCloseOnCompletion() throws SQLException
+    {
+        return false;
+    }
 }
 

Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/ConnectionImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/ConnectionImple.java	2011-09-26 14:25:37 UTC (rev 37484)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/ConnectionImple.java	2011-09-26 14:39:22 UTC (rev 37485)
@@ -48,6 +48,7 @@
 import java.sql.*;
 import javax.transaction.RollbackException;
 import java.sql.SQLException;
+import java.util.concurrent.Executor;
 
 /**
  * A transactional JDBC connection. This wraps the real connection and
@@ -295,7 +296,7 @@
 	         */
 
 	        boolean delayClose = false;
-	        
+
 	        if (tx != null)
 	        {
 	            if (_recoveryConnection.validTransaction(tx))
@@ -313,12 +314,12 @@
                         jdbcLogger.i18NLogger.info_closingconnectionnull(_theConnection.toString());
 
 	                    // no indication about connections, so assume close immediately
-	                    
+
 	                    if (_theConnection != null && !_theConnection.isClosed())
 	                        _theConnection.close();
 
 	                    _theConnection = null;
-	                    
+
 	                    return;
 	                }
 	                else
@@ -339,14 +340,14 @@
 	                if (delayClose)
 	                {
         	                tx.registerSynchronization(new ConnectionSynchronization(_theConnection, _recoveryConnection));
-        	                       
+
                                 _theConnection = null;
 	                }
 	            }
 	            else
 	                throw new SQLException(jdbcLogger.i18NLogger.get_closeerrorinvalidtx(tx.toString()));
 	        }
-	        
+
 	        if (!delayClose)  // close now
 	        {
 	            _recoveryConnection.closeCloseCurrentConnection();
@@ -373,7 +374,7 @@
 	        throw sqlException;
 	    }
 	}
-	
+
 	public boolean isClosed() throws SQLException
 	{
 		/*
@@ -756,7 +757,47 @@
 	 * *******************************************************************
 	 */
 
+    /*
+     * ******************************************************************* *
+     * Java 7 method section.
+     */
 
+    //@Override
+    public void setSchema(String schema) throws SQLException
+    {
+        throw new SQLException();
+    }
+
+    //@Override
+    public String getSchema() throws SQLException
+    {
+        throw new SQLException();
+    }
+
+    //@Override
+    public void abort(Executor executor) throws SQLException
+    {
+        throw new SQLException();
+    }
+
+    //@Override
+    public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException
+    {
+        throw new SQLException();
+    }
+
+    //@Override
+    public int getNetworkTimeout() throws SQLException
+    {
+        throw new SQLException();
+    }
+
+    /*
+	 * end of the Java 7 section
+	 * *******************************************************************
+	 */
+
+
     /**
 	 * @return the XAResource associated with the current XAConnection.
 	 */

Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/TransactionalDriver.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/TransactionalDriver.java	2011-09-26 14:25:37 UTC (rev 37484)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/TransactionalDriver.java	2011-09-26 14:39:22 UTC (rev 37485)
@@ -1,20 +1,20 @@
 /*
  * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors 
- * as indicated by the @author tags. 
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
  * See the copyright.txt in the distribution for a
- * full listing of individual contributors. 
+ * full listing of individual contributors.
  * This copyrighted material is made available to anyone wishing to use,
  * modify, copy, or redistribute it subject to the terms and conditions
  * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
  * You should have received a copy of the GNU Lesser General Public License,
  * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
- * 
+ *
  * (C) 2005-2006,
  * @author JBoss Inc.
  */
@@ -24,7 +24,7 @@
  * Hewlett-Packard Arjuna Labs,
  * Newcastle upon Tyne,
  * Tyne and Wear,
- * UK.  
+ * UK.
  *
  * $Id: TransactionalDriver.java 2342 2006-03-30 13:06:17Z  $
  */
@@ -42,6 +42,7 @@
 
 import java.sql.SQLException;
 import java.lang.ExceptionInInitializerError;
+import java.util.logging.Logger;
 
 /**
  * Transactional JDBC 2.0 driver. This returns transactional JDBC connections
@@ -87,7 +88,7 @@
 	    return ConnectionManager.create(url.substring(TransactionalDriver.arjunaDriver.length()), info);
 	}
     }
-    
+
     public boolean acceptsURL (String url) throws SQLException
     {
 	if (jdbcLogger.logger.isTraceEnabled()) {
@@ -109,12 +110,12 @@
     {
 	return 2;
     }
-    
+
     public int getMinorVersion ()
     {
 	return 0;
     }
-    
+
     public boolean jdbcCompliant ()
     {
 	return true;
@@ -142,6 +143,12 @@
 	}
     }
 
+    //@Override
+    public Logger getParentLogger() throws SQLFeatureNotSupportedException
+    {
+        throw new SQLFeatureNotSupportedException();
+    }
+
     static
     {
 	try
@@ -153,6 +160,6 @@
 	    throw new ExceptionInInitializerError(e);
 	}
     }
-    
+
 }
 



More information about the jboss-svn-commits mailing list