db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r413409 - in /db/derby/code/trunk/java: engine/org/apache/derby/loc/ testing/org/apache/derbyTesting/functionTests/master/ testing/org/apache/derbyTesting/functionTests/master/j9_13/ testing/org/apache/derbyTesting/functionTests/master/j9_2...
Date Sun, 11 Jun 2006 03:05:57 GMT
Author: fuzzylogic
Date: Sat Jun 10 20:05:56 2006
New Revision: 413409

URL: http://svn.apache.org/viewvc?rev=413409&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.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/errorCode.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_13/errorCode.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_22/errorCode.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rollForwardBackup.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rollForwardBackup_sed.properties

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties?rev=413409&r1=413408&r2=413409&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties Sat Jun 10
20:05:56 2006
@@ -208,7 +208,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/trunk/java/testing/org/apache/derbyTesting/functionTests/master/errorCode.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/errorCode.out?rev=413409&r1=413408&r2=413409&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/errorCode.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/errorCode.out
Sat Jun 10 20:05:56 2006
@@ -298,7 +298,7 @@
 ij> select * from new org.apache.derby.diag.ErrorMessages() c where sql_state = 'XSLAT';
 SQL_&|MESSAGE                                                                       
                                                 |SEVERITY   
 --------------------------------------------------------------------------------------------------------------------------------------------------
-XSLAT|Log directory {0} exists. Please make sure specified logDevice location is correct.
                                            |45000      
+XSLAT|The log directory '{0}' exists. The directory might belong to another database. Check
that the location specified for the logDe&|45000      
 ij> select * from new org.apache.derby.diag.ErrorMessages() c where sql_state = 'XSDB0';
 SQL_&|MESSAGE                                                                       
                                                 |SEVERITY   
 --------------------------------------------------------------------------------------------------------------------------------------------------

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_13/errorCode.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_13/errorCode.out?rev=413409&r1=413408&r2=413409&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_13/errorCode.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_13/errorCode.out
Sat Jun 10 20:05:56 2006
@@ -298,7 +298,7 @@
 ij> select * from new org.apache.derby.diag.ErrorMessages() c where sql_state = 'XSLAT';
 SQL_&|MESSAGE                                                                       
                                                 |SEVERITY   
 --------------------------------------------------------------------------------------------------------------------------------------------------
-XSLAT|Log directory {0} exists. Please make sure specified logDevice location is correct.
                                            |45000      
+XSLAT|The log directory '{0}' exists. The directory might belong to another database. Check
that the location specified for the logDe&|45000      
 ij> select * from new org.apache.derby.diag.ErrorMessages() c where sql_state = 'XSDB0';
 SQL_&|MESSAGE                                                                       
                                                 |SEVERITY   
 --------------------------------------------------------------------------------------------------------------------------------------------------

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_22/errorCode.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_22/errorCode.out?rev=413409&r1=413408&r2=413409&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_22/errorCode.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_22/errorCode.out
Sat Jun 10 20:05:56 2006
@@ -298,7 +298,7 @@
 ij> select * from new org.apache.derby.diag.ErrorMessages() c where sql_state = 'XSLAT';
 SQL_&|MESSAGE                                                                       
                                                 |SEVERITY   
 --------------------------------------------------------------------------------------------------------------------------------------------------
-XSLAT|Log directory {0} exists. Please make sure specified logDevice location is correct.
                                            |45000      
+XSLAT|The log directory '{0}' exists. The directory might belong to another database. Check
that the location specified for the logDe&|45000      
 ij> select * from new org.apache.derby.diag.ErrorMessages() c where sql_state = 'XSDB0';
 SQL_&|MESSAGE                                                                       
                                                 |SEVERITY   
 --------------------------------------------------------------------------------------------------------------------------------------------------

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rollForwardBackup.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rollForwardBackup.out?rev=413409&r1=413408&r2=413409&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
Sat Jun 10 20:05:56 2006
@@ -244,7 +244,7 @@
 --following connection shoul fail.
 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.  
+ERROR XSLAT: The log directory 'extinout<ps>crwombatlog<ps>log' exists. The directory
might belong to another database. Check that the location specified for the logDevice attribute
is correct.
 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        

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rollForwardBackup_sed.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rollForwardBackup_sed.properties?rev=413409&r1=413408&r2=413409&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rollForwardBackup_sed.properties
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rollForwardBackup_sed.properties
Sat Jun 10 20:05:56 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 extinout<ps>crwombatlog<ps>log
exists. Please make sure specified log,XSLAT: Log directory extinout/crwombatlog/log exists.;XSLAT:
Log directory extinout<ps>crwombat<ps>log exists.,XBM0Y: Backup database directory
nobackup.*wombat not found;XBM0Y: Backup database directory nobackup<ps>wombat not found,XBM0Y:
Backup database directory nobackup/wombat not found;XBM0Y: Backup database directory nobackup<ps>wombat
not found,XBM0Q: File extinout/mybackup/wombat/service.properties not found.;XBM0Q: File extinout<ps>mybackup<ps>wombat<ps>service.properties
not found.,XBM0Q: File extinout.*mybackup.*wombat.*service.properties not found.;XBM0Q: File
extinout<ps>mybackup<ps>wombat<ps>service.properties not found.,XSDG6: Data
segment directory not found in extinout/mybackup/wombat backup during restore.;XSDG6: Data
segment directory not found in extinout<ps>mybackup<ps>wombat backup during restore.,XSDG6:
D
 ata segment directory not found in extinout.*mybackup.*wombat backup during restore.;XSDG6:
Data segment directory not found in extinout<ps>mybackup<ps>wombat backup during
restore.,XSLAS: Log directory extinout/mybackup/wombat/log not found;XSLAS: Log directory
extinout<ps>mybackup<ps>wombat<ps>log not found,XSLAS: Log directory extinout.*mybackup.*wombat.*log
not found;XSLAS: Log directory extinout<ps>mybackup<ps>wombat<ps>log not
found
+substitute=XSLAT: The log directory 'extinout.*crwombatlog.*log';XSLAT: The log directory
'extinout<ps>crwombatlog<ps>log',XSLAT: The log directory 'extinout/crwombatlog/log';XSLAT:
Log directory 'extinout<ps>crwombat<ps>log',XBM0Y: Backup database directory nobackup.*wombat
not found;XBM0Y: Backup database directory nobackup<ps>wombat not found,XBM0Y: Backup
database directory nobackup/wombat not found;XBM0Y: Backup database directory nobackup<ps>wombat
not found,XBM0Q: File extinout/mybackup/wombat/service.properties not found.;XBM0Q: File extinout<ps>mybackup<ps>wombat<ps>service.properties
not found.,XBM0Q: File extinout.*mybackup.*wombat.*service.properties not found.;XBM0Q: File
extinout<ps>mybackup<ps>wombat<ps>service.properties not found.,XSDG6: Data
segment directory not found in extinout/mybackup/wombat backup during restore.;XSDG6: Data
segment directory not found in extinout<ps>mybackup<ps>wombat backup during restore.,XSDG6:
Data segment directory not found in 
 extinout.*mybackup.*wombat backup during restore.;XSDG6: Data segment directory not found
in extinout<ps>mybackup<ps>wombat backup during restore.,XSLAS: Log directory
extinout/mybackup/wombat/log not found;XSLAS: Log directory extinout<ps>mybackup<ps>wombat<ps>log
not found,XSLAS: Log directory extinout.*mybackup.*wombat.*log not found;XSLAS: Log directory
extinout<ps>mybackup<ps>wombat<ps>log not found



Mime
View raw message