Author: rhillegas Date: Mon Aug 6 19:43:44 2012 New Revision: 1369949 URL: http://svn.apache.org/viewvc?rev=1369949&view=rev Log: DERBY-5879: Fix some spelling and capitalization errors in Derby messages. Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_en.properties db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/GetPropertyInfoTest.out db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/refActions2.out db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_en.properties URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_en.properties?rev=1369949&r1=1369948&r2=1369949&view=diff ============================================================================== --- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_en.properties (original) +++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_en.properties Mon Aug 6 19:43:44 2012 @@ -86,7 +86,7 @@ DRDA_SQLException.S={0} DRDA_SQLWarning.I={0} DRDA_MissingValue.U=Missing required value: {0}. DRDA_InvalidPropVal.S=Invalid value for property, {0}, value: {1}. -DRDA_SessionNotFound.U=Session, {0}, not found or other error occurred starting tracing. Check runtimeinfo for valid session numbers and derby error log for possible permission errors or IO errors accesing the trace file. +DRDA_SessionNotFound.U=Session, {0}, not found or other error occurred starting tracing. Check runtimeinfo for valid session numbers and derby error log for possible permission errors or IO errors accessing the trace file. DRDA_ErrorStartingTracing.S=Error starting tracing. This can be caused by permission errors or IO error accessing the trace directory. Check derby error log for details. # arg0 = maxThreadCount 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=1369949&r1=1369948&r2=1369949&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 Mon Aug 6 19:43:44 2012 @@ -2215,7 +2215,7 @@ Guide. 42XAH - A NEXT VALUE FOR expression may not appear in many contexts, including WHERE, ON, HAVING, ORDER BY, DISTINCT, CASE, GENERATION, and AGGREGATE clauses as well as WINDOW functions and CHECK constraints. + A NEXT VALUE FOR expression may not appear in many contexts, including WHERE, ON, HAVING, ORDER BY, DISTINCT, CASE, GENERATION, and AGGREGATE clauses as well as WINDOW functions and CHECK CONSTRAINTS. @@ -4120,7 +4120,7 @@ ln=lower-case two-letter ISO-639 languag XCL38.S - the delete rule of foreign key must be {0}. (The relationship would cause the table to be delete-connected to the same table through multiple relationships and such relationships must have the same delete rule (NO ACTION, RESTRICT or CASCADE).) + The delete rule of foreign key must be {0}. The relationship would cause the table to be delete-connected to the same table through multiple relationships and such relationships must have the same delete rule (NO ACTION, RESTRICT or CASCADE). ruleName @@ -4136,7 +4136,7 @@ ln=lower-case two-letter ISO-639 languag XCL41.S - the delete rule of foreign key can not be CASCADE. (The relationship would cause another table to be delete-connected to the same table through multiple paths with different delete rules or with delete rule equal to SET NULL.) + The delete rule of foreign key can not be CASCADE. (The relationship would cause another table to be delete-connected to the same table through multiple paths with different delete rules or with delete rule equal to SET NULL.) @@ -4447,12 +4447,12 @@ ln=lower-case two-letter ISO-639 languag XJ010.S - Cannot issue savepoint when autoCommit is on. + Cannot issue SAVEPOINT when autoCommit is on. XJ011.S - Cannot pass null for savepoint name. + Cannot pass null for SAVEPOINT name. @@ -4463,12 +4463,12 @@ ln=lower-case two-letter ISO-639 languag XJ013.S - No ID for named savepoints. + No identifier for named SAVEPOINTS. XJ014.S - No name for un-named savepoints. + No name for un-named SAVEPOINTS. @@ -5131,7 +5131,7 @@ ln=lower-case two-letter ISO-639 languag XRE00 - This LogFactory module does not support replicatiosn. + This LogFactory module does not support replication. XRE01 @@ -5255,7 +5255,7 @@ ln=lower-case two-letter ISO-639 languag XRE43 - Unexpected error when trying to stop replication slave mode. To stop repliation slave mode, use operation 'stopSlave' or 'failover'. + Unexpected error when trying to stop replication slave mode. To stop replication slave mode, use operation 'stopSlave' or 'failover'. @@ -5288,13 +5288,13 @@ ln=lower-case two-letter ISO-639 languag XSAM2.S - There is no index or conglomerate with conglom id '{0}' to drop. + There is no index or conglomerate with conglomerate id '{0}' to drop. conglomID XSAM3.S - There is no index or conglomerate with conglom id '{0}'. + There is no index or conglomerate with conglomerate id '{0}'. conglomID @@ -7962,7 +7962,7 @@ Shutting down instance {0} on database d J031 - Collation for chararcter datatypes + Collation for character datatypes @@ -8049,7 +8049,7 @@ Shutting down instance {0} on database d J116 - Local security service non-retryable error + Local security service error for an operation which cannot be retried. 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=1369949&r1=1369948&r2=1369949&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 Mon Aug 6 19:43:44 2012 @@ -5,7 +5,7 @@ encryptionAlgorithm - value: null - desc 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 +collation - value: null - description: Collation for character 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 @@ -24,7 +24,7 @@ encryptionAlgorithm - value: null - desc 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 +collation - value: null - description: Collation for character 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 Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/refActions2.out URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/refActions2.out?rev=1369949&r1=1369948&r2=1369949&view=diff ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/refActions2.out (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/refActions2.out Mon Aug 6 19:43:44 2012 @@ -83,7 +83,7 @@ ij> alter table t3 add constraint c3 for 0 rows inserted/updated/deleted ij> alter table t3 add constraint c4 foreign key (k) references t2(y) on delete set null; -ERROR 42915: Foreign Key 'C4' is invalid for the reason which follows: 'the delete rule of foreign key must be CASCADE. (The relationship would cause the table to be delete-connected to the same table through multiple relationships and such relationships must have the same delete rule (NO ACTION, RESTRICT or CASCADE).) '. +ERROR 42915: Foreign Key 'C4' is invalid for the reason which follows: 'The delete rule of foreign key must be CASCADE. The relationship would cause the table to be delete-connected to the same table through multiple relationships and such relationships must have the same delete rule (NO ACTION, RESTRICT or CASCADE). '. ij> alter table t2 drop constraint c1; 0 rows inserted/updated/deleted ij> alter table t1 drop constraint c2; @@ -343,7 +343,7 @@ ij> alter table t3 add constraint c2 for 0 rows inserted/updated/deleted ij> alter table t3 add constraint c3 foreign key (m) references t2(y) on delete set null; -ERROR 42915: Foreign Key 'C3' is invalid for the reason which follows: 'the delete rule of foreign key must be CASCADE. (The relationship would cause the table to be delete-connected to the same table through multiple relationships and such relationships must have the same delete rule (NO ACTION, RESTRICT or CASCADE).) '. +ERROR 42915: Foreign Key 'C3' is invalid for the reason which follows: 'The delete rule of foreign key must be CASCADE. The relationship would cause the table to be delete-connected to the same table through multiple relationships and such relationships must have the same delete rule (NO ACTION, RESTRICT or CASCADE). '. ij> alter table t2 drop constraint c1; 0 rows inserted/updated/deleted ij> alter table t3 drop constraint c2; @@ -362,7 +362,7 @@ ij> create table t2(x int references t1( 0 rows inserted/updated/deleted ij> create table t3(l int references t1(a) ON DELETE CASCADE , m int references t2(y) ON DELETE SET NULL); -ERROR 42915: Foreign Key 'xxxxGENERATED-IDxxxx' is invalid for the reason which follows: 'the delete rule of foreign key must be CASCADE. (The relationship would cause the table to be delete-connected to the same table through multiple relationships and such relationships must have the same delete rule (NO ACTION, RESTRICT or CASCADE).) '. +ERROR 42915: Foreign Key 'xxxxGENERATED-IDxxxx' is invalid for the reason which follows: 'The delete rule of foreign key must be CASCADE. The relationship would cause the table to be delete-connected to the same table through multiple relationships and such relationships must have the same delete rule (NO ACTION, RESTRICT or CASCADE). '. ij> alter table t2 drop constraint c1; 0 rows inserted/updated/deleted ij> drop table t1; @@ -497,7 +497,7 @@ ij> alter table t3 add constraint c3 for 0 rows inserted/updated/deleted ij> alter table t4 add constraint c4 foreign key (c1) references t3(m) on delete cascade; -ERROR 42915: Foreign Key 'C4' is invalid for the reason which follows: 'the delete rule of foreign key can not be CASCADE. (The relationship would cause another table to be delete-connected to the same table through multiple paths with different delete rules or with delete rule equal to SET NULL.) '. +ERROR 42915: Foreign Key 'C4' is invalid for the reason which follows: 'The delete rule of foreign key can not be CASCADE. (The relationship would cause another table to be delete-connected to the same table through multiple paths with different delete rules or with delete rule equal to SET NULL.) '. ij> alter table t2 drop constraint c1; 0 rows inserted/updated/deleted ij> alter table t2 drop constraint c2; @@ -517,7 +517,7 @@ ij> alter table t3 add constraint c3 for 0 rows inserted/updated/deleted ij> alter table t4 add constraint c4 foreign key (c1) references t3(m) on delete cascade; -ERROR 42915: Foreign Key 'C4' is invalid for the reason which follows: 'the delete rule of foreign key can not be CASCADE. (The relationship would cause another table to be delete-connected to the same table through multiple paths with different delete rules or with delete rule equal to SET NULL.) '. +ERROR 42915: Foreign Key 'C4' is invalid for the reason which follows: 'The delete rule of foreign key can not be CASCADE. (The relationship would cause another table to be delete-connected to the same table through multiple paths with different delete rules or with delete rule equal to SET NULL.) '. ij> alter table t2 drop constraint c1; 0 rows inserted/updated/deleted ij> alter table t2 drop constraint c2; @@ -537,7 +537,7 @@ ij> alter table t3 add constraint c3 for 0 rows inserted/updated/deleted ij> alter table t4 add constraint c4 foreign key (c1) references t3(m) on delete cascade; -ERROR 42915: Foreign Key 'C4' is invalid for the reason which follows: 'the delete rule of foreign key can not be CASCADE. (The relationship would cause another table to be delete-connected to the same table through multiple paths with different delete rules or with delete rule equal to SET NULL.) '. +ERROR 42915: Foreign Key 'C4' is invalid for the reason which follows: 'The delete rule of foreign key can not be CASCADE. (The relationship would cause another table to be delete-connected to the same table through multiple paths with different delete rules or with delete rule equal to SET NULL.) '. ij> alter table t2 drop constraint c1; 0 rows inserted/updated/deleted ij> alter table t2 drop constraint c2; @@ -557,7 +557,7 @@ ij> alter table t3 add constraint c3 for 0 rows inserted/updated/deleted ij> alter table t4 add constraint c4 foreign key (c1) references t3(m) on delete cascade; -ERROR 42915: Foreign Key 'C4' is invalid for the reason which follows: 'the delete rule of foreign key can not be CASCADE. (The relationship would cause another table to be delete-connected to the same table through multiple paths with different delete rules or with delete rule equal to SET NULL.) '. +ERROR 42915: Foreign Key 'C4' is invalid for the reason which follows: 'The delete rule of foreign key can not be CASCADE. (The relationship would cause another table to be delete-connected to the same table through multiple paths with different delete rules or with delete rule equal to SET NULL.) '. ij> alter table t2 drop constraint c1; 0 rows inserted/updated/deleted ij> alter table t2 drop constraint c2; @@ -723,7 +723,7 @@ ij> create table t2(x int references t1( 0 rows inserted/updated/deleted ij> create table t3(l int references t1(a) ON DELETE CASCADE , m int references t2(y) ON DELETE SET NULL); -ERROR 42915: Foreign Key 'xxxxGENERATED-IDxxxx' is invalid for the reason which follows: 'the delete rule of foreign key must be CASCADE. (The relationship would cause the table to be delete-connected to the same table through multiple relationships and such relationships must have the same delete rule (NO ACTION, RESTRICT or CASCADE).) '. +ERROR 42915: Foreign Key 'xxxxGENERATED-IDxxxx' is invalid for the reason which follows: 'The delete rule of foreign key must be CASCADE. The relationship would cause the table to be delete-connected to the same table through multiple relationships and such relationships must have the same delete rule (NO ACTION, RESTRICT or CASCADE). '. ij> drop table t3 ; ERROR 42Y55: 'DROP TABLE' cannot be performed on 'T3' because it does not exist. ij> drop table t2 ; @@ -798,7 +798,7 @@ ij> alter table t3 add constraint c2 for 0 rows inserted/updated/deleted ij> alter table t3 add constraint c3 foreign key (m) references t2(y) on delete set null; -ERROR 42915: Foreign Key 'C3' is invalid for the reason which follows: 'the delete rule of foreign key must be CASCADE. (The relationship would cause the table to be delete-connected to the same table through multiple relationships and such relationships must have the same delete rule (NO ACTION, RESTRICT or CASCADE).) '. +ERROR 42915: Foreign Key 'C3' is invalid for the reason which follows: 'The delete rule of foreign key must be CASCADE. The relationship would cause the table to be delete-connected to the same table through multiple relationships and such relationships must have the same delete rule (NO ACTION, RESTRICT or CASCADE). '. ij> alter table t2 drop constraint c1; 0 rows inserted/updated/deleted ij> alter table t3 drop constraint c2; @@ -992,7 +992,7 @@ ij> create table t3(l int unique not nul 0 rows inserted/updated/deleted ij> create table t2(x int references t1(a) ON DELETE CASCADE , y int references t3(l) ON DELETE RESTRICT); -ERROR 42915: Foreign Key 'xxxxGENERATED-IDxxxx' is invalid for the reason which follows: 'the delete rule of foreign key must be CASCADE. (The relationship would cause the table to be delete-connected to the same table through multiple relationships and such relationships must have the same delete rule (NO ACTION, RESTRICT or CASCADE).) '. +ERROR 42915: Foreign Key 'xxxxGENERATED-IDxxxx' is invalid for the reason which follows: 'The delete rule of foreign key must be CASCADE. The relationship would cause the table to be delete-connected to the same table through multiple relationships and such relationships must have the same delete rule (NO ACTION, RESTRICT or CASCADE). '. ij> drop table t2; ERROR 42Y55: 'DROP TABLE' cannot be performed on 'T2' because it does not exist. ij> drop table t3; @@ -1267,7 +1267,7 @@ create table t1( a int not null primary 0 rows inserted/updated/deleted ij> create table t2(x int references t1(a) ON DELETE RESTRICT, y int not null unique, z int references t1(b) ON DELETE CASCADE); -ERROR 42915: Foreign Key 'xxxxGENERATED-IDxxxx' is invalid for the reason which follows: 'the delete rule of foreign key must be RESTRICT. (The relationship would cause the table to be delete-connected to the same table through multiple relationships and such relationships must have the same delete rule (NO ACTION, RESTRICT or CASCADE).) '. +ERROR 42915: Foreign Key 'xxxxGENERATED-IDxxxx' is invalid for the reason which follows: 'The delete rule of foreign key must be RESTRICT. The relationship would cause the table to be delete-connected to the same table through multiple relationships and such relationships must have the same delete rule (NO ACTION, RESTRICT or CASCADE). '. ij> drop table t1; 0 rows inserted/updated/deleted ij> create table t1(a int not null unique , b int not null unique); Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties?rev=1369949&r1=1369948&r2=1369949&view=diff ============================================================================== --- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties (original) +++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties Mon Aug 6 19:43:44 2012 @@ -156,7 +156,7 @@ IJ_NotYetImpl=Not yet implemented IJ_AlreHaveACon=Already have a connection named {0} IJ_ExceRunnComm=Exception running command: {0} IJ_UnabToGetWar=Unable to get warnings for connection -IJ_CoulNotLocaC=Could not locate class for procotol, {0} +IJ_CoulNotLocaC=Could not locate class for protocol, {0} IJ_CoulNotLocaC_5=Could not locate class {0} IJ_FailToDisc=Failed to disconnect IJ_DrivNotClasN=Driver not class name {0}