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 my...@apache.org on 2006/11/29 16:21:29 UTC
svn commit: r480594 [1/2] - in /db/derby/code/branches/10.2/java:
drda/org/apache/derby/loc/drda/ engine/org/apache/derby/loc/
testing/org/apache/derbyTesting/functionTests/master/
testing/org/apache/derbyTesting/functionTests/master/j9_13/ testing/org...
Author: myrnavl
Date: Wed Nov 29 07:21:28 2006
New Revision: 480594
URL: http://svn.apache.org/viewvc?view=rev&rev=480594
Log:
DERBY-2110 - messages changes in 10.2
Modified:
db/derby/code/branches/10.2/java/drda/org/apache/derby/loc/drda/servlet_en.properties
db/derby/code/branches/10.2/java/engine/org/apache/derby/loc/messages_en.properties
db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out
db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/errorCode.out
db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/j9_13/errorCode.out
db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/j9_22/errorCode.out
Modified: db/derby/code/branches/10.2/java/drda/org/apache/derby/loc/drda/servlet_en.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/drda/org/apache/derby/loc/drda/servlet_en.properties?view=diff&rev=480594&r1=480593&r2=480594
==============================================================================
--- db/derby/code/branches/10.2/java/drda/org/apache/derby/loc/drda/servlet_en.properties (original)
+++ db/derby/code/branches/10.2/java/drda/org/apache/derby/loc/drda/servlet_en.properties Wed Nov 29 07:21:28 2006
@@ -59,7 +59,7 @@
SRV_NewMaxThreads=New maximum number of threads:
SRV_NewTimeSlice=New thread time slice:
SRV_Interupt=Connection interrupted.
-SRV_MaxTrys=Could not connect to server after {0} trys.
+SRV_MaxTrys=Could not connect to server after {0} tries.
SRV_NetworkServerError=Network Server Error
SRV_Message=Message is:{0}
SRV_MissingParam=Required parameter not set ("{0}")
Modified: db/derby/code/branches/10.2/java/engine/org/apache/derby/loc/messages_en.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/engine/org/apache/derby/loc/messages_en.properties?view=diff&rev=480594&r1=480593&r2=480594
==============================================================================
--- db/derby/code/branches/10.2/java/engine/org/apache/derby/loc/messages_en.properties (original)
+++ db/derby/code/branches/10.2/java/engine/org/apache/derby/loc/messages_en.properties Wed Nov 29 07:21:28 2006
@@ -26,7 +26,7 @@
XBM05.D=Startup failed due to missing product version information for {0}.
XBM06.D=Startup failed. An encrypted database cannot be accessed without the correct boot password.
XBM07.D=Startup failed. Boot password must be at least 8 bytes long.
-XBM08.D=Could not instantiage {0} StorageFactory class {1}.
+XBM08.D=Could not instantiate {0} StorageFactory class {1}.
XBM0G.D=Failed to start encryption engine. Please make sure you are running Java 2 and have downloaded an encryption provider such as jce and put it in your class path.
XBM0H.D=Directory {0} cannot be created.
@@ -108,8 +108,8 @@
XBCXR.S=Cannot re-encrypt a read-only database with a new boot password or an external encryption key .
XBCXS.S=Cannot configure a database for encryption, when database is in the log archive mode.
XBCXT.S=Cannot re-encrypt a database with a new boot password or an external encryption key, when database is in the log archive mode.
-XBCXU.S=Encryption of an un-encrypted database failed: {0}.
-XBCXV.S=Encryption of an encrypted database with a new key or a new password failed: {0}.
+XBCXU.S=Encryption of an un-encrypted database failed: {0}
+XBCXV.S=Encryption of an encrypted database with a new key or a new password failed: {0}
#../java/com/ibm/db2j/impl/BasicServices/CacheService/Generic/messages.properties
@@ -188,7 +188,7 @@
XSCB7.S=An internal error was encountered during a btree scan - current_rh is null = {0}, position key is null = {1}.
XSCB6.S=Limitation: Record of a btree secondary index cannot be updated or inserted due to lack of space on the page. Use the parameters derby.storage.pageSize and/or derby.storage.pageReservedSpace to work around this limitation.
XSCB5.S=During logical undo of a btree insert or delete the row could not be found in the tree.
-XSCB4.S=A method on a btree open scan has been called prior to positioning the scan on the first row (ie. no next() call has been made yet). The current state of the scan is ({0}).
+XSCB4.S=A method on a btree open scan has been called prior to positioning the scan on the first row (i.e. no next() call has been made yet). The current state of the scan is ({0}).
XSCB3.S=Unimplemented feature.
XSCB2.S=The required property {0} not found in the property list given to createConglomerate() for a btree secondary index.
XSCB1.S=Container {0} not found.
@@ -239,7 +239,7 @@
XSLAO.D=Recovery failed unexpected problem {0}.
XSLAN.D=Database at {0} has an incompatible format with the current version of the software. The database was created by or upgraded by version {1}.
XSLAM.D=Cannot verify database format at {1} due to IOException.
-XSLAL.D=log record size {2} exceeded the maximum allowable log file size {3}. Error encounted in log file {0}, position {1}
+XSLAL.D=log record size {2} exceeded the maximum allowable log file size {3}. Error encountered in log file {0}, position {1}.
XSLAK.D=Database has exceeded largest log file number {0}.
XSLAJ.D=The logging system has been marked to shut down due to an earlier problem and will not allow any more operations until the system shuts down and restarts.
XSLAI.D=Cannot log the checkpoint log record
@@ -295,8 +295,8 @@
58009.C.4=An error occurred during a deferred connect reset and the connection has been terminated. See chained exceptions for details.
58009.C.5=Insufficient data while reading from the network - expected a minimum of {0} bytes and received only {1} bytes. The connection has been terminated.
58009.C.6=Attempt to fully materialize lob data that is too large for the JVM. The connection has been terminated.
-58009.C.7=Network protocol exception: scldta length, {0}, is invalid for rdbcolid. The connection has been terminated.
-58009.C.8=Network protocol exception: scldta length, {0}, is invalid for pkgid. The connection has been terminated.
+58009.C.7=Network protocol exception: SCLDTA length, {0}, is invalid for RDBCOLID. The connection has been terminated.
+58009.C.8=Network protocol exception: SCLDTA length, {0}, is invalid for PKGID. The connection has been terminated.
58009.C.9=Network protocol exception: PKGNAMCSN length, {0}, is invalid at SQLAM {1}. The connection has been terminated.
58009.C.10=Network protocol exception: only one of the VCM, VCS length can be greater than 0. The connection has been terminated.
58009.C.11=The connection was terminated because the encoding is not supported.
@@ -309,7 +309,7 @@
58009.C.18=Network protocol exception: invalid FDOCA LID. The connection has been terminated.
58009.C.19=Network protocol exception: SECTKN was not returned. The connection has been terminated.
58009.C.20=Network protocol exception: only one of NVCM, NVCS can be non-null. The connection has been terminated.
-58009.C.21=Network protocol exception: scldta length, {0}, is invalid for rdbnam. The connection has been terminated.
+58009.C.21=Network protocol exception: SCLDTA length, {0}, is invalid for RDBNAM. The connection has been terminated.
58010.C=A network protocol error was encountered. A connection could not be established because the manager {0} at level {1} is not supported by the server.
@@ -339,13 +339,13 @@
XSTB2.M=Cannot log transaction changes, maybe trying to write to a read only database.
XSTB3.M=Cannot abort transaction because the log manager is null, probably due to an earlier error.
XSTB5.M=Creating database with logging disabled encountered unexpected problem.
-XSTB6.M=Cannot substitue a transaction table with another while one is already in use.
+XSTB6.M=Cannot substitute a transaction table with another while one is already in use.
# java/com/ibm/db2j/impl/Database/Storage/RawStore/Data/Generic
# transaction errors.
# sqlstate range: 40XD0 to 40XDZ
-40XD0=Container has been closed
-40XD1=Container was opened in read-only mode.
+40XD0=Container has been closed.
+40XD1=Container was opened in read-only mode.
40XD2=Container {0} cannot be opened; it either has been dropped or does not exist.
@@ -395,7 +395,7 @@
# sqlstate range: XSDF0 to XSDFZ
XSDF0.S=Could not create file {0} as it already exists.
XSDF1.S=Exception during creation of file {0} for container
-XSDF2.S=Exception during creation of file {0} for container, file could not be removed. The exeception was: {1}.
+XSDF2.S=Exception during creation of file {0} for container, file could not be removed. The exception was: {1}.
XSDF3.S=Cannot create segment {0}.
XSDF4.S=Exception during remove of file {0} for dropped container, file could not be removed {1}.
XSDF6.S=Cannot find the allocation page {0}.
@@ -560,13 +560,13 @@
42X43=The ResultSetMetaData returned for the class/object ''{0}'' was null. In order to use this class as an external virtual table, the ResultSetMetaData cannot be null.
42X44=Invalid length ''{0}'' in column specification.
42X45={0} is an invalid type for argument number {1} of {2}.
-42X46=There are multiple functions named ''{0}''. Use a the full signature or the specific name.
-42X47=There are multiple procedures named ''{0}''. Use a the full signature or the specific name.
+42X46=There are multiple functions named ''{0}''. Use the full signature or the specific name.
+42X47=There are multiple procedures named ''{0}''. Use the full signature or the specific name.
42X48=Value ''{1}'' is not a valid precision for {0}.
42X49=Value ''{0}'' is not a valid integer literal.
42X50=No method was found that matched the method call {0}.{1}({2}), tried all combinations of object and primitive types and any possible type conversion for any parameters the method call may have. The method might exist but it is not public and/or static, or the parameter types are not method invocation convertible.
42X51=The class ''{0}'' does not exist or is inaccessible. This can happen if the class is not public.
-42X52=Calling method (''{0}'') using a receiver of the Java primitive type ''{1}" is not allowed.
+42X52=Calling method (''{0}'') using a receiver of the Java primitive type ''{1}'' is not allowed.
42X53=The LIKE predicate can only have ''CHAR'' or ''VARCHAR'' operands. Type ''{0}'' is not permitted.
42X54=The Java method ''{0}'' has a ? as a receiver. This is not allowed.
42X55=Table name ''{1}'' should be the same as ''{0}''.
@@ -770,7 +770,7 @@
42Z50=INTERNAL ERROR: Unable to generate code for {0}.
42Z53=INTERNAL ERROR: Type of activation to generate for node choice {0} is unknown.
-42Z54.U=This excepiton stops the statement after parsing - no further processing is needed.
+42Z54.U=This exception stops the statement after parsing - no further processing is needed.
42Z55.U=Execution stopped after parsing by StopAfterParsing debug flag.
42Z56.U=Execution stopped after binding by StopAfterBinding debug flag.
42Z57.U=Execution stopped after optimizing by StopAfterOptimizing debug flag.
@@ -1250,7 +1250,7 @@
XJ097.S=Cannot rollback or release a savepoint that was not created by this connection.
XJ098.S=The auto-generated keys value {0} is invalid
XJ099.S=The Reader/Stream object does not contain length characters
-XJ100.S=The scale supplied by the registerOutParameter method does not match with the setter method. Possible loss of precision!"
+XJ100.S=The scale supplied by the registerOutParameter method does not match with the setter method. Possible loss of precision!
XJ102.S=Can not perform an insert at the current position.
XJ103.S=Table name can not be null
XJ104.S=Shared key length is invalid: {0}.
@@ -1413,8 +1413,8 @@
L005=\n------------ BEGIN ERROR STACK -------------\n
L006=\n------------ END ERROR STACK -------------\n
L007=WARNING: Log file not found, creating new log. Possible inconsistency in the database
-L008=Deleteing incompatible old Logfile {0}
-L009=Deleteing old Logfile {0}
+L008=Deleting incompatible old Logfile {0}
+L009=Deleting old Logfile {0}
L010=Incomplete log record detected in file {0} clearing log file from position {1} to eof at {2}.
L011=Checkpoint Daemon caught standard exception
L012=log record is Not first but transaction is not in transaction table : {0}
@@ -1430,7 +1430,7 @@
# Class Manager
C000=Wrote class {0} to file {1}. Please provide support with the file and the following exception information: {2}
-C001=Class {0} has a unknown certificate type in jar {1}, expecting X509 certificate.
+C001=Class {0} has an unknown certificate type in jar {1}, expecting X509 certificate.
C002=Security exception thrown accessing class {0} in jar {1} : {2}
C003=Exception loading database jar {0} - {1}
C004=Stale class loader for class {0}
Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out?view=diff&rev=480594&r1=480593&r2=480594
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out Wed Nov 29 07:21:28 2006
@@ -867,7 +867,7 @@
length of clob chosen is 10000
After drop
Expect to get an IOException, container has been closed
-EXPECTED IO Exception:ERROR 40XD0: Container has been closed
+EXPECTED IO Exception:ERROR 40XD0: Container has been closed.
START: clobNegativeTest_Derby265
-----------------------------
START: blobTestNegativeTest_Derby265
Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/errorCode.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/errorCode.out?view=diff&rev=480594&r1=480593&r2=480594
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/errorCode.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/errorCode.out Wed Nov 29 07:21:28 2006
@@ -133,7 +133,7 @@
ij> select * from new org.apache.derby.diag.ErrorMessages() c where sql_state = 'XBM08';
SQL_&|MESSAGE |SEVERITY
--------------------------------------------------------------------------------------------------------------------------------------------------
-XBM08|Could not instantiage {0} StorageFactory class {1}. |45000
+XBM08|Could not instantiate {0} StorageFactory class {1}. |45000
ij> select * from new org.apache.derby.diag.ErrorMessages() c where sql_state = 'XBM0G';
SQL_&|MESSAGE |SEVERITY
--------------------------------------------------------------------------------------------------------------------------------------------------
@@ -282,7 +282,7 @@
ij> select * from new org.apache.derby.diag.ErrorMessages() c where sql_state = 'XSLAL';
SQL_&|MESSAGE |SEVERITY
--------------------------------------------------------------------------------------------------------------------------------------------------
-XSLAL|log record size {2} exceeded the maximum allowable log file size {3}. Error encounted in log file {0}, position {1} |45000
+XSLAL|log record size {2} exceeded the maximum allowable log file size {3}. Error encountered in log file {0}, position {1}. |45000
ij> select * from new org.apache.derby.diag.ErrorMessages() c where sql_state = 'XSLAM';
SQL_&|MESSAGE |SEVERITY
--------------------------------------------------------------------------------------------------------------------------------------------------
@@ -400,7 +400,7 @@
ij> select * from new org.apache.derby.diag.ErrorMessages() c where sql_state = 'XSTB6';
SQL_&|MESSAGE |SEVERITY
--------------------------------------------------------------------------------------------------------------------------------------------------
-XSTB6|Cannot substitue a transaction table with another while one is already in use. |50000
+XSTB6|Cannot substitute a transaction table with another while one is already in use. |50000
ij> select * from new org.apache.derby.diag.ErrorMessages() c where sql_state = 'XJ015';
SQL_&|MESSAGE |SEVERITY
--------------------------------------------------------------------------------------------------------------------------------------------------
Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/j9_13/errorCode.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/j9_13/errorCode.out?view=diff&rev=480594&r1=480593&r2=480594
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/j9_13/errorCode.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/j9_13/errorCode.out Wed Nov 29 07:21:28 2006
@@ -133,7 +133,7 @@
ij> select * from new org.apache.derby.diag.ErrorMessages() c where sql_state = 'XBM08';
SQL_&|MESSAGE |SEVERITY
--------------------------------------------------------------------------------------------------------------------------------------------------
-XBM08|Could not instantiage {0} StorageFactory class {1}. |45000
+XBM08|Could not instantiate {0} StorageFactory class {1}. |45000
ij> select * from new org.apache.derby.diag.ErrorMessages() c where sql_state = 'XBM0G';
SQL_&|MESSAGE |SEVERITY
--------------------------------------------------------------------------------------------------------------------------------------------------
@@ -282,7 +282,7 @@
ij> select * from new org.apache.derby.diag.ErrorMessages() c where sql_state = 'XSLAL';
SQL_&|MESSAGE |SEVERITY
--------------------------------------------------------------------------------------------------------------------------------------------------
-XSLAL|log record size {2} exceeded the maximum allowable log file size {3}. Error encounted in log file {0}, position {1} |45000
+XSLAL|log record size {2} exceeded the maximum allowable log file size {3}. Error encountered in log file {0}, position {1}. |45000
ij> select * from new org.apache.derby.diag.ErrorMessages() c where sql_state = 'XSLAM';
SQL_&|MESSAGE |SEVERITY
--------------------------------------------------------------------------------------------------------------------------------------------------
@@ -400,7 +400,7 @@
ij> select * from new org.apache.derby.diag.ErrorMessages() c where sql_state = 'XSTB6';
SQL_&|MESSAGE |SEVERITY
--------------------------------------------------------------------------------------------------------------------------------------------------
-XSTB6|Cannot substitue a transaction table with another while one is already in use. |50000
+XSTB6|Cannot substitute a transaction table with another while one is already in use. |50000
ij> select * from new org.apache.derby.diag.ErrorMessages() c where sql_state = 'XJ015';
SQL_&|MESSAGE |SEVERITY
--------------------------------------------------------------------------------------------------------------------------------------------------