Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 5331 invoked from network); 4 Jun 2005 21:48:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 4 Jun 2005 21:48:43 -0000 Received: (qmail 68370 invoked by uid 500); 4 Jun 2005 21:48:43 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 68334 invoked by uid 500); 4 Jun 2005 21:48:42 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 68316 invoked by uid 500); 4 Jun 2005 21:48:42 -0000 Delivered-To: apmail-incubator-derby-cvs@incubator.apache.org Received: (qmail 68313 invoked by uid 99); 4 Jun 2005 21:48:42 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Sat, 04 Jun 2005 14:48:40 -0700 Received: (qmail 5312 invoked by uid 65534); 4 Jun 2005 21:48:39 -0000 Message-ID: <20050604214839.5311.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 -0000 To: derby-cvs@incubator.apache.org From: djd@apache.org X-Mailer: svnmailer-1.0.0-dev X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: djd Date: Sat Jun 4 14:48:28 2005 New Revision: 180028 URL: http://svn.apache.org/viewcvs?rev=3D180028&view=3Drev 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/functio= nTests/tests/jdbcapi/getCurConnJdbc20_app.properties (with props) Removed: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/bestrowidentifier_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/metadataJdbc20_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/cursorerrors_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/distinct_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/implicitConversions_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/joins_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/repeat_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/selectivity_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/EscalateLock_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/TransactionTable_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/access_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/cisco_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/connectDisconnect_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/heapscan_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/readUncommitted_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/rlliso1multi_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/rlliso2multi_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/rlliso3multi_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/unit/cacheService_app.properties Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/harness/RunTest.java incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/master/bug3498.out incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/derbynet/netxaPositive_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/i18n/default_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/StmtCloseFunTest.java incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/copyfiles.ant incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/default_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/metadataJdbc20.java incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/resultsetJdbc30_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/savepointJdbc30_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/secureUsers1_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/secureUsers_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/users2_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/users_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/xaAnotherTest_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/xaSimplePositive_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/aggbuiltin_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/comparisons_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/ddlTableLockMode_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/declareGlobalTempTableJavaJDBC30_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/default_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/desc_index_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/dynamicLikeOptimization_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/ejbql_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/floattypes_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/holdCursorIJ_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/holdCursorJavaReflection_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/holdCursorJava_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/partdml_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/releaseCompileLocks_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/specjPlans_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/staleplans_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/stmtCache1_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/wisconsin_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/bootLock_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/bug3498_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/copyfiles.ant incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/default_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/encryptDatabase_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/holdCursorExternalSortJDBC30_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/holdCursorJDBC30_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/logDevice_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/rollForwardBackup_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/rollForwardRecovery_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/storetests/default_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/tools/URLCheck_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/tools/default_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/tools/ij3_app.properties incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/unit/default_app.properties Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/harness/RunTest.java URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/= org/apache/derbyTesting/functionTests/harness/RunTest.java?rev=3D180028&r1= =3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/harness/RunTest.java (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/harness/RunTest.java Sat Jun 4 14:48:28 2005 @@ -1464,8 +1464,16 @@ } =09 // for now we want just want to have a single property - // for all j9 versions - String testJVM =3D (jvmName.startsWith("j9") ? "j9" : jvmName); + // for all j9 versions exception j9_foundation + // which we map to the generic name foundation. + String testJVM =3D jvmName; + if (jvmName.startsWith("j9")) + { + if (jvmName.equals("j9_foundation")) + testJVM =3D "foundation"; + else + testJVM =3D "j9"; + } runwithjvm =3D ap.getProperty("runwith" + testJVM); if ((runwithjvm !=3D null) && (runwithjvm.equalsIgnoreCase("f= alse"))) { Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/master/bug3498.out URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/= org/apache/derbyTesting/functionTests/master/bug3498.out?rev=3D180028&r1=3D= 180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/master/bug3498.out (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/master/bug3498.out Sat Jun 4 14:48:28 2005 @@ -1,5 +1,3 @@ -CONNECTION0* - jdbc:derby:wombat -* =3D 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 =20 ----------- -0 rows selected ij> commit; ij>=20 Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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.prop= erties?rev=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/derbynet/netxaPositive_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/derbynet/netxaPositive_app.properties Sat Jun 4 14:48:28 2005 @@ -4,3 +4,7 @@ ij.showNoCountForSelect=3Dtrue #ij.exceptionTrace=3Dtrue =20 +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat +ij.dataSource.createDatabase=3Dcreate + Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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= =3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/i18n/default_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/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 _app.properties to be used instead of this file. # -database=3Djdbc:derby:wombat;create=3Dtrue -derby.optimizer.noTimeout=3Dtrue +ij.database=3Djdbc:derby:wombat;create=3Dtrue =20 ij.showNoConnectionsAtStart=3Dtrue ij.showNoCountForSelect=3Dtrue + +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat +ij.dataSource.createDatabase=3Dcreate \ No newline at end of file Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/tests/jdbcapi/StmtCloseFunTest.java URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/= org/apache/derbyTesting/functionTests/tests/jdbcapi/StmtCloseFunTest.java?r= ev=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/StmtCloseFunTest.java (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/StmtCloseFunTest.java Sat Jun 4 14:48:28 2005 @@ -21,14 +21,12 @@ package org.apache.derbyTesting.functionTests.tests.jdbcapi; =20 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/f= unctionTests/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=3D180= 028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/copyfiles.ant (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/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/f= unctionTests/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=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/default_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/default_app.properties Sat Jun 4 14:48:28 2005 @@ -21,3 +21,7 @@ =20 ij.showNoConnectionsAtStart=3Dtrue ij.showNoCountForSelect=3Dtrue + +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat +ij.dataSource.createDatabase=3Dcreate Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/func= tionTests/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.pr= operties?rev=3D180028&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/getCurConnJdbc20_app.properties (added) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/getCurConnJdbc20_app.properties Sat Jun 4 14:48:28 20= 05 @@ -0,0 +1,4 @@ +# Current connection requires DriverManager for jdbc:default:connection +runwithfoundation=3Dfalse + +usedefaults=3Dtrue Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting= /functionTests/tests/jdbcapi/getCurConnJdbc20_app.properties ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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= =3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/metadataJdbc20.java (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/metadataJdbc20.java Sat Jun 4 14:48:28 2005 @@ -21,13 +21,11 @@ package org.apache.derbyTesting.functionTests.tests.jdbcapi; =20 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; =20 import org.apache.derby.tools.ij; =20 @@ -63,7 +61,13 @@ "." + met.getDriverMinorVersion() + " (" + met.getDriverVersion() + ")"); =20 - 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"); + } =20 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); } =20 Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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.pro= perties?rev=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/resultsetJdbc30_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/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 _app.properties to be used instead of this file. # -database=3Djdbc:derby:wombat;create=3Dtrue -derby.optimizer.noTimeout=3Dtrue - -ij.showNoConnectionsAtStart=3Dtrue -ij.showNoCountForSelect=3Dtrue =20 runwithibm13=3Dfalse runwithjdk13=3Dfalse runwithj9=3Dfalse + +usedefaults=3Dtrue Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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.pro= perties?rev=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/savepointJdbc30_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/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. =20 -# *** THEY BELONG IN default_derby.properties. -# -# This file will get handed to the test on the command line in a -p -# 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 diffe= rent -# database, or to not be used, override this file by creating -# a file _app.properties to be used instead of this file. -# -database=3Djdbc:derby:wombat;create=3Dtrue -derby.optimizer.noTimeout=3Dtrue =20 -ij.showNoConnectionsAtStart=3Dtrue -ij.showNoCountForSelect=3Dtrue =20 runwithj9=3Dfalse runwithjdk13=3Dfalse runwithibm13=3Dfalse + +usedefaults=3Dtrue \ No newline at end of file Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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.proper= ties?rev=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/secureUsers1_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/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=3Djdbc:derby: ij.database=3Djdbc:derby:wombat;create=3Dtrue;user=3Dsystem;password=3Dman= ager =20 @@ -5,3 +8,9 @@ ij.showNoCountForSelect=3Dtrue =20 runwithj9=3Dfalse + +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat +ij.dataSource.createDatabase=3Dcreate +ij.dataSource.user=3Dsystem +ij.dataSource.password=3Dmanager Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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.propert= ies?rev=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/secureUsers_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/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=3Djdbc:derby: ij.database=3Djdbc:derby:wombat;create=3Dtrue;user=3Dsystem;password=3Dman= ager ij.showNoConnectionsAtStart=3Dtrue ij.showNoCountForSelect=3Dtrue =20 runwithj9=3Dfalse + + +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat +ij.dataSource.createDatabase=3Dcreate +ij.dataSource.user=3Dsystem +ij.dataSource.password=3Dmanager Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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?r= ev=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/users2_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/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=3Djdbc:derby: ij.database=3Djdbc:derby:wombat;create=3Dtrue;user=3Dsystem;password=3Dman= ager =20 ij.showNoConnectionsAtStart=3Dtrue ij.showNoCountForSelect=3Dtrue + +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat +ij.dataSource.createDatabase=3Dcreate +ij.dataSource.user=3Dsystem +ij.dataSource.password=3Dmanager Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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?re= v=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/users_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/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=3Djdbc:derby: ij.database=3Djdbc:derby:wombat;create=3Dtrue;user=3Dfrancois;password=3Dp= aceesalute =20 ij.showNoConnectionsAtStart=3Dtrue ij.showNoCountForSelect=3Dtrue + +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat +ij.dataSource.createDatabase=3Dcreate +ij.dataSource.user=3Dfrancois +ij.dataSource.password=3Dpaccesalute Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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.prope= rties?rev=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/xaAnotherTest_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/xaAnotherTest_app.properties Sat Jun 4 14:48:28 2005 @@ -3,3 +3,7 @@ ij.showNoConnectionsAtStart=3Dtrue ij.showNoCountForSelect=3Dtrue runwithj9=3Dfalse + +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat +ij.dataSource.createDatabase=3Dcreate Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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.pr= operties?rev=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/xaSimplePositive_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/jdbcapi/xaSimplePositive_app.properties Sat Jun 4 14:48:28 20= 05 @@ -2,3 +2,7 @@ ij.database=3Djdbc:derby:wombat;create=3Dtrue ij.showNoConnectionsAtStart=3Dtrue ij.showNoCountForSelect=3Dtrue + +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat +ij.dataSource.createDatabase=3Dcreate Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/aggbuiltin_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/aggbuiltin_app.properties Sat Jun 4 14:48:28 2005 @@ -9,3 +9,7 @@ ij.defaultResourcePackage=3D/org/apache/derbyTesting/functionTests/tests/l= ang/ ij.showNoConnectionsAtStart=3Dtrue ij.showNoCountForSelect=3Dtrue + +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat +ij.dataSource.createDatabase=3Dcreate \ No newline at end of file Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/comparisons_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/comparisons_app.properties Sat Jun 4 14:48:28 2005 @@ -9,3 +9,7 @@ ij.defaultResourcePackage=3D/org/apache/derbyTesting/functionTests/tests/l= ang/ ij.showNoConnectionsAtStart=3Dtrue ij.showNoCountForSelect=3Dtrue + +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat +ij.dataSource.createDatabase=3Dcreate \ No newline at end of file Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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.prope= rties?rev=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/ddlTableLockMode_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/ddlTableLockMode_app.properties Sat Jun 4 14:48:28 2005 @@ -25,3 +25,7 @@ ij.defaultResourcePackage=3D/org/apache/derbyTesting/functionTests/tests/l= ang/ ij.showNoConnectionsAtStart=3Dtrue ij.showNoCountForSelect=3Dtrue + +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat +ij.dataSource.createDatabase=3Dcreate \ No newline at end of file Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/tests/lang/declareGlobalTempTableJavaJDBC30_app.properties URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/= org/apache/derbyTesting/functionTests/tests/lang/declareGlobalTempTableJava= JDBC30_app.properties?rev=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/declareGlobalTempTableJavaJDBC30_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/declareGlobalTempTableJavaJDBC30_app.properties Sat Jun = 4 14:48:28 2005 @@ -27,3 +27,7 @@ runwithj9=3Dfalse runwithjdk13=3Dfalse runwithibm13=3Dfalse + +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat +ij.dataSource.createDatabase=3Dcreate \ No newline at end of file Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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= =3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/default_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/default_app.properties Sat Jun 4 14:48:28 2005 @@ -24,3 +24,7 @@ ij.defaultResourcePackage=3D/org/apache/derbyTesting/functionTests/tests/l= ang/ ij.showNoConnectionsAtStart=3Dtrue ij.showNoCountForSelect=3Dtrue + +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat +ij.dataSource.createDatabase=3Dcreate \ No newline at end of file Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/desc_index_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/desc_index_app.properties Sat Jun 4 14:48:28 2005 @@ -25,3 +25,7 @@ ij.defaultResourcePackage=3D/org/apache/derbyTesting/functionTests/tests/l= ang/ ij.showNoConnectionsAtStart=3Dtrue ij.showNoCountForSelect=3Dtrue + +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat +ij.dataSource.createDatabase=3Dcreate \ No newline at end of file Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/tests/lang/dynamicLikeOptimization_app.properties URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/= org/apache/derbyTesting/functionTests/tests/lang/dynamicLikeOptimization_ap= p=2Eproperties?rev=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/dynamicLikeOptimization_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/dynamicLikeOptimization_app.properties Sat Jun 4 14:48:2= 8 2005 @@ -4,3 +4,7 @@ ij.defaultResourcePackage=3D/org/apache/derbyTesting/functionTests/tests/l= ang/ ij.showNoConnectionsAtStart=3Dtrue ij.showNoCountForSelect=3Dtrue + +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat +ij.dataSource.createDatabase=3Dcreate \ No newline at end of file Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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= =3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/ejbql_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/ejbql_app.properties Sat Jun 4 14:48:28 2005 @@ -9,3 +9,7 @@ ij.defaultResourcePackage=3D/org/apache/derbyTesting/functionTests/tests/l= ang/ ij.showNoConnectionsAtStart=3Dtrue ij.showNoCountForSelect=3Dtrue + +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat +ij.dataSource.createDatabase=3Dcreate \ No newline at end of file Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/floattypes_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/floattypes_app.properties Sat Jun 4 14:48:28 2005 @@ -9,3 +9,7 @@ ij.defaultResourcePackage=3D/org/apache/derbyTesting/functionTests/tests/l= ang/ ij.showNoConnectionsAtStart=3Dtrue ij.showNoCountForSelect=3Dtrue + +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat +ij.dataSource.createDatabase=3Dcreate \ No newline at end of file Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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.propertie= s?rev=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/holdCursorIJ_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/holdCursorIJ_app.properties Sat Jun 4 14:48:28 2005 @@ -9,3 +9,7 @@ runwithibm13=3Dfalse runwithj9=3Dfalse excludeJCC=3D1.1 + +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat +ij.dataSource.createDatabase=3Dcreate \ No newline at end of file Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/tests/lang/holdCursorJavaReflection_app.properties URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/= org/apache/derbyTesting/functionTests/tests/lang/holdCursorJavaReflection_a= pp.properties?rev=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/holdCursorJavaReflection_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/holdCursorJavaReflection_app.properties Sat Jun 4 14:48:= 28 2005 @@ -6,3 +6,7 @@ ij.showNoCountForSelect=3Dtrue =20 excludeJCC=3D1.1 + +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat +ij.dataSource.createDatabase=3Dcreate \ No newline at end of file Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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.propert= ies?rev=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/holdCursorJava_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/holdCursorJava_app.properties Sat Jun 4 14:48:28 2005 @@ -8,3 +8,7 @@ runwithj9=3Dfalse runwithjdk13=3Dfalse runwithibm13=3Dfalse + +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat +ij.dataSource.createDatabase=3Dcreate \ No newline at end of file Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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= =3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/partdml_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/partdml_app.properties Sat Jun 4 14:48:28 2005 @@ -25,3 +25,7 @@ ij.defaultResourcePackage=3D/org/apache/derbyTesting/functionTests/tests/l= ang/ ij.showNoConnectionsAtStart=3Dtrue ij.showNoCountForSelect=3Dtrue + +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat +ij.dataSource.createDatabase=3Dcreate \ No newline at end of file Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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.pr= operties?rev=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/releaseCompileLocks_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/releaseCompileLocks_app.properties Sat Jun 4 14:48:28 20= 05 @@ -3,3 +3,7 @@ =20 ij.showNoConnectionsAtStart=3Dtrue ij.showNoCountForSelect=3Dtrue + +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat +ij.dataSource.createDatabase=3Dcreate \ No newline at end of file Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/specjPlans_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/specjPlans_app.properties Sat Jun 4 14:48:28 2005 @@ -25,3 +25,7 @@ ij.defaultResourcePackage=3D/org/apache/derbyTesting/functionTests/tests/l= ang/ ij.showNoConnectionsAtStart=3Dtrue ij.showNoCountForSelect=3Dtrue + +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat +ij.dataSource.createDatabase=3Dcreate \ No newline at end of file Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/staleplans_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/staleplans_app.properties Sat Jun 4 14:48:28 2005 @@ -25,3 +25,7 @@ ij.defaultResourcePackage=3D/org/apache/derbyTesting/functionTests/tests/l= ang/ ij.showNoConnectionsAtStart=3Dtrue ij.showNoCountForSelect=3Dtrue + +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat +ij.dataSource.createDatabase=3Dcreate \ No newline at end of file Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/stmtCache1_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/stmtCache1_app.properties Sat Jun 4 14:48:28 2005 @@ -3,8 +3,7 @@ # by the test returns some long strings. # # -database=3Djdbc:derby:wombat;create=3Dtrue + maximumDisplayWidth=3D1024 -ij.defaultResourcePackage=3D/org/apache/derbyTesting/functionTests/tests/l= ang/ -ij.showNoConnectionsAtStart=3Dtrue -ij.showNoCountForSelect=3Dtrue + +usedefaults=3Dtrue Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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?r= ev=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/wisconsin_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/wisconsin_app.properties Sat Jun 4 14:48:28 2005 @@ -8,13 +8,9 @@ # # #runwithj9=3Dfalse -database=3Djdbc:derby:wombat;create=3Dtrue -derby.optimizer.noTimeout=3Dtrue - -ij.defaultResourcePackage=3D/org/apache/derbyTesting/functionTests/tests/l= ang/ -ij.showNoConnectionsAtStart=3Dtrue -ij.showNoCountForSelect=3Dtrue =20 # flags specific to this test: it runs out of memory on jdk118 sometimes # so give the JVM more memory always: jvmflags=3D-ms32M -mx128M + +usedefaults=3Dtrue Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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?r= ev=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/bootLock_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/bootLock_app.properties Sat Jun 4 14:48:28 2005 @@ -1,13 +1,7 @@ -# -# default settings: -database=3Djdbc:derby:wombat;create=3Dtrue -derby.optimizer.noTimeout=3Dtrue =20 -ij.showNoConnectionsAtStart=3Dtrue -ij.showNoCountForSelect=3Dtrue - -ij.defaultResourcePackage=3D/org/apache/derbyTesting/functionTests/tests/s= tore/ # test specific settings: runwithj9=3Dfalse runwithibm13=3Dfalse runwithjdk13=3Dfalse + +usedefaults=3Dtrue Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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?re= v=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/bug3498_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/bug3498_app.properties Sat Jun 4 14:48:28 2005 @@ -1,5 +1,3 @@ -database=3Djdbc:derby:wombat;create=3Dtrue -derby.locks.deadlockTimeout=3D1 -derby.locks.waitTimeout=3D3 -#supportfiles=3DImportExport/sqlAnywhere.ctrl + useextdirs=3Dtrue +usedefaults=3Dtrue Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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=3D18002= 8&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/copyfiles.ant (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/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/f= unctionTests/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?re= v=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/default_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/default_app.properties Sat Jun 4 14:48:28 2005 @@ -16,8 +16,13 @@ # # ij.database=3Djdbc:derby:wombat;create=3Dtrue +ij.protocol=3Djdbc:derby: =20 ij.showNoConnectionsAtStart=3Dtrue ij.showNoCountForSelect=3Dtrue =20 ij.defaultResourcePackage=3D/org/apache/derbyTesting/functionTests/tests/s= tore/ + +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat +ij.dataSource.createDatabase=3Dcreate \ No newline at end of file Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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.prope= rties?rev=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/encryptDatabase_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/encryptDatabase_app.properties Sat Jun 4 14:48:28 2005 @@ -1,7 +1,5 @@ -database=3Djdbc:derby:wombat;create=3Dtrue;dataEncryption=3Dtrue;bootPassw= ord=3DThursday +ij.database=3Djdbc:derby:wombat;create=3Dtrue;dataEncryption=3Dtrue;bootPa= ssword=3DThursday =20 -# -derby.optimizer.noTimeout=3Dtrue =20 ij.showNoConnectionsAtStart=3Dtrue ij.showNoCountForSelect=3Dtrue Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/tests/store/holdCursorExternalSortJDBC30_app.properties URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/= org/apache/derbyTesting/functionTests/tests/store/holdCursorExternalSortJDB= C30_app.properties?rev=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/holdCursorExternalSortJDBC30_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/holdCursorExternalSortJDBC30_app.properties Sat Jun 4 1= 4:48:28 2005 @@ -1,11 +1,7 @@ -database=3Djdbc:derby:wombat;create=3Dtrue -derby.optimizer.noTimeout=3Dtrue =20 -ij.showNoConnectionsAtStart=3Dtrue -ij.showNoCountForSelect=3Dtrue - -ij.defaultResourcePackage=3D/org/apache/derbyTesting/functionTests/tests/s= tore/ =20 runwithjdk13=3Dfalse runwithibm13=3Dfalse excludeJCC=3D1.1 + +usedefaults=3Dtrue Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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.prop= erties?rev=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/holdCursorJDBC30_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/holdCursorJDBC30_app.properties Sat Jun 4 14:48:28 2005 @@ -1,11 +1,6 @@ -database=3Djdbc:derby:wombat;create=3Dtrue -derby.optimizer.noTimeout=3Dtrue - -ij.showNoConnectionsAtStart=3Dtrue -ij.showNoCountForSelect=3Dtrue - -ij.defaultResourcePackage=3D/org/apache/derbyTesting/functionTests/tests/s= tore/ =20 runwithjdk13=3Dfalse runwithibm13=3Dfalse excludeJCC=3D1.1 + +usedefaults=3Dtrue Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/logDevice_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/logDevice_app.properties Sat Jun 4 14:48:28 2005 @@ -10,9 +10,12 @@ # # ij.protocol=3Djdbc:derby: -database=3Djdbc:derby:wombat;create=3Dtrue;logDevice=3Dextinout/wierdlog -derby.optimizer.noTimeout=3Dtrue +ij.database=3Djdbc:derby:wombat;create=3Dtrue;logDevice=3Dextinout/wierdlog =20 ij.showNoConnectionsAtStart=3Dtrue ij.showNoCountForSelect=3Dtrue =20 +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat +ij.dataSource.createDatabase=3Dcreate +ij.dataSource.connectionAttributes=3DlogDevice=3Dextinout/wierdlog \ No newline at end of file Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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.pro= perties?rev=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/rollForwardBackup_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/rollForwardBackup_app.properties Sat Jun 4 14:48:28 2005 @@ -9,11 +9,7 @@ # initial connection to the database. # # -ij.protocol=3Djdbc:derby: -#database=3Djdbc:derby:wombat;create=3Dtrue;logDevice=3Dextinout/wierdlog -database=3Djdbc:derby:wombat;create=3Dtrue =20 -ij.showNoConnectionsAtStart=3Dtrue -ij.showNoCountForSelect=3Dtrue useextdirs=3Dtrue +usedefaults=3Dtrue =20 Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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.p= roperties?rev=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/rollForwardRecovery_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/store/rollForwardRecovery_app.properties Sat Jun 4 14:48:28 2= 005 @@ -9,11 +9,7 @@ # initial connection to the database. # # -ij.protocol=3Djdbc:derby: -#database=3Djdbc:derby:wombat;create=3Dtrue;logDevice=3Dextinout/wierdlog -database=3Djdbc:derby:wombat;create=3Dtrue =20 -ij.showNoConnectionsAtStart=3Dtrue -ij.showNoCountForSelect=3Dtrue useextdirs=3Dtrue +usedefaults=3Dtrue =20 Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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.properti= es?rev=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/storetests/default_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/storetests/default_app.properties Sat Jun 4 14:48:28 2005 @@ -12,8 +12,10 @@ # a file .sysprop to be used instead of this file. # # -database=3Djdbc:derby:wombat;autocommit=3Dtrue -derby.infolog.append=3Dtrue +ij.database=3Djdbc:derby:wombat ij.showNoConnectionsAtStart=3Dtrue ij.showNoCountForSelect=3Dtrue ij.defaultResourcePackage=3D/org/apache/derbyTesting/functionTests/tests/s= toretests/ + +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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?r= ev=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/tools/URLCheck_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/tools/URLCheck_app.properties Sat Jun 4 14:48:28 2005 @@ -1,3 +1,7 @@ ij.protocol=3Djdbc:derby: ij.database=3Djdbc:derby:wombat;create=3Dtrue ij.showNoConnectionsAtStart=3Dtrue + +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat +ij.dataSource.createDatabase=3Dcreate \ No newline at end of file Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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?re= v=3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/tools/default_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/tools/default_app.properties Sat Jun 4 14:48:28 2005 @@ -21,3 +21,7 @@ =20 ij.showNoConnectionsAtStart=3Dtrue ij.showNoCountForSelect=3Dtrue + +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat +ij.dataSource.createDatabase=3Dcreate \ No newline at end of file Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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=3D= 180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/tools/ij3_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/tools/ij3_app.properties Sat Jun 4 14:48:28 2005 @@ -6,3 +6,7 @@ =20 ij.showNoConnectionsAtStart=3Dtrue ij.showNoCountForSelect=3Dtrue + +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat +ij.dataSource.createDatabase=3Dcreate \ No newline at end of file Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/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= =3D180028&r1=3D180027&r2=3D180028&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/unit/default_app.properties (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/unit/default_app.properties Sat Jun 4 14:48:28 2005 @@ -18,8 +18,11 @@ # a file _app.properties to be used instead of this file. # # -database=3Djdbc:derby:wombat;create=3Dtrue -derby.optimizer.noTimeout=3Dtrue +ij.database=3Djdbc:derby:wombat;create=3Dtrue =20 ij.showNoConnectionsAtStart=3Dtrue ij.showNoCountForSelect=3Dtrue + +# DataSource properties, only used if ij.dataSource is set +ij.dataSource.databaseName=3Dwombat +ij.dataSource.createDatabase=3Dcreate \ No newline at end of file