db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1482044 - in /db/derby/code/trunk/java: engine/org/apache/derby/iapi/jdbc/ engine/org/apache/derby/iapi/sql/ engine/org/apache/derby/impl/jdbc/ engine/org/apache/derby/impl/store/raw/data/ engine/org/apache/derby/jdbc/ testing/org/apache/d...
Date Mon, 13 May 2013 19:34:04 GMT
Author: rhillegas
Date: Mon May 13 19:34:03 2013
New Revision: 1482044

URL: http://svn.apache.org/r1482044
Log:
DERBY-6213: Convert JDBC build scripts to Java 6 and misc merges.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement30.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection40.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement30.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet20.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSetMetaData.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RecordId.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver20.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver30.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedXAConnection.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedBaseDataSource.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDriver.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/InternalDriver.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/CheckToursDBTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/JDBC4FromJDBC3DataSourceTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceSerializationTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/NativeAuthenticationServiceTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dbjarUtil.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/MemoryDbManager.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoAPITest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeClassLoader.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeTrajectoryTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SupportFilesSetup.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java Mon May 13 19:34:03 2013
@@ -31,7 +31,7 @@ import java.util.Map;
 /**
  * JDBC 3 brokered CallableStatement
  */
-public class BrokeredCallableStatement extends BrokeredPreparedStatement
+public abstract class BrokeredCallableStatement extends BrokeredPreparedStatement
           implements CallableStatement
 {
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java Mon May 13 19:34:03 2013
@@ -37,7 +37,7 @@ import org.apache.derby.shared.common.re
  * This is a rudimentary connection that delegates
  * EVERYTHING to Connection.
  */
-public class BrokeredConnection implements EngineConnection
+public abstract class BrokeredConnection implements EngineConnection
 {
 	
 	// default for Derby
@@ -575,22 +575,15 @@ public class BrokeredConnection implemen
 		}
 	}
 
-	public BrokeredStatement newBrokeredStatement(BrokeredStatementControl statementControl) throws SQLException {
-		return new BrokeredStatement(statementControl);
-	}
+	public abstract BrokeredStatement newBrokeredStatement(BrokeredStatementControl statementControl) throws SQLException;
 
-    public BrokeredPreparedStatement newBrokeredStatement(
+    public abstract BrokeredPreparedStatement newBrokeredStatement(
             BrokeredStatementControl statementControl, String sql,
-            Object generatedKeys) throws SQLException {
-        return new BrokeredPreparedStatement(
-                statementControl, sql, generatedKeys);
-    }
+            Object generatedKeys) throws SQLException;
 
-    public BrokeredCallableStatement newBrokeredStatement(
+    public abstract BrokeredCallableStatement newBrokeredStatement(
             BrokeredStatementControl statementControl, String sql)
-            throws SQLException {
-        return new BrokeredCallableStatement(statementControl, sql);
-    }
+        throws SQLException;
 
 	/**
 	 *  set the DrdaId for this connection. The drdaID prints with the 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java Mon May 13 19:34:03 2013
@@ -31,7 +31,7 @@ import java.util.Calendar;
 	JDBC 3 brokered PreparedStatement. Forwards calls off to a real prepared statement
 	obtained through the BrokeredStatementControl getRealPreparedStatement method.
  */
-public class BrokeredPreparedStatement extends BrokeredStatement
+public abstract class BrokeredPreparedStatement extends BrokeredStatement
 	implements EnginePreparedStatement
 {
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java Mon May 13 19:34:03 2013
@@ -32,7 +32,7 @@ import java.sql.Statement;
 /**
 	A Statement implementation that forwards all of its requests to an underlying Statement.
  */
-public class BrokeredStatement implements EngineStatement
+public abstract class BrokeredStatement implements EngineStatement
 {
 
 	/**

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml Mon May 13 19:34:03 2013
@@ -37,12 +37,12 @@
 
 <!-- Targets -->
 
-  <target name="compile" depends="checkVMLevel, compile_iapi_jdbc_jdbc3, compile_jdbc4, compile_jdbc42"/>
+  <target name="compile" depends="checkVMLevel, compile_jdbc4, compile_jdbc42"/>
 
-  <target name="compile_iapi_jdbc_jsr169">
-	    <javac
-	      source="1.4"
-	      target="1.4"
+  <target name="compile_jdbc4" >
+    <javac
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -54,76 +54,12 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${jsr169compile.classpath}"/>
+        <pathelement path="${java16compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/${cur.dir}/*.java"/>
-	  <exclude name="${derby.dir}/${cur.dir}/BrokeredConnection.java"/>
-	  <exclude name="${derby.dir}/${cur.dir}/BrokeredConnection40.java"/>
-	  <exclude name="${derby.dir}/${cur.dir}/BrokeredPreparedStatement.java"/>
-	  <exclude name="${derby.dir}/${cur.dir}/BrokeredPreparedStatement40.java"/>
-	  <exclude name="${derby.dir}/${cur.dir}/BrokeredCallableStatement.java"/>
-	  <exclude name="${derby.dir}/${cur.dir}/BrokeredCallableStatement40.java"/>
-	  <exclude name="${derby.dir}/${cur.dir}/BrokeredStatement.java"/>
-      <exclude name="${derby.dir}/${cur.dir}/BrokeredStatement40.java"/>
-      <exclude name="${derby.dir}/${cur.dir}/EngineCallableStatement40.java"/>
-      <exclude name="${derby.dir}/${cur.dir}/EngineConnection40.java"/>
-      <exclude name="${derby.dir}/${cur.dir}/FailedProperties40.java"/>
-      <exclude name="${derby.dir}/${cur.dir}/ResourceAdapter.java"/>
 	  <exclude name="${derby.dir}/${cur.dir}/*42.java"/>
+      <!-- <compilerarg value="-Xlint:unchecked"/> -->
     </javac>
-  </target>
-
-  <target name="compile_iapi_jdbc_jdbc3" depends="compile_iapi_jdbc_jsr169">
-    <javac
-      source="1.5"
-      target="1.5"
-      bootclasspath="${empty}"
-      nowarn="on"
-      debug="${debug}"
-      depend="${depend}"
-      deprecation="${deprecation}"
-      optimize="${optimize}"
-      proceed="${proceed}"
-      verbose="${verbose}"
-      srcdir="${derby.engine.src.dir}"
-      destdir="${out.dir}">
-      <classpath>
-        <pathelement path="${java15compile.classpath}"/>
-      </classpath>
-      <include name="${derby.dir}/${cur.dir}/BrokeredStatement.java"/>
-	  <include name="${derby.dir}/${cur.dir}/BrokeredConnection.java"/>
-	  <include name="${derby.dir}/${cur.dir}/BrokeredPreparedStatement.java"/>
-	  <include name="${derby.dir}/${cur.dir}/BrokeredCallableStatement.java"/>
-      <include name="${derby.dir}/${cur.dir}/XAResourceAdapter.java"/>
-	  <include name="${derby.dir}/${cur.dir}/ResourceAdapter.java"/>
-    </javac>
-  </target>
-
-  <target name="compile_jdbc4" >
-      <javac
-          source="${compilerLevel16}"
-          target="${compilerLevel16}"
-          bootclasspath="${empty}"
-          nowarn="on"
-          debug="${debug}"
-          depend="${depend}"
-          deprecation="${deprecation}"
-          optimize="${optimize}"
-          proceed="${proceed}"
-          verbose="${verbose}"
-          srcdir="${derby.engine.src.dir}"
-          destdir="${out.dir}">
-          <classpath>
-              <pathelement path="${java16compile.classpath}"/>
-          </classpath>
-          <include name="${derby.dir}/${cur.dir}/BrokeredConnection40.java"/>
-          <include name="${derby.dir}/${cur.dir}/BrokeredStatement40.java"/>
-          <include name="${derby.dir}/${cur.dir}/BrokeredPreparedStatement40.java"/>
-          <include name="${derby.dir}/${cur.dir}/BrokeredCallableStatement40.java"/>
-          <include name="${derby.dir}/${cur.dir}/EngineCallableStatement40.java"/>
-          <include name="${derby.dir}/${cur.dir}/EngineConnection40.java"/>
-          <include name="${derby.dir}/${cur.dir}/FailedProperties40.java"/>
-      </javac>
   </target> 
 
   <target name="compile_jdbc42" if="vmLevelIsAtLeast1.8">
@@ -144,6 +80,7 @@
               <pathelement path="${java18compile.classpath}"/>
           </classpath>
           <include name="${derby.dir}/${cur.dir}/*42.java"/>
+          <!-- <compilerarg value="-Xlint:unchecked"/> -->
       </javac>
   </target> 
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/build.xml?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/build.xml Mon May 13 19:34:03 2013
@@ -34,12 +34,11 @@
 
 <!-- Targets -->
 
-  <target name="compile" depends="compile_iapi_sql_jsr169,java5"/>
+  <target name="compile">
 
-  <target name="compile_iapi_sql_jsr169">
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -51,31 +50,10 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${compile.classpath}"/>
+        <pathelement path="${java16compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/iapi/sql/**"/>
-      <exclude name="${derby.dir}/iapi/sql/dictionary/OptionalTool.java"/>
-    </javac>
-  </target>
-
-  <target name="java5">
-    <javac
-      source="1.5"
-      target="1.5"
-      bootclasspath="${empty}"
-      nowarn="on"
-      debug="${debug}"
-      depend="${depend}"
-      deprecation="${deprecation}"
-      optimize="${optimize}"
-      proceed="${proceed}"
-      verbose="${verbose}"
-      srcdir="${derby.engine.src.dir}"
-      destdir="${out.dir}">
-      <classpath>
-        <pathelement path="${java15compile.classpath}"/>
-      </classpath>
-      <include name="${derby.dir}/iapi/sql/dictionary/OptionalTool.java"/>
+      <!-- <compilerarg value="-Xlint:unchecked"/> -->
     </javac>
   </target>
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java Mon May 13 19:34:03 2013
@@ -47,7 +47,7 @@ import java.util.Calendar;
  * Local implementation.
  *
  */
-public class EmbedCallableStatement extends EmbedPreparedStatement
+public abstract class EmbedCallableStatement extends EmbedPreparedStatement
 	implements CallableStatement
 {
 	/*

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement30.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement30.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement30.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement30.java Mon May 13 19:34:03 2013
@@ -44,7 +44,7 @@ import org.apache.derby.impl.jdbc.EmbedC
  * @see org.apache.derby.impl.jdbc.EmbedCallableStatement
  *
  */
-public class EmbedCallableStatement30 extends EmbedCallableStatement20
+public abstract class EmbedCallableStatement30 extends EmbedCallableStatement20
 {
 
 	//////////////////////////////////////////////////////////////

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java Mon May 13 19:34:03 2013
@@ -62,13 +62,19 @@ import java.security.AccessControlExcept
 import java.sql.Connection;
 import java.sql.ResultSet;
 */
+import java.sql.Array;
 import java.sql.PreparedStatement;
 import java.sql.CallableStatement;
 import java.sql.Blob;
 import java.sql.Clob;
 import java.sql.DatabaseMetaData;
+import java.sql.NClob;
+import java.sql.SQLXML;
+import java.sql.Struct;
 import java.sql.ResultSet;
+import java.sql.SQLClientInfoException;
 import java.sql.SQLException;
+import java.sql.SQLPermission;
 import java.sql.SQLWarning;
 import java.sql.Savepoint;
 import java.sql.Statement;
@@ -79,9 +85,11 @@ import java.util.WeakHashMap;
 import java.util.HashMap;
 import java.util.Properties;
 import java.util.Iterator;
+import java.util.concurrent.Executor;
 
 import org.apache.derby.iapi.jdbc.EngineLOB;
 import org.apache.derby.iapi.jdbc.ExceptionFactory;
+import org.apache.derby.iapi.jdbc.FailedProperties40;
 import org.apache.derby.iapi.reference.Limits;
 import org.apache.derby.iapi.sql.conn.StatementContext;
 import org.apache.derby.iapi.transaction.TransactionControl;
@@ -117,7 +125,7 @@ import org.apache.derby.impl.jdbc.authen
  * @see TransactionResourceImpl
  *
  */
-public class EmbedConnection implements EngineConnection
+public abstract class EmbedConnection implements EngineConnection
 {
 
 	protected static final StandardException exceptionClose = StandardException.closeException();
@@ -2294,19 +2302,6 @@ public class EmbedConnection implements 
 	//
 	/////////////////////////////////////////////////////////////////////////
 
-    /**
-     *
-	 * Get the type-map object associated with this connection.
-	 * By default, the map returned is empty.
-	 * JDBC 2.0 - java.util.Map requires JDK 1
-     *
-     */
-    public java.util.Map getTypeMap() throws SQLException {
-        checkIfClosed();
-		// just return an immuntable empty map
-		return java.util.Collections.EMPTY_MAP;
-    }
-
     /** 
 	 * Install a type-map object as the default type-map for
 	 * this connection.
@@ -3711,4 +3706,269 @@ public class EmbedConnection implements 
             }
         }
     }
+    
+    /*
+     *-------------------------------------------------------
+     * JDBC 4.0
+     *-------------------------------------------------------
+     */
+    
+    public Array createArrayOf(String typeName, Object[] elements)
+        throws SQLException {
+        throw Util.notImplemented();
+    }
+    
+    public NClob createNClob() throws SQLException {
+        throw Util.notImplemented();
+    }
+    
+    public SQLXML createSQLXML() throws SQLException {
+        throw Util.notImplemented();
+    }
+    
+    public Struct createStruct(String typeName, Object[] attributes)
+        throws SQLException {
+        throw Util.notImplemented();
+    }
+    
+    /**
+     * Checks if the connection has not been closed and is still valid. 
+     * The validity is checked by checking that the connection is not closed.
+     *
+     * @param timeout This should be the time in seconds to wait for the 
+     * database operation used to validate the connection to complete 
+     * (according to the JDBC4 JavaDoc). This is currently not supported/used.
+     *
+     * @return true if the connection is valid, false otherwise
+     * @exception SQLException if the parameter value is illegal or if a
+     * database error has occurred
+     */
+    public boolean isValid(int timeout) throws SQLException {
+        // Validate that the timeout has a legal value
+        if (timeout < 0) {
+            throw Util.generateCsSQLException(SQLState.INVALID_API_PARAMETER,
+                                              new Integer(timeout), "timeout",
+                                              "java.sql.Connection.isValid");
+        }
+
+        // Use the closed status for the connection to determine if the
+        // connection is valid or not
+        return !isClosed();
+    }
+
+    /**
+     * <code>setClientInfo</code> will always throw a
+     * <code>SQLClientInfoException</code> since Derby does not support
+     * any properties.
+     *
+     * @param name a property key <code>String</code>
+     * @param value a property value <code>String</code>
+     * @exception SQLClientInfoException unless both name and value are null
+     */
+    public void setClientInfo(String name, String value)
+    throws SQLClientInfoException{
+        Properties p = FailedProperties40.makeProperties(name,value);
+        try { checkIfClosed(); }
+        catch (SQLException se) {
+            FailedProperties40 fp = new FailedProperties40(p);
+            throw new SQLClientInfoException(se.getMessage(), 
+                                             se.getSQLState(), 
+                                             se.getErrorCode(),
+                                             fp.getProperties());
+        }
+        // Allow null to simplify compliance testing through
+        // reflection, (test all methods in an interface with null
+        // arguments)
+        if (name == null && value == null) {
+            return;
+        }
+        setClientInfo(p);
+    }
+    
+    /**
+     * <code>setClientInfo</code> will throw a
+     * <code>SQLClientInfoException</code> unless the <code>properties</code>
+     * parameter is empty, since Derby does not support any
+     * properties. All the property keys in the
+     * <code>properties</code> parameter are added to failedProperties
+     * of the exception thrown, with REASON_UNKNOWN_PROPERTY as the
+     * value. 
+     *
+     * @param properties a <code>Properties</code> object with the
+     * properties to set
+     * @exception SQLClientInfoException unless properties parameter
+     * is null or empty
+     */
+    public void setClientInfo(Properties properties)
+    throws SQLClientInfoException {
+        FailedProperties40 fp = new FailedProperties40(properties);
+        
+        try { checkIfClosed(); }
+        catch (SQLException se) {
+            throw new SQLClientInfoException(se.getMessage(), se.getSQLState(),
+            		se.getErrorCode(), fp.getProperties());
+        }
+
+        // Allow null to simplify compliance testing through
+        // reflection, (test all methods in an interface with null
+        // arguments)
+        // An empty properties object is meaningless, but allowed
+        if (properties == null || properties.isEmpty()) {
+            return;
+        }
+
+        StandardException se = 
+            StandardException.newException
+            (SQLState.PROPERTY_UNSUPPORTED_CHANGE, 
+             fp.getFirstKey(), 
+             fp.getFirstValue());
+        throw new SQLClientInfoException(se.getMessage(),
+        		se.getSQLState(), 
+        		se.getErrorCode(),
+        		fp.getProperties());
+    }
+    
+    /**
+     * <code>getClientInfo</code> always returns a
+     * <code>null String</code> since Derby doesn't support
+     * ClientInfoProperties.
+     *
+     * @param name a <code>String</code> value
+     * @return a <code>null String</code> value
+     * @exception SQLException if the connection is closed.
+     */
+    public String getClientInfo(String name)
+    throws SQLException{
+        checkIfClosed();
+        return null;
+    }
+    
+    /**
+     * <code>getClientInfo</code> always returns an empty
+     * <code>Properties</code> object since Derby doesn't support
+     * ClientInfoProperties.
+     *
+     * @return an empty <code>Properties</code> object
+     * @exception SQLException if the connection is closed.
+     */
+    public Properties getClientInfo()
+    throws SQLException{
+        checkIfClosed();
+        return new Properties();
+    }
+
+    /**
+     * Returns the type map for this connection.
+     *
+     * @return type map for this connection
+     * @exception SQLException if a database access error occurs
+     */
+    @SuppressWarnings("unchecked")
+    public final Map<String, Class<?>> getTypeMap() throws SQLException {
+        checkIfClosed();
+		// just return an immuntable empty map
+		return java.util.Collections.EMPTY_MAP;
+    }
+    
+    /**
+     * Returns false unless <code>interfaces</code> is implemented 
+     * 
+     * @param  interfaces             a Class defining an interface.
+     * @return true                   if this implements the interface or 
+     *                                directly or indirectly wraps an object 
+     *                                that does.
+     * @throws java.sql.SQLException  if an error occurs while determining 
+     *                                whether this is a wrapper for an object 
+     *                                with the given interface.
+     */
+    public boolean isWrapperFor(Class<?> interfaces) throws SQLException {
+        checkIfClosed();
+        return interfaces.isInstance(this);
+    }
+    
+    /**
+     * Returns <code>this</code> if this class implements the interface
+     *
+     * @param  interfaces a Class defining an interface
+     * @return an object that implements the interface
+     * @throws java.sql.SQLExption if no object if found that implements the 
+     * interface
+     */
+    public <T> T unwrap(java.lang.Class<T> interfaces) 
+                            throws SQLException{
+        checkIfClosed();
+        //Derby does not implement non-standard methods on 
+        //JDBC objects
+        //hence return this if this class implements the interface 
+        //or throw an SQLException
+        try {
+            return interfaces.cast(this);
+        } catch (ClassCastException cce) {
+            throw newSQLException(SQLState.UNABLE_TO_UNWRAP,interfaces);
+        }
+    }
+    
+    ////////////////////////////////////////////////////////////////////
+    //
+    // INTRODUCED BY JDBC 4.1 IN JAVA 7
+    //
+    ////////////////////////////////////////////////////////////////////
+
+    public  void    abort( Executor executor )  throws SQLException
+    {
+        // NOP if called on a closed connection.
+        if ( isClosed() ) { return; }
+        // Null executor not allowed.
+        if ( executor == null )
+        {
+            throw newSQLException( SQLState.UU_INVALID_PARAMETER, "executor", "null" );
+        }
+
+        //
+        // Must have privilege to invoke this method.
+        //
+        // The derby jars should be granted this permission. We deliberately
+        // do not wrap this check in an AccessController.doPrivileged() block.
+        // If we did so, that would absolve outer code blocks of the need to
+        // have this permission granted to them too. It is critical that the
+        // outer code blocks enjoy this privilege. That is what allows
+        // connection pools to prevent ordinary code from calling abort()
+        // and restrict its usage to privileged tools.
+        //
+        SecurityManager securityManager = System.getSecurityManager();
+        if ( securityManager != null )
+        { securityManager.checkPermission( new SQLPermission( "callAbort" ) ); }
+
+        // Mark the Connection as closed. Set the "aborting" flag to allow internal
+        // processing in close() to proceed.
+        beginAborting();
+
+        //
+        // Now pass the Executor a Runnable which does the real work.
+        //
+        executor.execute
+            (
+             new Runnable()
+             {
+                 public void run()
+                 {
+                     try {
+                         rollback();
+                         close(exceptionClose);
+                     } catch (SQLException se) { Util.logSQLException( se ); }
+                 }
+             }
+             );
+    }
+    
+    public int getNetworkTimeout() throws SQLException
+    {
+        throw Util.notImplemented();
+    }
+    
+    public void setNetworkTimeout( Executor executor, int milliseconds ) throws SQLException
+    {
+        throw Util.notImplemented();
+    }
+    
 }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection40.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection40.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection40.java Mon May 13 19:34:03 2013
@@ -53,269 +53,4 @@ public class EmbedConnection40
         super(driver, url, info);
     }
     
-    /*
-     *-------------------------------------------------------
-     * JDBC 4.0
-     *-------------------------------------------------------
-     */
-    
-    public Array createArrayOf(String typeName, Object[] elements)
-        throws SQLException {
-        throw Util.notImplemented();
-    }
-    
-    public NClob createNClob() throws SQLException {
-        throw Util.notImplemented();
-    }
-    
-    public SQLXML createSQLXML() throws SQLException {
-        throw Util.notImplemented();
-    }
-    
-    public Struct createStruct(String typeName, Object[] attributes)
-        throws SQLException {
-        throw Util.notImplemented();
-    }
-    
-    /**
-     * Checks if the connection has not been closed and is still valid. 
-     * The validity is checked by checking that the connection is not closed.
-     *
-     * @param timeout This should be the time in seconds to wait for the 
-     * database operation used to validate the connection to complete 
-     * (according to the JDBC4 JavaDoc). This is currently not supported/used.
-     *
-     * @return true if the connection is valid, false otherwise
-     * @exception SQLException if the parameter value is illegal or if a
-     * database error has occurred
-     */
-    public boolean isValid(int timeout) throws SQLException {
-        // Validate that the timeout has a legal value
-        if (timeout < 0) {
-            throw Util.generateCsSQLException(SQLState.INVALID_API_PARAMETER,
-                                              new Integer(timeout), "timeout",
-                                              "java.sql.Connection.isValid");
-        }
-
-        // Use the closed status for the connection to determine if the
-        // connection is valid or not
-        return !isClosed();
-    }
-
-    /**
-     * <code>setClientInfo</code> will always throw a
-     * <code>SQLClientInfoException</code> since Derby does not support
-     * any properties.
-     *
-     * @param name a property key <code>String</code>
-     * @param value a property value <code>String</code>
-     * @exception SQLClientInfoException unless both name and value are null
-     */
-    public void setClientInfo(String name, String value)
-    throws SQLClientInfoException{
-        Properties p = FailedProperties40.makeProperties(name,value);
-        try { checkIfClosed(); }
-        catch (SQLException se) {
-            FailedProperties40 fp = new FailedProperties40(p);
-            throw new SQLClientInfoException(se.getMessage(), 
-                                             se.getSQLState(), 
-                                             se.getErrorCode(),
-                                             fp.getProperties());
-        }
-        // Allow null to simplify compliance testing through
-        // reflection, (test all methods in an interface with null
-        // arguments)
-        if (name == null && value == null) {
-            return;
-        }
-        setClientInfo(p);
-    }
-    
-    /**
-     * <code>setClientInfo</code> will throw a
-     * <code>SQLClientInfoException</code> unless the <code>properties</code>
-     * parameter is empty, since Derby does not support any
-     * properties. All the property keys in the
-     * <code>properties</code> parameter are added to failedProperties
-     * of the exception thrown, with REASON_UNKNOWN_PROPERTY as the
-     * value. 
-     *
-     * @param properties a <code>Properties</code> object with the
-     * properties to set
-     * @exception SQLClientInfoException unless properties parameter
-     * is null or empty
-     */
-    public void setClientInfo(Properties properties)
-    throws SQLClientInfoException {
-        FailedProperties40 fp = new FailedProperties40(properties);
-        
-        try { checkIfClosed(); }
-        catch (SQLException se) {
-            throw new SQLClientInfoException(se.getMessage(), se.getSQLState(),
-            		se.getErrorCode(), fp.getProperties());
-        }
-
-        // Allow null to simplify compliance testing through
-        // reflection, (test all methods in an interface with null
-        // arguments)
-        // An empty properties object is meaningless, but allowed
-        if (properties == null || properties.isEmpty()) {
-            return;
-        }
-
-        StandardException se = 
-            StandardException.newException
-            (SQLState.PROPERTY_UNSUPPORTED_CHANGE, 
-             fp.getFirstKey(), 
-             fp.getFirstValue());
-        throw new SQLClientInfoException(se.getMessage(),
-        		se.getSQLState(), 
-        		se.getErrorCode(),
-        		fp.getProperties());
-    }
-    
-    /**
-     * <code>getClientInfo</code> always returns a
-     * <code>null String</code> since Derby doesn't support
-     * ClientInfoProperties.
-     *
-     * @param name a <code>String</code> value
-     * @return a <code>null String</code> value
-     * @exception SQLException if the connection is closed.
-     */
-    public String getClientInfo(String name)
-    throws SQLException{
-        checkIfClosed();
-        return null;
-    }
-    
-    /**
-     * <code>getClientInfo</code> always returns an empty
-     * <code>Properties</code> object since Derby doesn't support
-     * ClientInfoProperties.
-     *
-     * @return an empty <code>Properties</code> object
-     * @exception SQLException if the connection is closed.
-     */
-    public Properties getClientInfo()
-    throws SQLException{
-        checkIfClosed();
-        return new Properties();
-    }
-
-    /**
-     * Returns the type map for this connection.
-     *
-     * @return type map for this connection
-     * @exception SQLException if a database access error occurs
-     */
-    @SuppressWarnings("unchecked")
-    public final Map<String, Class<?>> getTypeMap() throws SQLException {
-        // Return the map from the super class. The method is overridden
-        // just to get the generic signature and prevent an unchecked warning
-        // at compile time.
-        return super.getTypeMap();
-    }
-    
-    /**
-     * Returns false unless <code>interfaces</code> is implemented 
-     * 
-     * @param  interfaces             a Class defining an interface.
-     * @return true                   if this implements the interface or 
-     *                                directly or indirectly wraps an object 
-     *                                that does.
-     * @throws java.sql.SQLException  if an error occurs while determining 
-     *                                whether this is a wrapper for an object 
-     *                                with the given interface.
-     */
-    public boolean isWrapperFor(Class<?> interfaces) throws SQLException {
-        checkIfClosed();
-        return interfaces.isInstance(this);
-    }
-    
-    /**
-     * Returns <code>this</code> if this class implements the interface
-     *
-     * @param  interfaces a Class defining an interface
-     * @return an object that implements the interface
-     * @throws java.sql.SQLExption if no object if found that implements the 
-     * interface
-     */
-    public <T> T unwrap(java.lang.Class<T> interfaces) 
-                            throws SQLException{
-        checkIfClosed();
-        //Derby does not implement non-standard methods on 
-        //JDBC objects
-        //hence return this if this class implements the interface 
-        //or throw an SQLException
-        try {
-            return interfaces.cast(this);
-        } catch (ClassCastException cce) {
-            throw newSQLException(SQLState.UNABLE_TO_UNWRAP,interfaces);
-        }
-    }
-    
-    ////////////////////////////////////////////////////////////////////
-    //
-    // INTRODUCED BY JDBC 4.1 IN JAVA 7
-    //
-    ////////////////////////////////////////////////////////////////////
-
-    public  void    abort( Executor executor )  throws SQLException
-    {
-        // NOP if called on a closed connection.
-        if ( isClosed() ) { return; }
-        // Null executor not allowed.
-        if ( executor == null )
-        {
-            throw newSQLException( SQLState.UU_INVALID_PARAMETER, "executor", "null" );
-        }
-
-        //
-        // Must have privilege to invoke this method.
-        //
-        // The derby jars should be granted this permission. We deliberately
-        // do not wrap this check in an AccessController.doPrivileged() block.
-        // If we did so, that would absolve outer code blocks of the need to
-        // have this permission granted to them too. It is critical that the
-        // outer code blocks enjoy this privilege. That is what allows
-        // connection pools to prevent ordinary code from calling abort()
-        // and restrict its usage to privileged tools.
-        //
-        SecurityManager securityManager = System.getSecurityManager();
-        if ( securityManager != null )
-        { securityManager.checkPermission( new SQLPermission( "callAbort" ) ); }
-
-        // Mark the Connection as closed. Set the "aborting" flag to allow internal
-        // processing in close() to proceed.
-        beginAborting();
-
-        //
-        // Now pass the Executor a Runnable which does the real work.
-        //
-        executor.execute
-            (
-             new Runnable()
-             {
-                 public void run()
-                 {
-                     try {
-                         rollback();
-                         close(exceptionClose);
-                     } catch (SQLException se) { Util.logSQLException( se ); }
-                 }
-             }
-             );
-    }
-    
-    public int getNetworkTimeout() throws SQLException
-    {
-        throw Util.notImplemented();
-    }
-    
-    public void setNetworkTimeout( Executor executor, int milliseconds ) throws SQLException
-    {
-        throw Util.notImplemented();
-    }
-    
 }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java Mon May 13 19:34:03 2013
@@ -86,7 +86,7 @@ import org.apache.derby.iapi.util.Interr
  *
  * @see <a href="http://java.sun.com/products/jdbc/download.html#corespec30">JDBC 3.0 Specification</a>
  */
-public class EmbedDatabaseMetaData extends ConnectionChild 
+public abstract class EmbedDatabaseMetaData extends ConnectionChild 
 	implements DatabaseMetaData, java.security.PrivilegedAction {
 
     private static final int ILLEGAL_UDT_TYPE = 0;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java Mon May 13 19:34:03 2013
@@ -78,7 +78,7 @@ import org.apache.derby.iapi.util.Interr
    <LI> JSR169
    </UL>
  */
-public class EmbedPreparedStatement
+public abstract class EmbedPreparedStatement
 	extends EmbedStatement
 	implements EnginePreparedStatement
 {

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement30.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement30.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement30.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement30.java Mon May 13 19:34:03 2013
@@ -42,7 +42,7 @@ import java.net.URL;
   * @see org.apache.derby.impl.jdbc.EmbedPreparedStatement
  *
  */
-public class EmbedPreparedStatement30 extends EmbedPreparedStatement20
+public abstract class EmbedPreparedStatement30 extends EmbedPreparedStatement20
 {
 
 	//////////////////////////////////////////////////////////////

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java Mon May 13 19:34:03 2013
@@ -92,7 +92,7 @@ import org.apache.derby.iapi.util.Interr
    </UL>
  */
 
-public class EmbedResultSet extends ConnectionChild
+public abstract class EmbedResultSet extends ConnectionChild
     implements EngineResultSet, Comparable {
 
     /** For use in debugging setLargeMaxRows() method added by JDBC 4.2 */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet20.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet20.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet20.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet20.java Mon May 13 19:34:03 2013
@@ -49,7 +49,7 @@ import java.math.BigDecimal;
  *
  */
 
-public class EmbedResultSet20
+public abstract class EmbedResultSet20
         extends org.apache.derby.impl.jdbc.EmbedResultSet {
 
         //////////////////////////////////////////////////////////////

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSetMetaData.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSetMetaData.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSetMetaData.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSetMetaData.java Mon May 13 19:34:03 2013
@@ -57,7 +57,7 @@ import java.sql.ResultSet;
    this sharing must be removed.
  *
  */
-public class EmbedResultSetMetaData
+public abstract class EmbedResultSetMetaData
 	implements ResultSetMetaData {
 
 	private final ResultColumnDescriptor[] columnInfo;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java Mon May 13 19:34:03 2013
@@ -58,7 +58,7 @@ import java.sql.ResultSet;
    </UL>
 
  */
-public class EmbedStatement extends ConnectionChild
+public abstract class EmbedStatement extends ConnectionChild
     implements EngineStatement {
 
 	private final java.sql.Connection applicationConnection;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml Mon May 13 19:34:03 2013
@@ -34,12 +34,12 @@
 
 <!-- Targets -->
 
-  <target name="compile" depends="checkVMLevel, compile_jdbc3, compile_jdbc4, compile_jdbc42"/>
+  <target name="compile" depends="checkVMLevel, compile_jdbc4, compile_jdbc42"/>
 
-  <target name="compile_jsr169">
+  <target name="compile_jdbc4">
 	    <javac
-	      source="1.4"
-	      target="1.4"
+	      source="1.6"
+	      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -51,67 +51,15 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${jsr169compile.classpath}"/>
+        <pathelement path="${java16compile.classpath}"/>
       </classpath>
-      <include name="${derby.dir}/impl/jdbc/*.java"/>
-	  <exclude name="${derby.dir}/impl/jdbc/*20.java"/>
-	  <exclude name="${derby.dir}/impl/jdbc/*30.java"/>
-	  <exclude name="${derby.dir}/impl/jdbc/*40.java"/>
+      <include name="${derby.dir}/impl/jdbc/**"/>
 	  <exclude name="${derby.dir}/impl/jdbc/*42.java"/>
-	  <exclude name="${derby.dir}/impl/jdbc/LOBStoredProcedure.java"/>
-
-	  <include name="${derby.dir}/impl/jdbc/authentication/**"/>
-	  <exclude name="${derby.dir}/impl/jdbc/authentication/JNDI**"/>
-	  <exclude name="${derby.dir}/impl/jdbc/authentication/LDAP**"/>
+      <!-- <compilerarg value="-Xlint:unchecked"/> -->
    </javac>
     <copy file="metadata.properties" tofile="${out.dir}/org/apache/derby/impl/jdbc/metadata.properties"/>
-    </target>
-  <target name="compile_jdbc3" depends="compile_jsr169">
-    <javac
-      source="1.5"
-      target="1.5"
-      bootclasspath="${empty}"
-      nowarn="on"
-      debug="${debug}"
-      depend="${depend}"
-      deprecation="${deprecation}"
-      optimize="${optimize}"
-      proceed="${proceed}"
-      verbose="${verbose}"
-      srcdir="${derby.engine.src.dir}"
-      destdir="${out.dir}">
-      <classpath>
-        <pathelement path="${java15compile.classpath}"/>
-      </classpath>
-	  <include name="${derby.dir}/impl/jdbc/*20.java"/>
-  	  <include name="${derby.dir}/impl/jdbc/*30.java"/>
-  	  <include name="${derby.dir}/impl/jdbc/LOBStoredProcedure.java"/>
-      <include name="${derby.dir}/impl/jdbc/authentication/JNDI**"/>
-      <include name="${derby.dir}/impl/jdbc/authentication/LDAP**"/>
-    </javac>
   </target>
 
-<target name="compile_jdbc4" depends="compile_jdbc3" >
-    <javac
-      source="${compilerLevel16}"
-      target="${compilerLevel16}"
-        bootclasspath="${empty}"
-        nowarn="on"
-        debug="${debug}"
-        depend="${depend}"
-        deprecation="${deprecation}"
-        optimize="${optimize}"
-        proceed="${proceed}"
-        verbose="${verbose}"
-        srcdir="${derby.engine.src.dir}"
-        destdir="${out.dir}">
-        <classpath>
-            <pathelement path="${java16compile.classpath}"/>
-        </classpath>
-        <include name="${derby.dir}/impl/jdbc/*40.java"/>
-    </javac>
-</target>
-
 
 <target name="compile_jdbc42" depends="compile_jdbc4"  if="vmLevelIsAtLeast1.8">
     <javac

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RecordId.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RecordId.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RecordId.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RecordId.java Mon May 13 19:34:03 2013
@@ -270,7 +270,7 @@ public final class RecordId implements R
 	/**
 		This lockable wants to participate in the Virtual Lock table.
 	 */
-	public boolean lockAttributes(int flag, Hashtable attributes)
+	public boolean lockAttributes(int flag, Hashtable<String,Object> attributes)
 	{
 
 		if (SanityManager.DEBUG)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java Mon May 13 19:34:03 2013
@@ -26,9 +26,11 @@ import java.sql.Driver;
 import java.sql.Connection;
 import java.sql.DriverPropertyInfo;
 import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
 
 import java.io.PrintStream;
 import java.util.Properties;
+import java.util.logging.Logger;
 
 import org.apache.derby.iapi.reference.MessageId;
 import org.apache.derby.iapi.reference.Attribute;
@@ -192,6 +194,17 @@ public class AutoloadedDriver implements
 		}
 	}
 
+    ////////////////////////////////////////////////////////////////////
+    //
+    // INTRODUCED BY JDBC 4.1 IN JAVA 7
+    //
+    ////////////////////////////////////////////////////////////////////
+
+    public  Logger getParentLogger() throws SQLFeatureNotSupportedException
+    {
+        throw (SQLFeatureNotSupportedException) Util.notImplemented( "getParentLogger()" );
+    }
+    
 	///////////////////////////////////////////////////////////////////////
 	//
 	// Support for booting and shutting down the engine.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver20.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver20.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver20.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver20.java Mon May 13 19:34:03 2013
@@ -105,13 +105,9 @@ public abstract class Driver20 extends I
 		AutoloadedDriver.unregisterDriverModule();
 	}
   
-	public org.apache.derby.impl.jdbc.EmbedResultSet 
+	public abstract org.apache.derby.impl.jdbc.EmbedResultSet 
 	newEmbedResultSet(EmbedConnection conn, ResultSet results, boolean forMetaData, org.apache.derby.impl.jdbc.EmbedStatement statement, boolean isAtomic)
-		throws SQLException
-	{
-		return new EmbedResultSet20(conn, results, forMetaData, statement,
-								 isAtomic); 
-	}
+		throws SQLException;
 
     public abstract BrokeredConnection newBrokeredConnection(
             BrokeredConnectionControl control) throws SQLException;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver30.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver30.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver30.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver30.java Mon May 13 19:34:03 2013
@@ -39,7 +39,7 @@ import org.apache.derby.impl.jdbc.*;
  
 */
 
-public class Driver30 extends Driver20 {
+public abstract class Driver30 extends Driver20 {
 
 	/**
  	 * Get a new nested connection.
@@ -49,25 +49,19 @@ public class Driver30 extends Driver20 {
 	 * @return A nested connection object.
 	 *
 	 */
-	public Connection getNewNestedConnection(EmbedConnection conn)
-	{
-        return new EmbedConnection(conn);
-	}
+	public abstract Connection getNewNestedConnection(EmbedConnection conn);
 
 	/*
 		Methods to be overloaded in sub-implementations such as
 		a tracing driver.
   */
-	protected EmbedConnection getNewEmbedConnection(String url, Properties info)
-		 throws SQLException 
-	{
-        return new EmbedConnection(this, url, info);
-	}
+	protected abstract EmbedConnection getNewEmbedConnection(String url, Properties info)
+        throws SQLException;
 
 	/**
 	 	@exception SQLException if fails to create statement
 	 */
-	public java.sql.PreparedStatement
+	public abstract java.sql.PreparedStatement
 	newEmbedPreparedStatement (
 			EmbedConnection conn,
 			String stmt,
@@ -78,67 +72,39 @@ public class Driver30 extends Driver20 {
 			int autoGeneratedKeys,
 			int[] columnIndexes,
 			String[] columnNames)
-    throws SQLException
-	{
-		return new EmbedPreparedStatement30(conn,
-								stmt,
-								forMetaData,
-								resultSetType,
-								resultSetConcurrency,
-								resultSetHoldability,
-								autoGeneratedKeys,
-								columnIndexes,
-								columnNames);
-	}
+        throws SQLException;
 
 	/**
 	 	@exception SQLException if fails to create statement
 	 */
-	public java.sql.CallableStatement
+	public abstract java.sql.CallableStatement
 	newEmbedCallableStatement(
 			EmbedConnection conn,
 			String stmt,
 			int resultSetType,
 			int resultSetConcurrency,
 			int resultSetHoldability)
-    throws SQLException
-	{
-		return new EmbedCallableStatement30(conn,
-								stmt,
-								resultSetType,
-								resultSetConcurrency,
-								resultSetHoldability);
-	}
-	public BrokeredConnection newBrokeredConnection(
+        throws SQLException;
+
+	public abstract BrokeredConnection newBrokeredConnection(
             BrokeredConnectionControl control)
-        throws SQLException
-    {
-        return new BrokeredConnection(control);
-	}
+        throws SQLException;
 
     /**
      * Create and return an EmbedPooledConnection from the received instance
      * of EmbeddedDataSource.
      */
-    protected PooledConnection getNewPooledConnection(
+    protected abstract PooledConnection getNewPooledConnection(
         EmbeddedBaseDataSource eds, String user, String password,
-        boolean requestPassword) throws SQLException
-    {
-        return new EmbedPooledConnection(
-            eds, user, password, requestPassword);
-    }
+        boolean requestPassword) throws SQLException;
 
     /**
      * Create and return an EmbedXAConnection from the received instance
      * of EmbeddedDataSource.
      */
-    protected XAConnection getNewXAConnection(
+    protected abstract XAConnection getNewXAConnection(
         EmbeddedBaseDataSource eds, ResourceAdapter ra,
         String user, String password, boolean requestPassword)
-        throws SQLException
-    {
-        return new EmbedXAConnection(
-            eds, ra, user, password, requestPassword);
-    }
+        throws SQLException;
 
 }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java Mon May 13 19:34:03 2013
@@ -62,7 +62,7 @@ import javax.sql.ConnectionEvent;
 	</UL>
 
  */
-class EmbedPooledConnection implements javax.sql.PooledConnection, BrokeredConnectionControl
+abstract class EmbedPooledConnection implements javax.sql.PooledConnection, BrokeredConnectionControl
 {
     /** the connection string */
     private String connString;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedXAConnection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedXAConnection.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedXAConnection.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedXAConnection.java Mon May 13 19:34:03 2013
@@ -41,7 +41,7 @@ import javax.sql.XAConnection;
 
 /** 
  */
-class EmbedXAConnection extends EmbedPooledConnection
+abstract class EmbedXAConnection extends EmbedPooledConnection
 		implements XAConnection
 
 {

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedBaseDataSource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedBaseDataSource.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedBaseDataSource.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedBaseDataSource.java Mon May 13 19:34:03 2013
@@ -25,7 +25,10 @@ import java.sql.Connection;
 import java.sql.Driver;
 import java.sql.DriverManager;
 import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
 import java.util.Properties;
+import java.util.logging.Logger;
+
 import org.apache.derby.iapi.db.Database;
 import org.apache.derby.iapi.error.ExceptionSeverity;
 import org.apache.derby.iapi.jdbc.ResourceAdapter;
@@ -737,4 +740,17 @@ public abstract class EmbeddedBaseDataSo
 
         return ra;
     }
+    
+    ////////////////////////////////////////////////////////////////////
+    //
+    // INTRODUCED BY JDBC 4.1 IN JAVA 7
+    //
+    ////////////////////////////////////////////////////////////////////
+
+    public  Logger getParentLogger() throws SQLFeatureNotSupportedException
+    {
+        throw (SQLFeatureNotSupportedException) Util.generateCsSQLException
+            ( SQLState.NOT_IMPLEMENTED, "getParentLogger" );
+    }
+    
 }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java Mon May 13 19:34:03 2013
@@ -22,8 +22,12 @@
 package org.apache.derby.jdbc;
 
 import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.logging.Logger;
 import javax.sql.PooledConnection;
 
+import org.apache.derby.impl.jdbc.Util;
+
 /** 
     This datasource is suitable for an application using embedded Derby,
     running on full Java SE 5 or 6, corresponding to JDBC 3.0 and 4.0.
@@ -132,6 +136,18 @@ public class EmbeddedConnectionPoolDataS
             this, user, password, requestPassword);
     }
 
+    ////////////////////////////////////////////////////////////////////
+    //
+    // INTRODUCED BY JDBC 4.1 IN JAVA 7
+    //
+    ////////////////////////////////////////////////////////////////////
+
+    public  Logger getParentLogger()
+        throws SQLFeatureNotSupportedException
+    {
+        throw (SQLFeatureNotSupportedException) Util.notImplemented( "getParentLogger()" );
+    }
+
 }
 
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java Mon May 13 19:34:03 2013
@@ -70,16 +70,4 @@ public class EmbeddedConnectionPoolDataS
     // http://svn.apache.org/viewvc?view=revision&revision=1438035 .
     private static final long serialVersionUID = -4368824293743156916L;
     
-    ////////////////////////////////////////////////////////////////////
-    //
-    // INTRODUCED BY JDBC 4.1 IN JAVA 7
-    //
-    ////////////////////////////////////////////////////////////////////
-
-    public  Logger getParentLogger()
-        throws SQLFeatureNotSupportedException
-    {
-        throw (SQLFeatureNotSupportedException) Util.notImplemented( "getParentLogger()" );
-    }
-
 }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDriver.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDriver.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDriver.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDriver.java Mon May 13 19:34:03 2013
@@ -27,9 +27,12 @@ import java.sql.Driver;
 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;
 import org.apache.derby.iapi.jdbc.JDBCBoot;
 import org.apache.derby.iapi.reference.Attribute;
+import org.apache.derby.impl.jdbc.Util;
 
 
 /**
@@ -196,6 +199,15 @@ public class EmbeddedDriver  implements 
         new JDBCBoot().boot(Attribute.PROTOCOL, pw);
 	}
 
-
+    ////////////////////////////////////////////////////////////////////
+    //
+    // INTRODUCED BY JDBC 4.1 IN JAVA 7
+    //
+    ////////////////////////////////////////////////////////////////////
+
+    public  Logger getParentLogger() throws SQLFeatureNotSupportedException
+    {
+        throw (SQLFeatureNotSupportedException) Util.notImplemented( "getParentLogger()" );
+    }
 	
 }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/InternalDriver.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/InternalDriver.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/InternalDriver.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/InternalDriver.java Mon May 13 19:34:03 2013
@@ -582,16 +582,12 @@ public abstract class InternalDriver imp
 	** their classes into the mix.
 	*/
 
-	public java.sql.Statement newEmbedStatement(
+	public abstract java.sql.Statement newEmbedStatement(
 				EmbedConnection conn,
 				boolean forMetaData,
 				int resultSetType,
 				int resultSetConcurrency,
-				int resultSetHoldability)
-	{
-		return new EmbedStatement(conn, forMetaData, resultSetType, resultSetConcurrency,
-		resultSetHoldability);
-	}
+				int resultSetHoldability);
 	/**
 	 	@exception SQLException if fails to create statement
 	 */
@@ -622,10 +618,8 @@ public abstract class InternalDriver imp
 	 * Return a new java.sql.DatabaseMetaData instance for this implementation.
 	 	@exception SQLException on failure to create.
 	 */
-	public DatabaseMetaData newEmbedDatabaseMetaData(EmbedConnection conn,
-		String dbname) throws SQLException {
-		return new EmbedDatabaseMetaData(conn,dbname);
-	}
+	public abstract DatabaseMetaData newEmbedDatabaseMetaData
+        (EmbedConnection conn, String dbname) throws SQLException;
 
 	/**
 	 * Return a new java.sql.ResultSet instance for this implementation.
@@ -646,10 +640,8 @@ public abstract class InternalDriver imp
          * @param columnInfo a ResultColumnDescriptor that stores information 
          *        about the columns in a ResultSet
          */
-        public EmbedResultSetMetaData newEmbedResultSetMetaData
-                           (ResultColumnDescriptor[] columnInfo) {
-            return new EmbedResultSetMetaData(columnInfo);
-        }
+        public abstract EmbedResultSetMetaData newEmbedResultSetMetaData
+            (ResultColumnDescriptor[] columnInfo);
 
     /**
      * Indicate to {@code AutoloadedDriver} whether it should deregister

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/CheckToursDBTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/CheckToursDBTest.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/CheckToursDBTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/CheckToursDBTest.java Mon May 13 19:34:03 2013
@@ -182,7 +182,7 @@ public class CheckToursDBTest extends Ba
     public void insertMapsPrivileged() throws Exception {
         try {
 
-            AccessController.doPrivileged(new PrivilegedExceptionAction() {
+            AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
                 public Object run() throws SQLException, FileNotFoundException,
                         IOException {
                     insertMaps();

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/build.xml?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/build.xml Mon May 13 19:34:03 2013
@@ -85,6 +85,7 @@
       </classpath>
       <include name="${this.dir}/*.java"/>
       <!--exclude name=""/-->
+      <compilerarg value="-Xlint:unchecked"/>
     </javac>
   </target>
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/JDBC4FromJDBC3DataSourceTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/JDBC4FromJDBC3DataSourceTest.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/JDBC4FromJDBC3DataSourceTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/JDBC4FromJDBC3DataSourceTest.java Mon May 13 19:34:03 2013
@@ -89,7 +89,6 @@ public class JDBC4FromJDBC3DataSourceTes
     {
         ConnectionPoolDataSource ds = J2EEDataSource.getConnectionPoolDataSource();
 
-        assertNonJDBC4DataSource((DataSource)ds);
         checkJDBC4Interface(ds.getPooledConnection());
     }
 
@@ -101,37 +100,9 @@ public class JDBC4FromJDBC3DataSourceTes
     {
         XADataSource ds = J2EEDataSource.getXADataSource();
 
-        assertNonJDBC4DataSource((DataSource)ds);
         checkJDBC4Interface(ds.getXAConnection());
     }
 
-    /**
-     * Make sure that the received DataSource is *not* a JDBC 4
-     * data source, since that would defeat the whole purpose
-     * of this test.
-     */
-    private void assertNonJDBC4DataSource(DataSource ds)
-        throws SQLException
-    {
-        // See if we can invoke the JDBC 4.1 getParentLogger() method. If we
-        // can, we have a JDBC 4 data source.
-        try {
-            ds.getClass().getMethod("getParentLogger").invoke(ds);
-            fail("Call to getParentLogger() not expected to pass");
-        } catch (NoSuchMethodException nsme) {
-            // OK. Method not found is expected on Java 6.
-        } catch (InvocationTargetException ite) {
-            // On Java 7 and newer the method is found in the CommonDataSource
-            // interface, so expect an AbstractMethodError instead of
-            // NoSuchMethodException.
-            Throwable cause = ite.getCause();
-            if (!(cause instanceof AbstractMethodError)) {
-                fail("Unexpected exception", cause);
-            }
-        } catch (IllegalAccessException iae) {
-            fail("Unexpected exception", iae);
-        }
-    }
 
     /**
      * Make sure that the received PooledConnection, which we assume came

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceSerializationTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceSerializationTest.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceSerializationTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceSerializationTest.java Mon May 13 19:34:03 2013
@@ -233,6 +233,7 @@ public class DataSourceSerializationTest
         fname.append('-');
         fname.append(version);
         fname.append(".ser");
+        println( "Deserializing " + fname.toString() );
 
         // De-serialize the data source.
         InputStream is;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/NativeAuthenticationServiceTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/NativeAuthenticationServiceTest.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/NativeAuthenticationServiceTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/NativeAuthenticationServiceTest.java Mon May 13 19:34:03 2013
@@ -549,7 +549,7 @@ public class NativeAuthenticationService
             File        nast2Jar = new File( readOnlyDirectory, NAST2_JAR_FILE );
 
             try {
-                result = new ClasspathSetup( result, nast2Jar.toURL() );
+                result = new ClasspathSetup( result, nast2Jar.toURI().toURL() );
             }
             catch (Exception e) { printStackTrace( e ); }
         }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dbjarUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dbjarUtil.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dbjarUtil.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dbjarUtil.java Mon May 13 19:34:03 2013
@@ -122,7 +122,7 @@ public class dbjarUtil
 
 		File jar = new File(root, jarName);
 		
-		URLClassLoader cl = new URLClassLoader(new URL[] {jar.toURL()});
+		URLClassLoader cl = new URLClassLoader(new URL[] {jar.toURI().toURL()});
     	java.lang.Thread.currentThread().setContextClassLoader(cl);
    
     }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/MemoryDbManager.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/MemoryDbManager.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/MemoryDbManager.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/MemoryDbManager.java Mon May 13 19:34:03 2013
@@ -61,11 +61,11 @@ public class MemoryDbManager {
     }
 
     /** List of openend statements, closed at clean up. */
-    private final ArrayList STATEMENTS = new ArrayList();
+    private final ArrayList<Statement> STATEMENTS = new ArrayList<Statement>();
     /** List of openend connections, closed at clean up. */
-    private final ArrayList CONNECTIONS = new ArrayList();
+    private final ArrayList<Connection> CONNECTIONS = new ArrayList<Connection>();
     /** List of created databases, deleted at clean up. */
-    private final ArrayList DATABASES = new ArrayList();
+    private final ArrayList<String> DATABASES = new ArrayList<String>();
 
     public MemoryDbManager() { }
 
@@ -242,12 +242,12 @@ public class MemoryDbManager {
             throws SQLException {
         // Close all known statements.
         for (int i=STATEMENTS.size() -1; i >= 0; i--) {
-            Statement stmt = (Statement)STATEMENTS.remove(i);
+            Statement stmt = STATEMENTS.remove(i);
             stmt.close();
         }
         // Close all known connections.
         for (int i=CONNECTIONS.size() -1; i >= 0; i--) {
-            Connection con = (Connection)CONNECTIONS.remove(i);
+            Connection con = CONNECTIONS.remove(i);
             try {
                 con.rollback();
             } catch (SQLException sqle) {
@@ -257,7 +257,7 @@ public class MemoryDbManager {
         }
         // Delete all known databases.
         for (int i=DATABASES.size() -1; i >= 0; i--) {
-            dropDatabase((String)DATABASES.remove(i));
+            dropDatabase(DATABASES.remove(i));
         }
     }
 }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/build.xml?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/build.xml Mon May 13 19:34:03 2013
@@ -86,6 +86,7 @@
       </classpath>
       <include name="${this.dir}/*.java"/>
       <!--exclude name=""/-->
+      <compilerarg value="-Xlint:unchecked"/>
     </javac>
   </target>
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoAPITest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoAPITest.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoAPITest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoAPITest.java Mon May 13 19:34:03 2013
@@ -60,7 +60,7 @@ public class SysinfoAPITest extends Base
     /**
      *  Test various invocations of sysinfo.getMajorVersion()
      */
-    public void testMajorVersion() {
+    public void testMajorVersion() throws Exception {
         int dmMajor = dm.getDriverMajorVersion();
         assertEquals(dmMajor, sysinfo.getMajorVersion());
         assertEquals(dmMajor, sysinfo.getMajorVersion(sysinfo.DBMS));
@@ -75,7 +75,7 @@ public class SysinfoAPITest extends Base
     /**
      *  Test various invocations of sysinfo.getMinorVersion()
      */
-    public void testMinorVersion() {
+    public void testMinorVersion() throws Exception {
         int dmMinor = dm.getDriverMinorVersion();
         assertEquals(dmMinor, sysinfo.getMinorVersion());
         assertEquals(dmMinor, sysinfo.getMinorVersion(sysinfo.DBMS));

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeClassLoader.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeClassLoader.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeClassLoader.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeClassLoader.java Mon May 13 19:34:03 2013
@@ -202,7 +202,7 @@ public class UpgradeClassLoader
 
             for (int i=0; i < jarFiles.length; i++) {
                 try {
-                    url[i] = new File(lib, jarFiles[i]).toURL();
+                    url[i] = new File(lib, jarFiles[i]).toURI().toURL();
                 } catch (MalformedURLException e) {
                     Assert.fail(e.toString());
                 }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeTrajectoryTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeTrajectoryTest.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeTrajectoryTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeTrajectoryTest.java Mon May 13 19:34:03 2013
@@ -209,9 +209,9 @@ public class UpgradeTrajectoryTest exten
     private String             _trajectoryName;
     private boolean[]          _hardUpgradeRequests;
     
-    private HashMap     _unstableColumnValues = new HashMap();
+    private HashMap<String,String>     _unstableColumnValues = new HashMap<String,String>();
 
-    private static ThreadLocal _originalClassLoader = new ThreadLocal();
+    private static ThreadLocal<ClassLoader> _originalClassLoader = new ThreadLocal<ClassLoader>();
 
     // these are the system tables which must be read first in order to
     // prep the mapping of unstable identifiers
@@ -576,11 +576,11 @@ public class UpgradeTrajectoryTest exten
      * list of initial tables.
      * </p>
      */
-    private ArrayList listSystemTables
+    private ArrayList<String> listSystemTables
         ( Connection conn )
         throws Exception
     {
-        ArrayList result = new ArrayList();
+        ArrayList<String> result = new ArrayList<String>();
 
         StringBuffer buffer = new StringBuffer();
 
@@ -621,7 +621,7 @@ public class UpgradeTrajectoryTest exten
         String rightTableName = rightSchema + "." + tableName;
         StringBuffer columnList = new StringBuffer();
         StringBuffer insertList = new StringBuffer();
-        ArrayList columnNames = new ArrayList();
+        ArrayList<String> columnNames = new ArrayList<String>();
 
         PreparedStatement leftPS = chattyPrepare( leftConn, query );
         PreparedStatement rightPS = chattyPrepare( rightConn, query );
@@ -1215,7 +1215,7 @@ public class UpgradeTrajectoryTest exten
      */
     private static Version.Trajectory[] buildMinimalSet( Version[] supportedVersions )
     {
-        ArrayList   trajectoryList = new ArrayList();
+        ArrayList<Version.Trajectory>   trajectoryList = new ArrayList<Version.Trajectory>();
         int  versionCount = supportedVersions.length;
         boolean[]  include = new boolean[ versionCount ];
 
@@ -1238,7 +1238,7 @@ public class UpgradeTrajectoryTest exten
      */
     private static Version.Trajectory[] buildPowerSet( Version[] supportedVersions )
     {
-        ArrayList   trajectoryList = new ArrayList();
+        ArrayList<Version.Trajectory>   trajectoryList = new ArrayList<Version.Trajectory>();
         int            versionCount = supportedVersions.length;
         boolean[]  include = new boolean[ versionCount ];
 
@@ -1252,7 +1252,7 @@ public class UpgradeTrajectoryTest exten
      * Turn a list of trajectories into an array.
      * </p>
      */
-    private static Version.Trajectory[] squeezeArray( ArrayList trajectoryList )
+    private static Version.Trajectory[] squeezeArray( ArrayList<Version.Trajectory> trajectoryList )
     {
         Version.Trajectory[] result = new Version.Trajectory[ trajectoryList.size() ];
         trajectoryList.toArray( result );
@@ -1269,7 +1269,7 @@ public class UpgradeTrajectoryTest exten
      * </p>
      */
     private static void buildPowerSetMinion
-        ( Version[] supportedVersions, ArrayList result, boolean[] include, int idx, boolean removeSameBranchNeighbors )
+        ( Version[] supportedVersions, ArrayList<Version.Trajectory> result, boolean[] include, int idx, boolean removeSameBranchNeighbors )
     {
         int  versionCount = supportedVersions.length;
 
@@ -1292,11 +1292,11 @@ public class UpgradeTrajectoryTest exten
      * </p>
      */
     private static void addSubset
-        ( Version[] supportedVersions, ArrayList result, boolean[] include, boolean removeSameBranchNeighbors )
+        ( Version[] supportedVersions, ArrayList<Version.Trajectory> result, boolean[] include, boolean removeSameBranchNeighbors )
     {
         int  versionCount = supportedVersions.length;
 
-        ArrayList seed = new ArrayList();
+        ArrayList<Version> seed = new ArrayList<Version>();
         Version   previousVersion = null;
         
         for ( int i = 0; i < versionCount; i++ )

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml Mon May 13 19:34:03 2013
@@ -84,6 +84,7 @@
 	<pathelement path="${junit}"/>
       </classpath>
       <include name="${this.dir}/*.java"/>
+      <compilerarg value="-Xlint:unchecked"/>
     </javac>
   </target>
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SupportFilesSetup.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SupportFilesSetup.java?rev=1482044&r1=1482043&r2=1482044&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SupportFilesSetup.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SupportFilesSetup.java Mon May 13 19:34:03 2013
@@ -280,7 +280,7 @@ public class SupportFilesSetup extends T
             (new java.security.PrivilegedExceptionAction(){
 
                 public Object run() throws MalformedURLException{
-                return file.toURL();
+                    return file.toURI().toURL();
 
                 }
             }



Mime
View raw message