Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 85199 invoked from network); 27 Nov 2006 06:38:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 Nov 2006 06:38:06 -0000 Received: (qmail 12841 invoked by uid 500); 27 Nov 2006 06:38:15 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 12774 invoked by uid 500); 27 Nov 2006 06:38:15 -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 12763 invoked by uid 99); 27 Nov 2006 06:38:15 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 26 Nov 2006 22:38:15 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 26 Nov 2006 22:38:05 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 14C321A9846; Sun, 26 Nov 2006 22:37:28 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r479527 - in /db/derby/code/trunk/java: build/org/apache/derbyBuild/ drda/org/apache/derby/loc/drda/ engine/org/apache/derby/loc/ testing/org/apache/derbyTesting/functionTests/master/ testing/org/apache/derbyTesting/functionTests/master/j9_... Date: Mon, 27 Nov 2006 06:37:27 -0000 To: derby-commits@db.apache.org From: myrnavl@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061127063728.14C321A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: myrnavl Date: Sun Nov 26 22:37:26 2006 New Revision: 479527 URL: http://svn.apache.org/viewvc?view=rev&rev=479527 Log: DERBY-2110 - correcting typos in a number of messages - fix involved also updating MessageBuilder.java, because the resulting dita file did not correctly replace all quotes when put into html. - also corrected BlobClob4BlobTest which has the string of message 40X0D hardcoded. - also updated errorCode.out masters, incl. for j9_13 and j9_22, even though that's not really needed anymore. Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/MessageBuilder.java db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_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/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/tests/jdbcapi/BlobClob4BlobTest.java Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/MessageBuilder.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/MessageBuilder.java?view=diff&rev=479527&r1=479526&r2=479527 ============================================================================== --- db/derby/code/trunk/java/build/org/apache/derbyBuild/MessageBuilder.java (original) +++ db/derby/code/trunk/java/build/org/apache/derbyBuild/MessageBuilder.java Sun Nov 26 22:37:26 2006 @@ -552,13 +552,24 @@ String propertyText = escapePropertiesText( rawText ); int parameterCount = countParameters( rawText ); String[] args = getArgs( message ); - String displayText = replaceSpecialChars( plugInArgs( rawText, args ) ); if ( parameterCount != args.length ) { throw new Exception( name + " has " + parameterCount + " parameters but " + args.length + " nested args." ); } + String displayText; + if (rawText.indexOf('\'')>=0) + { + displayText = replaceSpecialChars( escapeTextWithAQuote( rawText ) ); + displayText = plugInArgs( displayText , args ); + + } + else + { + displayText = plugInArgs( replaceSpecialChars( rawText), args ) ; + } + ditaWriter.beginTag( "row" ); { ditaWriter.writeTextElement( "entry", "colname=\"col1\"", sqlstate ); @@ -643,7 +654,7 @@ // add xml angle brackets around the args for ( int i = 0; i < count; i++ ) { - cookedArgs[ i ] = "<" + rawArgs[ i ] + ">"; + cookedArgs[ i ] = "<" + rawArgs[ i ] + ">"; } return MessageFormat.format( message, cookedArgs ); @@ -729,6 +740,7 @@ return output; } + /** *

* Replace newlines with the escape sequence needed by properties files. @@ -740,6 +752,19 @@ String output = input.replaceAll( "\n", "\\\\n" ); output = output.replaceAll( "\'", "\'\'" ); + + return output; + } + + /** + *

+ * Replace single quotes with two single quotes. + * Only needed when there are parameters with quotes. + *

+ */ + private static String escapeTextWithAQuote( java.lang.String input ) + { + String output = input.replaceAll( "\'", "\'\'" ); return output; } Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_en.properties URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_en.properties?view=diff&rev=479527&r1=479526&r2=479527 ============================================================================== --- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_en.properties (original) +++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_en.properties Sun Nov 26 22:37:26 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/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?view=diff&rev=479527&r1=479526&r2=479527 ============================================================================== --- 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 Sun Nov 26 22:37:26 2006 @@ -942,12 +942,12 @@ 40XD0 - Container has been closed + Container has been closed. 40XD1 - Container was opened in read-only mode. + Container was opened in read-only mode. @@ -1467,13 +1467,13 @@ 42X46 - There are multiple functions named '{0}'. Use a the full signature or the specific name. + There are multiple functions named '{0}'. Use the full signature or the specific name. functionName 42X47 - There are multiple procedures named '{0}'. Use a the full signature or the specific name. + There are multiple procedures named '{0}'. Use the full signature or the specific name. procedureName @@ -1506,7 +1506,7 @@ 42X52 - Calling method ('{0}') using a receiver of the Java primitive type '{1}" is not allowed. + Calling method ('{0}') using a receiver of the Java primitive type '{1}' is not allowed. methodName type @@ -1608,7 +1608,7 @@ 42X69 - It is not allowed to reference a field ('{0}') using a referencing expresssion of the Java primitive type '{1}'. + It is not allowed to reference a field ('{0}') using a referencing expression of the Java primitive type '{1}'. fieldName type @@ -2488,7 +2488,7 @@ 58009.C.21 - Network protocol exception: scldta length, {0}, is invalid for rdbnam. The connection has been terminated. + Network protocol exception: SCLDTA length, {0}, is invalid for RDBNAM. The connection has been terminated. length @@ -2523,13 +2523,13 @@ 58009.C.7 - Network protocol exception: scldta length, {0}, is invalid for rdbcolid. The connection has been terminated. + Network protocol exception: SCLDTA length, {0}, is invalid for RDBCOLID. The connection has been terminated. length 58009.C.8 - Network protocol exception: scldta length, {0}, is invalid for pkgid. The connection has been terminated. + Network protocol exception: SCLDTA length, {0}, is invalid for PKGID. The connection has been terminated. length @@ -3168,13 +3168,13 @@ XBCXU.S - Encryption of an un-encrypted database failed: {0}. + Encryption of an un-encrypted database failed: {0} failureMessage XBCXV.S - Encryption of an encrypted database with a new key or a new password failed: {0}. + Encryption of an encrypted database with a new key or a new password failed: {0} failureMessage @@ -3213,7 +3213,7 @@ XBM08.D - Could not instantiage {0} StorageFactory class {1}. + Could not instantiate {0} StorageFactory class {1}. value value @@ -4189,7 +4189,7 @@ XJ100.S - The scale supplied by the registerOutParameter method does not match with the setter method. Possible loss of precision!" + The scale supplied by the registerOutParameter method does not match with the setter method. Possible loss of precision! @@ -4609,7 +4609,7 @@ 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}). + 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}). value @@ -4923,7 +4923,7 @@ XSDF2.S - Exception during creation of file {0} for container, file could not be removed. The exeception was: {1}. + Exception during creation of file {0} for container, file could not be removed. The exception was: {1}. fileName value @@ -5164,7 +5164,7 @@ XSLAL.D - log record size {2} exceeded the maximum allowable log file size {3}. Error encounted in log file {0}, position {1} + log record size {2} exceeded the maximum allowable log file size {3}. Error encountered in log file {0}, position {1}. value number logfileName @@ -5380,7 +5380,7 @@ XSTB6.M - Cannot substitue a transaction table with another while one is already in use. + Cannot substitute a transaction table with another while one is already in use. @@ -5570,7 +5570,7 @@ 42Z54.U - This excepiton stops the statement after parsing - no further processing is needed. + This exception stops the statement after parsing - no further processing is needed. @@ -6688,7 +6688,7 @@ C001 - Class {0} has a unknown certificate type in jar {1}, expecting X509 certificate. + Class {0} has an unknown certificate type in jar {1}, expecting X509 certificate. className jarName @@ -7169,13 +7169,13 @@ L008 - Deleteing incompatible old Logfile {0} + Deleting incompatible old Logfile {0} fileName L009 - Deleteing old Logfile {0} + Deleting old Logfile {0} fileName 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?view=diff&rev=479527&r1=479526&r2=479527 ============================================================================== --- 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 Sun Nov 26 22:37:26 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/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?view=diff&rev=479527&r1=479526&r2=479527 ============================================================================== --- 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 Sun Nov 26 22:37:26 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/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?view=diff&rev=479527&r1=479526&r2=479527 ============================================================================== --- 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 Sun Nov 26 22:37:26 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/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobClob4BlobTest.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobClob4BlobTest.java?view=diff&rev=479527&r1=479526&r2=479527 ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobClob4BlobTest.java (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobClob4BlobTest.java Sun Nov 26 22:37:26 2006 @@ -2634,7 +2634,7 @@ assertTrue("FAIL - only embedded should be this exception", usingEmbedded()); assertEquals("FAIL - wrong exception", "ERROR 40XD0: Container " + - "has been closed", ioe.getMessage()); + "has been closed.", ioe.getMessage()); } rollback();