db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r348593 [1/2] - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/ master/j9_foundation/ tests/i18n/ tests/lang/ tests/store/ tests/storetests/ tests/tools/ util/
Date Wed, 23 Nov 2005 23:43:24 GMT
Author: kmarsden
Date: Wed Nov 23 15:42:53 2005
New Revision: 348593

URL: http://svn.apache.org/viewcvs?rev=348593&view=rev
Log:
DERBY-398 -  Bring store tests into J2ME/CDC Foundation testing

Contributed by Deepa Remesh
Attaching a patch 'store_patch.diff' for enabling tests (mostly store tests) to run in J2ME. This patch does the following:
 
* i18n\urlLocale.sql, i18n\urlLocale_app.properties, urlLocale.out - Removed protocol name from URLs and added 'ij.protocol' to app_properties file so that test can run in J2ME. Updated master file.
* i18n\DefaultLocale.java - Removed lines to get nested connection from procedure methods since these connections were not used. This was causing failures with JSR169 where nested connections are not supported.
* i18n\iepnegativetests_ES_app.properties, iepnegativetests_ES.out - Added 'ij.protocol' to app_properties file so that test can run in J2ME. Updated master file.
* storetests\st_1_app.properties, storetests\st_schema_app.properties, storetests\st_b5772_app.properties, storetests\derby94_app.properties - Changed the property 'database' to 'ij.database' in st_schema_app.properties. 
* tools\ij2_app.properties - Changed the property 'database' to 'ij.database' and added ij.dataSource properties.
* tools\ij4_app.properties - Added comment that this test has to be excluded since it is a test for a case with no default driver.
* tools\iepnegativetests_app.properties, tools\iepnegativetests.sql, iepnegativetests.out - Removed protocol name from URLs and added 'ij.protocol' to app_properties file so that test can run in J2ME. Updated master file.
* tools\ij_app.properties - Added comment that test is specific to ij and tests bad/good urls
* testRoutines.sql - To avoid using nested connection, directly called create procedures instead of calling a wrapper which will create the procedures.
* store\databaseProperties_app.properties, databaseProperties.out - Changed the master file to match change in testRoutines.sql
* TestUtil.java - Changed getDataSource method to handle case for EmbeddedSimpleDataSource. Added getDataSourceConnection method which takes a Properties object and returns a connection using the appropriate data source class. This method can be used to boot/shutdown Derby using DataSource.
* lang\errorStream_app.properties - This test works with changes to  TestUtil.getDataSource method to handle case for EmbeddedSimpleDataSource.
* lang\logStream.java, lang\logStream_app.properties, logStream.out - Changed to call TestUtil.getDataSourceConnection instead of DriverManager.getConnection
* lang\functions_app.properties - Added comment that test is excluded for now since it uses server-side JDBC. This test can be converted to Java test to call only functions which do not use server-side JDBC in JSR169 environment. 
* lang\releaseCompileLocks_app.properties - Added comment that test uses server-side JDBC
* store\backupRestore.sql, store\backupRestore_app.properties, backupRestore.out -  Removed protocol name from URLs. Updated master file.
* store\removeStubs.sql, store\removeStubs_app.properties, removeStubs.out -  Removed protocol name from URLs. Updated master file.
* store\rollForwardBackup_app.properties, store\rollForwardBackup.sql, rollForwardBackup.out - Removed protocol name from URLs. Updated master file.
* store\connectDisconnect_app.properties - This test works after changes for DERBY-597. So just re-enabled it.
* store\Beetle6038_app.properties - Added comment that this tests encryption which is not supported in Derby J2ME implementation
* store\TestDurabilityProperty.java, store\TestDurabilityProperty_app.properties - Changed to call TestUtil.getDataSourceConnection instead of DriverManager.getConnection
* store\backupRestore1.java, store\backupRestore1_app.properties - Changed to call TestUtil.getDataSourceConnection instead of DriverManager.getConnection
* store\MaxLogNumber_app.properties, store\MaxLogNumberRecovery_app.properties - Changed the property 'database' to 'ij.database' and added ij.dataSource properties.
* store\rollForwardRecovery.sql, store\rollForwardRecovery_app.properties, rollForwardRecovery.out - Removed protocol name from URLs. Updated master file.
* store\logDevice_app.properties - This test works after changes for DERBY-597. So just re-enabled it.
* lang\closed.java, lang\closed_app.properties - Added catch for NoSuchMethodError for DatabaseMetadata.getURL method. Skips 'shutDownTest' if it is JSR169. I think I can change this to use TestUtil.getDataSourceConnection for shutdown test. I noticed this when writing this down and so will submit this in my next patch.
* j9_foundation\closed.out - Added new master to handle DatabaseMetadata.getURL
* j9_foundation\ij2.out - Added new master because of difference in output of show connections in J2ME.

Ran derbyall with this patch using Sun JDK 1.4.2 and j9_foundation in IBM WCTME 5.7. No new failures.


Created: 28/Jun/05 07:23 PM   Updated: Yesterday 11:56 PM 

Added:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/closed.out   (with props)
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/ij2.out   (with props)
Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/backupRestore.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/databaseProperties.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/iepnegativetests.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/iepnegativetests_ES.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/logStream.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/removeStubs.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rollForwardBackup.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rollForwardRecovery.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/urlLocale.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/DefaultLocale.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/iepnegativetests_ES_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/urlLocale.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/urlLocale_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/closed.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/closed_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/errorStream_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/functions_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/logStream.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/logStream_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/releaseCompileLocks_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Beetle6038_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/MaxLogNumberRecovery_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/MaxLogNumber_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/TestDurabilityProperty.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/TestDurabilityProperty_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/backupRestore.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/backupRestore1.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/backupRestore1_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/backupRestore_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/connectDisconnect_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/databaseProperties_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/logDevice_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/removeStubs.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/removeStubs_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rollForwardBackup.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rollForwardBackup_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rollForwardRecovery.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rollForwardRecovery_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/derby94_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/st_1_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/st_b5772_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/st_schema_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/iepnegativetests.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/iepnegativetests_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij2_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij4_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/TestUtil.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/testRoutines.sql

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/backupRestore.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/backupRestore.out?rev=348593&r1=348592&r2=348593&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/backupRestore.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/backupRestore.out Wed Nov 23 15:42:53 2005
@@ -18,32 +18,32 @@
 ij> ----take a backup.
 call SYSCS_UTIL.SYSCS_BACKUP_DATABASE('extinout/mybackup');
 0 rows inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
 ij> ---restore a databases
-connect 'jdbc:derby:wombat;restoreFrom=extinout/mybackup/wombat';
+connect 'wombat;restoreFrom=extinout/mybackup/wombat';
 ij> select cast (dv(x) as dec(5,2)) from x;
 1       
 --------
 2.00    
 20.00   
 40.00   
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
 ij> ---create a new database from backup.
-connect 'jdbc:derby:wombatnew;createFrom=extinout/mybackup/wombat';
+connect 'wombatnew;createFrom=extinout/mybackup/wombat';
 ij> select cast (dv(x) as dec(5,2)) from x;
 1       
 --------
 2.00    
 20.00   
 40.00   
-ij> connect 'jdbc:derby:wombatnew;shutdown=true';
+ij> connect 'wombatnew;shutdown=true';
 ERROR 08006: Database 'wombatnew' shutdown.
 ij> disconnect;
-ij> connect 'jdbc:derby:wombat';
+ij> connect 'wombat';
 ij> select cast (dv(x) as dec(5,2)) from x;
 1       
 --------
@@ -78,11 +78,11 @@
 2.00    
 20.00   
 40.00   
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
 ij> ---perform a rollforward recovery
-connect 'jdbc:derby:wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
+connect 'wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
 ij> select * from x;
 X                     |Y          
 ----------------------------------
@@ -121,7 +121,7 @@
 40.00   
 ij> insert into x values (1,1),(10,1),(20,1);
 3 rows inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
 ij> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/databaseProperties.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/databaseProperties.out?rev=348593&r1=348592&r2=348593&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/databaseProperties.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/databaseProperties.out Wed Nov 23 15:42:53 2005
@@ -1,9 +1,9 @@
 ij> run resource '/org/apache/derbyTesting/functionTests/util/testRoutines.sql';
-ij> CREATE PROCEDURE TESTROUTINE.INSTALL_ROUTINES() MODIFIES SQL DATA EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.TestRoutines.installRoutines' language java parameter style java;
+ij> -- Changed to create individual procedures so that this will work with JSR169. 
+-- Direct call to 'installRoutines' uses nested connection
+CREATE PROCEDURE TESTROUTINE.SET_SYSTEM_PROPERTY(IN PROPERTY_KEY VARCHAR(32000), IN PROPERTY_VALUE VARCHAR(32000)) NO SQL EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.TestRoutines.setSystemProperty' language java parameter style java;
 0 rows inserted/updated/deleted
-ij> CALL TESTROUTINE.INSTALL_ROUTINES();
-0 rows inserted/updated/deleted
-ij> DROP PROCEDURE TESTROUTINE.INSTALL_ROUTINES;
+ij> CREATE PROCEDURE TESTROUTINE.SLEEP(IN SLEEP_TIME_MS BIGINT) NO SQL EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.TestRoutines.sleep' language java parameter style java;
 0 rows inserted/updated/deleted
 ij> CREATE FUNCTION GET_TABLE_PROPERTY (SCHEMA_NAME VARCHAR(128), TABLE_NAME VARCHAR(128), PROP_KEY VARCHAR(1000)) RETURNS VARCHAR(1000) EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.TestPropertyInfo.getTableProperty' LANGUAGE JAVA PARAMETER STYLE JAVA;
 0 rows inserted/updated/deleted

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/iepnegativetests.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/iepnegativetests.out?rev=348593&r1=348592&r2=348593&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/iepnegativetests.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/iepnegativetests.out Wed Nov 23 15:42:53 2005
@@ -302,8 +302,8 @@
 ij> call SYSCS_UTIL.SYSCS_EXPORT_QUERY('select * from parent where a < 3' , 'extinout/parent.del' , 
                                  null, null, null) ;
 0 rows inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat' as c1;
-ij(C1)> connect 'jdbc:derby:wombat' as c2;
+ij> connect 'wombat' as c1;
+ij(C1)> connect 'wombat' as c2;
 ij(C2)> set connection c1;
 ij(C1)> autocommit off;
 ij(C1)> lock table iep.parent in share mode;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/iepnegativetests_ES.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/iepnegativetests_ES.out?rev=348593&r1=348592&r2=348593&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/iepnegativetests_ES.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/iepnegativetests_ES.out Wed Nov 23 15:42:53 2005
@@ -311,8 +311,8 @@
 ij> call SYSCS_UTIL.SYSCS_EXPORT_QUERY('select * from parent where a < 3' , 'extinout/parent.del' , 
                                  null, null, null) ;
 0 rows inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat' as c1;
-ij(C1)> connect 'jdbc:derby:wombat' as c2;
+ij> connect 'wombat' as c1;
+ij(C1)> connect 'wombat' as c2;
 ij(C2)> set connection c1;
 ij(C1)> autocommit off;
 ij(C1)> lock table iep.parent in share mode;

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/closed.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/closed.out?rev=348593&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/closed.out (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/closed.out Wed Nov 23 15:42:53 2005
@@ -0,0 +1,16 @@
+Test closed starting
+DatabaseMetaData.getURL not present - correct for JSR169
+Test case for Derby-62 - serialization error with SQLException
+'DROP TABLE' cannot be performed on 'APP.DERBY62_DAIN_SUNDSTROM' because it does not exist.
+ERROR XJ012: 'Statement' already closed.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR 08003: No current connection.
+ERROR 08003: No current connection.
+ERROR 08003: No current connection.
+ERROR 08003: No current connection.
+ERROR 08003: No current connection.
+ERROR 08003: No current connection.
+ERROR 08003: No current connection.
+PASS
+Test closed finished

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/closed.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/ij2.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/ij2.out?rev=348593&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/ij2.out (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/ij2.out Wed Nov 23 15:42:53 2005
@@ -0,0 +1,137 @@
+ij> -- this test shows some ij abilities against an active database
+create table t (i int);
+0 rows inserted/updated/deleted
+ij> insert into t values (3), (4);
+2 rows inserted/updated/deleted
+ij> prepare s as 'select * from t';
+ij> execute s;
+I          
+-----------
+3          
+4          
+ij> remove s;
+ij> -- now it won't find s
+execute s;
+IJ ERROR: Unable to establish prepared statement S
+ij> prepare s as 'select * from t where i=?';
+ij> -- fails, needs parameter
+execute s;
+ERROR 07000: At least one parameter to the current statement is uninitialized.
+ij> -- works, finds value
+execute s using 'values 3';
+IJ WARNING: Autocommit may close using result set
+I          
+-----------
+3          
+ij> prepare t as 'values 3';
+ij> -- same as last execute
+execute s using t;
+IJ WARNING: Autocommit may close using result set
+I          
+-----------
+3          
+ij> -- same as last execute
+execute 'select * from t where i=?' using 'values 3';
+IJ WARNING: Autocommit may close using result set
+I          
+-----------
+3          
+ij> -- same as last execute
+execute 'select * from t where i=?' using t;
+IJ WARNING: Autocommit may close using result set
+I          
+-----------
+3          
+ij> -- param that is not needed gets out of range message
+execute 'select * from t where i=?' using 'values (3,4)';
+IJ WARNING: Autocommit may close using result set
+ERROR XCL13: The parameter position '2' is out of range.  The number of parameters for this prepared  statement is '1'.
+ij> -- ignores rows that are not needed
+execute 'select * from t where i=?' using 'values 3,4';
+IJ WARNING: Autocommit may close using result set
+I          
+-----------
+3          
+ij> -- with autocommit off, extra rows are processed and no warning results
+autocommit off;
+ij> execute 'select * from t where i=?' using 'values 3,4';
+I          
+-----------
+3          
+I          
+-----------
+4          
+ij> execute 'select * from t where i=?' using 'values 3';
+I          
+-----------
+3          
+ij> autocommit on;
+ij> -- will say params not set when no rows in using values
+execute 'select * from t where i=?' using 'select * from t where i=9';
+IJ ERROR: Using clause had no results
+ij> -- will say params not set when using values is not a query
+execute 'select * from t where i=?' using 'create table s (i int)';
+IJ ERROR: Using clause had no results
+ij> -- note that the using part was, however, executed...
+drop table s;
+0 rows inserted/updated/deleted
+ij> -- bug 5926 - make sure the using clause result set got closed
+drop table t;
+0 rows inserted/updated/deleted
+ij> create table t(c1 int);
+0 rows inserted/updated/deleted
+ij> insert into t values(1);
+1 row inserted/updated/deleted
+ij> execute 'select * from t where c1=?' using 'select * from t where c1=1';
+IJ WARNING: Autocommit may close using result set
+C1         
+-----------
+1          
+ij> drop table t;
+0 rows inserted/updated/deleted
+ij> create table t(c1 int);
+0 rows inserted/updated/deleted
+ij> insert into t values(1);
+1 row inserted/updated/deleted
+ij> insert into t values(2);
+1 row inserted/updated/deleted
+ij> execute 'select * from t where c1=?' using 'select * from t where c1>=1';
+IJ WARNING: Autocommit may close using result set
+C1         
+-----------
+1          
+ij> drop table t;
+0 rows inserted/updated/deleted
+ij> -- show that long fields now don't take forever...
+create table t ( c char(50));
+0 rows inserted/updated/deleted
+ij> insert into t values('hello');
+1 row inserted/updated/deleted
+ij> select cast(c as varchar(20)) from t;
+1                   
+--------------------
+hello               
+ij> drop table t;
+0 rows inserted/updated/deleted
+ij> -- show multiconnect ability; db name is wombat, reuse it...
+-- assumes ij.protocol is appropriately set...
+connect 'wombat' as wombat;
+ij(WOMBAT)> show connections;
+CONNECTION0
+WOMBAT*
+* = current connection
+ij(WOMBAT)> set connection connection0;
+ij(CONNECTION0)> show connections;
+CONNECTION0*
+WOMBAT
+* = current connection
+ij(CONNECTION0)> set connection wombat;
+ij(WOMBAT)> disconnect;
+ij> show connections;
+CONNECTION0
+No current connection
+ij> set connection connection0;
+ij> show connections;
+CONNECTION0*
+* = current connection
+ij> 

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/ij2.out
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/logStream.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/logStream.out?rev=348593&r1=348592&r2=348593&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/logStream.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/logStream.out Wed Nov 23 15:42:53 2005
@@ -2,7 +2,7 @@
 derby.log exists ?       true
 derby.log is directory ? false
 derby.log has content ?  true
-SHUTDOWN Cloudscape
+SHUTDOWN Derby
 SHUTDOWN :Derby system shutdown.
 derby.log exists ?       true
 derby.log is directory ? false

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/removeStubs.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/removeStubs.out?rev=348593&r1=348592&r2=348593&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/removeStubs.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/removeStubs.out Wed Nov 23 15:42:53 2005
@@ -6,10 +6,10 @@
 ij> drop table t1 ;
 0 rows inserted/updated/deleted
 ij> commit ;
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect all;
-ij> connect 'jdbc:derby:wombat';
+ij> connect 'wombat';
 ij> autocommit on;
 ij> create table t1(a int ) ;
 0 rows inserted/updated/deleted
@@ -29,16 +29,16 @@
 0 rows inserted/updated/deleted
 ij> CALL SYSCS_UTIL.SYSCS_CHECKPOINT_DATABASE();
 0 rows inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect all;
-ij> connect 'jdbc:derby:wombat';
+ij> connect 'wombat';
 ij> create table t2( a int ) ;
 0 rows inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect all;
-ij> connect 'jdbc:derby:wombat';
+ij> connect 'wombat';
 ij> drop table t2 ;
 0 rows inserted/updated/deleted
 ij> CALL SYSCS_UTIL.SYSCS_CHECKPOINT_DATABASE();

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rollForwardBackup.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rollForwardBackup.out?rev=348593&r1=348592&r2=348593&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rollForwardBackup.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rollForwardBackup.out Wed Nov 23 15:42:53 2005
@@ -73,11 +73,11 @@
 1 row inserted/updated/deleted
 ij> insert into t1 values(6);
 1 row inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
 ij> --performa rollforward recovery
-connect 'jdbc:derby:wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
+connect 'wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
 ij> select * from t1 ;
 A          
 -----------
@@ -103,11 +103,11 @@
 1 row inserted/updated/deleted
 ij> insert into t1 values(12);
 1 row inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
 ij> --perform complete version restore
-connect 'jdbc:derby:wombat;restoreFrom=extinout/mybackup/wombat';
+connect 'wombat;restoreFrom=extinout/mybackup/wombat';
 ij> select * from t1 ;
 A          
 -----------
@@ -135,11 +135,11 @@
 ij> call SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE(
     'extinout/mybackup', 1);
 0 rows inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
 ij> --create a new database using wombat db backup copy with a different database name
-connect 'jdbc:derby:wombat1;createFrom=extinout/mybackup/wombat';
+connect 'wombat1;createFrom=extinout/mybackup/wombat';
 ij> select * from t1;
 A          
 -----------
@@ -167,11 +167,11 @@
 ij> call SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE(
     'extinout/mybackup', 1);
 0 rows inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat1;shutdown=true';
+ij> connect 'wombat1;shutdown=true';
 ERROR 08006: Database 'wombat1' shutdown.
 ij> disconnect;
 ij> ---BACKUP AND RESTORE USING LOGDEVICE.
-connect 'jdbc:derby:crwombat;createFrom=extinout/mybackup/wombat;logDevice=extinout/crwombatlog';
+connect 'crwombat;createFrom=extinout/mybackup/wombat;logDevice=extinout/crwombatlog';
 ij> values SUBSTR(SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('logDevice'), LOCATE('crwombatlog',SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('logDevice')),11);
 1          
 -----------
@@ -200,11 +200,11 @@
 1 row inserted/updated/deleted
 ij> insert into t1 values(21);
 1 row inserted/updated/deleted
-ij> connect 'jdbc:derby:crwombat;shutdown=true';
+ij> connect 'crwombat;shutdown=true';
 ERROR 08006: Database 'crwombat' shutdown.
 ij> disconnect;
 ij> --do a plain boot , we should have the log device specified earlier.
-connect 'jdbc:derby:crwombat';
+connect 'crwombat';
 ij> values SUBSTR(SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('logDevice'), LOCATE('crwombatlog',SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('logDevice')),11);
 1          
 -----------
@@ -236,16 +236,16 @@
 1 row inserted/updated/deleted
 ij> insert into t1 values(24);
 1 row inserted/updated/deleted
-ij> connect 'jdbc:derby:crwombat;shutdown=true';
+ij> connect 'crwombat;shutdown=true';
 ERROR 08006: Database 'crwombat' shutdown.
 ij> disconnect;
 ij> ---check the error case of log device only existing when
 -- we try to do createFrom .
 --following connection shoul fail.
-connect 'jdbc:derby:erwombat;createFrom=extinout/mybackup/wombat;logDevice=extinout/crwombatlog';
+connect 'erwombat;createFrom=extinout/mybackup/wombat;logDevice=extinout/crwombatlog';
 ERROR XJ040: Failed to start database 'erwombat', see the next exception for details.
 ERROR XSLAT: Log directory extinout<ps>crwombatlog<ps>log exists. Please make sure specified logDevice location is correct.  
-ij> connect 'jdbc:derby:wombat;restoreFrom=extinout/mybackup/wombat;logDevice=extinout/wombatlog';
+ij> connect 'wombat;restoreFrom=extinout/mybackup/wombat;logDevice=extinout/wombatlog';
 ij> values SUBSTR(SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('logDevice'), LOCATE('wombatlog',SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('logDevice')),9);
 1        
 ---------
@@ -277,12 +277,12 @@
 ij> call SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE(
     'extinout/mybackup', 1);
 0 rows inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
 ij> --restore again from backup case to make sure
 --backups are getting the log device property.	
-connect 'jdbc:derby:wombat;restoreFrom=extinout/mybackup/wombat';
+connect 'wombat;restoreFrom=extinout/mybackup/wombat';
 ij> values SUBSTR(SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('logDevice'), LOCATE('wombatlog',SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('logDevice')),9);
 1        
 ---------
@@ -314,11 +314,11 @@
 1 row inserted/updated/deleted
 ij> insert into t1 values(24);
 1 row inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
 ij> --do a vannila boot and see the device to make sure the log device is still intact.
-connect 'jdbc:derby:wombat';
+connect 'wombat';
 ij> values SUBSTR(SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('logDevice'), LOCATE('wombatlog',SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('logDevice')),9);
 1        
 ---------
@@ -355,11 +355,11 @@
 ij> insert into t1 values(27);
 1 row inserted/updated/deleted
 ij> rollback;
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
 ij> --performa rollforward recovery with logDevice specified at backup
-connect 'jdbc:derby:wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
+connect 'wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
 ij> values SUBSTR(SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('logDevice'), LOCATE('wombatlog',SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('logDevice')),9);
 1        
 ---------
@@ -394,17 +394,17 @@
 1 row inserted/updated/deleted
 ij> insert into t1 values(27);
 1 row inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
 ij> --perform a rollforward recovery with log device is moved
 --to some other place than what it was when backup was taken.
 --move the log to different dir name.
-connect 'jdbc:derby:dummycondb;createFrom=extinout/mybackup/wombat;logDevice=extinout/wombatlog1';
+connect 'dummycondb;createFrom=extinout/mybackup/wombat;logDevice=extinout/wombatlog1';
 ij> call RENAME_FILE(null,'extinout/wombatlog','extinout/wombatlogmoved');
 0 rows inserted/updated/deleted
 ij> disconnect;
-ij> connect 'jdbc:derby:wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat;logDevice=extinout/wombatlogmoved';
+ij> connect 'wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat;logDevice=extinout/wombatlogmoved';
 ij> values SUBSTR(SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('logDevice'), LOCATE('wombatlogmoved',SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('logDevice')),14);
 1             
 --------------
@@ -442,11 +442,11 @@
 1 row inserted/updated/deleted
 ij> insert into t1 values(32);
 1 row inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
 ij> --do a plain boot and verify the log device.
-connect 'jdbc:derby:wombat';
+connect 'wombat';
 ij> values SUBSTR(SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('logDevice'), LOCATE('wombatlogmoved',SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('logDevice')),14);
 1             
 --------------
@@ -491,11 +491,11 @@
 call SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE(
     'extinout/mybackup', 1);
 0 rows inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
 ij> --restore and check the results;
-connect 'jdbc:derby:wombat;restoreFrom=extinout/mybackup/wombat';
+connect 'wombat;restoreFrom=extinout/mybackup/wombat';
 ij> values SUBSTR(SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('logDevice'), LOCATE('wombatlogmoved',SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('logDevice')),14);
 1             
 --------------
@@ -539,24 +539,24 @@
 1 row inserted/updated/deleted
 ij> insert into t1 values(38);
 1 row inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
 ij> --simulate OS type copy and then boot(Commented because it does not work in nightlies)
---connect 'jdbc:derby:dummycondb';
+--connect 'dummycondb';
 --call RENAME_FILE('rollForwardBackup', 'wombat', 'wombat.old');
 --call RENAME_FILE(null, 'extinout/mybackup/wombat', 'rollForwardBackup/wombat');
 ---disconnect;
----connect 'jdbc:derby:wombat';
+---connect 'wombat';
 --Following SHOULD SHOW NULL value.
 --values SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('logDevice');
 --select * from t1;
 --call SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE(
 --     'extinout/mybackup', 1);
---connect 'jdbc:derby:wombat;shutdown=true';
+--connect 'wombat;shutdown=true';
 --disconnect;
 ---createFrom without logDevice specified on URL should have null value.
-connect 'jdbc:derby:tempwombat;createFrom=extinout/mybackup/wombat';
+connect 'tempwombat;createFrom=extinout/mybackup/wombat';
 ij> values SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('logDevice');
 1                                                                                                                               
 --------------------------------------------------------------------------------------------------------------------------------
@@ -603,10 +603,10 @@
 ij> call SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE(
     'extinout/mybackup', 1);
 0 rows inserted/updated/deleted
-ij> connect 'jdbc:derby:tempwombat;shutdown=true';
+ij> connect 'tempwombat;shutdown=true';
 ERROR 08006: Database 'tempwombat' shutdown.
 ij> disconnect;
-ij> connect 'jdbc:derby:wombat;restoreFrom=extinout/mybackup/tempwombat';
+ij> connect 'wombat;restoreFrom=extinout/mybackup/tempwombat';
 ij> values SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('logDevice');
 1                                                                                                                               
 --------------------------------------------------------------------------------------------------------------------------------
@@ -614,11 +614,11 @@
 ij> call SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE(
     'extinout/mybackup', 1);
 0 rows inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
 ij> ---Using plain backup mechanism rstore/recreate db using  restoreFrom/createFrom
-connect 'jdbc:derby:wombat';
+connect 'wombat';
 ij> call SYSCS_UTIL.SYSCS_DISABLE_LOG_ARCHIVE_MODE(1);
 0 rows inserted/updated/deleted
 ij> select * from t1;
@@ -673,10 +673,10 @@
 1 row inserted/updated/deleted
 ij> insert into t1 values(47);
 1 row inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
-ij> connect 'jdbc:derby:wombat;restoreFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;restoreFrom=extinout/mybackup/wombat';
 ij> select * from t1;
 A          
 -----------
@@ -724,10 +724,10 @@
 1 row inserted/updated/deleted
 ij> call SYSCS_UTIL.SYSCS_BACKUP_DATABASE('extinout/mybackup');
 0 rows inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
-ij> connect 'jdbc:derby:wombatnew;createFrom=extinout/mybackup/wombat';
+ij> connect 'wombatnew;createFrom=extinout/mybackup/wombat';
 ij> select * from t1;
 A          
 -----------
@@ -776,64 +776,64 @@
 1 row inserted/updated/deleted
 ij> insert into t1 values(50);
 1 row inserted/updated/deleted
-ij> connect 'jdbc:derby:wombatnew;shutdown=true';
+ij> connect 'wombatnew;shutdown=true';
 ERROR 08006: Database 'wombatnew' shutdown.
 ij> disconnect;
 ij> --enable the log archive mode again.
-connect 'jdbc:derby:wombat';
+connect 'wombat';
 ij> call SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE(
     'extinout/mybackup', 1);
 0 rows inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
 ij> --NEGATIVE TEST with  RESTORE FLAGS
 -- with createFrom option should give erro on existing database
-connect 'jdbc:derby:wombat;createFrom=extinout/mybackup/wombat';
+connect 'wombat;createFrom=extinout/mybackup/wombat';
 ERROR XJ040: Failed to start database 'wombat', see the next exception for details.
 ERROR XBM0J: Directory DBLOCATION/wombat already exists.
 ij> -- specify conflictint attributes; it should fail.
-connect 'jdbc:derby:wombat;create=true;createFrom=extinout/mybackup/wombat';
+connect 'wombat;create=true;createFrom=extinout/mybackup/wombat';
 ERROR XJ049: Conflicting create attributes specified.
-ij> connect 'jdbc:derby:wombat;create=true;rollForwardRecoveryFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;create=true;rollForwardRecoveryFrom=extinout/mybackup/wombat';
 ERROR XJ049: Conflicting create attributes specified.
-ij> connect 'jdbc:derby:wombat;create=true;restoreFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;create=true;restoreFrom=extinout/mybackup/wombat';
 ERROR XJ049: Conflicting create attributes specified.
-ij> connect 'jdbc:derby:wombat;restoreFrom=extinout/mybackup/wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;restoreFrom=extinout/mybackup/wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
 ERROR XJ081: Conflicting create/restore/recovery attributes specified.
-ij> connect 'jdbc:derby:wombat;createFrom=extinout/mybackup/wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;createFrom=extinout/mybackup/wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
 ERROR XJ081: Conflicting create/restore/recovery attributes specified.
 ij> -- With wrong back up path name it shoud fail.
-connect 'jdbc:derby:wombat;rollForwardRecoveryFrom=nobackup/wombat';
+connect 'wombat;rollForwardRecoveryFrom=nobackup/wombat';
 ERROR XJ040: Failed to start database 'wombat', see the next exception for details.
 ERROR XBM0Y: Backup database directory nobackup<ps>wombat not found. Please make sure that the specified backup path is right.
-ij> connect 'jdbc:derby:wombat;restoreFrom=nobackup/wombat';
+ij> connect 'wombat;restoreFrom=nobackup/wombat';
 ERROR XJ040: Failed to start database 'wombat', see the next exception for details.
 ERROR XBM0Y: Backup database directory nobackup<ps>wombat not found. Please make sure that the specified backup path is right.
-ij> connect 'jdbc:derby:wombat2;createFrom=nobackup/wombat';
+ij> connect 'wombat2;createFrom=nobackup/wombat';
 ERROR XJ040: Failed to start database 'wombat2', see the next exception for details.
 ERROR XBM0Y: Backup database directory nobackup<ps>wombat not found. Please make sure that the specified backup path is right.
 ij> --Simulate missing files by renaming some files in backup(like a corrupted backup and check 
 --whether we get proper error messages
 --Get a connection because it is required to make any calls in ij 
-connect 'jdbc:derby:wombat2;restoreFrom=extinout/mybackup/wombat';
+connect 'wombat2;restoreFrom=extinout/mybackup/wombat';
 ij> call RENAME_FILE('extinout/mybackup/wombat/','service.properties','service.properties.old');
 0 rows inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;restoreFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;restoreFrom=extinout/mybackup/wombat';
 ERROR XJ040: Failed to start database 'wombat', see the next exception for details.
 ERROR XBM0Q: File extinout<ps>mybackup<ps>wombat<ps>service.properties not found. Please make sure that backup copy is the correct one and it is not corrupted.
 ij> call RENAME_FILE('extinout/mybackup/wombat/','service.properties.old','service.properties');
 0 rows inserted/updated/deleted
 ij> call RENAME_FILE('extinout/mybackup/wombat/','log','log.old');
 0 rows inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;restoreFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;restoreFrom=extinout/mybackup/wombat';
 ERROR XJ040: Failed to start database 'wombat', see the next exception for details.
 ERROR XSLAS: Log directory extinout<ps>mybackup<ps>wombat<ps>log not found in backup during restore. Please make sure that backup copy is the correct one and it is not corrupted.
 ij> call RENAME_FILE('extinout/mybackup/wombat/','log.old','log');
 0 rows inserted/updated/deleted
 ij> call RENAME_FILE('extinout/mybackup/wombat/','seg0','data.old');
 0 rows inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;restoreFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;restoreFrom=extinout/mybackup/wombat';
 ERROR XJ040: Failed to start database 'wombat', see the next exception for details.
 ERROR XSDG6: Data segment directory not found in extinout<ps>mybackup<ps>wombat backup during restore. Please make sure that backup copy is the right one and it is not corrupted.
 ij> call RENAME_FILE('extinout/mybackup/wombat/','data.old','seg0');
@@ -842,21 +842,21 @@
 --next createFrom call will fail with DBLOCATION/wombat exist error.
 call RENAME_FILE('extinout/mybackup/wombat/','service.properties','service.properties.old');
 0 rows inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;createFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;createFrom=extinout/mybackup/wombat';
 ERROR XJ040: Failed to start database 'wombat', see the next exception for details.
 ERROR XBM0Q: File extinout<ps>mybackup<ps>wombat<ps>service.properties not found. Please make sure that backup copy is the correct one and it is not corrupted.
 ij> call RENAME_FILE('extinout/mybackup/wombat/','service.properties.old','service.properties');
 0 rows inserted/updated/deleted
 ij> call RENAME_FILE('extinout/mybackup/wombat/','log','log.old');
 0 rows inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;createFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;createFrom=extinout/mybackup/wombat';
 ERROR XJ040: Failed to start database 'wombat', see the next exception for details.
 ERROR XSLAS: Log directory extinout<ps>mybackup<ps>wombat<ps>log not found in backup during restore. Please make sure that backup copy is the correct one and it is not corrupted.
 ij> call RENAME_FILE('extinout/mybackup/wombat/','log.old','log');
 0 rows inserted/updated/deleted
 ij> call RENAME_FILE('extinout/mybackup/wombat/','seg0','data.old');
 0 rows inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;createFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;createFrom=extinout/mybackup/wombat';
 ERROR XJ040: Failed to start database 'wombat', see the next exception for details.
 ERROR XSDG6: Data segment directory not found in extinout<ps>mybackup<ps>wombat backup during restore. Please make sure that backup copy is the right one and it is not corrupted.
 ij> call RENAME_FILE('extinout/mybackup/wombat/','data.old','seg0');

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rollForwardRecovery.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rollForwardRecovery.out?rev=348593&r1=348592&r2=348593&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rollForwardRecovery.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rollForwardRecovery.out Wed Nov 23 15:42:53 2005
@@ -17,10 +17,10 @@
 1 row inserted/updated/deleted
 ij> drop table t1;
 0 rows inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
-ij> connect 'jdbc:derby:wombat';
+ij> connect 'wombat';
 ij> --checkpoint to make sure that 
 --the stub is dropped and we use the 
 --the same container id which we dropped earlier
@@ -40,11 +40,11 @@
 4          
 5          
 6          
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
 ij> --performa rollforward recovery
-connect 'jdbc:derby:wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
+connect 'wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
 ij> select * from t1 ;
 A          
 -----------
@@ -81,10 +81,10 @@
 ij> alter table t2 add constraint c1 foreign key (b)
                              references t1(a);
 0 rows inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
-ij> connect 'jdbc:derby:wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
 ij> insert into t2 values(4);
 1 row inserted/updated/deleted
 ij> insert into t2 values(5);
@@ -145,10 +145,10 @@
 --alter table t3 add column c2 int not null primary key;
 --alter table t4 add column c2 int not null;
 --alter table t3 add column c3 int not null unique;
-connect 'jdbc:derby:wombat;shutdown=true';
+connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
-ij> connect 'jdbc:derby:wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
 ij> select * from t1;
 A          
 -----------
@@ -247,10 +247,10 @@
 ij> --unlogged add unique constraint
 alter table t4 add constraint uk2 unique(c1);
 0 rows inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
-ij> connect 'jdbc:derby:wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
 ij> --following insert should throw duplicate error.
 insert into t4 values(101);
 ERROR 23505: The statement was aborted because it would have caused a duplicate key value in a unique or primary key constraint or unique index identified by 'UK2' defined on 'T4'.
@@ -259,10 +259,10 @@
 ij> --folowing should throw foreign key violations error.
 insert into t4 values(9999);
 ERROR 23503: INSERT on table 'T4' caused a violation of foreign key constraint 'FK1' for key (9999).  The statement has been rolled back.
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
-ij> connect 'jdbc:derby:wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
 ij> select * from t1;
 A          
 -----------
@@ -400,10 +400,10 @@
 ij> delete from t3;
 67 rows inserted/updated/deleted
 ij> rollback;
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
-ij> connect 'jdbc:derby:wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
 ij> select * from t1;
 A          
 -----------
@@ -540,10 +540,10 @@
 ij> insert into t5 values ( 1 , 2, 3 , 'one'), 
 (11 , 22, 33, 'eleven'), (111, 222, 333, 'one hundred eleven');
 3 rows inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
-ij> connect 'jdbc:derby:wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
 ij> select * from t5 ;
 C1         |C2         |C3         |C4                                                                                                  
 ----------------------------------------------------------------------------------------------------------------------------------------
@@ -567,10 +567,10 @@
 11         |22         |33         |eleven                                                                                              
 111        |222        |333        |one hundred eleven                                                                                  
 1111       |2222       |3333       |four ones ..                                                                                        
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
-ij> connect 'jdbc:derby:wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
 ij> select * from t5;
 C1         |C2         |C3         |C4                                                                                                  
 ----------------------------------------------------------------------------------------------------------------------------------------
@@ -603,10 +603,10 @@
 1 row inserted/updated/deleted
 ij> insert into testing values (PADSTRING('100000000',2024),PADSTRING('200000000',1024), PADSTRING('300000000',1024), PADSTRING('400000000',2048), PADSTRING('500000000',300));
 1 row inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
-ij> connect 'jdbc:derby:wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
 ij> -- select the whole row, or individual columns.
 -- 9 rows should be returned from each of the following selects
 select * from testing;
@@ -692,10 +692,10 @@
 1 row inserted/updated/deleted
 ij> insert into testing (a, b, c, d, e) values (PADSTRING('a',2024), PADSTRING('b',1024), PADSTRING('c',1024), PADSTRING('d',2048), PADSTRING('e',300));
 1 row inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
-ij> connect 'jdbc:derby:wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
 ij> -- select some partial rows.
 -- should select 14 rows
 select * from testing;
@@ -801,10 +801,10 @@
 update testing set a = PADSTRING('aaa',2024), b = PADSTRING('bbb',1024), c = PADSTRING('ccc',1024), d = PADSTRING('ddd',2048), e = PADSTRING('eee',300)
 	where d = PADSTRING('d',2048);
 2 rows inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
-ij> connect 'jdbc:derby:wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
 ij> -- following select should return 0 rows
 select * from testing where d = PADSTRING('d',2048);
 A                                                                                                                               |B                                                                                                                               |C                                                                                                                               |D                                                                                                                               |E                                                                                                                               
@@ -869,10 +869,10 @@
 1 row inserted/updated/deleted
 ij> insert into testing values (2, PADSTRING('fill1',2500), PADSTRING('fill2',2500), 20, PADSTRING('fill3',2500), PADSTRING('fill4',2500), 200, PADSTRING('fill5',2400), PADSTRING('fill6',2400), 2000);
 1 row inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
-ij> connect 'jdbc:derby:wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
 ij> select * from testing;
 KEY1       |FILLER1                                                                                                                         |FILLER2                                                                                                                         |KEY2       |FILLER3                                                                                                                         |FILLER4                                                                                                                         |KEY3       |FILLER5                                                                                                                         |FILLER6                                                                                                                         |KEY4       
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -969,10 +969,10 @@
 1 row inserted/updated/deleted
 ij> insert into testing values (PADSTRING('aa bb cc dd ee ff gg',8096));
 1 row inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
-ij> connect 'jdbc:derby:wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
 ij> -- should return 4 rows
 select a from testing;
 A                                                                                                                               
@@ -995,10 +995,10 @@
 1 row inserted/updated/deleted
 ij> insert into testing values (4, PADSTRING('aa bb cc dd ee ff gg',32384));
 1 row inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
-ij> connect 'jdbc:derby:wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
 ij> -- should return 4 rows
 select * from testing;
 A          |B                                                                                                                               
@@ -1040,10 +1040,10 @@
 1 row inserted/updated/deleted
 ij> insert into testing values (PADSTRING('aa bb cc dd ee ff gg',32384), 4);
 1 row inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
-ij> connect 'jdbc:derby:wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
 ij> -- should return 4 rows
 select * from testing;
 A                                                                                                                               |B          
@@ -1085,10 +1085,10 @@
 1 row inserted/updated/deleted
 ij> insert into testing values (4, PADSTRING('aa bb cc dd ee ff gg',32384), 4);
 1 row inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
-ij> connect 'jdbc:derby:wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
 ij> -- should return 4 rows
 select * from testing;
 Z          |A                                                                                                                               |B          
@@ -1137,10 +1137,10 @@
 4 rows inserted/updated/deleted
 ij> update testing set a = PADSTRING('update five times',32384);
 4 rows inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
-ij> connect 'jdbc:derby:wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
 ij> -- select should return 4 rows
 select a from testing;
 A                                                                                                                               
@@ -1163,10 +1163,10 @@
 1 row inserted/updated/deleted
 ij> insert into testing values (PADSTRING('aa bb cc dd ee ff gg',32384), 4, PADSTRING('aa bb cc dd ee ff gg',32084));
 1 row inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
-ij> connect 'jdbc:derby:wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
 ij> -- should return 4 rows
 select * from testing;
 A                                                                                                                               |B          |C                                                                                                                               
@@ -1229,10 +1229,10 @@
 4 rows inserted/updated/deleted
 ij> update testing set c = PADSTRING('update 9',32084);
 4 rows inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
-ij> connect 'jdbc:derby:wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
 ij> -- select should return 4 rows
 select * from testing;
 A                                                                                                                               |B          |C                                                                                                                               
@@ -1263,10 +1263,10 @@
 1 row inserted/updated/deleted
 ij> insert into testing values (7, PADSTRING('aa bb cc dd ee ff gg',64768), 8, PADSTRING('aa bb cc dd ee ff gg',32384), 9);
 1 row inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
-ij> connect 'jdbc:derby:wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
 ij> -- select shoudl return 8 rows
 select * from testing;
 A          |B                                                                                                                               |C          |D                                                                                                                               |E          
@@ -1333,10 +1333,10 @@
 8 rows inserted/updated/deleted
 ij> update testing set b = PADSTRING('update 9',64768);
 8 rows inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
-ij> connect 'jdbc:derby:wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
 ij> -- select should return 8 rows
 select b from testing;
 B                                                                                                                               
@@ -1386,10 +1386,10 @@
 1 row inserted/updated/deleted
 ij> insert into testing values (PADSTRING('a a a a a a a a a a',64768), PADSTRING('b b b b b b b b b b',32384), PADSTRING('c c c c c c c c c c',64768), PADSTRING('d d d d d d d d d d',32384), PADSTRING('e e e e e e e e',64768));
 1 row inserted/updated/deleted
-ij> connect 'jdbc:derby:wombat;shutdown=true';
+ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
-ij> connect 'jdbc:derby:wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
+ij> connect 'wombat;rollForwardRecoveryFrom=extinout/mybackup/wombat';
 ij> -- select should return 10 rows
 select * from testing;
 A                                                                                                                               |B                                                                                                                               |C                                                                                                                               |D                                                                                                                               |E                                                                                                                               

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/urlLocale.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/urlLocale.out?rev=348593&r1=348592&r2=348593&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/urlLocale.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/urlLocale.out Wed Nov 23 15:42:53 2005
@@ -14,90 +14,90 @@
 0 rows inserted/updated/deleted
 ij> disconnect;
 ij> -- create a Swiss database
-connect 'jdbc:derby:swissdb;create=true;territory=fr_CH';
+connect 'swissdb;create=true;territory=fr_CH';
 ij> create procedure checkDatabaseLoc(in locale char(12)) parameter style java language java external name 'org.apache.derbyTesting.functionTests.tests.i18n.DefaultLocale.checkDatabaseLocale';
 0 rows inserted/updated/deleted
 ij> call checkDatabaseLoc('fr_CH');
 0 rows inserted/updated/deleted
 ij> disconnect;
-ij> connect 'jdbc:derby:swissdb;shutdown=true';
+ij> connect 'swissdb;shutdown=true';
 ERROR 08006: Arr EnC:>234< t de la base de donn EnC:>233< es 'swissdb'.
 ij> -- check it is still Swiss when we re-boot
-connect 'jdbc:derby:swissdb';
+connect 'swissdb';
 ij> call checkDatabaseLoc('fr_CH');
 0 rows inserted/updated/deleted
 ij> disconnect;
-ij> connect 'jdbc:derby:swissdb;shutdown=true';
+ij> connect 'swissdb;shutdown=true';
 ERROR 08006: Arr EnC:>234< t de la base de donn EnC:>233< es 'swissdb'.
 ij> -- Locale automatically converts the components to the correct case
 -- create a Hindi in India database (hi_IN)
-connect 'jdbc:derby:hindi;create=true;territory=HI_in';
+connect 'hindi;create=true;territory=HI_in';
 ij> create procedure checkDatabaseLoc(in locale char(12)) parameter style java language java external name 'org.apache.derbyTesting.functionTests.tests.i18n.DefaultLocale.checkDatabaseLocale';
 0 rows inserted/updated/deleted
 ij> call checkDatabaseLoc('hi_IN');
 0 rows inserted/updated/deleted
 ij> disconnect;
-ij> connect 'jdbc:derby:hindi;shutdown=true';
+ij> connect 'hindi;shutdown=true';
 ERROR 08006: Database 'hindi' shutdown.
 ij> -- now try one with a variant
 -- create a English in Israel database for JavaOS en_IL_JavaOS
-connect 'jdbc:derby:Israel;create=true;territory=en_IL_JavaOS';
+connect 'Israel;create=true;territory=en_IL_JavaOS';
 ij> create procedure checkDatabaseLoc(in locale char(12)) parameter style java language java external name 'org.apache.derbyTesting.functionTests.tests.i18n.DefaultLocale.checkDatabaseLocale';
 0 rows inserted/updated/deleted
 ij> call checkDatabaseLoc('en_IL_JavaOS');
 0 rows inserted/updated/deleted
 ij> disconnect;
-ij> connect 'jdbc:derby:Israel;shutdown=true';
+ij> connect 'Israel;shutdown=true';
 ERROR 08006: Database 'Israel' shutdown.
 ij> -- now try with just a language - we support this
 -- as some vms do.
-connect 'jdbc:derby:bacon;create=true;territory=da';
+connect 'bacon;create=true;territory=da';
 ij> create procedure checkDatabaseLoc(in locale char(12)) parameter style java language java external name 'org.apache.derbyTesting.functionTests.tests.i18n.DefaultLocale.checkDatabaseLocale';
 0 rows inserted/updated/deleted
 ij> call checkDatabaseLoc('da');
 0 rows inserted/updated/deleted
 ij> disconnect;
-ij> connect 'jdbc:derby:bacon;shutdown=true';
+ij> connect 'bacon;shutdown=true';
 ERROR 08006: Database 'bacon' shutdown.
-ij> connect 'jdbc:derby:bacon';
+ij> connect 'bacon';
 ij> call checkDatabaseLoc('da');
 0 rows inserted/updated/deleted
 ij> disconnect;
-ij> connect 'jdbc:derby:bacon;shutdown=true';
+ij> connect 'bacon;shutdown=true';
 ERROR 08006: Database 'bacon' shutdown.
 ij> --
 -- some negative tests
 --
-connect 'jdbc:derby:fail1;create=true;territory=';
+connect 'fail1;create=true;territory=';
 ERROR XJ041: Failed to create database 'fail1', see the next exception for details.
 ERROR XBM0X: Supplied territory description '' is invalid, expecting ln[_CO[_variant]]
 ln=lower-case two-letter ISO-639 language code, CO=upper-case two-letter ISO-3166 country codes, see java.util.Locale.
 ij> -- database will not have been created so this connection will fail
-connect 'jdbc:derby:fail1;shutdown=true';
+connect 'fail1;shutdown=true';
 ERROR XJ004: Database 'fail1' not found.
-ij> connect 'jdbc:derby:fail3;create=true;territory=en_';
+ij> connect 'fail3;create=true;territory=en_';
 ERROR XJ041: Failed to create database 'fail3', see the next exception for details.
 ERROR XBM0X: Supplied territory description 'en_' is invalid, expecting ln[_CO[_variant]]
 ln=lower-case two-letter ISO-639 language code, CO=upper-case two-letter ISO-3166 country codes, see java.util.Locale.
-ij> connect 'jdbc:derby:fail4;create=true;territory=en_d';
+ij> connect 'fail4;create=true;territory=en_d';
 ERROR XJ041: Failed to create database 'fail4', see the next exception for details.
 ERROR XBM0X: Supplied territory description 'en_d' is invalid, expecting ln[_CO[_variant]]
 ln=lower-case two-letter ISO-639 language code, CO=upper-case two-letter ISO-3166 country codes, see java.util.Locale.
-ij> connect 'jdbc:derby:fail5;create=true;territory=en_US_';
+ij> connect 'fail5;create=true;territory=en_US_';
 ERROR XJ041: Failed to create database 'fail5', see the next exception for details.
 ERROR XBM0X: Supplied territory description 'en_US_' is invalid, expecting ln[_CO[_variant]]
 ln=lower-case two-letter ISO-639 language code, CO=upper-case two-letter ISO-3166 country codes, see java.util.Locale.
-ij> connect 'jdbc:derby:fail6;create=true;territory=en-US';
+ij> connect 'fail6;create=true;territory=en-US';
 ERROR XJ041: Failed to create database 'fail6', see the next exception for details.
 ERROR XBM0X: Supplied territory description 'en-US' is invalid, expecting ln[_CO[_variant]]
 ln=lower-case two-letter ISO-639 language code, CO=upper-case two-letter ISO-3166 country codes, see java.util.Locale.
 ij> -- try using a database name with trailing blanks
 -- beetle 4653
-connect 'jdbc:derby:trailblank;create=true';
-ij> connect 'jdbc:derby:trailblank';
-ij(CONNECTION1)> connect 'jdbc:derby:trailblank     ';
-ij(CONNECTION2)> connect 'jdbc:derby:trailblank      ;shutdown=true';
+connect 'trailblank;create=true';
+ij> connect 'trailblank';
+ij(CONNECTION1)> connect 'trailblank     ';
+ij(CONNECTION2)> connect 'trailblank      ;shutdown=true';
 ERROR 08006: Database 'trailblank' shutdown.
-ij(CONNECTION2)> connect 'jdbc:derby:;shutdown=true';
+ij(CONNECTION2)> connect ';shutdown=true';
 ERROR XJ015: Derby system shutdown.
 ij(CONNECTION2)> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/DefaultLocale.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/DefaultLocale.java?rev=348593&r1=348592&r2=348593&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/DefaultLocale.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/DefaultLocale.java Wed Nov 23 15:42:53 2005
@@ -58,7 +58,6 @@
 	// used in messageLocale test
 	public static void checkDatabaseLocale(String Locale) throws SQLException
 	{
-		Connection conn = DriverManager.getConnection("jdbc:default:connection");
 		String dbLocale = org.apache.derby.iapi.db.Factory.getDatabaseOfConnection().getLocale().toString();
 		//System.out.println(dbLocale + "-");
 		//System.out.println(Locale + "-");

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/iepnegativetests_ES_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/iepnegativetests_ES_app.properties?rev=348593&r1=348592&r2=348593&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/iepnegativetests_ES_app.properties (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/iepnegativetests_ES_app.properties Wed Nov 23 15:42:53 2005
@@ -1,3 +1,4 @@
+ij.protocol=jdbc:derby:
 database=jdbc:derby:wombat;create=true;territory=es_MX;unicode=true
 useextdirs=true
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/urlLocale.sql
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/urlLocale.sql?rev=348593&r1=348592&r2=348593&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/urlLocale.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/urlLocale.sql Wed Nov 23 15:42:53 2005
@@ -12,67 +12,67 @@
 disconnect;
 
 -- create a Swiss database
-connect 'jdbc:derby:swissdb;create=true;territory=fr_CH';
+connect 'swissdb;create=true;territory=fr_CH';
 create procedure checkDatabaseLoc(in locale char(12)) parameter style java language java external name 'org.apache.derbyTesting.functionTests.tests.i18n.DefaultLocale.checkDatabaseLocale';
 call checkDatabaseLoc('fr_CH');
 disconnect;
-connect 'jdbc:derby:swissdb;shutdown=true';
+connect 'swissdb;shutdown=true';
 
 -- check it is still Swiss when we re-boot
-connect 'jdbc:derby:swissdb';
+connect 'swissdb';
 call checkDatabaseLoc('fr_CH');
 disconnect;
-connect 'jdbc:derby:swissdb;shutdown=true';
+connect 'swissdb;shutdown=true';
 
 
 -- Locale automatically converts the components to the correct case
 -- create a Hindi in India database (hi_IN)
-connect 'jdbc:derby:hindi;create=true;territory=HI_in';
+connect 'hindi;create=true;territory=HI_in';
 create procedure checkDatabaseLoc(in locale char(12)) parameter style java language java external name 'org.apache.derbyTesting.functionTests.tests.i18n.DefaultLocale.checkDatabaseLocale';
 call checkDatabaseLoc('hi_IN');
 disconnect;
-connect 'jdbc:derby:hindi;shutdown=true';
+connect 'hindi;shutdown=true';
 
 
 -- now try one with a variant
 -- create a English in Israel database for JavaOS en_IL_JavaOS
-connect 'jdbc:derby:Israel;create=true;territory=en_IL_JavaOS';
+connect 'Israel;create=true;territory=en_IL_JavaOS';
 create procedure checkDatabaseLoc(in locale char(12)) parameter style java language java external name 'org.apache.derbyTesting.functionTests.tests.i18n.DefaultLocale.checkDatabaseLocale';
 call checkDatabaseLoc('en_IL_JavaOS');
 disconnect;
-connect 'jdbc:derby:Israel;shutdown=true';
+connect 'Israel;shutdown=true';
 
 -- now try with just a language - we support this
 -- as some vms do.
-connect 'jdbc:derby:bacon;create=true;territory=da';
+connect 'bacon;create=true;territory=da';
 create procedure checkDatabaseLoc(in locale char(12)) parameter style java language java external name 'org.apache.derbyTesting.functionTests.tests.i18n.DefaultLocale.checkDatabaseLocale';
 call checkDatabaseLoc('da');
 disconnect;
-connect 'jdbc:derby:bacon;shutdown=true';
-connect 'jdbc:derby:bacon';
+connect 'bacon;shutdown=true';
+connect 'bacon';
 call checkDatabaseLoc('da');
 disconnect;
-connect 'jdbc:derby:bacon;shutdown=true';
+connect 'bacon;shutdown=true';
 
 
 --
 -- some negative tests
 --
-connect 'jdbc:derby:fail1;create=true;territory=';
+connect 'fail1;create=true;territory=';
 -- database will not have been created so this connection will fail
-connect 'jdbc:derby:fail1;shutdown=true';
+connect 'fail1;shutdown=true';
 
-connect 'jdbc:derby:fail3;create=true;territory=en_';
-connect 'jdbc:derby:fail4;create=true;territory=en_d';
-connect 'jdbc:derby:fail5;create=true;territory=en_US_';
-connect 'jdbc:derby:fail6;create=true;territory=en-US';
+connect 'fail3;create=true;territory=en_';
+connect 'fail4;create=true;territory=en_d';
+connect 'fail5;create=true;territory=en_US_';
+connect 'fail6;create=true;territory=en-US';
 
 -- try using a database name with trailing blanks
 -- beetle 4653
-connect 'jdbc:derby:trailblank;create=true';
-connect 'jdbc:derby:trailblank';
-connect 'jdbc:derby:trailblank     ';
-connect 'jdbc:derby:trailblank      ;shutdown=true';
+connect 'trailblank;create=true';
+connect 'trailblank';
+connect 'trailblank     ';
+connect 'trailblank      ;shutdown=true';
 
 
-connect 'jdbc:derby:;shutdown=true';
+connect ';shutdown=true';

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/urlLocale_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/urlLocale_app.properties?rev=348593&r1=348592&r2=348593&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/urlLocale_app.properties (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/urlLocale_app.properties Wed Nov 23 15:42:53 2005
@@ -1,6 +1,4 @@
-#Exclude for J2ME/Foundation  - test requires java.sql.DriverManager
-runwithfoundation=false
-
+ij.protocol=jdbc:derby:
 usedefaults=true
 
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/closed.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/closed.java?rev=348593&r1=348592&r2=348593&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/closed.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/closed.java Wed Nov 23 15:42:53 2005
@@ -58,8 +58,19 @@
 			// make the initial connection.
 			ij.getPropertyArg(args);
 			conn = ij.startJBMS();
-
-			String url = conn.getMetaData().getURL();
+			
+			boolean jsr169_test = false;
+			String url = new String();
+			try{
+				url = conn.getMetaData().getURL();
+			}
+			catch (NoSuchMethodError msme)
+			{
+				jsr169_test = true;
+				System.out.println("DatabaseMetaData.getURL not present - correct for JSR169");
+			} catch (Throwable err) {
+			    System.out.println("%%getURL() gave the exception: " + err);
+			}
 
 			passed = testDerby62(conn) && passed;
 
@@ -80,12 +91,13 @@
 				conn.close();
 			}
 
-			// shutdown the database
-			passed = shutdownTest(url, url + ";shutdown=true");
+			if(!jsr169_test){
+				// shutdown the database
+				passed = shutdownTest(url, url + ";shutdown=true");
 
-
-			// shutdown the system
-			passed = shutdownTest(url, "jdbc:derby:;shutdown=true");
+				// shutdown the system
+				passed = shutdownTest(url, "jdbc:derby:;shutdown=true");
+			}
 
 
 		} catch (Throwable e) {

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/closed_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/closed_app.properties?rev=348593&r1=348592&r2=348593&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/closed_app.properties (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/closed_app.properties Wed Nov 23 15:42:53 2005
@@ -1,5 +1,2 @@
-#Exclude for J2ME/Foundation - test requires java/sql/DatabaseMetaData.getURL()
-runwithfoundation=false
-
 usedefaults=true
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/errorStream_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/errorStream_app.properties?rev=348593&r1=348592&r2=348593&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/errorStream_app.properties (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/errorStream_app.properties Wed Nov 23 15:42:53 2005
@@ -14,6 +14,4 @@
 ij.dataSource.databaseName=wombat
 ij.dataSource.createDatabase=create
 
-#Exclude for J2ME/Foundation - test requires javax.naming.Referenceable
-runwithfoundation=false
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/functions_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/functions_app.properties?rev=348593&r1=348592&r2=348593&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/functions_app.properties (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/functions_app.properties Wed Nov 23 15:42:53 2005
@@ -1,4 +1,4 @@
-#Exclude for J2ME/Foundation - test requires java.math.BigDecimal
+#Exclude for J2ME/Foundation for now - test uses server-side JDBC
 runwithfoundation=false
 
 usedefaults=true

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/logStream.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/logStream.java?rev=348593&r1=348592&r2=348593&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/logStream.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/logStream.java Wed Nov 23 15:42:53 2005
@@ -25,6 +25,8 @@
 
 import org.apache.derby.tools.ij;
 import org.apache.derby.tools.JDBCDisplayUtil;
+import org.apache.derbyTesting.functionTests.util.TestUtil;
+import java.util.Properties;
 
 /**
  * Demonstrate subselect behavior with prepared statement. 
@@ -51,14 +53,24 @@
 		System.out.println("derby.log is directory ? " + derbyLog.isDirectory());
 		System.out.println("derby.log has content ?  " + (derbyLog.length() > 0));
 
-		System.out.println("SHUTDOWN Cloudscape");
-		try {
-			DriverManager.getConnection("jdbc:derby:;shutdown=true");
-			System.out.println("FAIL - shutdown returned connection");
-		} catch (SQLException sqle) {
-			System.out.println("SHUTDOWN :" + sqle.getMessage());
+		System.out.println("SHUTDOWN Derby");
+		if(TestUtil.HAVE_DRIVER_CLASS){
+			try {
+				DriverManager.getConnection("jdbc:derby:;shutdown=true");
+				System.out.println("FAIL - shutdown returned connection");
+			} catch (SQLException sqle) {
+				System.out.println("SHUTDOWN :" + sqle.getMessage());
+			}
+		}
+		else{	
+			//Call helper method which shuts down Derby using Datasource
+			try {
+				TestUtil.shutdownUsingDataSource("");
+				System.out.println("FAIL - shutdown returned connection");
+			} catch (SQLException sqle) {
+				System.out.println("SHUTDOWN :" + sqle.getMessage());
+			}
 		}
-
 
 		System.out.println("derby.log exists ?       " + derbyLog.exists());
 		System.out.println("derby.log is directory ? " + derbyLog.isDirectory());

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/logStream_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/logStream_app.properties?rev=348593&r1=348592&r2=348593&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/logStream_app.properties (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/logStream_app.properties Wed Nov 23 15:42:53 2005
@@ -1,5 +1,2 @@
-#Exclude for J2ME/Foundation - test requires java.sql.DriverManager
-runwithfoundation=false
-
 usedefaults=true
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/releaseCompileLocks_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/releaseCompileLocks_app.properties?rev=348593&r1=348592&r2=348593&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/releaseCompileLocks_app.properties (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/releaseCompileLocks_app.properties Wed Nov 23 15:42:53 2005
@@ -8,5 +8,5 @@
 ij.dataSource.databaseName=wombat
 ij.dataSource.createDatabase=create
 
-#Exclude for J2ME/Foundation - test requires java.sql.DriverManager
+#Exclude for J2ME/Foundation - test requires java.sql.DriverManager for server-side JDBC
 runwithfoundation=false

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Beetle6038_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Beetle6038_app.properties?rev=348593&r1=348592&r2=348593&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Beetle6038_app.properties (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Beetle6038_app.properties Wed Nov 23 15:42:53 2005
@@ -14,5 +14,5 @@
 #
 runwithj9=false
 
-#Exclude for J2ME/Foundation - test requires java.sql.Driver
+#Exclude for J2ME/Foundation - tests encryption not supported in Derby J2ME implementation
 runwithfoundation=false

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/MaxLogNumberRecovery_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/MaxLogNumberRecovery_app.properties?rev=348593&r1=348592&r2=348593&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/MaxLogNumberRecovery_app.properties (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/MaxLogNumberRecovery_app.properties Wed Nov 23 15:42:53 2005
@@ -9,7 +9,7 @@
 # initial connection to the database.
 #
 #
-database=jdbc:derby:maxlogwombat
+ij.database=jdbc:derby:maxlogwombat
 
-#Exclude for J2ME/Foundation - test requires java.sql.Driver
-runwithfoundation=false
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=maxlogwombat

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/MaxLogNumber_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/MaxLogNumber_app.properties?rev=348593&r1=348592&r2=348593&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/MaxLogNumber_app.properties (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/MaxLogNumber_app.properties Wed Nov 23 15:42:53 2005
@@ -9,7 +9,8 @@
 # initial connection to the database.
 #
 #
-database=jdbc:derby:maxlogwombat;create=true
+ij.database=jdbc:derby:maxlogwombat;create=true
 
-#Exclude for J2ME/Foundation - test requires java.sql.Driver
-runwithfoundation=false
+# DataSource properties, only used if ij.dataSource is set
+ij.dataSource.databaseName=maxlogwombat
+ij.dataSource.createDatabase=create
\ No newline at end of file



Mime
View raw message