You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2012/07/27 14:26:09 UTC
svn commit: r1366362 - in /db/derby/code/trunk/java:
engine/org/apache/derby/impl/store/raw/data/ engine/org/apache/derby/loc/
shared/org/apache/derby/shared/common/reference/
testing/org/apache/derbyTesting/functionTests/master/
testing/org/apache/der...
Author: rhillegas
Date: Fri Jul 27 12:26:08 2012
New Revision: 1366362
URL: http://svn.apache.org/viewvc?rev=1366362&view=rev
Log:
DERBY-5871: Fix capitalization errors in messages with error codes in MessageId.
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml
db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/MessageId.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/GetPropertyInfoTest.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java?rev=1366362&r1=1366361&r2=1366362&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java Fri Jul 27 12:26:08 2012
@@ -351,17 +351,17 @@ public class BaseDataFileFactory
}
logMsg(LINE);
- String readOnlyMsg = (isReadOnly())
- ? MessageService.getTextMessage(MessageId.STORE_BOOT_READONLY_MSG)
- : "";
+ String messageID = (isReadOnly()) ?
+ MessageId.STORE_BOOT_MSG_READ_ONLY
+ : MessageId.STORE_BOOT_MSG;
boolean logBootTrace = Boolean.valueOf(startParams.getProperty(Property.LOG_BOOT_TRACE,
PropertyUtil.getSystemProperty(Property.LOG_BOOT_TRACE))).booleanValue();
logMsg(new Date() +
- MessageService.getTextMessage(MessageId.STORE_BOOT_MSG,
+ MessageService.getTextMessage(messageID,
jbmsVersion,
identifier,
+ dataDirectory,
// cast to Object so we get object hash code
- dataDirectory + " " + readOnlyMsg,
(Object) this.getClass().getClassLoader(),
jarCPath
));
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml?rev=1366362&r1=1366361&r2=1366362&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml Fri Jul 27 12:26:08 2012
@@ -6020,7 +6020,7 @@ ln=lower-case two-letter ISO-639 languag
<msg>
<name>XSLAO.D</name>
- <text>Recovery failed unexpected problem {0}.</text>
+ <text>Recovery failed unexpected problem: {0}.</text>
<arg>value</arg>
</msg>
@@ -7611,6 +7611,19 @@ MessageId.java.
<title>Undocumented Raw Store Messages from MessageId.java</title>
<msg>
+ <name>D000</name>
+ <text>:
+Booting Derby (version {0}) instance {1}
+on database directory {2} in READ ONLY mode with class loader {3}.
+Loaded from {4}.</text>
+ <arg>derbyVersion</arg>
+ <arg>id</arg>
+ <arg>directoryName</arg>
+ <arg>classloader</arg>
+ <arg>JarClassPath</arg>
+ </msg>
+
+ <msg>
<name>D001</name>
<text>:
Booting Derby version {0}: instance {1}
@@ -7641,7 +7654,7 @@ Shutting down instance {0} on database d
<msg>
<name>D005</name>
- <text>moved old backup copy from {0} to {1}</text>
+ <text>Moved old backup copy from {0} to {1}</text>
<arg>filePath</arg>
<arg>filePath</arg>
</msg>
@@ -7654,18 +7667,18 @@ Shutting down instance {0} on database d
<msg>
<name>D007</name>
- <text>edited database service.properties to use default log device</text>
+ <text>Edited database service.properties to use default log device</text>
</msg>
<msg>
<name>D008</name>
- <text>error editing database service.properties, backup aborted: {0}</text>
+ <text>Error editing database service.properties, backup aborted: {0}</text>
<arg>errorMessage</arg>
</msg>
<msg>
<name>D009</name>
- <text>copied log directory from {0} to {1}</text>
+ <text>Copied log directory from {0} to {1}</text>
<arg>filePath</arg>
<arg>filePath</arg>
</msg>
@@ -7677,7 +7690,7 @@ Shutting down instance {0} on database d
<msg>
<name>D011</name>
- <text>removed old backup copy at {0}</text>
+ <text>Removed old backup copy at {0}</text>
<arg>filePath</arg>
</msg>
@@ -7697,11 +7710,6 @@ Shutting down instance {0} on database d
</msg>
<msg>
- <name>D014</name>
- <text>in READ ONLY mode</text>
- </msg>
-
- <msg>
<name>D015</name>
<text>Could not read further because another transaction has modified the value.</text>
</msg>
@@ -7759,102 +7767,102 @@ Shutting down instance {0} on database d
<msg>
<name>J004</name>
- <text>database identity</text>
+ <text>Database identity</text>
</msg>
<msg>
<name>J005</name>
- <text>shut down Derby</text>
+ <text>Shut down Derby</text>
</msg>
<msg>
<name>J006</name>
- <text>deregister AutoloadedDriver</text>
+ <text>Deregister AutoloadedDriver</text>
</msg>
<msg>
<name>J007</name>
- <text>create database</text>
+ <text>Create database</text>
</msg>
<msg>
<name>J008</name>
- <text>no details</text>
+ <text>No details</text>
</msg>
<msg>
<name>J010</name>
- <text>encrypt database on disk</text>
+ <text>Encrypt database on disk</text>
</msg>
<msg>
<name>J013</name>
- <text>upgrade database</text>
+ <text>Upgrade database</text>
</msg>
<msg>
<name>J016</name>
- <text>cryptographic service provider</text>
+ <text>Cryptographic service provider</text>
</msg>
<msg>
<name>J017</name>
- <text>cryptographic algorithm</text>
+ <text>Cryptographic algorithm</text>
</msg>
<msg>
<name>J018</name>
- <text>cryptographic key length</text>
+ <text>Cryptographic key length</text>
</msg>
<msg>
<name>J019</name>
- <text>external cryptographic key</text>
+ <text>External cryptographic key</text>
</msg>
<msg>
<name>J020</name>
- <text>secret cryptographic key</text>
+ <text>Secret cryptographic key</text>
</msg>
<msg>
<name>J021</name>
- <text>territory for the database</text>
+ <text>Territory for the database</text>
</msg>
<msg>
<name>J022</name>
- <text>user name</text>
+ <text>User name</text>
</msg>
<msg>
<name>J023</name>
- <text>user password</text>
+ <text>User password</text>
</msg>
<msg>
<name>J025</name>
- <text>log directory path</text>
+ <text>Log directory path</text>
</msg>
<msg>
<name>J028</name>
- <text>backup path for rollforward recovery</text>
+ <text>Backup path for roll-forward recovery</text>
</msg>
<msg>
<name>J029</name>
- <text>backup path for creating database from backup</text>
+ <text>Backup path for creating database from backup</text>
</msg>
<msg>
<name>J030</name>
- <text>backup path for restoring database from backup</text>
+ <text>Backup path for restoring database from backup</text>
</msg>
<msg>
<name>J031</name>
- <text>collation for chararcter datatypes</text>
+ <text>Collation for chararcter datatypes</text>
</msg>
<msg>
@@ -7911,37 +7919,37 @@ Shutting down instance {0} on database d
<msg>
<name>J110</name>
- <text>security mechanism not supported</text>
+ <text>Security mechanism not supported</text>
</msg>
<msg>
<name>J111</name>
- <text>password missing</text>
+ <text>Password missing</text>
</msg>
<msg>
<name>J112</name>
- <text>userid missing</text>
+ <text>Userid missing</text>
</msg>
<msg>
<name>J113</name>
- <text>userid or password invalid</text>
+ <text>Userid or password invalid</text>
</msg>
<msg>
<name>J114</name>
- <text>userid revoked</text>
+ <text>Userid revoked</text>
</msg>
<msg>
<name>J115</name>
- <text>new password invalid</text>
+ <text>New password invalid</text>
</msg>
<msg>
<name>J116</name>
- <text>local security service non-retryable error</text>
+ <text>Local security service non-retryable error</text>
</msg>
<msg>
@@ -7951,68 +7959,63 @@ Shutting down instance {0} on database d
<msg>
<name>J118</name>
- <text>password expired</text>
+ <text>Password expired</text>
</msg>
<msg>
<name>J120</name>
- <text>not specified</text>
+ <text>Unspecified connection error</text>
</msg>
<msg>
<name>J121</name>
- <text>the user is not authorized to access the database</text>
+ <text>The user is not authorized to access the database.</text>
</msg>
<msg>
<name>J122</name>
- <text>a command requesting services of the database was issued prior to the command requesting access to database (ACCRDB)</text>
+ <text>A command requesting services of the database was issued prior to the command requesting access to database (ACCRDB).</text>
</msg>
<msg>
<name>J123</name>
- <text>the requested command encountered an unarchitected and implementation-specific condition for which there was no architected message (additional information may be available in the derby.log file on the server)</text>
+ <text>The requested command encountered an unarchitected and implementation-specific condition for which there was no architected message (additional information may be available in the derby.log file on the server).</text>
</msg>
<msg>
<name>J124</name>
- <text>the access relational database (ACCRDB) command cannot be issued because the database is already currently accessed</text>
+ <text>The access relational database (ACCRDB) command cannot be issued because the database is already currently accessed.</text>
</msg>
<msg>
<name>J125</name>
- <text>a Data Descriptor Mismatch Error was detected.</text>
+ <text>A Data Descriptor Mismatch Error was detected.</text>
</msg>
<msg>
<name>J126</name>
- <text>a conversational protocol error was detected. Reason: 0x{0}.</text>
+ <text>A conversational protocol error was detected. Reason: 0x{0}.</text>
<arg>hexNumber</arg>
</msg>
<msg>
- <name>J127</name>
- <text>parseSQLDIAGGRP is not yet implemented</text>
- </msg>
-
- <msg>
<name>J128</name>
- <text>the cursor is not open</text>
+ <text>The cursor is not open.</text>
</msg>
<msg>
<name>J129</name>
- <text>an Open Query command was issued for a query which was already open</text>
+ <text>An Open Query command was issued for a query which was already open.</text>
</msg>
<msg>
<name>J130</name>
- <text>A PROTOCOL Invalid FDOCA Description Error was detected</text>
+ <text>A protocol error (Invalid FDOCA Description Error) was detected.</text>
</msg>
<msg>
<name>J131</name>
- <text>A PROTOCOL Data Stream Syntax Error was detected. Reason: 0x{0}. Plaintext connection attempt to an SSL enabled server?</text>
+ <text>A protocol error (Data Stream Syntax Error) was detected. Reason: 0x{0}. Perhaps this is an attempt to open a plaintext connection to an SSL enabled server.</text>
<arg>hexNumber</arg>
</msg>
@@ -8120,13 +8123,13 @@ Shutting down instance {0} on database d
<msg>
<name>L012</name>
- <text>log record is Not first but transaction is not in transaction table : {0}</text>
+ <text>Log record is Not first but transaction is not in transaction table : {0}</text>
<arg>transactionID</arg>
</msg>
<msg>
<name>L013</name>
- <text>log record is first but transaction is already in transaction table : {0}</text>
+ <text>Log record is first but transaction is already in transaction table : {0}</text>
<arg>transactionID</arg>
</msg>
@@ -8137,19 +8140,19 @@ Shutting down instance {0} on database d
<msg>
<name>L015</name>
- <text>new log file exist and cannot be deleted {0}</text>
+ <text>New log file exist and cannot be deleted {0}</text>
<arg>fileName</arg>
</msg>
<msg>
<name>L016</name>
- <text>cannot create a new log file {0}</text>
+ <text>Cannot create a new log file {0}</text>
<arg>fileName</arg>
</msg>
<msg>
<name>L017</name>
- <text>cannot create a new log file {0} due to {1}</text>
+ <text>Cannot create a new log file {0} due to {1}</text>
<arg>fileName</arg>
<arg>errorMessage</arg>
</msg>
@@ -8304,7 +8307,7 @@ Shutting down instance {0} on database d
<msg>
<name>N001</name>
- <text>caused by</text>
+ <text>This error is caused by the following error.</text>
</msg>
</family>
Modified: db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/MessageId.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/MessageId.java?rev=1366362&r1=1366361&r2=1366362&view=diff
==============================================================================
--- db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/MessageId.java (original)
+++ db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/MessageId.java Fri Jul 27 12:26:08 2012
@@ -75,6 +75,7 @@ public interface MessageId {
* Raw Store data
*/
+ String STORE_BOOT_MSG_READ_ONLY = "D000";
String STORE_BOOT_MSG = "D001";
String STORE_SHUTDOWN_MSG = "D002";
String STORE_BACKUP_STARTED = "D004";
@@ -88,7 +89,6 @@ public interface MessageId {
String STORE_BACKUP_COMPLETED = "D012";
String STORE_DURABILITY_TESTMODE_NO_SYNC = "D013"; // for derby.system.durability is
// set to test
- String STORE_BOOT_READONLY_MSG = "D014";
/**
* When the specified overflow page isn't found while streaming from a
* page overflow chain (large data values, typically BLOB or CLOB).
@@ -159,7 +159,6 @@ public interface MessageId {
String CONN_DRDA_RDBACCRM = "J124";
String CONN_DRDA_DTARMCHRM = "J125";
String CONN_DRDA_PRCCNVRM = "J126";
- String CONN_PARSE_SQLDIAGGRP_NOT_IMPLEMENTED = "J127";
String CONN_CURSOR_NOT_OPEN = "J128";
String CONN_DRDA_QRYOPEN = "J129";
String CONN_DRDA_INVALIDFDOCA = "J130";
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/GetPropertyInfoTest.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/GetPropertyInfoTest.out?rev=1366362&r1=1366361&r2=1366362&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/GetPropertyInfoTest.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/GetPropertyInfoTest.out Fri Jul 27 12:26:08 2012
@@ -1,40 +1,40 @@
Test GetPropertyInfoTest starting
-databaseName - value: EncryptedDB - description: database identity - required false
-encryptionProvider - value: null - description: cryptographic service provider - required false - choices null
-encryptionAlgorithm - value: null - description: cryptographic algorithm - required false - choices null
-encryptionKeyLength - value: null - description: cryptographic key length - required false - choices null
-encryptionKey - value: null - description: external cryptographic key - required false - choices null
-territory - value: null - description: territory for the database - required false - choices null
-collation - value: null - description: collation for chararcter datatypes - required false - choices null
-user - value: null - description: user name - required false - choices null
-logDevice - value: null - description: log directory path - required false - choices null
-rollForwardRecoveryFrom - value: null - description: backup path for rollforward recovery - required false - choices null
-createFrom - value: null - description: backup path for creating database from backup - required false - choices null
-restoreFrom - value: null - description: backup path for restoring database from backup - required false - choices null
-bootPassword - value: - description: secret cryptographic key - required false - choices null
-password - value: - description: user password - required false - choices null
-shutdown - value: false - description: shut down Derby - required false - choices [0] : false - choices [1] : true
-deregister - value: false - description: deregister AutoloadedDriver - required false - choices [0] : false - choices [1] : true
-create - value: true - description: create database - required false - choices [0] : false - choices [1] : true
-dataEncryption - value: true - description: encrypt database on disk - required false - choices [0] : false - choices [1] : true
-upgrade - value: false - description: upgrade database - required false - choices [0] : false - choices [1] : true
-databaseName - value: - description: database identity - required false - choices [0] : EncryptedDB
-encryptionProvider - value: null - description: cryptographic service provider - required false - choices null
-encryptionAlgorithm - value: null - description: cryptographic algorithm - required false - choices null
-encryptionKeyLength - value: null - description: cryptographic key length - required false - choices null
-encryptionKey - value: null - description: external cryptographic key - required false - choices null
-territory - value: null - description: territory for the database - required false - choices null
-collation - value: null - description: collation for chararcter datatypes - required false - choices null
-user - value: null - description: user name - required false - choices null
-logDevice - value: null - description: log directory path - required false - choices null
-rollForwardRecoveryFrom - value: null - description: backup path for rollforward recovery - required false - choices null
-createFrom - value: null - description: backup path for creating database from backup - required false - choices null
-restoreFrom - value: null - description: backup path for restoring database from backup - required false - choices null
-bootPassword - value: **** - description: secret cryptographic key - required false - choices null
-password - value: - description: user password - required false - choices null
-shutdown - value: false - description: shut down Derby - required false - choices [0] : false - choices [1] : true
-deregister - value: false - description: deregister AutoloadedDriver - required false - choices [0] : false - choices [1] : true
-create - value: true - description: create database - required false - choices [0] : false - choices [1] : true
-dataEncryption - value: true - description: encrypt database on disk - required false - choices [0] : false - choices [1] : true
-upgrade - value: false - description: upgrade database - required false - choices [0] : false - choices [1] : true
+databaseName - value: EncryptedDB - description: Database identity - required false
+encryptionProvider - value: null - description: Cryptographic service provider - required false - choices null
+encryptionAlgorithm - value: null - description: Cryptographic algorithm - required false - choices null
+encryptionKeyLength - value: null - description: Cryptographic key length - required false - choices null
+encryptionKey - value: null - description: External cryptographic key - required false - choices null
+territory - value: null - description: Territory for the database - required false - choices null
+collation - value: null - description: Collation for chararcter datatypes - required false - choices null
+user - value: null - description: User name - required false - choices null
+logDevice - value: null - description: Log directory path - required false - choices null
+rollForwardRecoveryFrom - value: null - description: Backup path for roll-forward recovery - required false - choices null
+createFrom - value: null - description: Backup path for creating database from backup - required false - choices null
+restoreFrom - value: null - description: Backup path for restoring database from backup - required false - choices null
+bootPassword - value: - description: Secret cryptographic key - required false - choices null
+password - value: - description: User password - required false - choices null
+shutdown - value: false - description: Shut down Derby - required false - choices [0] : false - choices [1] : true
+deregister - value: false - description: Deregister AutoloadedDriver - required false - choices [0] : false - choices [1] : true
+create - value: true - description: Create database - required false - choices [0] : false - choices [1] : true
+dataEncryption - value: true - description: Encrypt database on disk - required false - choices [0] : false - choices [1] : true
+upgrade - value: false - description: Upgrade database - required false - choices [0] : false - choices [1] : true
+databaseName - value: - description: Database identity - required false - choices [0] : EncryptedDB
+encryptionProvider - value: null - description: Cryptographic service provider - required false - choices null
+encryptionAlgorithm - value: null - description: Cryptographic algorithm - required false - choices null
+encryptionKeyLength - value: null - description: Cryptographic key length - required false - choices null
+encryptionKey - value: null - description: External cryptographic key - required false - choices null
+territory - value: null - description: Territory for the database - required false - choices null
+collation - value: null - description: Collation for chararcter datatypes - required false - choices null
+user - value: null - description: User name - required false - choices null
+logDevice - value: null - description: Log directory path - required false - choices null
+rollForwardRecoveryFrom - value: null - description: Backup path for roll-forward recovery - required false - choices null
+createFrom - value: null - description: Backup path for creating database from backup - required false - choices null
+restoreFrom - value: null - description: Backup path for restoring database from backup - required false - choices null
+bootPassword - value: **** - description: Secret cryptographic key - required false - choices null
+password - value: - description: User password - required false - choices null
+shutdown - value: false - description: Shut down Derby - required false - choices [0] : false - choices [1] : true
+deregister - value: false - description: Deregister AutoloadedDriver - required false - choices [0] : false - choices [1] : true
+create - value: true - description: Create database - required false - choices [0] : false - choices [1] : true
+dataEncryption - value: true - description: Encrypt database on disk - required false - choices [0] : false - choices [1] : true
+upgrade - value: false - description: Upgrade database - required false - choices [0] : false - choices [1] : true
Test GetPropertyInfoTest finished
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java?rev=1366362&r1=1366361&r2=1366362&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java Fri Jul 27 12:26:08 2012
@@ -244,7 +244,7 @@ public final class ErrorCodeTest extends
{"XSLAL","log record size {2} exceeded the maximum allowable log file size {3}. Error encountered in log file {0}, position {1}.","45000"},
{"XSLAM","Cannot verify database format at {1} due to IOException.","45000"},
{"XSLAN","Database at {0} has an incompatible format with the current version of the software. The database was created by or upgraded by version {1}.","45000"},
- {"XSLAO","Recovery failed unexpected problem {0}.","45000"},
+ {"XSLAO","Recovery failed unexpected problem: {0}.","45000"},
{"XSLAP","Database at {0} is at version {1}. Beta databases cannot be upgraded,","45000"},
{"XSLAQ","cannot create log file at directory {0}.","45000"},
{"XSLAR","Unable to copy log file '{0}' to '{1}' during restore. Please make sure that there is enough space and permissions are correct. ","45000"},