db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r180028 - in /incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: harness/ master/ tests/derbynet/ tests/i18n/ tests/jdbcapi/ tests/lang/ tests/store/ tests/storetests/ tests/tools/ tests/unit/
Date Sat, 04 Jun 2005 21:48:32 GMT
Author: djd
Date: Sat Jun  4 14:48:28 2005
New Revision: 180028

URL: http://svn.apache.org/viewcvs?rev=180028&view=rev
Log:
Various changes to enable tests to be run using a DataSource
and a specific skip property at the test level for J2ME/CDC/Foundation.

Added:
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/getCurConnJdbc20_app.properties   (with props)
Removed:
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/bestrowidentifier_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadataJdbc20_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/cursorerrors_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/distinct_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/implicitConversions_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/joins_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/repeat_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/selectivity_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/EscalateLock_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/TransactionTable_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/access_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/cisco_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/connectDisconnect_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/heapscan_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/readUncommitted_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rlliso1multi_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rlliso2multi_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rlliso3multi_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/cacheService_app.properties
Modified:
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/bug3498.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/netxaPositive_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/default_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/StmtCloseFunTest.java
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/copyfiles.ant
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/default_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadataJdbc20.java
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultsetJdbc30_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/savepointJdbc30_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/secureUsers1_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/secureUsers_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/users2_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/users_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaAnotherTest_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaSimplePositive_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/aggbuiltin_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/comparisons_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ddlTableLockMode_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/declareGlobalTempTableJavaJDBC30_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/default_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/desc_index_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dynamicLikeOptimization_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ejbql_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/floattypes_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorIJ_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorJavaReflection_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorJava_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/partdml_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/releaseCompileLocks_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/specjPlans_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/staleplans_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/stmtCache1_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/bootLock_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/bug3498_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/copyfiles.ant
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/default_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptDatabase_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/holdCursorExternalSortJDBC30_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/holdCursorJDBC30_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/logDevice_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rollForwardBackup_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rollForwardRecovery_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/default_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/URLCheck_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/default_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij3_app.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/default_app.properties

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java Sat Jun  4 14:48:28 2005
@@ -1464,8 +1464,16 @@
             }
 		
             // for now we want just want to have a single property
-            // for all j9 versions
-            String testJVM = (jvmName.startsWith("j9") ? "j9" : jvmName);
+            // for all j9 versions exception j9_foundation
+            // which we map to the generic name foundation.
+            String testJVM = jvmName;
+            if (jvmName.startsWith("j9"))
+            {
+            	if (jvmName.equals("j9_foundation"))
+            		testJVM = "foundation";
+            	else
+            		testJVM = "j9";
+            }
             runwithjvm = ap.getProperty("runwith" + testJVM);
             if  ((runwithjvm != null) && (runwithjvm.equalsIgnoreCase("false")))
             {

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/bug3498.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/bug3498.out?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/bug3498.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/bug3498.out Sat Jun  4 14:48:28 2005
@@ -1,5 +1,3 @@
-CONNECTION0* - 	jdbc:derby:wombat
-* = current connection
 ij> -- Track 3498
 --
 -- test case for a post commit queued during an nested user transaction.  This
@@ -304,6 +302,5 @@
 ij> select * from testabort;
 A          
 -----------
-0 rows selected
 ij> commit;
 ij> 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/netxaPositive_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/netxaPositive_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/netxaPositive_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/netxaPositive_app.properties Sat Jun  4 14:48:28 2005
@@ -4,3 +4,7 @@
 ij.showNoCountForSelect=true
 #ij.exceptionTrace=true
 
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat
+ij.dataSource.createDatabase=create
+

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/default_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/default_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/default_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/default_app.properties Sat Jun  4 14:48:28 2005
@@ -17,8 +17,11 @@
 # database, or to not be used, override this file by creating
 # a file <testname>_app.properties to be used instead of this file.
 #
-database=jdbc:derby:wombat;create=true
-derby.optimizer.noTimeout=true
+ij.database=jdbc:derby:wombat;create=true
 
 ij.showNoConnectionsAtStart=true
 ij.showNoCountForSelect=true
+
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat
+ij.dataSource.createDatabase=create
\ No newline at end of file

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/StmtCloseFunTest.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/StmtCloseFunTest.java?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/StmtCloseFunTest.java (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/StmtCloseFunTest.java Sat Jun  4 14:48:28 2005
@@ -21,14 +21,12 @@
 package org.apache.derbyTesting.functionTests.tests.jdbcapi;
 
 import org.apache.derby.tools.ij;
-import java.sql.DriverManager;
 import java.sql.Connection;
 import java.sql.Statement;
 import java.sql.PreparedStatement;
 import java.sql.CallableStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.lang.Float;
 import java.sql.Date;
 import java.sql.Types;
 import java.util.GregorianCalendar;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/copyfiles.ant
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/copyfiles.ant?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/copyfiles.ant (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/copyfiles.ant Sat Jun  4 14:48:28 2005
@@ -10,6 +10,7 @@
 default_app.properties
 default_derby.properties
 empty.txt
+getCurConnJdbc20_app.properties
 getCurConnJdbc20.sql
 littleclob.txt
 metadata_app.properties

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/default_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/default_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/default_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/default_app.properties Sat Jun  4 14:48:28 2005
@@ -21,3 +21,7 @@
 
 ij.showNoConnectionsAtStart=true
 ij.showNoCountForSelect=true
+
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat
+ij.dataSource.createDatabase=create

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/getCurConnJdbc20_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/getCurConnJdbc20_app.properties?rev=180028&view=auto
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/getCurConnJdbc20_app.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/getCurConnJdbc20_app.properties Sat Jun  4 14:48:28 2005
@@ -0,0 +1,4 @@
+# Current connection requires DriverManager for jdbc:default:connection
+runwithfoundation=false
+
+usedefaults=true

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/getCurConnJdbc20_app.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadataJdbc20.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadataJdbc20.java?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadataJdbc20.java (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadataJdbc20.java Sat Jun  4 14:48:28 2005
@@ -21,13 +21,11 @@
 package org.apache.derbyTesting.functionTests.tests.jdbcapi;
 
 import java.sql.Connection;
-import java.sql.DriverManager;
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSetMetaData;
 import java.sql.Statement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Types;
 
 import org.apache.derby.tools.ij;
 
@@ -63,7 +61,13 @@
 							   "." + met.getDriverMinorVersion() +
 							   " (" + met.getDriverVersion() + ")");
 
-			System.out.println("The URL is: " + met.getURL());
+
+			try {
+				System.out.println("The URL is: " + met.getURL());
+			} catch (NoSuchMethodError msme)
+			{
+				System.out.println("DatabaseMetaData.getURL not present - correct for JSR169");
+			}
 
 			System.out.println();
 			System.out.println("getUDTs() with user-named types null :");
@@ -112,7 +116,7 @@
 			dumpSQLExceptions(e);
 		}
 		catch (Throwable e) {
-			System.out.println("FAIL -- unexpected exception:");
+			System.out.println("FAIL -- unexpected exception: " + e.getMessage());
 			e.printStackTrace(System.out);
 		}
 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultsetJdbc30_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultsetJdbc30_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultsetJdbc30_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultsetJdbc30_app.properties Sat Jun  4 14:48:28 2005
@@ -17,12 +17,9 @@
 # database, or to not be used, override this file by creating
 # a file <testname>_app.properties to be used instead of this file.
 #
-database=jdbc:derby:wombat;create=true
-derby.optimizer.noTimeout=true
-
-ij.showNoConnectionsAtStart=true
-ij.showNoCountForSelect=true
 
 runwithibm13=false
 runwithjdk13=false
 runwithj9=false
+
+usedefaults=true

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/savepointJdbc30_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/savepointJdbc30_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/savepointJdbc30_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/savepointJdbc30_app.properties Sat Jun  4 14:48:28 2005
@@ -1,28 +1,7 @@
-#
-# This is the default system properties file for SQL and JAVA tests.
-#
-# *** DO NOT PUT PROPERTIES FOR THE DERBY SYSTEM IN THIS FILE.  
-# *** THEY BELONG IN default_derby.properties.
-#
-# This file will get handed to the test on the command line in a -p <filename>
-# argument.
-#
-# This causes ij to load the driver and make an
-# initial connection to the database.
-#
-# The .java test has to call util.getPropertyArg and util.startJBMS
-# to process the property file.  See any of the .java tests for this code.
-#
-# If you want to alter these to use a different driver, connect to a different
-# database, or to not be used, override this file by creating
-# a file <testname>_app.properties to be used instead of this file.
-#
-database=jdbc:derby:wombat;create=true
-derby.optimizer.noTimeout=true
 
-ij.showNoConnectionsAtStart=true
-ij.showNoCountForSelect=true
 
 runwithj9=false
 runwithjdk13=false
 runwithibm13=false
+
+usedefaults=true
\ No newline at end of file

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/secureUsers1_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/secureUsers1_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/secureUsers1_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/secureUsers1_app.properties Sat Jun  4 14:48:28 2005
@@ -1,3 +1,6 @@
+# not using ij.user here as those properties are used
+# for every connection request in ij, but for this test
+# the user name is only required for the initial connection.
 ij.protocol=jdbc:derby:
 ij.database=jdbc:derby:wombat;create=true;user=system;password=manager
 
@@ -5,3 +8,9 @@
 ij.showNoCountForSelect=true
 
 runwithj9=false
+
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat
+ij.dataSource.createDatabase=create
+ij.dataSource.user=system
+ij.dataSource.password=manager

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/secureUsers_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/secureUsers_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/secureUsers_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/secureUsers_app.properties Sat Jun  4 14:48:28 2005
@@ -1,6 +1,16 @@
+# not using ij.user here as those properties are used
+# for every connection request in ij, but for this test
+# the user name is only required for the initial connection.
 ij.protocol=jdbc:derby:
 ij.database=jdbc:derby:wombat;create=true;user=system;password=manager
 ij.showNoConnectionsAtStart=true
 ij.showNoCountForSelect=true
 
 runwithj9=false
+
+
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat
+ij.dataSource.createDatabase=create
+ij.dataSource.user=system
+ij.dataSource.password=manager

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/users2_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/users2_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/users2_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/users2_app.properties Sat Jun  4 14:48:28 2005
@@ -1,5 +1,14 @@
+# not using ij.user here as those properties are used
+# for every connection request in ij, but for this test
+# the user name is only required for the initial connection.
 ij.protocol=jdbc:derby:
 ij.database=jdbc:derby:wombat;create=true;user=system;password=manager
 
 ij.showNoConnectionsAtStart=true
 ij.showNoCountForSelect=true
+
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat
+ij.dataSource.createDatabase=create
+ij.dataSource.user=system
+ij.dataSource.password=manager

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/users_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/users_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/users_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/users_app.properties Sat Jun  4 14:48:28 2005
@@ -1,5 +1,14 @@
+# not using ij.user here as those properties are used
+# for every connection request in ij, but for this test
+# the user name is only required for the initial connection.
 ij.protocol=jdbc:derby:
 ij.database=jdbc:derby:wombat;create=true;user=francois;password=paceesalute
 
 ij.showNoConnectionsAtStart=true
 ij.showNoCountForSelect=true
+
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat
+ij.dataSource.createDatabase=create
+ij.dataSource.user=francois
+ij.dataSource.password=paccesalute

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaAnotherTest_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaAnotherTest_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaAnotherTest_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaAnotherTest_app.properties Sat Jun  4 14:48:28 2005
@@ -3,3 +3,7 @@
 ij.showNoConnectionsAtStart=true
 ij.showNoCountForSelect=true
 runwithj9=false
+
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat
+ij.dataSource.createDatabase=create

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaSimplePositive_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaSimplePositive_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaSimplePositive_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaSimplePositive_app.properties Sat Jun  4 14:48:28 2005
@@ -2,3 +2,7 @@
 ij.database=jdbc:derby:wombat;create=true
 ij.showNoConnectionsAtStart=true
 ij.showNoCountForSelect=true
+
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat
+ij.dataSource.createDatabase=create

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/aggbuiltin_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/aggbuiltin_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/aggbuiltin_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/aggbuiltin_app.properties Sat Jun  4 14:48:28 2005
@@ -9,3 +9,7 @@
 ij.defaultResourcePackage=/org/apache/derbyTesting/functionTests/tests/lang/
 ij.showNoConnectionsAtStart=true
 ij.showNoCountForSelect=true
+
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat
+ij.dataSource.createDatabase=create
\ No newline at end of file

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/comparisons_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/comparisons_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/comparisons_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/comparisons_app.properties Sat Jun  4 14:48:28 2005
@@ -9,3 +9,7 @@
 ij.defaultResourcePackage=/org/apache/derbyTesting/functionTests/tests/lang/
 ij.showNoConnectionsAtStart=true
 ij.showNoCountForSelect=true
+
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat
+ij.dataSource.createDatabase=create
\ No newline at end of file

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ddlTableLockMode_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ddlTableLockMode_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ddlTableLockMode_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ddlTableLockMode_app.properties Sat Jun  4 14:48:28 2005
@@ -25,3 +25,7 @@
 ij.defaultResourcePackage=/org/apache/derbyTesting/functionTests/tests/lang/
 ij.showNoConnectionsAtStart=true
 ij.showNoCountForSelect=true
+
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat
+ij.dataSource.createDatabase=create
\ No newline at end of file

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/declareGlobalTempTableJavaJDBC30_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/declareGlobalTempTableJavaJDBC30_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/declareGlobalTempTableJavaJDBC30_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/declareGlobalTempTableJavaJDBC30_app.properties Sat Jun  4 14:48:28 2005
@@ -27,3 +27,7 @@
 runwithj9=false
 runwithjdk13=false
 runwithibm13=false
+
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat
+ij.dataSource.createDatabase=create
\ No newline at end of file

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/default_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/default_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/default_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/default_app.properties Sat Jun  4 14:48:28 2005
@@ -24,3 +24,7 @@
 ij.defaultResourcePackage=/org/apache/derbyTesting/functionTests/tests/lang/
 ij.showNoConnectionsAtStart=true
 ij.showNoCountForSelect=true
+
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat
+ij.dataSource.createDatabase=create
\ No newline at end of file

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/desc_index_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/desc_index_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/desc_index_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/desc_index_app.properties Sat Jun  4 14:48:28 2005
@@ -25,3 +25,7 @@
 ij.defaultResourcePackage=/org/apache/derbyTesting/functionTests/tests/lang/
 ij.showNoConnectionsAtStart=true
 ij.showNoCountForSelect=true
+
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat
+ij.dataSource.createDatabase=create
\ No newline at end of file

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dynamicLikeOptimization_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dynamicLikeOptimization_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dynamicLikeOptimization_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dynamicLikeOptimization_app.properties Sat Jun  4 14:48:28 2005
@@ -4,3 +4,7 @@
 ij.defaultResourcePackage=/org/apache/derbyTesting/functionTests/tests/lang/
 ij.showNoConnectionsAtStart=true
 ij.showNoCountForSelect=true
+
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat
+ij.dataSource.createDatabase=create
\ No newline at end of file

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ejbql_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ejbql_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ejbql_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ejbql_app.properties Sat Jun  4 14:48:28 2005
@@ -9,3 +9,7 @@
 ij.defaultResourcePackage=/org/apache/derbyTesting/functionTests/tests/lang/
 ij.showNoConnectionsAtStart=true
 ij.showNoCountForSelect=true
+
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat
+ij.dataSource.createDatabase=create
\ No newline at end of file

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/floattypes_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/floattypes_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/floattypes_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/floattypes_app.properties Sat Jun  4 14:48:28 2005
@@ -9,3 +9,7 @@
 ij.defaultResourcePackage=/org/apache/derbyTesting/functionTests/tests/lang/
 ij.showNoConnectionsAtStart=true
 ij.showNoCountForSelect=true
+
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat
+ij.dataSource.createDatabase=create
\ No newline at end of file

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorIJ_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorIJ_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorIJ_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorIJ_app.properties Sat Jun  4 14:48:28 2005
@@ -9,3 +9,7 @@
 runwithibm13=false
 runwithj9=false
 excludeJCC=1.1
+
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat
+ij.dataSource.createDatabase=create
\ No newline at end of file

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorJavaReflection_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorJavaReflection_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorJavaReflection_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorJavaReflection_app.properties Sat Jun  4 14:48:28 2005
@@ -6,3 +6,7 @@
 ij.showNoCountForSelect=true
 
 excludeJCC=1.1
+
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat
+ij.dataSource.createDatabase=create
\ No newline at end of file

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorJava_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorJava_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorJava_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorJava_app.properties Sat Jun  4 14:48:28 2005
@@ -8,3 +8,7 @@
 runwithj9=false
 runwithjdk13=false
 runwithibm13=false
+
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat
+ij.dataSource.createDatabase=create
\ No newline at end of file

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/partdml_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/partdml_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/partdml_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/partdml_app.properties Sat Jun  4 14:48:28 2005
@@ -25,3 +25,7 @@
 ij.defaultResourcePackage=/org/apache/derbyTesting/functionTests/tests/lang/
 ij.showNoConnectionsAtStart=true
 ij.showNoCountForSelect=true
+
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat
+ij.dataSource.createDatabase=create
\ No newline at end of file

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/releaseCompileLocks_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/releaseCompileLocks_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/releaseCompileLocks_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/releaseCompileLocks_app.properties Sat Jun  4 14:48:28 2005
@@ -3,3 +3,7 @@
 
 ij.showNoConnectionsAtStart=true
 ij.showNoCountForSelect=true
+
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat
+ij.dataSource.createDatabase=create
\ No newline at end of file

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/specjPlans_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/specjPlans_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/specjPlans_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/specjPlans_app.properties Sat Jun  4 14:48:28 2005
@@ -25,3 +25,7 @@
 ij.defaultResourcePackage=/org/apache/derbyTesting/functionTests/tests/lang/
 ij.showNoConnectionsAtStart=true
 ij.showNoCountForSelect=true
+
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat
+ij.dataSource.createDatabase=create
\ No newline at end of file

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/staleplans_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/staleplans_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/staleplans_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/staleplans_app.properties Sat Jun  4 14:48:28 2005
@@ -25,3 +25,7 @@
 ij.defaultResourcePackage=/org/apache/derbyTesting/functionTests/tests/lang/
 ij.showNoConnectionsAtStart=true
 ij.showNoCountForSelect=true
+
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat
+ij.dataSource.createDatabase=create
\ No newline at end of file

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/stmtCache1_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/stmtCache1_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/stmtCache1_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/stmtCache1_app.properties Sat Jun  4 14:48:28 2005
@@ -3,8 +3,7 @@
 # by the test returns some long strings.
 #
 #
-database=jdbc:derby:wombat;create=true
+
 maximumDisplayWidth=1024
-ij.defaultResourcePackage=/org/apache/derbyTesting/functionTests/tests/lang/
-ij.showNoConnectionsAtStart=true
-ij.showNoCountForSelect=true
+
+usedefaults=true

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin_app.properties Sat Jun  4 14:48:28 2005
@@ -8,13 +8,9 @@
 #
 #
 #runwithj9=false
-database=jdbc:derby:wombat;create=true
-derby.optimizer.noTimeout=true
-
-ij.defaultResourcePackage=/org/apache/derbyTesting/functionTests/tests/lang/
-ij.showNoConnectionsAtStart=true
-ij.showNoCountForSelect=true
 
 # flags specific to this test: it runs out of memory on jdk118 sometimes
 # so give the JVM more memory always:
 jvmflags=-ms32M -mx128M
+
+usedefaults=true

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/bootLock_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/bootLock_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/bootLock_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/bootLock_app.properties Sat Jun  4 14:48:28 2005
@@ -1,13 +1,7 @@
-#
-# default settings:
-database=jdbc:derby:wombat;create=true
-derby.optimizer.noTimeout=true
 
-ij.showNoConnectionsAtStart=true
-ij.showNoCountForSelect=true
-
-ij.defaultResourcePackage=/org/apache/derbyTesting/functionTests/tests/store/
 # test specific settings:
 runwithj9=false
 runwithibm13=false
 runwithjdk13=false
+
+usedefaults=true

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/bug3498_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/bug3498_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/bug3498_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/bug3498_app.properties Sat Jun  4 14:48:28 2005
@@ -1,5 +1,3 @@
-database=jdbc:derby:wombat;create=true
-derby.locks.deadlockTimeout=1
-derby.locks.waitTimeout=3
-#supportfiles=ImportExport/sqlAnywhere.ctrl
+
 useextdirs=true
+usedefaults=true

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/copyfiles.ant
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/copyfiles.ant?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/copyfiles.ant (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/copyfiles.ant Sat Jun  4 14:48:28 2005
@@ -39,11 +39,9 @@
 checkPoint_derby.properties
 cisco.sql
 cisco.subsql
-cisco_app.properties
 cisco_default.properties
 cisco_derby.properties
 connectDisconnect.sql
-connectDisconnect_app.properties
 connectDisconnect_derby.properties
 copyfiles.ant
 createTestProcedures.subsql
@@ -58,10 +56,8 @@
 encryptionKey_app.properties
 global_xactTable.view
 heapscan.sql
-heapscan_app.properties
 heapscan_derby.properties
 holdCursorExternalSortJDBC30.sql
-holdCursorExternalSortJDBC30_app.properties
 holdCursorExternalSortJDBC30_derby.properties
 holdCursorJDBC30.sql
 holdCursorJDBC30_app.properties
@@ -83,13 +79,10 @@
 removeStubs.sql
 rlliso1multi.sql
 rlliso1multi.subsql
-rlliso1multi_app.properties
 rlliso1multi_derby.properties
 rlliso2multi.sql
-rlliso2multi_app.properties
 rlliso2multi_derby.properties
 rlliso3multi.sql
-rlliso3multi_app.properties
 rlliso3multi_derby.properties
 rollForwardBackup.sql
 rollForwardBackup_app.properties

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/default_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/default_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/default_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/default_app.properties Sat Jun  4 14:48:28 2005
@@ -16,8 +16,13 @@
 #
 #
 ij.database=jdbc:derby:wombat;create=true
+ij.protocol=jdbc:derby:
 
 ij.showNoConnectionsAtStart=true
 ij.showNoCountForSelect=true
 
 ij.defaultResourcePackage=/org/apache/derbyTesting/functionTests/tests/store/
+
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat
+ij.dataSource.createDatabase=create
\ No newline at end of file

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptDatabase_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptDatabase_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptDatabase_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptDatabase_app.properties Sat Jun  4 14:48:28 2005
@@ -1,7 +1,5 @@
-database=jdbc:derby:wombat;create=true;dataEncryption=true;bootPassword=Thursday
+ij.database=jdbc:derby:wombat;create=true;dataEncryption=true;bootPassword=Thursday
 
-#
-derby.optimizer.noTimeout=true
 
 ij.showNoConnectionsAtStart=true
 ij.showNoCountForSelect=true

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/holdCursorExternalSortJDBC30_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/holdCursorExternalSortJDBC30_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/holdCursorExternalSortJDBC30_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/holdCursorExternalSortJDBC30_app.properties Sat Jun  4 14:48:28 2005
@@ -1,11 +1,7 @@
-database=jdbc:derby:wombat;create=true
-derby.optimizer.noTimeout=true
 
-ij.showNoConnectionsAtStart=true
-ij.showNoCountForSelect=true
-
-ij.defaultResourcePackage=/org/apache/derbyTesting/functionTests/tests/store/
 
 runwithjdk13=false
 runwithibm13=false
 excludeJCC=1.1
+
+usedefaults=true

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/holdCursorJDBC30_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/holdCursorJDBC30_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/holdCursorJDBC30_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/holdCursorJDBC30_app.properties Sat Jun  4 14:48:28 2005
@@ -1,11 +1,6 @@
-database=jdbc:derby:wombat;create=true
-derby.optimizer.noTimeout=true
-
-ij.showNoConnectionsAtStart=true
-ij.showNoCountForSelect=true
-
-ij.defaultResourcePackage=/org/apache/derbyTesting/functionTests/tests/store/
 
 runwithjdk13=false
 runwithibm13=false
 excludeJCC=1.1
+
+usedefaults=true

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/logDevice_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/logDevice_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/logDevice_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/logDevice_app.properties Sat Jun  4 14:48:28 2005
@@ -10,9 +10,12 @@
 #
 #
 ij.protocol=jdbc:derby:
-database=jdbc:derby:wombat;create=true;logDevice=extinout/wierdlog
-derby.optimizer.noTimeout=true
+ij.database=jdbc:derby:wombat;create=true;logDevice=extinout/wierdlog
 
 ij.showNoConnectionsAtStart=true
 ij.showNoCountForSelect=true
 
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat
+ij.dataSource.createDatabase=create
+ij.dataSource.connectionAttributes=logDevice=extinout/wierdlog
\ No newline at end of file

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rollForwardBackup_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rollForwardBackup_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rollForwardBackup_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rollForwardBackup_app.properties Sat Jun  4 14:48:28 2005
@@ -9,11 +9,7 @@
 # initial connection to the database.
 #
 #
-ij.protocol=jdbc:derby:
-#database=jdbc:derby:wombat;create=true;logDevice=extinout/wierdlog
-database=jdbc:derby:wombat;create=true
 
-ij.showNoConnectionsAtStart=true
-ij.showNoCountForSelect=true
 useextdirs=true
+usedefaults=true
 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rollForwardRecovery_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rollForwardRecovery_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rollForwardRecovery_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rollForwardRecovery_app.properties Sat Jun  4 14:48:28 2005
@@ -9,11 +9,7 @@
 # initial connection to the database.
 #
 #
-ij.protocol=jdbc:derby:
-#database=jdbc:derby:wombat;create=true;logDevice=extinout/wierdlog
-database=jdbc:derby:wombat;create=true
 
-ij.showNoConnectionsAtStart=true
-ij.showNoCountForSelect=true
 useextdirs=true
+usedefaults=true
 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/default_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/default_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/default_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/default_app.properties Sat Jun  4 14:48:28 2005
@@ -12,8 +12,10 @@
 # a file <testname>.sysprop to be used instead of this file.
 #
 #
-database=jdbc:derby:wombat;autocommit=true
-derby.infolog.append=true
+ij.database=jdbc:derby:wombat
 ij.showNoConnectionsAtStart=true
 ij.showNoCountForSelect=true
 ij.defaultResourcePackage=/org/apache/derbyTesting/functionTests/tests/storetests/
+
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/URLCheck_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/URLCheck_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/URLCheck_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/URLCheck_app.properties Sat Jun  4 14:48:28 2005
@@ -1,3 +1,7 @@
 ij.protocol=jdbc:derby:
 ij.database=jdbc:derby:wombat;create=true
 ij.showNoConnectionsAtStart=true
+
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat
+ij.dataSource.createDatabase=create
\ No newline at end of file

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/default_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/default_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/default_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/default_app.properties Sat Jun  4 14:48:28 2005
@@ -21,3 +21,7 @@
 
 ij.showNoConnectionsAtStart=true
 ij.showNoCountForSelect=true
+
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat
+ij.dataSource.createDatabase=create
\ No newline at end of file

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij3_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij3_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij3_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij3_app.properties Sat Jun  4 14:48:28 2005
@@ -6,3 +6,7 @@
 
 ij.showNoConnectionsAtStart=true
 ij.showNoCountForSelect=true
+
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat
+ij.dataSource.createDatabase=create
\ No newline at end of file

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/default_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/default_app.properties?rev=180028&r1=180027&r2=180028&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/default_app.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/default_app.properties Sat Jun  4 14:48:28 2005
@@ -18,8 +18,11 @@
 # a file <testname>_app.properties to be used instead of this file.
 #
 #
-database=jdbc:derby:wombat;create=true
-derby.optimizer.noTimeout=true
+ij.database=jdbc:derby:wombat;create=true
 
 ij.showNoConnectionsAtStart=true
 ij.showNoCountForSelect=true
+
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=wombat
+ij.dataSource.createDatabase=create
\ No newline at end of file



Mime
View raw message