You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by fu...@apache.org on 2005/03/03 02:30:45 UTC

svn commit: r155990 [2/15] - in incubator/derby/code/trunk: ./ java/testing/ java/testing/org/apache/derbyTesting/functionTests/harness/ java/testing/org/apache/derbyTesting/functionTests/master/ java/testing/org/apache/derbyTesting/functionTests/suites/ java/testing/org/apache/derbyTesting/functionTests/tests/lang/ java/testing/org/apache/derbyTesting/functionTests/tests/store/ java/testing/org/apache/derbyTesting/functionTests/tests/unit/ java/testing/org/apache/derbyTesting/unitTests/ java/testing/org/apache/derbyTesting/unitTests/crypto/ java/testing/org/apache/derbyTesting/unitTests/harness/ java/testing/org/apache/derbyTesting/unitTests/lang/ java/testing/org/apache/derbyTesting/unitTests/services/ java/testing/org/apache/derbyTesting/unitTests/store/ java/testing/org/apache/derbyTesting/unitTests/util/

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/recoveryTest.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/recoveryTest.out?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/recoveryTest.out (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/recoveryTest.out Wed Mar  2 17:30:05 2005
@@ -0,0 +1,2 @@
+-- Unit Test T_Recovery starting
+-- Unit Test T_Recovery finished

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/recoveryTest.out
------------------------------------------------------------------------------
    snv:eol-style = native

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall?view=diff&r1=155989&r2=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall Wed Mar  2 17:30:05 2005
@@ -52,6 +52,7 @@
 lang/dynamicLikeOptimization.sql
 lang/ejbql.sql
 lang/ejbql_nonSPS.sql
+lang/emptyStatistics.sql
 lang/errorCode.sql
 lang/fk_nonSPS.sql
 lang/floattypes.sql
@@ -71,6 +72,7 @@
 lang/isolationLevels.sql
 lang/joinDeadlock.sql
 lang/joins.sql
+lang/langUnitTests.sql
 lang/lockTable.sql
 lang/logStream.java
 lang/logop.sql

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryption.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryption.properties?view=diff&r1=155989&r2=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryption.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryption.properties Wed Mar  2 17:30:05 2005
@@ -1,4 +1,4 @@
 encryption=true
 testEncryptionAlgorithm=DESede/CBC/NoPadding
 testJavaFlags=testDataEncryption=Thursday
-suites=storemats
+suites=encryption propertyinfo multi storemats

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryption.runall
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryption.runall?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryption.runall (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryption.runall Wed Mar  2 17:30:05 2005
@@ -0,0 +1,2 @@
+unit/T_Cipher.unit
+store/encryptDatabase.sql

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryption.runall
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionAES.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionAES.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionAES.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionAES.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,6 @@
+encryption=true
+testEncryptionAlgorithm=AES/CBC/NoPadding
+testJavaFlags=testDataEncryption=Thursday
+runwithibm13=false
+runwithjdk13=false
+runwithjdk14=false

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionAES.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionAES.runall
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionAES.runall?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionAES.runall (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionAES.runall Wed Mar  2 17:30:05 2005
@@ -0,0 +1,2 @@
+store/encryptDatabase.sql
+store/access.sql

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionAES.runall
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionAll.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionAll.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionAll.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionAll.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,2 @@
+encryption=true
+suites=encryptionAll encryptionECB encryptionCFB encryptionOFB encryptionDES encryptionBlowfish encryption encryptionAES

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionAll.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionAll.runall
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionAll.runall?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionAll.runall (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionAll.runall Wed Mar  2 17:30:05 2005
@@ -0,0 +1,3 @@
+store/aes.sql
+store/encryptParams.sql
+store/encryptionKey.sql

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionAll.runall
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionBlowfish.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionBlowfish.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionBlowfish.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionBlowfish.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,6 @@
+encryption=true
+# there is a jvm bug in IBM jvm 1.4.2 which makes Blowfish really very, very slow...
+runwithibm14=false
+testEncryptionAlgorithm=Blowfish/CBC/NoPadding
+testJavaFlags=testDataEncryption=Thursday
+

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionBlowfish.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionBlowfish.runall
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionBlowfish.runall?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionBlowfish.runall (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionBlowfish.runall Wed Mar  2 17:30:05 2005
@@ -0,0 +1,3 @@
+unit/T_CipherBlowfish.unit
+store/encryptDatabase.sql
+store/access.sql

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionBlowfish.runall
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionCFB.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionCFB.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionCFB.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionCFB.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,4 @@
+encryption=true
+testEncryptionAlgorithm=DESede/CFB/NoPadding
+testJavaFlags=testDataEncryption=Thursday
+

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionCFB.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionCFB.runall
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionCFB.runall?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionCFB.runall (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionCFB.runall Wed Mar  2 17:30:05 2005
@@ -0,0 +1,3 @@
+unit/T_CipherCFB.unit
+store/encryptDatabase.sql
+store/access.sql

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionCFB.runall
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionDES.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionDES.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionDES.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionDES.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,4 @@
+encryption=true
+testEncryptionAlgorithm=DES/CBC/NoPadding
+testJavaFlags=testDataEncryption=Thursday
+

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionDES.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionDES.runall
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionDES.runall?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionDES.runall (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionDES.runall Wed Mar  2 17:30:05 2005
@@ -0,0 +1,3 @@
+unit/T_CipherDES.unit
+store/encryptDatabase.sql
+store/access.sql

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionDES.runall
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionECB.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionECB.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionECB.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionECB.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,4 @@
+encryption=true
+testEncryptionAlgorithm=DES/ECB/NoPadding
+testJavaFlags=testDataEncryption=Thursday
+

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionECB.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionECB.runall
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionECB.runall?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionECB.runall (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionECB.runall Wed Mar  2 17:30:05 2005
@@ -0,0 +1,3 @@
+unit/T_CipherECB.unit
+store/encryptDatabase.sql
+store/access.sql

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionECB.runall
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionOFB.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionOFB.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionOFB.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionOFB.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,4 @@
+encryption=true
+testEncryptionAlgorithm=DES/OFB/NoPadding
+testJavaFlags=testDataEncryption=Thursday
+

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionOFB.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionOFB.runall
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionOFB.runall?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionOFB.runall (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionOFB.runall Wed Mar  2 17:30:05 2005
@@ -0,0 +1,3 @@
+unit/T_CipherOFB.unit
+store/encryptDatabase.sql
+store/access.sql

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionOFB.runall
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/storeunit.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/storeunit.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/storeunit.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/storeunit.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,13 @@
+# run the store unit tests 
+#
+#    The store suites include each other, and are set up as follows:
+#    storeall
+#        xa
+#        storemats
+#            storeunit
+#        storetests
+#
+#    Each store test should only appear ONCE in one of the following, this is
+#    so that the nightly run doesn't run tests twice.
+#        
+usesystem=storeunit

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/storeunit.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/storeunit.runall
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/storeunit.runall?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/storeunit.runall (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/storeunit.runall Wed Mar  2 17:30:05 2005
@@ -0,0 +1,26 @@
+unit/T_RawStoreFactory.unit
+unit/T_FileSystemData.unit
+unit/T_StreamFile.unit
+unit/T_AccessFactory.unit
+unit/T_Heap.unit
+unit/T_b2i.unit
+unit/T_SortController.unit
+unit/TLockFactory.unit
+unit/TUUIDFactory.unit
+unit/recoverySetup.unit
+unit/recoveryTest.unit
+unit/recoverBadLogSetup.unit
+unit/recoverBadLog1.unit
+unit/recoverBadLog2.unit
+unit/recoverBadLog3.unit
+unit/recoverBadLog4.unit
+unit/recoverBadLog5.unit
+unit/recoverBadLog6.unit
+unit/recoverBadLog7.unit
+unit/recoverBadLog1.unit
+unit/recoverBadLog2.unit
+unit/fillLog.unit
+unit/logSwitchFail.unit
+unit/fullRecoveryFail.unit
+unit/fullRecoveryFail.unit
+unit/fullRecovery.unit

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/storeunit.runall
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/unit.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/unit.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/unit.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/unit.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1 @@
+usesystem=unit

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/unit.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/unit.runall
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/unit.runall?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/unit.runall (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/unit.runall Wed Mar  2 17:30:05 2005
@@ -0,0 +1,4 @@
+unit/T_Diagnosticable.unit
+unit/daemonService.unit
+unit/cacheService.unit
+unit/T_MarkedLimitInputStream.unit

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/unit.runall
------------------------------------------------------------------------------
    snv:eol-style = native

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xa.runall
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xa.runall?view=diff&r1=155989&r2=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xa.runall (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xa.runall Wed Mar  2 17:30:05 2005
@@ -7,3 +7,4 @@
 jdbcapi/xaMorph.sql
 store/xaOffline1.sql
 store/xab2354.sql
+unit/T_XA.unit

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GetPropertyInfoTest.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GetPropertyInfoTest.java?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GetPropertyInfoTest.java (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GetPropertyInfoTest.java Wed Mar  2 17:30:05 2005
@@ -0,0 +1,175 @@
+/*
+
+   Derby - Class org.apache.derbyTesting.functionTests.tests.lang.GetPropertyInfoTest
+
+   Copyright 2001, 2005 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+ */
+
+package org.apache.derbyTesting.functionTests.tests.lang;
+
+import java.sql.Connection;
+import java.sql.Driver;
+import java.sql.DriverManager;
+import java.sql.DriverPropertyInfo;
+import java.sql.SQLException;
+import java.util.Properties;
+
+
+public class GetPropertyInfoTest
+{
+	static String protocol = "jdbc:derby:";
+	static String url = "EncryptedDB;create=true;dataEncryption=true";
+	static String driver = "org.apache.derby.jdbc.EmbeddedDriver";
+
+	public static void main(String[] args) throws SQLException,
+		InterruptedException, Exception 
+    {
+		boolean		passed = true;
+
+		// adjust URL to compensate for other encryption providers
+		String provider = System.getProperty("testEncryptionProvider");
+		if (provider != null)
+		{
+		    url = "EncryptedDB;create=true;dataEncryption=true;encryptionProvider=" + provider;
+		}
+
+		System.out.println("Test GetPropertyInfoTest starting");
+		try
+		{
+			Properties info = new Properties();
+			Class.forName(driver).newInstance();
+			Driver cDriver = DriverManager.getDriver(protocol);
+			boolean canConnect = false;
+
+			// Test getPropertyInfo by passing attributes in the
+			// url.
+			for(int i = 0; i < 2; i++)
+			{
+				// In order to check for inadequate properties, we omit the
+				// bootPassword and call getPropertyInfo. (bootPassword is
+				// required because dataEncryption is true)
+				DriverPropertyInfo[] attributes = cDriver.getPropertyInfo(protocol+url,info);
+				
+				// zero length means a connection attempt can be made
+				if (attributes.length == 0)
+				{
+					canConnect = true;
+					break;
+				}
+
+				for (int j = 0; j < attributes.length; j++)
+				{
+					System.out.println(attributes[j].name + ": " + attributes[j].value);
+				}
+
+				// Now set bootPassword and call getPropertyInfo again.  
+				// This time attribute length should be zero, sice we pass all
+				// minimum required properties. 
+				url = url + ";bootPassword=db2everyplace";
+			}
+
+			if(canConnect == false)
+			{
+				System.out.println("More attributes are required to connect to the database");
+				passed = false;
+			}
+			else
+			{			
+				Connection conn = DriverManager.getConnection(protocol + url, info);
+				conn.close();
+			}
+		
+			canConnect = false;
+
+			// Test getPropertyInfo by passing attributes in the
+			// Properties array.
+			info.put("create", "true");
+			info.put("dataEncryption", "true");
+			info.put("bootPassword", "db2everyplace");
+			// Use alternate encryption provider if necessary.
+			if (provider != null)
+			{ 
+			    info.put("encryptionProvider", provider);
+			}
+
+			for(int i = 0; i < 2; i++)
+			{
+				// In order to check for inadequate properties, we omit the
+				// database name and call getPropertyInfo. 
+				DriverPropertyInfo[] attributes = cDriver.getPropertyInfo(protocol,info);
+			
+				// zero length means a connection attempt can be made
+				if (attributes.length == 0)
+				{
+					canConnect = true;
+					break;
+				}
+
+				for (int j = 0; j < attributes.length; j++)
+				{
+					System.out.println(attributes[j].name + ": " + attributes[j].value);
+				}
+				// Now set database name and call getPropertyInfo again.  
+				// This time attribute length should be zero, sice we pass all
+				// minimum required properties. 
+				info.put("databaseName", "EncryptedDB1");
+			}
+
+			if(canConnect == false)
+			{
+				System.out.println("More attributes are required to connect to the database");
+				passed = false;
+			}
+			else
+			{			
+				Connection conn1 = DriverManager.getConnection(protocol, info);
+				conn1.close();
+			}
+
+		}
+		catch(SQLException sqle)
+		{
+			passed = false;
+			do {
+				System.out.println(sqle.getSQLState() + ":" + sqle.getMessage());
+				sqle = sqle.getNextException();
+			} while (sqle != null);
+		}
+		catch (Throwable e) 
+		{
+			System.out.println("FAIL -- unexpected exception caught in main():\n");
+			System.out.println(e.getMessage());
+			e.printStackTrace();
+			passed = false;
+		}
+
+		if(passed)
+			System.out.println("Test GetPropertyInfoTest finished");
+		else
+			System.out.println("Test GetPropertyInfoTest failed");
+	}
+}
+
+	
+
+
+
+
+
+
+
+
+

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GetPropertyInfoTest.java
------------------------------------------------------------------------------
    snv:eol-style = native

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/copyfiles.ant
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/copyfiles.ant?view=diff&r1=155989&r2=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/copyfiles.ant (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/copyfiles.ant Wed Mar  2 17:30:05 2005
@@ -72,6 +72,8 @@
 ejbql.sql
 ejbql_app.properties
 ejbql_nonSPS.sql
+emptyStatistics_derby.properties
+emptyStatistics.sql
 errorCode.sql
 errorCode_app.properties
 fk_nonSPS.sql

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/emptyStatistics.sql
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/emptyStatistics.sql?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/emptyStatistics.sql (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/emptyStatistics.sql Wed Mar  2 17:30:05 2005
@@ -0,0 +1,4 @@
+-- test to verify that RTS functionality is stubbed out
+call SYSCS_UTIL.SYSCS_SET_RUNTIMESTATISTICS(1);
+values 1, 2, 3;
+values SYSCS_UTIL.SYSCS_GET_RUNTIMESTATISTICS();

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/emptyStatistics.sql
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/emptyStatistics_derby.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/emptyStatistics_derby.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/emptyStatistics_derby.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/emptyStatistics_derby.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1 @@
+derby.module.statistics=org.apache.derbyTesting.unitTests.lang.EmptyResultSetStatisticsFactory

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/emptyStatistics_derby.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/langUnitTests.sql
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/langUnitTests.sql?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/langUnitTests.sql (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/langUnitTests.sql Wed Mar  2 17:30:05 2005
@@ -0,0 +1,2 @@
+-- just a simple query so that we have a .sql file
+values 1;

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/langUnitTests.sql
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/langUnitTests_derby.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/langUnitTests_derby.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/langUnitTests_derby.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/langUnitTests_derby.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,8 @@
+#
+# This properties file is for the lang unit test.
+# its configuration's only difference from the default configuration
+# is that it runs with like unit test.
+#
+derby.service.test=org.apache.derbyTesting.unitTests.harness.UnitTestManager
+derby.module.testManager=org.apache.derbyTesting.unitTests.harness.BasicUnitTestManager
+derby.module.test.like=org.apache.derbyTesting.unitTests.lang.T_Like

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/langUnitTests_derby.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/aes.sql
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/aes.sql?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/aes.sql (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/aes.sql Wed Mar  2 17:30:05 2005
@@ -0,0 +1,152 @@
+------------------------------------------------------------------------------------
+-- beetle6023 : support for AES encryption algorithm
+-- Top level testcases grp.
+-- Case 1.x	different feedback modes (valid - CBC,ECB,OFB,unsupported - ABC)
+-- 		2 cases for each - creating db and recovery mode
+-- Case 2.x	padding ( unsupported padding )
+-- Case 3.x	key lengths with bootpassword
+--		case of 128 bits, 192 bits and 256 bits and unsupported 512 bits
+--		mismatch keylengths (case of one keylength during creation and another 
+--		during connecting)
+-- Case 4.x	case of changing boot password ( covered by test - store/encryptDatabase.sql)
+-- Also see store/access.sql for other cases that are run with AES encryption
+-- Case 5.x	give external encryptionKey instead of bootpassword
+------------------------------------------------------------------------------------
+
+-- 1.1.1 AES - CBC  
+connect 'jdbc:derby:encdb;create=true;dataEncryption=true;encryptionAlgorithm=AES/CBC/NoPadding;bootPassword=Thursday';
+autocommit off;
+create table t1(i1 int);
+insert into t1 values ( 1);
+select * from t1;
+commit;
+disconnect;
+-----------------------------------
+-- 1.1.2 AES - CBC, recover
+
+connect 'jdbc:derby:encdb;create=true;dataEncryption=true;encryptionAlgorithm=AES/CBC/NoPadding;bootPassword=Thursday';
+autocommit off;
+create table t1(i1 int);
+insert into t1 values ( 1);
+select * from t1;
+commit;
+disconnect;
+
+-----------------------------------
+-- 1.2.1 AES - ECB  
+connect 'jdbc:derby:encdb_ecb;create=true;dataEncryption=true;encryptionAlgorithm=AES/ECB/NoPadding;bootPassword=Thursday';
+autocommit off;
+create table t1(i1 int);
+insert into t1 values ( 1);
+select * from t1;
+commit;
+disconnect;
+-----------------------------------
+-- 1.2.2 AES - ECB, recover
+
+connect 'jdbc:derby:encdb_ecb;create=true;dataEncryption=true;encryptionAlgorithm=AES/ECB/NoPadding;bootPassword=Thursday';
+autocommit off;
+create table t1(i1 int);
+insert into t1 values ( 1);
+select * from t1;
+commit;
+disconnect;
+
+-----------------------------------
+-- 1.3.1 AES - OFB  
+connect 'jdbc:derby:encdb_ofb;create=true;dataEncryption=true;encryptionAlgorithm=AES/OFB/NoPadding;bootPassword=Thursday';
+autocommit off;
+create table t1(i1 int);
+insert into t1 values ( 1);
+select * from t1;
+commit;
+disconnect;
+-----------------------------------
+-- 1.3.2 AES - OFB, recover
+
+connect 'jdbc:derby:encdb_ofb;create=true;dataEncryption=true;encryptionAlgorithm=AES/OFB/NoPadding;bootPassword=Thursday';
+autocommit off;
+create table t1(i1 int);
+insert into t1 values ( 1);
+select * from t1;
+commit;
+disconnect;
+-----------------------------------
+-- 1.4.1 AES - CFB  
+connect 'jdbc:derby:encdb_cfb;create=true;dataEncryption=true;encryptionAlgorithm=AES/CFB/NoPadding;bootPassword=Thursday';
+autocommit off;
+create table t1(i1 int);
+insert into t1 values ( 1);
+select * from t1;
+commit;
+disconnect;
+-----------------------------------
+-- 1.4.2 AES - CFB, recover
+
+connect 'jdbc:derby:encdb_cfb;create=true;dataEncryption=true;encryptionAlgorithm=AES/CFB/NoPadding;bootPassword=Thursday';
+autocommit off;
+create table t1(i1 int);
+insert into t1 values ( 1);
+select * from t1;
+commit;
+disconnect;
+-----------------------------------
+-- 1.5.1 -ve cases:  AES - unsupported feedback mode
+
+connect 'jdbc:derby:encdb_abc;create=true;dataEncryption=true;encryptionAlgorithm=AES/ABC/NoPadding;bootPassword=Thursday';
+autocommit off;
+create table t1(i1 int);
+insert into t1 values ( 1);
+
+-----------------------------------
+-- 2.1 -ve cases:  AES - unsupported padding mode
+
+connect 'jdbc:derby:encdb_pkcs5;create=true;dataEncryption=true;encryptionAlgorithm=AES/ECB/PKCS5Padding;bootPassword=Thursday';
+autocommit off;
+create table t1(i1 int);
+insert into t1 values ( 1);
+
+------------------------------------
+-- 3.x key lengths 
+-- 128,192,256 and also unsupported key length
+
+-- 3.1 , 128 key length
+connect 'jdbc:derby:encdbcbc_128;create=true;dataEncryption=true;encryptionKeyLength=128
+;encryptionAlgorithm=AES/CBC/NoPadding;bootPassword=Thursday';
+autocommit off;
+create table t1(i1 int);
+insert into t1 values ( 1);
+select * from t1;
+commit;
+disconnect;
+connect 'jdbc:derby:encdbcbc_128;create=true;dataEncryption=true;encryptionKeyLength=128;
+encryptionAlgorithm=AES/CBC/NoPadding;bootPassword=Thursday';
+autocommit off;
+create table t1(i1 int);
+insert into t1 values ( 1);
+select * from t1;
+commit;
+disconnect;
+--------------------------
+--------------------------
+-- 3.4 unsupported key length
+connect 'jdbc:derby:encdbcbc_512;create=true;dataEncryption=true;encryptionKeyLength=512;encryptionAlgorithm=AES/CBC/NoPadding;bootPassword=Thursday';
+autocommit off;
+create table t1(i1 int);
+insert into t1 values ( 1);
+select * from t1;
+commit;
+disconnect;
+-------------------------
+-------------------------
+-- 5.1	give external encryptionKey instead of bootpassword
+connect 'jdbc:derby:encdbcbc_key;create=true;dataEncryption=true;encryptionAlgorithm=AES/CBC/NoPadding;encryptionKey=61626364656667686961626364656568';
+
+create table t1(i1 int);
+insert into t1 values(1);
+select * from t1;
+commit;
+disconnect;
+connect 'jdbc:derby:encdbcbc_key;create=true;dataEncryption=true;encryptionAlgorithm=AES/CBC/NoPadding;encryptionKey=61626364656667686961626364656568';
+select * from t1;
+

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/aes.sql
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/aes_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/aes_app.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/aes_app.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/aes_app.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,3 @@
+runwithibm13=false
+runwithjdk13=false
+#runwithjdk14=false

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/aes_app.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/aes_sed.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/aes_sed.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/aes_sed.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/aes_sed.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,11 @@
+# Filters and substitutes for SED
+# Multiple patterns for DELETE: comma separated
+#   delete=pattern1,pattern2,...,patternn
+# No commas can be allowed in the patterns.
+#
+# Multiple patterns for SUBSTITUTE: comma separated <pattern;substitute> pair
+#   substitute=pattern1;substitute1,pattern2;substitute2,...,patternn;substituten
+# No commas or semicolons can be allowed in the patterns/subsitutes.
+#------
+# ibm jvms have a slightly different message from sun jvms
+substitute=ERROR XJ001: Java exception: 'Keysize must;ERROR XJ001: Java exception: 'Wrong keysize: must

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/aes_sed.properties
------------------------------------------------------------------------------
    snv:eol-style = native

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?view=diff&r1=155989&r2=155990
==============================================================================
--- 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 Wed Mar  2 17:30:05 2005
@@ -26,6 +26,9 @@
 access.sql
 access_app.properties
 access_derby.properties
+aes.sql
+aes_app.properties
+aes_sed.properties
 backupRestore.sql
 backupRestore_app.properties
 backupRestore1_app.properties
@@ -47,6 +50,12 @@
 databaseProperties.sql
 default_app.properties
 default_derby.properties
+encryptDatabase.sql
+encryptDatabase_app.properties
+encryptParams.sql
+encryptParams_app.properties
+encryptionKey.sql
+encryptionKey_app.properties
 global_xactTable.view
 heapscan.sql
 heapscan_app.properties

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptDatabase.sql
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptDatabase.sql?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptDatabase.sql (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptDatabase.sql Wed Mar  2 17:30:05 2005
@@ -0,0 +1,87 @@
+
+
+-- test database encryption
+
+-- for bug 3668 - you couldn't change the password without exiting out of db create session
+call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('bootPassword', 'Thursday, Wednesday');
+
+disconnect;
+connect 'jdbc:derby:;shutdown=true';
+
+-- test for bug 3668
+-- try the old password, should fail
+connect 'jdbc:derby:wombat;bootPassword=Thursday';
+connect 'jdbc:derby:wombat;bootPassword=Wednesday';
+-- switch back to old password
+call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('bootPassword', 'Wednesday, Thursday');
+
+create table t1 ( a char(20));
+
+-- make sure we cannot access the secret key
+values SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('bootPassword');
+values SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('encryptedBootPassword');
+
+insert into t1 values ('hello world');
+
+-- change the secret key
+
+-- these should fail
+call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('bootPassword', null);
+call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('bootPassword', 'wrongkey, ');
+call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('bootPassword', 'Thursday');
+call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('bootPassword', 'Thursday , ');
+call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('bootPassword', 'Thursday , short');
+call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('bootPassword', 'Thursdya , derbypwd');
+call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('bootPassword', 'Thursdayx , derbypwd');
+call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('bootPassword', 'xThursday , derbypwd');
+call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('bootPassword', 'thursday , derbypwd');
+
+-- this should work
+call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('bootPassword', ' Thursday , Saturday');
+
+-- this should fail
+call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('bootPassword', 'Thursday , derbypwd');
+
+-- change it again
+call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('bootPassword', 'Saturday,derbypwd');
+
+
+-- make sure we cannot access the secret key
+values SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('bootPassword');
+values SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('encryptedBootPassword');
+
+disconnect;
+connect 'jdbc:derby:;shutdown=true';
+
+connect 'jdbc:derby:wombat';
+connect 'jdbc:derby:wombat;bootPassword=Thursday';
+connect 'jdbc:derby:wombat;bootPassword=Saturday';
+connect 'jdbc:derby:wombat;bootPassword=derbypwd';
+
+values SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('bootPassword');
+values SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('encryptedBootPassword');
+
+-- change it again, make sure it trims white spaces
+call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('bootPassword', '   derbypwd   ,  bbderbypwdx  ');
+call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('bootPassword', 'bbderbypwdx, derbypwdxx ');
+
+values SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('bootPassword');
+values SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('encryptedBootPassword');
+
+disconnect;
+connect 'jdbc:derby:;shutdown=true';
+
+connect 'jdbc:derby:wombat;bootPassword=derbypwd';
+connect 'jdbc:derby:wombat;bootPassword=derbypwdxx';
+select * from t1;
+
+-- test that you cannot change the encryption provider or algorithm after database creation
+-- this should not work
+call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('encryptionAlgorithm', 'DES/blabla/NoPadding');
+call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('encryptionProvider', 'com.pom.aplomb');
+
+
+
+
+
+

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptDatabase.sql
------------------------------------------------------------------------------
    snv:eol-style = native

Added: 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?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptDatabase_app.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptDatabase_app.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,7 @@
+database=jdbc:derby:wombat;create=true;dataEncryption=true;bootPassword=Thursday
+
+#
+derby.optimizer.noTimeout=true
+
+ij.showNoConnectionsAtStart=true
+ij.showNoCountForSelect=true

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptDatabase_app.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptParams.sql
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptParams.sql?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptParams.sql (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptParams.sql Wed Mar  2 17:30:05 2005
@@ -0,0 +1,95 @@
+-- test database encryption parameters such as the encryption algorithm and the encryption provider
+
+
+connect 'jdbc:derby:;shutdown=true';
+
+connect 'jdbc:derby:wombatDESede;create=true;dataEncryption=true;bootPassword=ThursdaySaturday;encryptionAlgorithm=DESede/CBC/NoPadding';
+
+create table t1 ( a char(20));
+insert into t1 values ('hello world');
+
+select * from t1;
+
+
+disconnect;
+connect 'jdbc:derby:;shutdown=true';
+
+-- algorithm is not specified, doesn't matter since algorithm is stored in the database
+connect 'jdbc:derby:wombatDESede;bootPassword=ThursdaySaturday';
+select * from t1;
+
+disconnect;
+connect 'jdbc:derby:;shutdown=true';
+
+-- wrong algorithm, doesn't matter since algorithm is stored in the database
+connect 'jdbc:derby:wombatDESede;bootPassword=ThursdaySaturday;encryptionAlgorithm=Blowfish/CBC/NoPadding';
+
+select * from t1;
+
+disconnect;
+connect 'jdbc:derby:;shutdown=true';
+
+-- create new databases with different encryption algorithms
+connect 'jdbc:derby:wombatDES;create=true;dataEncryption=true;bootPassword=ThursdaySaturdayfoobarpo;encryptionAlgorithm=DES/CBC/NoPadding';
+
+create table t2 ( a char(20));
+insert into t2 values ('hot air');
+
+select * from t2;
+
+disconnect;
+connect 'jdbc:derby:;shutdown=true';
+
+connect 'jdbc:derby:wombatBlowfish;create=true;dataEncryption=true;bootPassword=SundayMondayFriday;encryptionAlgorithm=Blowfish/CBC/NoPadding';
+
+create table t3 ( a char(20));
+insert into t3 values ('blow hot air on fish');
+
+select * from t3;
+
+disconnect;
+connect 'jdbc:derby:;shutdown=true';
+
+
+                
+-- have 3 connections open to 3 databases, each datababase uses a different encryption algorithm
+
+connect 'jdbc:derby:wombatDESede;bootPassword=ThursdaySaturday' AS C1;
+connect 'jdbc:derby:wombatDES;bootPassword=ThursdaySaturdayfoobarpo' AS C2;
+connect 'jdbc:derby:wombatBlowfish;bootPassword=SundayMondayFriday' AS C3;
+
+set connection C1;
+select * from t1;
+
+set connection C2;
+select * from t2;
+
+set connection C3;
+select * from t3;
+
+disconnect;
+connect 'jdbc:derby:;shutdown=true';
+
+-- create a new database with an algorithm which uses padding
+-- should not work
+connect 'jdbc:derby:wombatBad;create=true;dataEncryption=true;bootPassword=ThursdaySaturday;encryptionAlgorithm=DESede/CBC/PKCS5Padding';
+
+-- create a new database with a bad algorithm
+-- should not work
+connect 'jdbc:derby:wombatBad;create=true;dataEncryption=true;bootPassword=ThursdaySaturday;encryptionAlgorithm=Fungus/CBC/NoPadding';
+
+-- create a new database with another bad algorithm (bad feedback mode)
+-- should not work
+connect 'jdbc:derby:wombatBad;create=true;dataEncryption=true;bootPassword=ThursdaySaturday;encryptionAlgorithm=DES/CNN/NoPadding';
+
+-- create a new database with a bad provider
+-- should not work
+connect 'jdbc:derby:wombatBad;create=true;dataEncryption=true;bootPassword=ThursdaySaturday;encryptionProvider=com.foo.bar';
+
+-- create a new database with a bad encryption algorithm format
+-- should not work
+connect 'jdbc:derby:wombatBad;create=true;dataEncryption=true;bootPassword=ThursdaySaturday;encryptionAlgorithm=DES';
+
+-- create a new database with a non supported feedback mode (PCBC)
+-- should not work
+connect 'jdbc:derby:wombatBad;create=true;dataEncryption=true;bootPassword=ThursdaySaturday;encryptionAlgorithm=DES/PCBC/NoPadding';

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptParams.sql
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptParams_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptParams_app.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptParams_app.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptParams_app.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,13 @@
+#database=jdbc:derby:wombat;create=true;dataEncryption=true;bootPassword=Thursday
+
+#
+derby.optimizer.noTimeout=true
+
+# turn the following on if you want to
+# test stored prepared statements.  will
+# run all execute immediate statements as
+# stored prepared statements
+#ij.executeAsSPS=true
+
+ij.showNoConnectionsAtStart=true
+ij.showNoCountForSelect=true

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptParams_app.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptionKey.sql
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptionKey.sql?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptionKey.sql (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptionKey.sql Wed Mar  2 17:30:05 2005
@@ -0,0 +1,85 @@
+------------------------------------------------------------------------------------
+-- This test file contains test cases for testing encryptionKey  property in the connection
+-- url 
+-- 
+-- Case 1: use external encryption key and create
+-- 	   connect using correct key
+--	   connect using wrong key ( different length, different key)
+--	   connect again using correct key
+-- Case 2: backup database
+--	   connect to original db after backup
+-- Case 3: createFrom backedup database
+--	   with wrong key
+--	   with right key
+--	   with wrong key
+--	   with right key
+-- 	   test restoreFrom 
+--	   
+------------------------------------------------------------------------------------
+-- case1:	give external encryptionKey instead of bootpassword
+connect 'jdbc:derby:encdbcbc_key;create=true;dataEncryption=true;encryptionAlgorithm=DES/CBC/NoPadding;encryptionKey=61626364656667686961626364656568';
+
+create table t1(i1 int);
+insert into t1 values(1);
+select * from t1;
+commit;
+connect 'jdbc:derby:encdbcbc_key;shutdown=true';
+
+-- case 1.1 - right key
+
+connect 'jdbc:derby:encdbcbc_key;create=true;dataEncryption=true;encryptionAlgorithm=DES/CBC/NoPadding;encryptionKey=61626364656667686961626364656568';
+select * from t1;
+
+connect 'jdbc:derby:encdbcbc_key;shutdown=true';
+-- (-ve case) connect without the encryptionKey 
+--  connect with encryptionKey and keylength ( will ignore the keylength value)
+
+--  wrong length
+connect 'jdbc:derby:encdbcbc_key;create=true;dataEncryption=true;encryptionAlgorithm=DES/CBC/NoPadding;encryptionKey=616364656667686961626364656568';
+-- wrong key
+connect 'jdbc:derby:encdbcbc_key;create=true;dataEncryption=true;encryptionAlgorithm=DES/CBC/NoPadding;encryptionKey=68626364656667686961626364656568';
+select * from t1;
+
+-- correct key
+connect 'jdbc:derby:encdbcbc_key;create=true;dataEncryption=true;encryptionAlgorithm=DES/CBC/NoPadding;encryptionKey=61626364656667686961626364656568';
+select * from t1;
+
+-- case 2 backup
+CALL SYSCS_UTIL.SYSCS_BACKUP_DATABASE('extinout/bkup1');
+connect 'jdbc:derby:encdbcbc_key;shutdown=true';
+
+-- connect to original db after backup
+
+connect 'jdbc:derby:encdbcbc_key;create=true;dataEncryption=true;encryptionAlgorithm=DES/CBC/NoPadding;encryptionKey=61626364656667686961626364656568';
+select * from t1;
+
+-- case 3 :create db from backup using correct key
+connect 'jdbc:derby:encdbcbc_key2;createFrom=extinout/bkup1/encdbcbc_key;dataEncryption=true;encryptionAlgorithm=DES/CBC/NoPadding;encryptionKey=61626364656667686961626364656568';
+select * from t1;
+connect 'jdbc:derby:encdbcbc_key2;shutdown=true';
+
+-- create db from backup using wrong key
+connect 'jdbc:derby:encdbcbc_key3;createFrom=extinout/bkup1/encdbcbc_key;dataEncryption=true;encryptionAlgorithm=DES/CBC/NoPadding;encryptionKey=61226364656667686961626364656568';
+select * from t1;
+
+connect 'jdbc:derby:encdbcbc_key3;shutdown=true';
+
+-- create db from backup using correct key
+connect 'jdbc:derby:encdbcbc_12;createFrom=extinout/bkup1/encdbcbc_key;dataEncryption=true;encryptionAlgorithm=DES/CBC/NoPadding;encryptionKey=61626364656667686961626364656568';
+select * from t1;
+
+connect 'jdbc:derby:encdbcbc_key12;shutdown=true';
+
+connect 'jdbc:derby:encdb;create=true;dataEncryption=true;encryptionAlgorithm=DES/CBC/NoPadding;encryptionKey=61626364656667686961626364656568';
+create table t1(i1 int ,c2 char(20));
+insert into t1 values(1,'a');
+select * from t1;
+
+call SYSCS_UTIL.SYSCS_BACKUP_DATABASE('extinout/mybackup2');
+
+connect 'jdbc:derby:encdb;shutdown=true';
+disconnect;
+
+connect 'jdbc:derby:encdb;restoreFrom=extinout/mybackup2/encdb;dataEncryption=true;encryptionAlgorithm=DES/CBC/NoPadding;encryptionKey=61626364656667686961626364656568';
+select * from t1;
+disconnect;

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptionKey.sql
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptionKey_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptionKey_app.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptionKey_app.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptionKey_app.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,8 @@
+#database=jdbc:derby:wombat;create=true;dataEncryption=true;bootPassword=Thursday
+
+#
+derby.optimizer.noTimeout=true
+
+ij.showNoConnectionsAtStart=true
+ij.showNoCountForSelect=true
+runwithjdk13=false

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptionKey_app.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/TLockFactory_derby.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/TLockFactory_derby.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/TLockFactory_derby.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/TLockFactory_derby.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,4 @@
+derby.module.testManager=org.apache.derbyTesting.unitTests.harness.BasicUnitTestManager
+derby.module.test.lockManager=org.apache.derbyTesting.unitTests.services.T_LockFactory
+derby.locks.deadlockTimeout=10
+derby.locks.waitTimeout=12

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/TLockFactory_derby.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/TUUIDFactory_derby.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/TUUIDFactory_derby.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/TUUIDFactory_derby.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/TUUIDFactory_derby.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,5 @@
+derby.module.testManager=org.apache.derbyTesting.unitTests.harness.BasicUnitTestManager
+derby.module.test.uuid=org.apache.derbyTesting.unitTests.services.T_UUIDFactory
+
+derby.locks.deadlockTimeout=10
+derby.locks.waitTimeout=12

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/TUUIDFactory_derby.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_AccessFactory_derby.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_AccessFactory_derby.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_AccessFactory_derby.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_AccessFactory_derby.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,4 @@
+derby.module.testManager=org.apache.derbyTesting.unitTests.harness.BasicUnitTestManager
+derby.module.test.access.interface=org.apache.derbyTesting.unitTests.store.T_AccessFactory
+derby.locks.deadlockTimeout=10
+derby.locks.waitTimeout=12

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_AccessFactory_derby.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_CipherBlowfish_derby.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_CipherBlowfish_derby.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_CipherBlowfish_derby.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_CipherBlowfish_derby.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,2 @@
+derby.module.testManager=org.apache.derbyTesting.unitTests.harness.BasicUnitTestManager
+derby.module.test.T_Cipher=org.apache.derbyTesting.unitTests.crypto.T_CipherBlowfish

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_CipherBlowfish_derby.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_CipherCFB_derby.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_CipherCFB_derby.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_CipherCFB_derby.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_CipherCFB_derby.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,2 @@
+derby.module.testManager=org.apache.derbyTesting.unitTests.harness.BasicUnitTestManager
+derby.module.test.T_Cipher=org.apache.derbyTesting.unitTests.crypto.T_CipherCFB

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_CipherCFB_derby.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_CipherDES_derby.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_CipherDES_derby.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_CipherDES_derby.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_CipherDES_derby.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,2 @@
+derby.module.testManager=org.apache.derbyTesting.unitTests.harness.BasicUnitTestManager
+derby.module.test.T_Cipher=org.apache.derbyTesting.unitTests.crypto.T_CipherDES

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_CipherDES_derby.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_CipherECB_derby.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_CipherECB_derby.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_CipherECB_derby.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_CipherECB_derby.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,2 @@
+derby.module.testManager=org.apache.derbyTesting.unitTests.harness.BasicUnitTestManager
+derby.module.test.T_Cipher=org.apache.derbyTesting.unitTests.crypto.T_CipherECB

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_CipherECB_derby.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_CipherOFB_derby.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_CipherOFB_derby.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_CipherOFB_derby.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_CipherOFB_derby.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,2 @@
+derby.module.testManager=org.apache.derbyTesting.unitTests.harness.BasicUnitTestManager
+derby.module.test.T_Cipher=org.apache.derbyTesting.unitTests.crypto.T_CipherOFB

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_CipherOFB_derby.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_Cipher_derby.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_Cipher_derby.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_Cipher_derby.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_Cipher_derby.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,2 @@
+derby.module.testManager=org.apache.derbyTesting.unitTests.harness.BasicUnitTestManager
+derby.module.test.T_Cipher=org.apache.derbyTesting.unitTests.crypto.T_Cipher

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_Cipher_derby.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_Diagnosticable_derby.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_Diagnosticable_derby.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_Diagnosticable_derby.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_Diagnosticable_derby.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,2 @@
+derby.module.testManager=org.apache.derbyTesting.unitTests.harness.BasicUnitTestManager
+derby.module.test.BasicServices.Diagnostic=org.apache.derbyTesting.unitTests.services.T_Diagnosticable

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_Diagnosticable_derby.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_FileSystemData_derby.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_FileSystemData_derby.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_FileSystemData_derby.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_FileSystemData_derby.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,4 @@
+derby.module.testManager=org.apache.derbyTesting.unitTests.harness.BasicUnitTestManager
+derby.module.test.FileSystemData=org.apache.derbyTesting.unitTests.store.T_FileSystemData
+derby.T_FileSystemData.numThreads=5
+derby.T_FileSystemData.iterations=2

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_FileSystemData_derby.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_Heap_derby.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_Heap_derby.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_Heap_derby.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_Heap_derby.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,2 @@
+derby.module.testManager=org.apache.derbyTesting.unitTests.harness.BasicUnitTestManager
+derby.module.test.access.heap=org.apache.derbyTesting.unitTests.store.T_Heap

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_Heap_derby.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_MarkedLimitInputStream_derby.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_MarkedLimitInputStream_derby.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_MarkedLimitInputStream_derby.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_MarkedLimitInputStream_derby.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,2 @@
+derby.module.testManager=org.apache.derbyTesting.unitTests.harness.BasicUnitTestManager
+derby.module.test.T_MarkedLimitInputStream=org.apache.derbyTesting.unitTests.services.T_MarkedLimitInputStream

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_MarkedLimitInputStream_derby.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_RawStoreFactory_derby.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_RawStoreFactory_derby.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_RawStoreFactory_derby.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_RawStoreFactory_derby.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,2 @@
+derby.module.testManager=org.apache.derbyTesting.unitTests.harness.BasicUnitTestManager
+derby.module.test.rawStore.interface=org.apache.derbyTesting.unitTests.store.T_RawStoreFactory

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_RawStoreFactory_derby.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_SortController_derby.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_SortController_derby.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_SortController_derby.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_SortController_derby.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,3 @@
+derby.module.testManager=org.apache.derbyTesting.unitTests.harness.BasicUnitTestManager
+derby.module.test.access.sort=org.apache.derbyTesting.unitTests.store.T_SortController
+derby.debug.true=testSort

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_SortController_derby.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_StreamFile_derby.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_StreamFile_derby.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_StreamFile_derby.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_StreamFile_derby.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,2 @@
+derby.module.testManager=org.apache.derbyTesting.unitTests.harness.BasicUnitTestManager
+derby.module.test.StreamFile=org.apache.derbyTesting.unitTests.store.T_StreamFile

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_StreamFile_derby.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_XA_derby.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_XA_derby.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_XA_derby.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_XA_derby.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,2 @@
+derby.module.testManager=org.apache.derbyTesting.unitTests.harness.BasicUnitTestManager
+derby.module.test.access.xa=org.apache.derbyTesting.unitTests.store.T_XA

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_XA_derby.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_b2i_derby.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_b2i_derby.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_b2i_derby.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_b2i_derby.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,2 @@
+derby.module.testManager=org.apache.derbyTesting.unitTests.harness.BasicUnitTestManager
+derby.module.test.access.b2i=org.apache.derbyTesting.unitTests.store.T_b2i

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/T_b2i_derby.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/build.xml
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/build.xml?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/build.xml (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/build.xml Wed Mar  2 17:30:05 2005
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+
+<!-- ==================================================================== -->
+<!--                       Derby build file                          -->
+<!-- ==================================================================== -->
+
+<project default="FTOtestsubdir" basedir="../../../../../../../.." >
+
+<!-- ==================================================================== -->
+<!--                           Set properties                             -->
+<!-- ==================================================================== -->
+
+  <!-- User settings -->
+  <property file="${user.home}/ant.properties"/>
+
+  <!-- Set property lib dir -->
+  <property name="properties.dir" value="tools/ant/properties" />
+
+  <!-- Significant dirs -->
+  <property file="${properties.dir}/dirs.properties"/>
+  <property file="${properties.dir}/derbytesting.properties"/>
+
+  <!-- Compiler settings -->
+  <property file="${properties.dir}/sane${sanity}.properties"/>
+  <property file="${properties.dir}/defaultcompiler.properties"/>
+  <property file="${properties.dir}/${build.compiler}.properties"/>
+
+  <!-- Parser properties -->
+  <!--property file="${properties.dir}/parser.properties"/-->
+
+  <!-- Compile-time classpath properties files -->
+  <property file="${properties.dir}/extrapath.properties"/>
+  <property file="${properties.dir}/compilepath.properties"/>
+
+  <!-- Release and Version info -->
+  <property file="${properties.dir}/release.properties"/>
+
+  <!-- derby testing specific properties files -->
+  <property file="${ant.home}/properties/derbytesting.properties"/>
+  <property file="${user.home}/properties/derbytesting.properties"/>
+  <property name="this.dir" value="${derby.testing.functest.dir}/tests/tools"/>
+
+<!--             ============ Begin Targets ==============                -->
+ 
+  <target name="FTOtestsubdir" depends="copyfiles"/>
+
+  <!-- mkdir / init target may not be necessary, just here for reference... -->
+  <target name="init">
+    <mkdir dir="${out.dir}/${derby.testing.functest.dir}/tests/unit"/>
+  </target>
+
+  <target name="copyfiles">
+    <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/unit">
+      <fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/unit" 
+        includes="*.properties"/>  
+    </copy>
+  </target> 
+
+
+<!--             ============= End Targets ==============                -->
+
+<!--             ============= End Project ==============                -->
+
+</project>
+

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/build.xml
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/cacheService_app.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/cacheService_app.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/cacheService_app.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/cacheService_app.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,25 @@
+# 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
+

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/cacheService_app.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/cacheService_derby.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/cacheService_derby.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/cacheService_derby.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/cacheService_derby.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,2 @@
+derby.module.testManager=org.apache.derbyTesting.unitTests.harness.BasicUnitTestManager
+derby.module.test.cache=org.apache.derbyTesting.unitTests.services.T_CacheService

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/cacheService_derby.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/daemonService_derby.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/daemonService_derby.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/daemonService_derby.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/daemonService_derby.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,5 @@
+derby.module.testManager=org.apache.derbyTesting.unitTests.harness.BasicUnitTestManager
+derby.T_DaemonService.numThreads=10
+derby.T_DaemonService.iterations=5
+
+derby.module.test.DaemonService=org.apache.derbyTesting.unitTests.services.T_DaemonService

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/daemonService_derby.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: 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?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/default_app.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/default_app.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,25 @@
+#
+# 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

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/default_app.properties
------------------------------------------------------------------------------
    snv:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/fillLog_derby.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/fillLog_derby.properties?view=auto&rev=155990
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/fillLog_derby.properties (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/fillLog_derby.properties Wed Mar  2 17:30:05 2005
@@ -0,0 +1,3 @@
+derby.module.testManager=org.apache.derbyTesting.unitTests.harness.BasicUnitTestManager
+derby.module.test.recoverFullLog=org.apache.derbyTesting.unitTests.store.T_RecoverFullLog
+TestFillLog=true

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/fillLog_derby.properties
------------------------------------------------------------------------------
    snv:eol-style = native