db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1483727 [1/3] - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting: functionTests/harness/ functionTests/suites/ functionTests/tests/junitTests/compatibility/ functionTests/tests/junitTests/derbyNet/ functionTests/tests/lang/ fun...
Date Fri, 17 May 2013 10:25:16 GMT
Author: kahatlen
Date: Fri May 17 10:25:14 2013
New Revision: 1483727

URL: http://svn.apache.org/r1483727
Log:
DERBY-5840: Clean up compiler warnings introduced by using Java 5 language features

Fix the warnings in the remaining test packages.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/FileCompare.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/NetServer.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/SimpleDiff.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/SysInfoLog.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/currentjvm.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/dbcleanup.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm13.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm14.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm15.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm16.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm17.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm18.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9_13.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9_22.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9_foundation.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9_foundation11.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9dee15.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk13.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk14.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk15.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk16.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk17.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk18.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jvm.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/CompatibilityCombinations.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/JDBCDriverTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/derbyNet/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CompressTableTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DatabaseClassLoadingTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DeadlockDetectionTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DeadlockModeTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DynamicLikeOptimizationTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GeneratedColumnsHelper.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GeneratedColumnsTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GroupByTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/InListMultiProbeTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/PredicateTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RolesConferredPrivilegesTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TableFunctionTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TriggerTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TruncateTableTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UDTTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XplainStatisticsTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/userDefMethods.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memory/BlobMemTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memory/ClobMemTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memory/ConnectionHandling.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memory/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/Utils.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/AutomaticIndexStatisticsMultiTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/AutomaticIndexStatisticsTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BTreeMaxScanTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/ClassLoaderBootTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby4676Test.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/EncryptionAESTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/EncryptionKeyTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/IndexSplitDeadlockTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/InterruptResilienceTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LiveLockTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OSReadOnlyTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/CanonTestCase.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/FTFileUtil.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/HarnessJavaTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/IjTestCase.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SampleVTI.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ScriptTestCase.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SecurityCheck.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/TestRoutines.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/TestUtil.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/crypto/T_Cipher.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/harness/BasicUnitTestManager.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/harness/T_Bomb.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_DaemonService.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_AccessFactory.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_QualifierTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_SortController.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/FileCompare.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/FileCompare.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/FileCompare.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/FileCompare.java Fri May 17 10:25:14 2013
@@ -30,7 +30,6 @@ package org.apache.derbyTesting.function
  ***/
 
 import java.io.*;
-import java.lang.reflect.*;
 import java.util.StringTokenizer;
 import java.util.Properties;
 
@@ -81,20 +80,12 @@ public class FileCompare
         // for later use if that is the case.
         if (framework.startsWith("DerbyNet"))
         {
-	  Class c = null;
-	  Method m = null;
-	  Object o = null;
-	  Integer i = null;
 	  try	
 	  {
-	    c = Class.forName(NetServer.getDriverName(framework));
-	    o = c.newInstance();
-	    m = c.getMethod("getMajorVersion", null);
-	    i = (Integer)m.invoke(o, null);
-	    driverVersionMajor = i.intValue();
-	    m = c.getMethod("getMinorVersion", null);
-	    i = (Integer)m.invoke(o, null);
-	    driverVersionMinor = i.intValue();
+        Class<?> c = Class.forName(NetServer.getDriverName(framework));
+        Object o = c.newInstance();
+        driverVersionMajor = (Integer) c.getMethod("getMajorVersion").invoke(o);
+        driverVersionMinor = (Integer) c.getMethod("getMinorVersion").invoke(o);
             if (framework.startsWith("DerbyNet")) searchDriverVersion = true;
 	  } catch ( Exception e )
 	  {

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/NetServer.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/NetServer.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/NetServer.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/NetServer.java Fri May 17 10:25:14 2013
@@ -22,15 +22,12 @@
 package org.apache.derbyTesting.functionTests.harness;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.util.Locale;
-import java.util.Properties;
 import java.util.Vector;
 import java.util.Hashtable;
 import java.lang.reflect.Method;
 import java.lang.reflect.Constructor;
-import java.net.ConnectException;
 import java.net.Socket;
 import org.apache.derbyTesting.functionTests.util.TestUtil;
 
@@ -59,7 +56,7 @@ public class NetServer
 
 	private static String NETWORK_SERVER_CLASS_NAME="org.apache.derby.drda.NetworkServerControl";
     
-    public static Hashtable m;
+    public static Hashtable<String, Object[]> m;
     public static int PREFIX_POS = 0;
     public static int SUFFIX_POS = 1;
     public static int DRIVER_POS = 2;
@@ -71,7 +68,7 @@ public class NetServer
     
     static {
     	hostName=TestUtil.getHostName();
-	m =  new Hashtable();
+	m =  new Hashtable<String, Object[]>();
 	// Hashtable is keyed on framework name and has 
 	// an array of the framework prefix, suffix, driver, port  and 
 	// String[] command arguments to start the server
@@ -167,7 +164,7 @@ public class NetServer
 		else if (javaCmd != null)
 		    jvm.setJavaCmd(javaCmd);
 		
-		Vector jvmProps = new Vector();
+		Vector<String> jvmProps = new Vector<String>();
 		if ( (clPath != null) && (clPath.length()>0) )
 		    jvm.setClasspath(clPath);
 
@@ -183,7 +180,7 @@ public class NetServer
         // For some platforms (like Mac) the process exec command
         // must be a string array; so we build this with a Vector
         // first because some strings (paths) could have spaces
-	Vector vCmd = jvm.getCommandLine();
+	Vector<String> vCmd = jvm.getCommandLine();
 	for (int i = 0; i < startcmd.length; i++)
 	    vCmd.addElement(startcmd[i]);
 
@@ -254,17 +251,14 @@ public class NetServer
 			return true;
 		}
 		
-	    Object[] testConnectionArg  = null;
 		if (networkServer == null)
 		{
-			Constructor serverConstructor;
-			Class serverClass = Class.forName(NETWORK_SERVER_CLASS_NAME);
-			serverConstructor = serverClass.getConstructor(null);
-			networkServer = serverConstructor.newInstance(null);
-			pingMethod = networkServer.getClass().getMethod("ping",
-															 null);
+			Class<?> serverClass = Class.forName(NETWORK_SERVER_CLASS_NAME);
+			Constructor<?> serverConstructor = serverClass.getConstructor();
+			networkServer = serverConstructor.newInstance();
+			pingMethod = networkServer.getClass().getMethod("ping");
 		}
-		pingMethod.invoke(networkServer,null);
+		pingMethod.invoke(networkServer);
 		return true;
 	}
 
@@ -280,12 +274,12 @@ public class NetServer
 						 + framework);
 	jvm jvm = null; // to quiet the compiler
 	jvm = jvm.getJvm(jvmName);
-	Vector jvmCmd = jvm.getCommandLine();
+	Vector<String> jvmCmd = jvm.getCommandLine();
 	
-	Vector connV = new Vector();
+	Vector<String> connV = new Vector<String>();
 	for (int i = 0; i < jvmCmd.size(); i++)
 	{
-	    connV.addElement((String)jvmCmd.elementAt(i));
+	    connV.addElement(jvmCmd.elementAt(i));
         }
 	
 	String[] stopcmd1 = (String[]) frameworkInfo[STOP_CMD1_POS];
@@ -313,7 +307,7 @@ public class NetServer
 		}		    
 		
 		
-		Vector stopV = new Vector();
+		Vector<String> stopV = new Vector<String>();
 		for (int i = 0; i < jvmCmd.size(); i++)
 		{
 		    stopV.addElement((String)jvmCmd.elementAt(i));

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java Fri May 17 10:25:14 2013
@@ -350,7 +350,7 @@ public class RunList
         // Build command string for RunTest()
         StringBuffer sb = new StringBuffer();
 	    jvm = jvm.getJvm(jvmName);
-	    Vector jvmProps = new Vector();
+	    Vector<String> jvmProps = new Vector<String>();
 	    if ((javaCmd.length()>0) )
 	    {
 	        jvm.setJavaCmd(javaCmd);
@@ -490,7 +490,7 @@ public class RunList
             jvm.setClasspath(classpath);
 
         jvm.setD(jvmProps);
-        Vector v = jvm.getCommandLine();
+        Vector<String> v = jvm.getCommandLine();
         v.addElement("org.apache.derbyTesting.functionTests.harness.RunTest");
 
         String str = "";
@@ -1212,7 +1212,7 @@ public class RunList
 
 	if (excludeJCC != null)
 	{
-	    Class c = null;
+	    Class<?> c = null;
 	    Method m = null;
 	    Object o = null;
 	    Integer i = null;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java Fri May 17 10:25:14 2013
@@ -48,7 +48,7 @@ public class RunSuite
     static final boolean verbose=true;
 
     static String suites; // list of subsuites in this suite
-    static Vector suitesToRun; // Vector of suites to run
+    static Vector<String> suitesToRun; // Vector of suites to run
 
     // Properties which may be specified
 	static String jvmName = "";
@@ -116,7 +116,7 @@ public class RunSuite
 	    System.out.println("Top suite: " + suiteName);
 
 	    // suiteName may be one suite or a list of suites
-        suitesToRun = new Vector();
+        suitesToRun = new Vector<String>();
 
         // Get properties set in the suite's properties file
 		suiteProperties = getSuiteProperties(suiteName, true);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java Fri May 17 10:25:14 2013
@@ -1071,7 +1071,7 @@ public class RunTest
         if ( framework.equals("DerbyNet") && (! jvmName.startsWith("j9_foundation")))
 		{	
 
-			Class c = null;
+			Class<?> c = null;
 			Method m = null;
 			Object o = null;
 			Integer i = null;
@@ -2240,7 +2240,7 @@ clp.list(System.out);
     }
 
 	public static void
-	addStandardTestJvmProps(Vector testJvmProps,String derbySystemHome,
+	addStandardTestJvmProps(Vector<String> testJvmProps,String derbySystemHome,
 							String userDirName, jvm jvm)
 	{
 		if (derbySystemHome==null || derbySystemHome.length() == 0)
@@ -2271,7 +2271,7 @@ clp.list(System.out);
         if ( (classpath != null) && (classpath.length()>0) )
             jvm.setClasspath(classpath);
 
-		Vector jvmProps = new Vector();
+		Vector<String> jvmProps = new Vector<String>();
 		if ( testType.equals("java"))
 		    addStandardTestJvmProps(jvmProps,systemHome,
 			    outDir.getCanonicalPath(),null);		    
@@ -2360,7 +2360,7 @@ clp.list(System.out);
         else
         	System.out.println("-- SecurityManager not installed --");
             
-        Vector v = jvm.getCommandLine();
+        Vector<String> v = jvm.getCommandLine();
         if ( ij.startsWith("ij") )
         {
             // As of cn1411-20030930 IBM jvm the system takes the default
@@ -2718,7 +2718,7 @@ clp.list(System.out);
             Class[] classArray = new Class[1];
             classArray[0] = args.getClass();
             String testName = javaPath + "." + testBase;
-            Class JavaTest = Class.forName(testName);
+            Class<?> JavaTest = Class.forName(testName);
             PrintStream stdout = System.out;
             PrintStream stderr = System.err;
             System.setOut(ps);
@@ -2830,7 +2830,7 @@ clp.list(System.out);
             // do if invoked in a separate process (useprocess=true).
            
             // Load the test class
-            Class testClass = Class.forName(testName);
+            Class<?> testClass = Class.forName(testName);
             
             TestSuite junitTestSuite = null;
             
@@ -2955,10 +2955,8 @@ clp.list(System.out);
     	{
         	// Get the set of -D options that would be needed
         	// for a spawned VM and convert them to system properties.
-    	    Vector propList = jvm.getSecurityProps(null);
-    	    for (Enumeration e = propList.elements(); e.hasMoreElements();)
+            for (String dashDOpt : jvm.getSecurityProps(null))
     	    {
-    	    	String dashDOpt = (String) e.nextElement();
     	    	if ("java.security.manager".equals(dashDOpt))
     	    		continue;
     	    	

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java Fri May 17 10:25:14 2013
@@ -65,7 +65,7 @@ public class Sed
     	String hostName = TestUtil.getHostName();
     	
         // Vector for storing lines to be deleted
-        Vector deleteLines = new Vector();
+        Vector<String> deleteLines = new Vector<String>();
         deleteLines.addElement("^ij version.*$");
         deleteLines.addElement("^\\*\\*\\*\\* Test Run Started .* \\*\\*\\*\\*$");
         deleteLines.addElement("^\\*\\*\\*\\* Test Run Completed .* \\*\\*\\*\\*$");
@@ -113,7 +113,7 @@ public class Sed
         deleteLines.addElement("^OK \\(.*$");
 
         // Vectors for substitutions
-        Vector searchStrings = new Vector();
+        Vector<String> searchStrings = new Vector<String>();
         searchStrings.addElement("^Transaction:\\(.*\\) *\\|"); 
         searchStrings.addElement("^Read [0-9]* of [0-9]* bytes$");
         searchStrings.addElement("Directory .*connect.wombat.seg0");
@@ -208,7 +208,7 @@ public class Sed
 			searchStrings.addElement("\\[\\.fffffffff\\]");			
 		}
 		
-        Vector subStrings = new Vector();
+        Vector<String> subStrings = new Vector<String>();
         subStrings.addElement("Transaction:(XXX)|");
         subStrings.addElement("Read ... bytes");
         subStrings.addElement("Directory DBLOCATION/seg0");
@@ -282,14 +282,14 @@ public class Sed
         throws IOException
     {
         // Vector for storing lines to be deleted
-        Vector deleteLines = new Vector();
+        Vector<String> deleteLines = new Vector<String>();
 
         // Vectors for substitutions
-        Vector searchStrings = new Vector();
+        Vector<String> searchStrings = new Vector<String>();
         searchStrings.addElement("[ ]*\\|");
         searchStrings.addElement("^--*");
 
-        Vector subStrings = new Vector();
+        Vector<String> subStrings = new Vector<String>();
         // true and false show up as 1 and 0 in JCC. 
         //because they have no boolean support
         subStrings.addElement(" |");
@@ -299,16 +299,18 @@ public class Sed
 
     }
 
-    private void doWork(File srcFile, File dstFile, InputStream is, Vector deleteLines, 
-        Vector searchStrings, Vector subStrings, InputStream isSed)
+    private void doWork(File srcFile, File dstFile, InputStream is,
+        Vector<String> deleteLines,  Vector<String> searchStrings,
+        Vector<String> subStrings, InputStream isSed)
         throws IOException
     {
         doWork(srcFile, dstFile, is, deleteLines, searchStrings, subStrings, isSed, false);
     }
 		
 
-    private void doWork(File srcFile, File dstFile, InputStream is, Vector deleteLines, 
-        Vector searchStrings, Vector subStrings, InputStream isSed, boolean isI18N)
+    private void doWork(File srcFile, File dstFile, InputStream is,
+        Vector<String> deleteLines, Vector<String> searchStrings,
+        Vector<String> subStrings, InputStream isSed, boolean isI18N)
         throws IOException
     {
 		
@@ -320,8 +322,8 @@ public class Sed
         PrintWriter outFile;
         String result = "";
         String regex;
-        Vector delPatternVector = new Vector();
-        Vector subPatternVector = new Vector();
+        Vector<Pattern> delPatternVector = new Vector<Pattern>();
+        Vector<Pattern> subPatternVector = new Vector<Pattern>();
 
         // ---------------------------------
         // Try loading the sed properties if they exist (see jdbc_sed.properties as an example)

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/SimpleDiff.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/SimpleDiff.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/SimpleDiff.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/SimpleDiff.java Fri May 17 10:25:14 2013
@@ -75,7 +75,7 @@ public class SimpleDiff
     public String[] readFile(BufferedReader input) throws IOException
     {
 
-        Vector vec = new Vector();
+        Vector<String> vec = new Vector<String>();
 
         String aLine = "";
         //int count = 0;
@@ -122,7 +122,7 @@ public class SimpleDiff
 
         int currentLine1 = 0;
         int currentLine2 = 0;
-        Vector returnVec = new Vector();
+        Vector<String> returnVec = new Vector<String>();
 
         while ( file1.isValidOffset(currentLine1) &&
                 file2.isValidOffset(currentLine2))
@@ -256,7 +256,7 @@ public class SimpleDiff
         file1.close();
         file2.close();
 
-        if (returnVec.size() == 0)
+        if (returnVec.isEmpty())
         {
             return null;
         }
@@ -366,7 +366,7 @@ public class SimpleDiff
         }
     }
 
-    class DiffBuffer extends Vector
+    class DiffBuffer extends Vector<String>
     {
 
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/SysInfoLog.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/SysInfoLog.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/SysInfoLog.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/SysInfoLog.java Fri May 17 10:25:14 2013
@@ -69,7 +69,7 @@ public class SysInfoLog
                     javavm.setClasspath(classpath);
                 }
 
-				Vector v = javavm.getCommandLine();
+				Vector<String> v = javavm.getCommandLine();
                 v.addElement("org.apache.derby.tools.sysinfo");
                 // Now convert the vector into a string array
                 String[] sCmd = new String[v.size()];

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/build.xml?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/build.xml Fri May 17 10:25:14 2013
@@ -83,7 +83,8 @@
         <pathelement path="${compile.classpath}"/>
         <pathelement path="${junit}"/>
       </classpath>
-        <include name="${this.dir}/*.java"/> 
+      <include name="${this.dir}/*.java"/>
+      <compilerarg value="-Xlint"/>
     </javac>
   </target>
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/currentjvm.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/currentjvm.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/currentjvm.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/currentjvm.java Fri May 17 10:25:14 2013
@@ -34,16 +34,16 @@ public class currentjvm extends jvm {
 	public String getName() {return "currentjvm";}
     public currentjvm(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
     long ss, long oss, long ms, long mx, String classpath, String prof,
-    boolean verify, boolean noverify, boolean nojit, Vector D) {
+    boolean verify, boolean noverify, boolean nojit, Vector<String> D) {
         super(noasyncgc,verbosegc,noclassgc,ss,oss,ms,mx,classpath,prof,
 		verify,noverify,nojit,D);
     }
     // more typical use:
-    public currentjvm(String classpath, Vector D) {
+    public currentjvm(String classpath, Vector<String> D) {
         super(classpath,D);
     }
     // more typical use:
-    public currentjvm(long ms, long mx, String classpath, Vector D) {
+    public currentjvm(long ms, long mx, String classpath, Vector<String> D) {
         super(ms,mx,classpath,D);
     }
     // actual use
@@ -51,10 +51,10 @@ public class currentjvm extends jvm {
 
     // return the command line to invoke this VM.  The caller then adds
     // the class and program arguments.
-    public Vector getCommandLine() 
+    public Vector<String> getCommandLine()
     {
         StringBuffer sb = new StringBuffer();
-        Vector v = super.getCommandLine();
+        Vector<String> v = super.getCommandLine();
         appendOtherFlags(sb);
         String s = sb.toString();
         StringTokenizer st = new StringTokenizer(s);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/dbcleanup.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/dbcleanup.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/dbcleanup.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/dbcleanup.java Fri May 17 10:25:14 2013
@@ -24,15 +24,10 @@ package org.apache.derbyTesting.function
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.Statement;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
-import java.sql.SQLWarning;
 import java.io.*;
 import java.util.*;
-import java.lang.Long;
-import java.util.Vector;
 
 import org.apache.derby.tools.JDBCDisplayUtil;
 
@@ -122,8 +117,8 @@ public class dbcleanup {
 
 		Enumeration schemalist = null;
 		Enumeration list = null;
-		Vector schemavec = new Vector();
-		Vector tablevec = null;
+		Vector<String> schemavec = new Vector<String>();
+		Vector<String> tablevec = null;
 		// get a list of the user schemas
 		try {
 			s = conn.createStatement();
@@ -148,7 +143,7 @@ public class dbcleanup {
 		String n = null;
 		boolean viewdependencyFound = false;
 		boolean tabledependencyFound = false;
-		Vector viewvec = null;
+		Vector<String> viewvec = null;
 		int count = 0;
 		for (schemalist = schemavec.elements(); schemalist.hasMoreElements();) {
 			schema = (String)schemalist.nextElement();
@@ -173,7 +168,7 @@ public class dbcleanup {
 				}
 			}
 
-			Vector stmtvec = new Vector();
+			Vector<String> stmtvec = new Vector<String>();
 			try {
 				rs = s.executeQuery( " select stmtname " +
 					" from sys.sysstatements t, sys.sysschemas  s " +
@@ -307,10 +302,10 @@ public class dbcleanup {
 		return(dependencyFound);
 	}
 
-	static  Vector findTables(Connection conn, Statement s, char c, String schema) throws Exception {
+	static  Vector<String> findTables(Connection conn, Statement s, char c, String schema) throws Exception {
 
 		ResultSet rs = null;
-		Vector tableviewvec = new Vector();
+		Vector<String> tableviewvec = new Vector<String>();
 
 		try {
 			rs = s.executeQuery( " select t.tablename " +
@@ -337,7 +332,7 @@ public class dbcleanup {
 		ResultSet rs = null;
 		Statement s = null;
 		String typestring = null;
-		Vector aliasvec = new Vector();
+		Vector<String> aliasvec = new Vector<String>();
 		String n = null;
 		int count = 0;
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm13.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm13.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm13.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm13.java Fri May 17 10:25:14 2013
@@ -33,16 +33,16 @@ public class ibm13 extends jvm {
 	public String getName(){return "ibm13";}
     public ibm13(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
     long ss, long oss, long ms, long mx, String classpath, String prof,
-    boolean verify, boolean noverify, boolean nojit, Vector D) {
+    boolean verify, boolean noverify, boolean nojit, Vector<String> D) {
         super(noasyncgc,verbosegc,noclassgc,ss,oss,ms,mx,classpath,prof,
 		verify,noverify,nojit,D);
     }
     // more typical use:
-    public ibm13(String classpath, Vector D) {
+    public ibm13(String classpath, Vector<String> D) {
         super(classpath,D);
     }
     // more typical use:
-    public ibm13(long ms, long mx, String classpath, Vector D) {
+    public ibm13(long ms, long mx, String classpath, Vector<String> D) {
         super(ms,mx,classpath,D);
     }
     // actual use
@@ -50,10 +50,10 @@ public class ibm13 extends jvm {
 
     // return the command line to invoke this VM.  The caller then adds
     // the class and program arguments.
-    public Vector getCommandLine() 
+    public Vector<String> getCommandLine()
     {
         StringBuffer sb = new StringBuffer();
-        Vector v = super.getCommandLine();
+        Vector<String> v = super.getCommandLine();
         appendOtherFlags(sb);
         String s = sb.toString();
         StringTokenizer st = new StringTokenizer(s);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm14.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm14.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm14.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm14.java Fri May 17 10:25:14 2013
@@ -33,16 +33,16 @@ public class ibm14 extends jvm {
 	public String getName(){return "ibm14";}
     public ibm14(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
     long ss, long oss, long ms, long mx, String classpath, String prof,
-    boolean verify, boolean noverify, boolean nojit, Vector D) {
+    boolean verify, boolean noverify, boolean nojit, Vector<String> D) {
         super(noasyncgc,verbosegc,noclassgc,ss,oss,ms,mx,classpath,prof,
 		verify,noverify,nojit,D);
     }
     // more typical use:
-    public ibm14(String classpath, Vector D) {
+    public ibm14(String classpath, Vector<String> D) {
         super(classpath,D);
     }
     // more typical use:
-    public ibm14(long ms, long mx, String classpath, Vector D) {
+    public ibm14(long ms, long mx, String classpath, Vector<String> D) {
         super(ms,mx,classpath,D);
     }
     // actual use
@@ -50,10 +50,10 @@ public class ibm14 extends jvm {
 
     // return the command line to invoke this VM.  The caller then adds
     // the class and program arguments.
-    public Vector getCommandLine() 
+    public Vector<String> getCommandLine()
     {
         StringBuffer sb = new StringBuffer();
-        Vector v = super.getCommandLine();
+        Vector<String> v = super.getCommandLine();
         appendOtherFlags(sb);
         String s = sb.toString();
         StringTokenizer st = new StringTokenizer(s);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm15.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm15.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm15.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm15.java Fri May 17 10:25:14 2013
@@ -33,16 +33,16 @@ public class ibm15 extends jvm {
 	public String getName(){return "ibm15";}
     public ibm15(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
     long ss, long oss, long ms, long mx, String classpath, String prof,
-    boolean verify, boolean noverify, boolean nojit, Vector D) {
+    boolean verify, boolean noverify, boolean nojit, Vector<String> D) {
         super(noasyncgc,verbosegc,noclassgc,ss,oss,ms,mx,classpath,prof,
 		verify,noverify,nojit,D);
     }
     // more typical use:
-    public ibm15(String classpath, Vector D) {
+    public ibm15(String classpath, Vector<String> D) {
         super(classpath,D);
     }
     // more typical use:
-    public ibm15(long ms, long mx, String classpath, Vector D) {
+    public ibm15(long ms, long mx, String classpath, Vector<String> D) {
         super(ms,mx,classpath,D);
     }
     // actual use
@@ -50,10 +50,10 @@ public class ibm15 extends jvm {
 
     // return the command line to invoke this VM.  The caller then adds
     // the class and program arguments.
-    public Vector getCommandLine()
+    public Vector<String> getCommandLine()
     {
         StringBuffer sb = new StringBuffer();
-        Vector v = super.getCommandLine();
+        Vector<String> v = super.getCommandLine();
         appendOtherFlags(sb);
         String s = sb.toString();
         StringTokenizer st = new StringTokenizer(s);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm16.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm16.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm16.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm16.java Fri May 17 10:25:14 2013
@@ -33,16 +33,16 @@ public class ibm16 extends jvm {
 	public String getName(){return "ibm16";}
     public ibm16(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
     long ss, long oss, long ms, long mx, String classpath, String prof,
-    boolean verify, boolean noverify, boolean nojit, Vector D) {
+    boolean verify, boolean noverify, boolean nojit, Vector<String> D) {
         super(noasyncgc,verbosegc,noclassgc,ss,oss,ms,mx,classpath,prof,
 		verify,noverify,nojit,D);
     }
     // more typical use:
-    public ibm16(String classpath, Vector D) {
+    public ibm16(String classpath, Vector<String> D) {
         super(classpath,D);
     }
     // more typical use:
-    public ibm16(long ms, long mx, String classpath, Vector D) {
+    public ibm16(long ms, long mx, String classpath, Vector<String> D) {
         super(ms,mx,classpath,D);
     }
     // actual use
@@ -50,10 +50,10 @@ public class ibm16 extends jvm {
 
     // return the command line to invoke this VM.  The caller then adds
     // the class and program arguments.
-    public Vector getCommandLine()
+    public Vector<String> getCommandLine()
     {
         StringBuffer sb = new StringBuffer();
-        Vector v = super.getCommandLine();
+        Vector<String> v = super.getCommandLine();
         appendOtherFlags(sb);
         String s = sb.toString();
         StringTokenizer st = new StringTokenizer(s);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm17.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm17.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm17.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm17.java Fri May 17 10:25:14 2013
@@ -33,16 +33,16 @@ public class ibm17 extends jvm {
 	public String getName(){return "ibm17";}
     public ibm17(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
     long ss, long oss, long ms, long mx, String classpath, String prof,
-    boolean verify, boolean noverify, boolean nojit, Vector D) {
+    boolean verify, boolean noverify, boolean nojit, Vector<String> D) {
         super(noasyncgc,verbosegc,noclassgc,ss,oss,ms,mx,classpath,prof,
 		verify,noverify,nojit,D);
     }
     // more typical use:
-    public ibm17(String classpath, Vector D) {
+    public ibm17(String classpath, Vector<String> D) {
         super(classpath,D);
     }
     // more typical use:
-    public ibm17(long ms, long mx, String classpath, Vector D) {
+    public ibm17(long ms, long mx, String classpath, Vector<String> D) {
         super(ms,mx,classpath,D);
     }
     // actual use
@@ -50,10 +50,10 @@ public class ibm17 extends jvm {
 
     // return the command line to invoke this VM.  The caller then adds
     // the class and program arguments.
-    public Vector getCommandLine()
+    public Vector<String> getCommandLine()
     {
         StringBuffer sb = new StringBuffer();
-        Vector v = super.getCommandLine();
+        Vector<String> v = super.getCommandLine();
         appendOtherFlags(sb);
         String s = sb.toString();
         StringTokenizer st = new StringTokenizer(s);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm18.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm18.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm18.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ibm18.java Fri May 17 10:25:14 2013
@@ -33,16 +33,16 @@ public class ibm18 extends jvm {
 	public String getName(){return "ibm18";}
     public ibm18(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
     long ss, long oss, long ms, long mx, String classpath, String prof,
-    boolean verify, boolean noverify, boolean nojit, Vector D) {
+    boolean verify, boolean noverify, boolean nojit, Vector<String> D) {
         super(noasyncgc,verbosegc,noclassgc,ss,oss,ms,mx,classpath,prof,
 		verify,noverify,nojit,D);
     }
     // more typical use:
-    public ibm18(String classpath, Vector D) {
+    public ibm18(String classpath, Vector<String> D) {
         super(classpath,D);
     }
     // more typical use:
-    public ibm18(long ms, long mx, String classpath, Vector D) {
+    public ibm18(long ms, long mx, String classpath, Vector<String> D) {
         super(ms,mx,classpath,D);
     }
     // actual use
@@ -50,10 +50,10 @@ public class ibm18 extends jvm {
 
     // return the command line to invoke this VM.  The caller then adds
     // the class and program arguments.
-    public Vector getCommandLine()
+    public Vector<String> getCommandLine()
     {
         StringBuffer sb = new StringBuffer();
-        Vector v = super.getCommandLine();
+        Vector<String> v = super.getCommandLine();
         appendOtherFlags(sb);
         String s = sb.toString();
         StringTokenizer st = new StringTokenizer(s);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9_13.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9_13.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9_13.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9_13.java Fri May 17 10:25:14 2013
@@ -35,16 +35,16 @@ public class j9_13 extends jvm {
 	public String getName(){return "j9_13";}
     public j9_13(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
     long ss, long oss, long ms, long mx, String classpath, String prof,
-    boolean verify, boolean noverify, boolean nojit, Vector D) {
+    boolean verify, boolean noverify, boolean nojit, Vector<String> D) {
         super(noasyncgc,verbosegc,noclassgc,ss,oss,ms,mx,classpath,prof,
 		verify,noverify,nojit,D);
     }
     // more typical use:
-    public j9_13(String classpath, Vector D) {
+    public j9_13(String classpath, Vector<String> D) {
         super(classpath,D);
     }
     // more typical use:
-    public j9_13(long ms, long mx, String classpath, Vector D) {
+    public j9_13(long ms, long mx, String classpath, Vector<String> D) {
         super(ms,mx,classpath,D);
     }
     // actual use
@@ -63,11 +63,11 @@ public class j9_13 extends jvm {
 
     // return the command line to invoke this VM.  The caller then adds
     // the class and program arguments.
-    public Vector getCommandLine() 
+    public Vector<String> getCommandLine()
     {
 
         StringBuffer sb = new StringBuffer();
-        Vector v = super.getCommandLine();
+        Vector<String> v = super.getCommandLine();
 
         appendOtherFlags(sb);
         String s = sb.toString();

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9_22.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9_22.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9_22.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9_22.java Fri May 17 10:25:14 2013
@@ -35,16 +35,16 @@ public class j9_22 extends jvm {
 	public String getName(){return "j9_22";}
     public j9_22(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
     long ss, long oss, long ms, long mx, String classpath, String prof,
-    boolean verify, boolean noverify, boolean nojit, Vector D) {
+    boolean verify, boolean noverify, boolean nojit, Vector<String> D) {
         super(noasyncgc,verbosegc,noclassgc,ss,oss,ms,mx,classpath,prof,
 		verify,noverify,nojit,D);
     }
     // more typical use:
-    public j9_22(String classpath, Vector D) {
+    public j9_22(String classpath, Vector<String> D) {
         super(classpath,D);
     }
     // more typical use:
-    public j9_22(long ms, long mx, String classpath, Vector D) {
+    public j9_22(long ms, long mx, String classpath, Vector<String> D) {
         super(ms,mx,classpath,D);
     }
     // actual use
@@ -63,11 +63,11 @@ public class j9_22 extends jvm {
 
     // return the command line to invoke this VM.  The caller then adds
     // the class and program arguments.
-    public Vector getCommandLine() 
+    public Vector<String> getCommandLine()
     {
 
         StringBuffer sb = new StringBuffer();
-        Vector v = super.getCommandLine();
+        Vector<String> v = super.getCommandLine();
 
         appendOtherFlags(sb);
         String s = sb.toString();

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9_foundation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9_foundation.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9_foundation.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9_foundation.java Fri May 17 10:25:14 2013
@@ -33,16 +33,16 @@ public class j9_foundation extends jvm {
     public String getName(){return "j9_foundation";}
     public j9_foundation(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
     long ss, long oss, long ms, long mx, String classpath, String prof,
-    boolean verify, boolean noverify, boolean nojit, Vector D) {
+    boolean verify, boolean noverify, boolean nojit, Vector<String> D) {
         super(noasyncgc,verbosegc,noclassgc,ss,oss,ms,mx,classpath,prof,
 		verify,noverify,nojit,D);
     }
     // more typical use:
-    public j9_foundation(String classpath, Vector D) {
+    public j9_foundation(String classpath, Vector<String> D) {
         super(classpath,D);
     }
     // more typical use:
-    public j9_foundation(long ms, long mx, String classpath, Vector D) {
+    public j9_foundation(long ms, long mx, String classpath, Vector<String> D) {
         super(ms,mx,classpath,D);
     }
     // actual use
@@ -61,10 +61,10 @@ public class j9_foundation extends jvm {
 
     // return the command line to invoke this VM.  The caller then adds
     // the class and program arguments.
-    public Vector getCommandLine() 
+    public Vector<String> getCommandLine()
     {
         StringBuffer sb = new StringBuffer();
-        Vector v = super.getCommandLine();
+        Vector<String> v = super.getCommandLine();
         appendOtherFlags(sb);
         String s = sb.toString();
         StringTokenizer st = new StringTokenizer(s);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9_foundation11.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9_foundation11.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9_foundation11.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9_foundation11.java Fri May 17 10:25:14 2013
@@ -33,16 +33,16 @@ public class j9_foundation11 extends jvm
     public String getName(){return "j9_foundation11";}
     public j9_foundation11(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
     long ss, long oss, long ms, long mx, String classpath, String prof,
-    boolean verify, boolean noverify, boolean nojit, Vector D) {
+    boolean verify, boolean noverify, boolean nojit, Vector<String> D) {
         super(noasyncgc,verbosegc,noclassgc,ss,oss,ms,mx,classpath,prof,
 		verify,noverify,nojit,D);
     }
     // more typical use:
-    public j9_foundation11(String classpath, Vector D) {
+    public j9_foundation11(String classpath, Vector<String> D) {
         super(classpath,D);
     }
     // more typical use:
-    public j9_foundation11(long ms, long mx, String classpath, Vector D) {
+    public j9_foundation11(long ms, long mx, String classpath, Vector<String> D) {
         super(ms,mx,classpath,D);
     }
     // actual use
@@ -61,10 +61,10 @@ public class j9_foundation11 extends jvm
 
     // return the command line to invoke this VM.  The caller then adds
     // the class and program arguments.
-    public Vector getCommandLine() 
+    public Vector<String> getCommandLine()
     {
         StringBuffer sb = new StringBuffer();
-        Vector v = super.getCommandLine();
+        Vector<String> v = super.getCommandLine();
         appendOtherFlags(sb);
         String s = sb.toString();
         StringTokenizer st = new StringTokenizer(s);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9dee15.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9dee15.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9dee15.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/j9dee15.java Fri May 17 10:25:14 2013
@@ -35,16 +35,16 @@ public class j9dee15 extends jvm {
 	public String getName(){return "j9dee15";}
     public j9dee15(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
     long ss, long oss, long ms, long mx, String classpath, String prof,
-    boolean verify, boolean noverify, boolean nojit, Vector D) {
+    boolean verify, boolean noverify, boolean nojit, Vector<String> D) {
         super(noasyncgc,verbosegc,noclassgc,ss,oss,ms,mx,classpath,prof,
 		verify,noverify,nojit,D);
     }
     // more typical use:
-    public j9dee15(String classpath, Vector D) {
+    public j9dee15(String classpath, Vector<String> D) {
         super(classpath,D);
     }
     // more typical use:
-    public j9dee15(long ms, long mx, String classpath, Vector D) {
+    public j9dee15(long ms, long mx, String classpath, Vector<String> D) {
         super(ms,mx,classpath,D);
     }
     // actual use
@@ -63,11 +63,11 @@ public class j9dee15 extends jvm {
 
     // return the command line to invoke this VM.  The caller then adds
     // the class and program arguments.
-    public Vector getCommandLine() 
+    public Vector<String> getCommandLine()
     {
 
         StringBuffer sb = new StringBuffer();
-        Vector v = super.getCommandLine();
+        Vector<String> v = super.getCommandLine();
 
         appendOtherFlags(sb);
         String s = sb.toString();

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk13.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk13.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk13.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk13.java Fri May 17 10:25:14 2013
@@ -33,16 +33,16 @@ public class jdk13 extends jvm {
 	public String getName(){return "jdk13";}
     public jdk13(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
     long ss, long oss, long ms, long mx, String classpath, String prof,
-    boolean verify, boolean noverify, boolean nojit, Vector D) {
+    boolean verify, boolean noverify, boolean nojit, Vector<String> D) {
         super(noasyncgc,verbosegc,noclassgc,ss,oss,ms,mx,classpath,prof,
 		verify,noverify,nojit,D);
     }
     // more typical use:
-    public jdk13(String classpath, Vector D) {
+    public jdk13(String classpath, Vector<String> D) {
         super(classpath,D);
     }
     // more typical use:
-    public jdk13(long ms, long mx, String classpath, Vector D) {
+    public jdk13(long ms, long mx, String classpath, Vector<String> D) {
         super(ms,mx,classpath,D);
     }
     // actual use
@@ -50,10 +50,10 @@ public class jdk13 extends jvm {
 
     // return the command line to invoke this VM.  The caller then adds
     // the class and program arguments.
-    public Vector getCommandLine() 
+    public Vector<String> getCommandLine()
     {
         StringBuffer sb = new StringBuffer();
-        Vector v = super.getCommandLine();
+        Vector<String> v = super.getCommandLine();
         appendOtherFlags(sb);
         String s = sb.toString();
         StringTokenizer st = new StringTokenizer(s);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk14.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk14.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk14.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk14.java Fri May 17 10:25:14 2013
@@ -33,16 +33,16 @@ public class jdk14 extends jvm {
 	public String getName(){return "jdk14";}
     public jdk14(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
     long ss, long oss, long ms, long mx, String classpath, String prof,
-    boolean verify, boolean noverify, boolean nojit, Vector D) {
+    boolean verify, boolean noverify, boolean nojit, Vector<String> D) {
         super(noasyncgc,verbosegc,noclassgc,ss,oss,ms,mx,classpath,prof,
 		verify,noverify,nojit,D);
     }
     // more typical use:
-    public jdk14(String classpath, Vector D) {
+    public jdk14(String classpath, Vector<String> D) {
         super(classpath,D);
     }
     // more typical use:
-    public jdk14(long ms, long mx, String classpath, Vector D) {
+    public jdk14(long ms, long mx, String classpath, Vector<String> D) {
         super(ms,mx,classpath,D);
     }
     // actual use
@@ -50,10 +50,10 @@ public class jdk14 extends jvm {
 
     // return the command line to invoke this VM.  The caller then adds
     // the class and program arguments.
-    public Vector getCommandLine() 
+    public Vector<String> getCommandLine()
     {
         StringBuffer sb = new StringBuffer();
-        Vector v = super.getCommandLine();
+        Vector<String> v = super.getCommandLine();
         appendOtherFlags(sb);
         String s = sb.toString();
         StringTokenizer st = new StringTokenizer(s);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk15.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk15.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk15.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk15.java Fri May 17 10:25:14 2013
@@ -33,16 +33,16 @@ public class jdk15 extends jvm {
 	public String getName(){return "jdk15";}
     public jdk15(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
     long ss, long oss, long ms, long mx, String classpath, String prof,
-    boolean verify, boolean noverify, boolean nojit, Vector D) {
+    boolean verify, boolean noverify, boolean nojit, Vector<String> D) {
         super(noasyncgc,verbosegc,noclassgc,ss,oss,ms,mx,classpath,prof,
 		verify,noverify,nojit,D);
     }
     // more typical use:
-    public jdk15(String classpath, Vector D) {
+    public jdk15(String classpath, Vector<String> D) {
         super(classpath,D);
     }
     // more typical use:
-    public jdk15(long ms, long mx, String classpath, Vector D) {
+    public jdk15(long ms, long mx, String classpath, Vector<String> D) {
         super(ms,mx,classpath,D);
     }
     // actual use
@@ -50,10 +50,10 @@ public class jdk15 extends jvm {
 
     // return the command line to invoke this VM.  The caller then adds
     // the class and program arguments.
-    public Vector getCommandLine() 
+    public Vector<String> getCommandLine()
     {
         StringBuffer sb = new StringBuffer();
-        Vector v = super.getCommandLine();
+        Vector<String> v = super.getCommandLine();
         appendOtherFlags(sb);
         String s = sb.toString();
         StringTokenizer st = new StringTokenizer(s);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk16.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk16.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk16.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk16.java Fri May 17 10:25:14 2013
@@ -30,25 +30,25 @@ public class jdk16 extends jvm {
     public String getName(){return "jdk16";}
     public jdk16(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
         long ss, long oss, long ms, long mx, String classpath, String prof,
-        boolean verify, boolean noverify, boolean nojit, Vector D) {
+        boolean verify, boolean noverify, boolean nojit, Vector<String> D) {
         super(noasyncgc,verbosegc,noclassgc,ss,oss,ms,mx,classpath,prof,
             verify,noverify,nojit,D);
     }
     
-    public jdk16(String classpath, Vector D) {
+    public jdk16(String classpath, Vector<String> D) {
         super(classpath,D);
     }
     
-    public jdk16(long ms, long mx, String classpath, Vector D) {
+    public jdk16(long ms, long mx, String classpath, Vector<String> D) {
         super(ms,mx,classpath,D);
     }
     
     public jdk16() { }
     
     
-    public Vector getCommandLine() {
+    public Vector<String> getCommandLine() {
         StringBuffer sb = new StringBuffer();
-        Vector v = super.getCommandLine();
+        Vector<String> v = super.getCommandLine();
         appendOtherFlags(sb);
         String s = sb.toString();
         StringTokenizer st = new StringTokenizer(s);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk17.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk17.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk17.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk17.java Fri May 17 10:25:14 2013
@@ -30,25 +30,25 @@ public class jdk17 extends jvm {
     public String getName(){return "jdk17";}
     public jdk17(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
         long ss, long oss, long ms, long mx, String classpath, String prof,
-        boolean verify, boolean noverify, boolean nojit, Vector D) {
+        boolean verify, boolean noverify, boolean nojit, Vector<String> D) {
         super(noasyncgc,verbosegc,noclassgc,ss,oss,ms,mx,classpath,prof,
             verify,noverify,nojit,D);
     }
     
-    public jdk17(String classpath, Vector D) {
+    public jdk17(String classpath, Vector<String> D) {
         super(classpath,D);
     }
     
-    public jdk17(long ms, long mx, String classpath, Vector D) {
+    public jdk17(long ms, long mx, String classpath, Vector<String> D) {
         super(ms,mx,classpath,D);
     }
     
     public jdk17() { }
     
     
-    public Vector getCommandLine() {
+    public Vector<String> getCommandLine() {
         StringBuffer sb = new StringBuffer();
-        Vector v = super.getCommandLine();
+        Vector<String> v = super.getCommandLine();
         appendOtherFlags(sb);
         String s = sb.toString();
         StringTokenizer st = new StringTokenizer(s);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk18.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk18.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk18.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk18.java Fri May 17 10:25:14 2013
@@ -30,25 +30,25 @@ public class jdk18 extends jvm {
     public String getName(){return "jdk18";}
     public jdk18(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
         long ss, long oss, long ms, long mx, String classpath, String prof,
-        boolean verify, boolean noverify, boolean nojit, Vector D) {
+        boolean verify, boolean noverify, boolean nojit, Vector<String> D) {
         super(noasyncgc,verbosegc,noclassgc,ss,oss,ms,mx,classpath,prof,
             verify,noverify,nojit,D);
     }
     
-    public jdk18(String classpath, Vector D) {
+    public jdk18(String classpath, Vector<String> D) {
         super(classpath,D);
     }
     
-    public jdk18(long ms, long mx, String classpath, Vector D) {
+    public jdk18(long ms, long mx, String classpath, Vector<String> D) {
         super(ms,mx,classpath,D);
     }
     
     public jdk18() { }
     
     
-    public Vector getCommandLine() {
+    public Vector<String> getCommandLine() {
         StringBuffer sb = new StringBuffer();
-        Vector v = super.getCommandLine();
+        Vector<String> v = super.getCommandLine();
         appendOtherFlags(sb);
         String s = sb.toString();
         StringTokenizer st = new StringTokenizer(s);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jvm.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jvm.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jvm.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jvm.java Fri May 17 10:25:14 2013
@@ -102,7 +102,7 @@ public abstract class jvm {
     // -nojit            turn off the jit
     public boolean nojit = false;
     // -Dprop=name       define property; can be specified more than once
-    public Vector D = null;
+    public Vector<String> D = null;
     // java cmd (java, java_g)
     public String javaCmd = "java";
     // major and minor version
@@ -122,7 +122,7 @@ public abstract class jvm {
 
     public jvm(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
     long ss, long oss, long ms, long mx, String classpath, String prof,
-    boolean verify, boolean noverify, boolean nojit, Vector D) {
+    boolean verify, boolean noverify, boolean nojit, Vector<String> D) {
         this.noasyncgc=noasyncgc;
         this.noclassgc=noclassgc;
         this.verbosegc=verbosegc;
@@ -138,12 +138,12 @@ public abstract class jvm {
         this.D=D;
     }
     // more typical use:
-    public jvm(String classpath, Vector D) {
+    public jvm(String classpath, Vector<String> D) {
         this.classpath=classpath;
         this.D=D;
     }
     // more typical use:
-    public jvm(long ms, long mx, String classpath, Vector D) {
+    public jvm(long ms, long mx, String classpath, Vector<String> D) {
         this.ms=ms;
         this.mx=mx;
         this.classpath=classpath;
@@ -168,14 +168,14 @@ public abstract class jvm {
     public void setVerify(boolean verify) { this.verify=verify; }
     public void setNoverify(boolean noverify) { this.noverify=noverify; }
     public void setNojit(boolean nojit) { this.nojit=nojit; }
-    public void setD(Vector D) { this.D = D; }
+    public void setD(Vector<String> D) { this.D = D; }
     public void setFlags(String flags) { this.flags = flags; }
     public void setJavaCmd(String jcmd) { this.javaCmd = jcmd; }
 
 	
-    public Vector getCommandLine()
+    public Vector<String> getCommandLine()
     {
-        Vector v = new Vector();
+        Vector<String> v = new Vector<String>();
         v.addElement(javaCmd);
         v.addElement("-Duser.language=en");
         v.addElement("-Duser.country=US");
@@ -345,10 +345,11 @@ public abstract class jvm {
 		
 	}
 	
-	static Vector getSecurityProps(Vector D) throws ClassNotFoundException, IOException
+    static Vector<String> getSecurityProps(Vector<String> D)
+            throws ClassNotFoundException, IOException
 	{
 		if (D == null)
-			D = new Vector();
+			D = new Vector<String>();
 		
 		String userDir = System.getProperty("user.dir");
 		String policyFile = userDir + baseName(DEFAULT_POLICY);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java Fri May 17 10:25:14 2013
@@ -21,7 +21,6 @@
 package org.apache.derbyTesting.functionTests.suites;
 
 import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -85,7 +84,7 @@ public class AllPackages extends BaseTes
      * @return list of test classes
      */
     private static List getTestClasses() {
-        ArrayList classes = new ArrayList();
+        ArrayList<Object> classes = new ArrayList<Object>();
 
         classes.add(org.apache.derbyTesting.functionTests.tests.derbynet._Suite.class);
         classes.add(org.apache.derbyTesting.functionTests.tests.lang._Suite.class); 
@@ -173,10 +172,9 @@ public class AllPackages extends BaseTes
      * @return the test suite returned by {@code suite()}
      * @throws Exception if the suite() method cannot be called or fails
      */
-    private static Test invokeSuite(Class klass) throws Exception {
+    private static Test invokeSuite(Class<?> klass) throws Exception {
         try {
-            Method suite = klass.getMethod("suite", null);
-            return (Test) suite.invoke(null, null);
+            return (Test) klass.getMethod("suite").invoke(null);
         } catch (Exception e) {
             System.err.println("Failed to invoke class " + klass.getName());
             e.printStackTrace();

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/build.xml?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/build.xml Fri May 17 10:25:14 2013
@@ -63,6 +63,7 @@
 	        <pathelement path="${junit}"/>
 	      </classpath>
 	      <include name="${derby.testing.functest.dir}/suites/*.java"/>
+              <compilerarg value="-Xlint"/>
 	    </javac>
 	  </target>
 </project>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/CompatibilityCombinations.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/CompatibilityCombinations.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/CompatibilityCombinations.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/CompatibilityCombinations.java Fri May 17 10:25:14 2013
@@ -696,7 +696,7 @@ public class CompatibilityCombinations e
         
         boolean testOK = false;
         
-        ArrayList cmd = new ArrayList();
+        ArrayList<String> cmd = new ArrayList<String>();
         cmd.add("-Ddrb.tests.debug=true");      // Used by JDBCDriverTest
         // cmd.add("-Dderby.tests.debug=true"); // Used by DerbyJUnitTest
         cmd.add("-Dderby.tests.trace=true");    // Used by DerbyJUnitTest
@@ -950,8 +950,8 @@ public class CompatibilityCombinations e
         
     }
 
-    private static String[] toStringArray(List list) {
-        return (String[]) list.toArray(new String[list.size()]);
+    private static String[] toStringArray(List<String> list) {
+        return list.toArray(new String[list.size()]);
     }
 
     private void startServer(int serverVM, int serverVersion)
@@ -970,7 +970,7 @@ public class CompatibilityCombinations e
         String command = "start";
         String allowedClients = "0.0.0.0"; // I.e. any
 
-        ArrayList cmd = new ArrayList();
+        ArrayList<String> cmd = new ArrayList<String>();
         cmd.add("-Dderby.infolog.append=true");
         cmd.add(networkServerControl);
         cmd.add(command);
@@ -1049,7 +1049,7 @@ public class CompatibilityCombinations e
         
         String creator = compatibilityTestSuite + "$Creator";
 
-        ArrayList cmd = new ArrayList();
+        ArrayList<String> cmd = new ArrayList<String>();
         cmd.add("-Ddrb.tests.debug=true");      // Used by JDBCDriverTest.
         // cmd.add("-Dderby.tests.debug=true"); // Used by DerbyJUnitTest
         cmd.add("-Dderby.tests.trace=true");    // Used by DerbyJUnitTest

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/JDBCDriverTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/JDBCDriverTest.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/JDBCDriverTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/JDBCDriverTest.java Fri May 17 10:25:14 2013
@@ -203,10 +203,12 @@ public	class	JDBCDriverTest	extends	Comp
 	/////////////////////////////////////////////////////////////
 
 	// map derby type name to type descriptor
-	private	static	HashMap		_types = new HashMap();	// maps Derby type names to TypeDescriptors
+    private static HashMap<String, TypeDescriptor> _types =
+            new HashMap<String, TypeDescriptor>();
 
 	// map jdbc type to index into COERCIONS
-	private	static	HashMap		_coercionIndex = new HashMap();	// maps jdbc types to legal coercions
+    private static HashMap<Integer, Integer> _coercionIndex =
+            new HashMap<Integer, Integer>();
 
 	/////////////////////////////////////////////////////////////
 	//
@@ -668,7 +670,7 @@ public	class	JDBCDriverTest	extends	Comp
 		
 		checkDBMetadata( conn, tableName );
 		stuffTable( conn, tableName, types, rows );
-		readTable( conn, tableName, types, rows, null );
+		readTable( conn, tableName, types, rows );
 	}
 	
 	//
@@ -777,7 +779,8 @@ public	class	JDBCDriverTest	extends	Comp
 	// Verify that we can select all legal datatypes in a table.
 	//
 	private	void	readTable
-		( Connection conn, String tableName, TypeDescriptor[] types, Object[][] rows, List casts )
+		( Connection conn, String tableName, TypeDescriptor[] types,
+          Object[][] rows )
 		throws Exception
 	{
 		PreparedStatement	ps = readTableQuery( conn, tableName, types );
@@ -786,7 +789,7 @@ public	class	JDBCDriverTest	extends	Comp
 		checkRSMD( rs );
 		close( rs );
         // Execute the statement again for each cast / coercion we check.
-        checkRows( ps, types, rows, casts );
+        checkRows( ps, types, rows );
 
 		close( ps );
 	}
@@ -874,12 +877,10 @@ public	class	JDBCDriverTest	extends	Comp
      * @param ps the query used to obtain the results
      * @param types the type descriptions of the columns
      * @param rows the values expected to be returned
-     * @param casts a list to which objects retrieved from the result rows
-     *      are added, specify {@code null} if you don't need this
      * @throws Exception
      */
     private void checkRows(PreparedStatement ps, TypeDescriptor[] types,
-                           Object[][] rows, List casts)
+                           Object[][] rows)
             throws Exception {
         int typeCount = types.length;
 
@@ -895,7 +896,7 @@ public	class	JDBCDriverTest	extends	Comp
                 // Make sure we're using the correct type descriptor.
                 assertEquals(types[colIndex], type);
                 checkPlainGet(ps, colIndex, type, rows);
-                checkCoercions(ps, type, casts);
+                checkCoercions(ps, type);
             }
         }
     }
@@ -935,10 +936,8 @@ public	class	JDBCDriverTest	extends	Comp
      *
      * @param ps the query used to obtain the rows
      * @param type the type description of the column
-     * @param casts
      */
-    private void checkCoercions(PreparedStatement ps, TypeDescriptor type,
-                                List casts)
+    private void checkCoercions(PreparedStatement ps, TypeDescriptor type)
             throws Exception {
         String columnName = type.getDerbyTypeName();
         T_CN coercionDesc = COERCIONS[ getCoercionIndex(type.getJdbcType()) ];
@@ -957,10 +956,6 @@ public	class	JDBCDriverTest	extends	Comp
                     int jdbcType = COERCIONS[i].getJdbcType();
                     Object retval = getColumn( rs, columnName, jdbcType );
 
-                    if (casts != null) {
-                        casts.add(retval);
-                    }
-
                     println( "\t" + jdbcType + ":\t" + retval );
                 }
                 rs.close();
@@ -1061,9 +1056,9 @@ public	class	JDBCDriverTest	extends	Comp
 	//
 	private	TypeDescriptor	getType( String typeName )
 	{
-		if ( _types.size() == 0 ) { buildTypeMap(); }
+		if ( _types.isEmpty() ) { buildTypeMap(); }
 		
-		return (TypeDescriptor) _types.get( typeName );
+		return _types.get( typeName );
 	}
 
 	//
@@ -1077,7 +1072,7 @@ public	class	JDBCDriverTest	extends	Comp
 	}
 	private	void	putCoercionIndex( int index )
 	{
-		_coercionIndex.put( new Integer( COERCIONS[ index ].getJdbcType() ), new Integer( index ) );
+        _coercionIndex.put(COERCIONS[index].getJdbcType(), index);
 	}
 
 	//
@@ -1085,9 +1080,9 @@ public	class	JDBCDriverTest	extends	Comp
 	//
 	private	int	getCoercionIndex( int jdbcType )
 	{
-		if ( _coercionIndex.size() == 0 ) { buildCoercionMap(); }
+		if ( _coercionIndex.isEmpty() ) { buildCoercionMap(); }
 		
-		return ((Integer) _coercionIndex.get( new Integer( jdbcType ) )).intValue();
+		return _coercionIndex.get(jdbcType);
 	}
 	
 	/////////////////////////////////////////////////////////////

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/build.xml?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/build.xml Fri May 17 10:25:14 2013
@@ -75,6 +75,7 @@
 	<pathelement path="${junit}"/>
       </classpath>
       <include name="${this.dir}/*.java"/>
+      <compilerarg value="-Xlint"/>
     </javac>
   </target>
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/derbyNet/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/derbyNet/build.xml?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/derbyNet/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/derbyNet/build.xml Fri May 17 10:25:14 2013
@@ -85,6 +85,7 @@
         <pathelement path="${junit}"/>
       </classpath>
       <include name="${this.dir}/*.java"/>
+      <compilerarg value="-Xlint"/>
     </javac>
   </target>
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CompressTableTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CompressTableTest.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CompressTableTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CompressTableTest.java Fri May 17 10:25:14 2013
@@ -22,13 +22,10 @@ limitations under the License.
 package org.apache.derbyTesting.functionTests.tests.lang;
 
 import java.sql.Connection;
-import java.sql.ResultSet;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
 import junit.framework.Test;
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
@@ -122,8 +119,8 @@ public class CompressTableTest extends B
         s.execute("insert into d4275 values 1");
 
         // Object used by the main thread to tell the helper thread to stop.
-        // The helper thread stops once the list is non-empty.
-        final List stop = Collections.synchronizedList(new ArrayList());
+        // The helper thread stops once the value is set to true.
+        final AtomicBoolean stop = new AtomicBoolean();
 
         // Holder for anything thrown by the run() method in the helper thread.
         final Throwable[] error = new Throwable[1];
@@ -136,7 +133,7 @@ public class CompressTableTest extends B
         Thread t = new Thread() {
             public void run() {
                 try {
-                    while (stop.isEmpty()) {
+                    while (!stop.get()) {
                         JDBC.assertSingleValueResultSet(ps.executeQuery(), "1");
                     }
                 } catch (Throwable t) {
@@ -158,7 +155,7 @@ public class CompressTableTest extends B
             }
         } finally {
             // We're done, so tell the helper thread to stop.
-            stop.add(Boolean.TRUE);
+            stop.set(true);
         }
 
         t.join();

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DatabaseClassLoadingTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DatabaseClassLoadingTest.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DatabaseClassLoadingTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DatabaseClassLoadingTest.java Fri May 17 10:25:14 2013
@@ -31,7 +31,6 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.security.AccessController;
-import java.security.PrivilegedActionException;
 import java.sql.CallableStatement;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -617,9 +616,8 @@ public class DatabaseClassLoadingTest ex
         
         final String db = getTestConfiguration().getDefaultDatabaseName();
         AccessController.doPrivileged
-        (new java.security.PrivilegedExceptionAction(){
-            
-            public Object run() throws Exception { 
+        (new java.security.PrivilegedExceptionAction<Void>() {
+            public Void run() throws Exception {
                 createArchive("dclt.jar", new File(backupDir, db), "dbro");;
               return null;
             }
@@ -1354,9 +1352,8 @@ public class DatabaseClassLoadingTest ex
     private static void setContextClassLoader(final URL url)
     {
         AccessController.doPrivileged
-        (new java.security.PrivilegedAction(){
-            
-            public Object run()  { 
+        (new java.security.PrivilegedAction<Void>() {
+            public Void run()  {
                 URLClassLoader cl = 
                     url == null ? null : new URLClassLoader(new URL[] {url});
                 java.lang.Thread.currentThread().setContextClassLoader(cl);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DeadlockDetectionTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DeadlockDetectionTest.java?rev=1483727&r1=1483726&r2=1483727&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DeadlockDetectionTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DeadlockDetectionTest.java Fri May 17 10:25:14 2013
@@ -25,7 +25,6 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 import junit.framework.Test;
 import org.apache.derbyTesting.functionTests.util.Barrier;
@@ -83,7 +82,8 @@ public class DeadlockDetectionTest exten
         final Barrier readLockBarrier = new Barrier(threads.length);
 
         // Exceptions seen by the threads.
-        final List exceptions = Collections.synchronizedList(new ArrayList());
+        final List<Exception> exceptions =
+                Collections.synchronizedList(new ArrayList<Exception>());
 
         // Start the two threads. Both should first obtain a read lock, and
         // when both have the read lock, they should try to lock the same row
@@ -132,8 +132,7 @@ public class DeadlockDetectionTest exten
         }
 
         // Verify that we only got deadlock exceptions.
-        for (Iterator it = exceptions.iterator(); it.hasNext(); ) {
-            Exception e = (Exception) it.next();
+        for (Exception e : exceptions) {
             if (e instanceof SQLException) {
                 assertSQLState(DEADLOCK, (SQLException) e);
             } else {
@@ -184,7 +183,8 @@ public class DeadlockDetectionTest exten
         // The transactions that have exclusive locks should attempt to lock
         // another row than the one they already have locked, otherwise there
         // will be no deadlock.
-        final List exceptions = Collections.synchronizedList(new ArrayList());
+        final List<Exception> exceptions =
+                Collections.synchronizedList(new ArrayList<Exception>());
         for (int i = 0; i < threads.length; i++) {
             final PreparedStatement ps = conns[i].prepareStatement(
                     "select x from derby5073 where x = ?");
@@ -225,9 +225,7 @@ public class DeadlockDetectionTest exten
             conns[i].close();
         }
 
-        // Verify that we only got deadlock exceptions.
-        for (Iterator it = exceptions.iterator(); it.hasNext(); ) {
-            Exception e = (Exception) it.next();
+        for (Exception e : exceptions) {
             if (e instanceof SQLException) {
                 assertSQLState(DEADLOCK, (SQLException) e);
             } else {



Mime
View raw message