Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 49537 invoked from network); 11 Jun 2006 03:26:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 11 Jun 2006 03:26:07 -0000 Received: (qmail 38937 invoked by uid 500); 11 Jun 2006 03:26:07 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 38906 invoked by uid 500); 11 Jun 2006 03:26:07 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 38895 invoked by uid 99); 11 Jun 2006 03:26:07 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 Jun 2006 20:26:07 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 Jun 2006 20:26:06 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 68BD31A983A; Sat, 10 Jun 2006 20:25:46 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r413410 - in /db/derby/code/branches/10.1/java: engine/org/apache/derby/loc/ testing/org/apache/derbyTesting/functionTests/master/ testing/org/apache/derbyTesting/functionTests/tests/store/ Date: Sun, 11 Jun 2006 03:25:45 -0000 To: derby-commits@db.apache.org From: fuzzylogic@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060611032546.68BD31A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: fuzzylogic Date: Sat Jun 10 20:25:45 2006 New Revision: 413410 URL: http://svn.apache.org/viewvc?rev=413410&view=rev Log: DERBY-1376: Update XSLAT message to provide a better warning that the value given to the logDevice attribute in the connection URL may contain another database. Merge of revision 413409 from trunk. errorCode test did not contain the relevant sections changed in the trunk. Modified: db/derby/code/branches/10.1/java/engine/org/apache/derby/loc/messages_en.properties db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/rollForwardBackup.out db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/store/rollForwardBackup_sed.properties Modified: db/derby/code/branches/10.1/java/engine/org/apache/derby/loc/messages_en.properties URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/engine/org/apache/derby/loc/messages_en.properties?rev=413410&r1=413409&r2=413410&view=diff ============================================================================== --- db/derby/code/branches/10.1/java/engine/org/apache/derby/loc/messages_en.properties (original) +++ db/derby/code/branches/10.1/java/engine/org/apache/derby/loc/messages_en.properties Sat Jun 10 20:25:45 2006 @@ -201,7 +201,7 @@ # java/com/ibm/db2j/impl/Database/Storage/RawStore/Log/Generic # database errors. # sqlstate range: XSLA0 to XSLAZ -XSLAT.D=Log directory {0} exists. Please make sure specified logDevice location is correct. +XSLAT.D=The log directory ''{0}'' exists. The directory might belong to another database. Check that the location specified for the logDevice attribute is correct. XSLAS.D=Log directory {0} not found in backup during restore. Please make sure that backup copy is the correct one and it is not corrupted. XSLAR.D=Unable to copy log file ''{0}'' to ''{1}'' during restore. Please make sure that there is enough space and permissions are correct. XSLAQ.D=cannot create log file at directory {0}. Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/rollForwardBackup.out URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/rollForwardBackup.out?rev=413410&r1=413409&r2=413410&view=diff ============================================================================== --- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/rollForwardBackup.out (original) +++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/rollForwardBackup.out Sat Jun 10 20:25:45 2006 @@ -244,7 +244,7 @@ --following connection shoul fail. connect 'jdbc:derby: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 extinoutcrwombatloglog exists. Please make sure specified logDevice location is correct. +ERROR XSLAT: The log directory 'extinoutcrwombatloglog' exists. The directory might belong to another database. Check that the location specified for the logDevice attribute is correct. ij> connect 'jdbc:derby: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 Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/store/rollForwardBackup_sed.properties URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/store/rollForwardBackup_sed.properties?rev=413410&r1=413409&r2=413410&view=diff ============================================================================== --- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/store/rollForwardBackup_sed.properties (original) +++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/store/rollForwardBackup_sed.properties Sat Jun 10 20:25:45 2006 @@ -9,4 +9,4 @@ --------------------------------------------------------------------------------- # needed for platform tests; path separator masking # note, the .* seems to take away too much on occasion, however, without it, nothing gets picked up. -substitute=XSLAT: Log directory extinout.*crwombatlog.*log;XSLAT: Log directory extinoutcrwombatloglog exists. Please make sure specified log,XSLAT: Log directory extinout/crwombatlog/log exists.;XSLAT: Log directory extinoutcrwombatlog exists.,XBM0Y: Backup database directory nobackup.*wombat not found;XBM0Y: Backup database directory nobackupwombat not found,XBM0Y: Backup database directory nobackup/wombat not found;XBM0Y: Backup database directory nobackupwombat not found,XBM0Q: File extinout/mybackup/wombat/service.properties not found.;XBM0Q: File extinoutmybackupwombatservice.properties not found.,XBM0Q: File extinout.*mybackup.*wombat.*service.properties not found.;XBM0Q: File extinoutmybackupwombatservice.properties not found.,XSDG6: Data segment directory not found in extinout/mybackup/wombat backup during restore.;XSDG6: Data segment directory not found in extinoutmybackupwombat backup during restore.,XSDG6: D ata segment directory not found in extinout.*mybackup.*wombat backup during restore.;XSDG6: Data segment directory not found in extinoutmybackupwombat backup during restore.,XSLAS: Log directory extinout/mybackup/wombat/log not found;XSLAS: Log directory extinoutmybackupwombatlog not found,XSLAS: Log directory extinout.*mybackup.*wombat.*log not found;XSLAS: Log directory extinoutmybackupwombatlog not found +substitute=XSLAT: The log directory 'extinout.*crwombatlog.*log';XSLAT: The log directory 'extinoutcrwombatloglog',XSLAT: The log directory 'extinout/crwombatlog/log';XSLAT: Log directory 'extinoutcrwombatlog',XBM0Y: Backup database directory nobackup.*wombat not found;XBM0Y: Backup database directory nobackupwombat not found,XBM0Y: Backup database directory nobackup/wombat not found;XBM0Y: Backup database directory nobackupwombat not found,XBM0Q: File extinout/mybackup/wombat/service.properties not found.;XBM0Q: File extinoutmybackupwombatservice.properties not found.,XBM0Q: File extinout.*mybackup.*wombat.*service.properties not found.;XBM0Q: File extinoutmybackupwombatservice.properties not found.,XSDG6: Data segment directory not found in extinout/mybackup/wombat backup during restore.;XSDG6: Data segment directory not found in extinoutmybackupwombat backup during restore.,XSDG6: Data segment directory not found in extinout.*mybackup.*wombat backup during restore.;XSDG6: Data segment directory not found in extinoutmybackupwombat backup during restore.,XSLAS: Log directory extinout/mybackup/wombat/log not found;XSLAS: Log directory extinoutmybackupwombatlog not found,XSLAS: Log directory extinout.*mybackup.*wombat.*log not found;XSLAS: Log directory extinoutmybackupwombatlog not found