db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r704290 - in /db/derby/code/trunk/java: client/org/apache/derby/client/am/ engine/org/apache/derby/loc/ shared/org/apache/derby/shared/common/reference/ testing/org/apache/derbyTesting/functionTests/master/
Date Tue, 14 Oct 2008 01:11:54 GMT
Author: myrnavl
Date: Mon Oct 13 18:11:53 2008
New Revision: 704290

URL: http://svn.apache.org/viewvc?rev=704290&view=rev
Log:
DERBY-3902; adjust orphaned message strings;
  - move J107, J108, J109 to common MessageId.java
  - remove references to 08000.S.1 and XJ102 from message.xml & mes*.properties

Modified:
    db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/Version.java
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pt_BR.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties
    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/MessageBundleTest.out

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java?rev=704290&r1=704289&r2=704290&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java Mon Oct 13
18:11:53 2008
@@ -26,6 +26,7 @@
 
 import org.apache.derby.shared.common.i18n.MessageUtil;
 import org.apache.derby.shared.common.error.ExceptionUtil;
+import org.apache.derby.shared.common.reference.MessageId;
 import org.apache.derby.shared.common.reference.SQLState;
 
 
@@ -89,10 +90,6 @@
     public static String CLIENT_MESSAGE_RESOURCE_NAME =
         "org.apache.derby.loc.clientmessages";
     
-    // Constants for message ids used in text we print out -- not used
-    // in SqlExceptions
-    public static final String BATCH_POSITION_ID                = "J107";
-    
     //SQLException factory initialised with default factory
     //It will be over written by the SQLException factory of the 
     //supported jdbc version    
@@ -378,7 +375,7 @@
     // when getMessage() is called.
     // Called by the Agent.
     void setBatchPositionLabel(int index) {
-        batchPositionLabel_ = getMessageUtil().getTextMessage(BATCH_POSITION_ID) + 
+        batchPositionLabel_ = getMessageUtil().getTextMessage(MessageId.BATCH_POSITION_ID)
+ 
             index + ": ";
     }
 

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Version.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/Version.java?rev=704290&r1=704289&r2=704290&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/Version.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Version.java Mon Oct 13 18:11:53
2008
@@ -22,16 +22,13 @@
 package org.apache.derby.client.am;
 
 import org.apache.derby.shared.common.i18n.MessageUtil;
+import org.apache.derby.shared.common.reference.MessageId;
 
 
 
 public abstract class Version {
     static MessageUtil msgutil = SqlException.getMessageUtil();
     
-    // Constants for internationalized message ids
-    private static String SECURITY_MANAGER_NO_ACCESS_ID             = "J108";
-    private static String UNKNOWN_HOST_ID                           = "J109";
-    
     // Same as java.sql.DatabaseMetaData.getDriverName()
     public static String getDriverName() {
         return Configuration.dncDriverName;
@@ -152,7 +149,7 @@
                 printWriter.flush();
             } catch (SecurityException e) {
                 printWriter.println(header + 
-                    msgutil.getTextMessage(SECURITY_MANAGER_NO_ACCESS_ID, property));
+                    msgutil.getTextMessage(MessageId.SECURITY_MANAGER_NO_ACCESS_ID, property));
                 printWriter.flush();
             }
         }
@@ -169,7 +166,7 @@
                 printWriter.flush();
             } catch (java.net.UnknownHostException e) {
                 printWriter.println(header + 
-                    msgutil.getTextMessage(UNKNOWN_HOST_ID, e.getMessage()));
+                    msgutil.getTextMessage(MessageId.UNKNOWN_HOST_ID, e.getMessage()));
                 printWriter.flush();
             }
         }

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=704290&r1=704289&r2=704290&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 Oct 13 18:11:53
2008
@@ -238,11 +238,6 @@
             </msg>
 
             <msg>
-                <name>08000.S.1</name>
-                <text>Cannot close a connection with an active transaction.  The transaction
remains open and the connection was not closed.</text>
-            </msg>
-
-            <msg>
                 <name>08001.C.10</name>
                 <text>A connection could not be established because the security token
is larger than the maximum allowed by the network protocol.</text>
             </msg>
@@ -4475,11 +4470,6 @@
             </msg>
 
             <msg>
-                <name>XJ102.S</name>
-                <text>Can not perform an insert at the current position.</text>
-            </msg>
-
-            <msg>
                 <name>XJ103.S</name>
                 <text>Table name can not be null</text>
             </msg>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties?rev=704290&r1=704289&r2=704290&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties Mon Oct 13
18:11:53 2008
@@ -55,7 +55,6 @@
 
 # COntext service
 08000=Spojen\u00ed bylo zav\u0159eno nezn\u00e1m\u00fdm p\u0159eru\u0161en\u00edm.
-08000.S.1=Nelze zav\u0159\u00edt spojen\u00ed s aktivn\u00ed transakc\u00ed. Transakce z\u016fst\u00e1v\u00e1
otev\u0159ena a spojen\u00ed nebylo zav\u0159eno.
 
 
 #../java/com/ibm/db2j/protocol/BasicServices/LockManager/messages.properties
@@ -1236,7 +1235,6 @@
 XJ098.S=Hodnota automaticky generovan\u00fdch kl\u00ed\u010d\u016f {0} je neplatn\u00e1
 XJ099.S=Objekt Reader/Stream neobsahuje znaky d\u00e9lky
 XJ100.S=M\u011b\u0159\u00edtko dodan\u00e9 metodou registerOutParameter neodpov\u00edd\u00e1
metod\u011b setter. Mo\u017en\u00e1 ztr\u00e1ta p\u0159esnosti!
-XJ102.S=Nelze prov\u00e9st vlo\u017een\u00ed na aktu\u00e1ln\u00ed pozici.
 XJ103.S=Jm\u00e9no tabulky nesm\u00ed m\u00edt hodnotu ''null''
 XJ104.S=D\u00e9lka sd\u00edlen\u00e9ho kl\u00ed\u010de je neplatn\u00e1: {0}.
 XJ105.S=Kl\u00ed\u010d DES m\u00e1 chybnou d\u00e9lku. O\u010dek\u00e1van\u00e1 d\u00e9lka
{0}, obdr\u017een\u00e1 d\u00e9lka {1}.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties?rev=704290&r1=704289&r2=704290&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties Mon Oct
13 18:11:53 2008
@@ -41,7 +41,6 @@
 07000=Mindestens ein Parameter der aktuellen Anweisung wurde nicht initialisiert.
 07004=Der Parameter {0} ist ein {1}-Prozedurparameter und muss vor der Ausf\u00FChrung mit
CallableStatement.registerOutParameter registriert werden.
 07009=Keine Eingabeparameter.
-08000.S.1=Eine Verbindung mit einer aktiven Transaktion kann nicht geschlossen werden. Die
Transaktion bleibt offen. Die Verbindung wurde nicht geschlossen.
 08000=Die Verbindung wurde von einer unbekannten Unterbrechung aufgehoben.
 08001.C.10=Es konnte keine Verbindung hergestellt werden, weil das Sicherheitstoken gr\u00F6\u00DFer
als f\u00FCr das Netzprotokoll maximal zul\u00E4ssig ist.
 08001.C.11=Es konnte keine Verbindung hergestellt werden, weil die Benutzer-ID die L\u00E4nge
null hat oder l\u00E4nger als f\u00FCr das Netzprotokoll maximal zul\u00E4ssig ist.
@@ -1035,7 +1034,6 @@
 XJ098.S=Der automatisch generierte Schl\u00FCsselwert {0} ist ung\u00FCltig.
 XJ099.S=Das Reader-/Datenstromobjekt enth\u00E4lt keine L\u00E4ngenzeichen.
 XJ100.S=Die von der Methode registerOutParameter angegebene Anzahl Nachkommastellen passt
nicht zur setter-Methode. Ein Genauigkeitsverlust ist m\u00F6glich\!
-XJ102.S=An der aktuellen Position ist keine Einf\u00FCgung m\u00F6glich.
 XJ103.S=Der Tabellenname muss ungleich null sein.
 XJ104.S=Ung\u00FCltige L\u00E4nge des gemeinsam genutzten Schl\u00FCssels\: {0}.
 XJ105.S=Der DES-Schl\u00FCssel hat die falsche L\u00E4nge. Erwartete L\u00E4nge\: {0}, empfangene
L\u00E4nge\: {1}

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties?rev=704290&r1=704289&r2=704290&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties Mon Oct 13
18:11:53 2008
@@ -41,7 +41,6 @@
 07000=Al menos un par\u00E1metro de la sentencia actual no est\u00E1 inicializado.
 07004=El par\u00E1metro {0} es un par\u00E1metro de procedimiento {1} y por tanto debe registrarse
con CallableStatement.registerOutParameter antes de la ejecuci\u00F3n.
 07009=Sin par\u00E1metros de entrada.
-08000.S.1=No se puede cerrar una conexi\u00F3n con una transacci\u00F3n activa.  La transacci\u00F3n
permanece abierta y la conexi\u00F3n no se ha cerrado.
 08000=Conexi\u00F3n cerrada por una interrupci\u00F3n desconocida.
 08001.C.10=No se ha podido establecer una conexi\u00F3n debido a que la se\u00F1al de seguridad
es mayor que el m\u00E1ximo que permite el protocolo de red.
 08001.C.11=No se ha podido establecer una conexi\u00F3n debido a que el id de usuario tiene
una longitud de cero o es mayor que el m\u00E1ximo que permite el protocolo de red.
@@ -1035,7 +1034,6 @@
 XJ098.S=El valor de claves generadas autom\u00E1ticamente {0} no es v\u00E1lido
 XJ099.S=El objeto Reader/Stream (Lector/Corriente) no contiene caracteres de longitud
 XJ100.S=La escala proporcionada por el m\u00E9todo registerOutParameter no coincide con el
m\u00E9todo setter. \u00A1Posible p\u00E9rdida de precisi\u00F3n\!
-XJ102.S=No se puede realizar una inserci\u00F3n en la posici\u00F3n actual.
 XJ103.S=El nombre de tabla no puede ser nulo
 XJ104.S=La longitud de clave compartida no es v\u00E1lida\: {0}.
 XJ105.S=La clave DES tiene una longitud incorrecta; longitud esperada {0}, longitud obtenida
{1}.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties?rev=704290&r1=704289&r2=704290&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties Mon Oct 13
18:11:53 2008
@@ -41,7 +41,6 @@
 07000=Au moins un param\u00E8tre de l''instruction en cours n''est pas initialis\u00E9.
 07004=Le param\u00E8tre {0} est un param\u00E8tre de proc\u00E9dure {1} et doit \u00EAtre
enregistr\u00E9 avec CallableStatement.registerOutParameter avant son ex\u00E9cution.
 07009=Aucun param\u00E8tre d''entr\u00E9e.
-08000.S.1=Impossible de fermer une connexion lorsqu''une transaction est active.  La transaction
reste ouverte et la connexion n''a pas \u00E9t\u00E9 ferm\u00E9e.
 08000=Connexion ferm\u00E9e par une interruption inconnue.
 08001.C.10=Aucune connexion n''a pu \u00EAtre \u00E9tablie car le jeton de s\u00E9curit\u00E9
est plus grand que la taille maximale autoris\u00E9e par le protocole r\u00E9seau.
 08001.C.11=Aucune connexion n''a pu \u00EAtre \u00E9tablie car l''ID utilisateur a une longueur
\u00E9gale \u00E0 z\u00E9ro ou est plus long que le maximum autoris\u00E9 par le protocole
r\u00E9seau.
@@ -1035,7 +1034,6 @@
 XJ098.S=La valeur de cl\u00E9s auto-g\u00E9n\u00E9r\u00E9es {0} est incorrecte
 XJ099.S=L''objet Reader/Stream ne contient pas de caract\u00E8re de longueur
 XJ100.S=L''\u00E9chelle fournie par la m\u00E9thode registerOutParameter ne correspond pas
\u00E0 la m\u00E9thode d''acc\u00E8s setter. Perte possible de pr\u00E9cision \!
-XJ102.S=Impossible d''ex\u00E9cuter une insertion \u00E0 l''emplacement actuel.
 XJ103.S=Le nom de table ne peut pas \u00EAtre null
 XJ104.S=La longueur de cl\u00E9 partag\u00E9e est incorrecte \: {0}.
 XJ105.S=La longueur de la cl\u00E9 DES est incorrecte \: longueur attendue {0}, longueur
obtenue {1}.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties?rev=704290&r1=704289&r2=704290&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties Mon Oct 13
18:11:53 2008
@@ -55,7 +55,6 @@
 
 # COntext service
 08000=A kapcsolatot ismeretlen megszak\u00edt\u00e1s lez\u00e1rta.
-08000.S.1=A kapcsolat akt\u00edv tranzakci\u00f3 k\u00f6zben nem z\u00e1rhat\u00f3 le.  A
tranzakci\u00f3 nyitva marad \u00e9s a kapcsolat nem ker\u00fclt lez\u00e1r\u00e1sra.
 
 
 #../java/com/ibm/db2j/protocol/BasicServices/LockManager/messages.properties
@@ -1236,7 +1235,6 @@
 XJ098.S=Az automatikusan el\u0151\u00e1ll\u00edtott kulcsok {0} \u00e9rt\u00e9ke \u00e9rv\u00e9nytelen
 XJ099.S=Az olvas\u00f3/folyam objektum nem tartalmaz hossz karaktereket
 XJ100.S=A registerOutParameter met\u00f3dus \u00e1ltal biztos\u00edtott sk\u00e1la nem felel
meg a setter met\u00f3dusnak. Pontoss\u00e1gveszt\u00e9s l\u00e9phet fel!
-XJ102.S=Besz\u00far\u00e1s az aktu\u00e1lis poz\u00edci\u00f3n nem hajthat\u00f3 v\u00e9gre.
 XJ103.S=A t\u00e1blan\u00e9v nem lehet \u00fcres
 XJ104.S=A megosztott kulcshossz \u00e9rv\u00e9nytelen: {0}.
 XJ105.S=A DES kulcs rossz hosszal rendelkezik. A v\u00e1rt hossz {0}, a kapott pedig {1}.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties?rev=704290&r1=704289&r2=704290&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties Mon Oct 13
18:11:53 2008
@@ -41,7 +41,6 @@
 07000=Almeno un parametro sull''istruzione corrente non \u00E8 inizializzato.
 07004=Il parametro {0} \u00E8 un parametro della procedura {1} e deve essere registrato con
CallableStatement.registerOutParameter prima dell''esecuzione.
 07009=Nessun parametro di input.
-08000.S.1=Impossibile chiudere una connessione con una transazione attiva.  La transazione
resta aperta e la connessione non \u00E8 stata chiusa.
 08000=Connessione chiusa a causa di un''interruzione sconosciuta.
 08001.C.10=Non \u00E8 stato possibile stabilire una connessione perch\u00E9 il token di sicurezza
possiede una dimensione superiore rispetto alla dimensione massima consentita dal protocollo
di rete.
 08001.C.11=Non \u00E8 stato possibile stabilire una connessione perch\u00E9 la lunghezza
dell''id utente \u00E8 uguale a zero o maggiore della lunghezza massima consentita dal protocollo
di rete.
@@ -1035,7 +1034,6 @@
 XJ098.S=Valore delle chiavi generato automaticamente {0} non valido
 XJ099.S=L''oggetto Reader/Stream non contiene i caratteri di lunghezza
 XJ100.S=La scala fornita dal metodo registerOutParameter non corrisponde al metodo setter.
Possibile perdita di precisione\!
-XJ102.S=Impossibile eseguire un inserimento alla posizione corrente.
 XJ103.S=Il nome della tabella non pu\u00F2 essere nullo
 XJ104.S=Lunghezza chiave condivisa non valida\: {0}.
 XJ105.S=La lunghezza della chiave DES non \u00E8 corretta, lunghezza prevista {0}, lunghezza
acquisita {1}.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties?rev=704290&r1=704289&r2=704290&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties Mon Oct
13 18:11:53 2008
@@ -41,7 +41,6 @@
 07000=\u73FE\u884C\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8\u306E\u5C11\u306A\u304F\u3068\u3082
1 \u3064\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u304C\u521D\u671F\u5316\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
 07004=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC {0} \u306F {1} \u30D7\u30ED\u30B7\u30FC\u30B8\u30E3\u30FC\u30FB\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3067\u3042\u308A\u3001\u5B9F\u884C\u306E\u524D\u306B
CallableStatement.registerOutParameter \u306B\u767B\u9332\u3055\u308C\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
 07009=\u5165\u529B\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-08000.S.1=\u30A2\u30AF\u30C6\u30A3\u30D6\u30FB\u30C8\u30E9\u30F3\u30B6\u30AF\u30B7\u30E7\u30F3\u304C\u3042\u308B\u5834\u5408\u3001\u63A5\u7D9A\u306F\u30AF\u30ED\u30FC\u30BA\u3067\u304D\u307E\u305B\u3093\u3002
 \u30C8\u30E9\u30F3\u30B6\u30AF\u30B7\u30E7\u30F3\u306F\u958B\u3044\u305F\u307E\u307E\u3067\u3042\u308A\u3001\u63A5\u7D9A\u306F\u30AF\u30ED\u30FC\u30BA\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002
 08000=\u4E0D\u660E\u306E\u5272\u308A\u8FBC\u307F\u306B\u3088\u308A\u3001\u63A5\u7D9A\u304C\u30AF\u30ED\u30FC\u30BA\u3055\u308C\u307E\u3057\u305F\u3002
 08001.C.10=\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FC\u30FB\u30C8\u30FC\u30AF\u30F3\u304C\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u30FB\u30D7\u30ED\u30C8\u30B3\u30EB\u306B\u3088\u308A\u8A31\u53EF\u3055\u308C\u308B\u6700\u5927\u9577\u3092\u8D85\u3048\u3066\u3044\u308B\u305F\u3081\u3001\u63A5\u7D9A\u3092\u78BA\u7ACB\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
 08001.C.11=\u30E6\u30FC\u30B6\u30FC ID \u306E\u9577\u3055\u304C\u30BC\u30ED\u3067\u3042\u308B\u304B\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u30FB\u30D7\u30ED\u30C8\u30B3\u30EB\u306B\u3088\u308A\u8A31\u53EF\u3055\u308C\u308B\u6700\u5927\u9577\u3092\u8D85\u3048\u3066\u3044\u308B\u305F\u3081\u3001\u63A5\u7D9A\u3092\u78BA\u7ACB\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
@@ -1035,7 +1034,6 @@
 XJ098.S=\u81EA\u52D5\u751F\u6210\u3055\u308C\u305F\u30AD\u30FC\u5024 {0} \u306F\u7121\u52B9\u3067\u3059\u3002
 XJ099.S=Reader/Stream \u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306B\u9577\u3055\u3092\u793A\u3059\u6587\u5B57\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u305B\u3093\u3002
 XJ100.S=registerOutParameter \u30E1\u30BD\u30C3\u30C9\u306B\u3088\u308A\u6307\u5B9A\u3055\u308C\u305F\u4F4D\u53D6\u308A\u304C
setter \u30E1\u30BD\u30C3\u30C9\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093\u3002 \u7CBE\u5EA6\u304C\u5931\u308F\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
-XJ102.S=\u73FE\u5728\u4F4D\u7F6E\u3067\u633F\u5165\u3092\u5B9F\u884C\u3067\u304D\u307E\u305B\u3093\u3002
 XJ103.S=\u8868\u540D\u3092 NULL \u306B\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
 XJ104.S=\u5171\u6709\u9375\u306E\u9577\u3055\u304C\u7121\u52B9\u3067\u3059\: {0}\u3002
 XJ105.S=DES \u9375\u306E\u9577\u3055\u304C\u8AA4\u3063\u3066\u3044\u307E\u3059\u3002\u4E88\u671F\u3057\u305F\u9577\u3055\u306F
{0}\u3001\u5F97\u3089\u308C\u305F\u9577\u3055\u306F {1} \u3067\u3059\u3002

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties?rev=704290&r1=704289&r2=704290&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties Mon Oct
13 18:11:53 2008
@@ -41,7 +41,6 @@
 07000=\uD604\uC7AC \uBA85\uB839\uBB38\uC5D0 \uB300\uD55C \uCD5C\uC18C\uD55C \uD558\uB098\uC758
\uB9E4\uAC1C\uBCC0\uC218\uAC00 \uCD08\uAE30\uD654\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
 07004={0} \uB9E4\uAC1C\uBCC0\uC218\uB294 {1} \uD504\uB85C\uC2DC\uC800 \uB9E4\uAC1C\uBCC0\uC218\uC774\uACE0
\uC2E4\uD589 \uC804\uC5D0 CallableStatement.registerOutParameter\uB85C \uB4F1\uB85D\uB418\uC5B4\uC57C
\uD569\uB2C8\uB2E4.
 07009=\uC785\uB825 \uB9E4\uAC1C\uBCC0\uC218 \uC5C6\uC74C.
-08000.S.1=\uD65C\uC131 \uD2B8\uB79C\uC7AD\uC158 \uC5F0\uACB0\uC744 \uB2EB\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
\uD2B8\uB79C\uC7AD\uC158\uC740 \uC5F4\uB9B0 \uCC44\uB85C \uC720\uC9C0\uB418\uBA70 \uC5F0\uACB0\uC740
\uB2EB\uD788\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
 08000=\uC54C \uC218 \uC5C6\uB294 \uC778\uD130\uB7FD\uD2B8\uC5D0 \uC758\uD574 \uC5F0\uACB0\uC774
\uC885\uB8CC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
 08001.C.10=\uBCF4\uC548 \uD1A0\uD070\uC774 \uB124\uD2B8\uC6CC\uD06C \uD504\uB85C\uD1A0\uCF5C\uC758
\uCD5C\uB300 \uD5C8\uC6A9 \uAC12\uBCF4\uB2E4 \uD06C\uAE30 \uB54C\uBB38\uC5D0 \uC5F0\uACB0\uC744
\uC124\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
 08001.C.11=\uC0AC\uC6A9\uC790 ID\uC758 \uAE38\uC774\uAC00 0\uC774\uAC70\uB098 \uB124\uD2B8\uC6CC\uD06C
\uD504\uB85C\uD1A0\uCF5C\uC758 \uCD5C\uB300 \uD5C8\uC6A9 \uAC12\uBCF4\uB2E4 \uD06C\uAE30 \uB54C\uBB38\uC5D0
\uC5F0\uACB0\uC744 \uC124\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
@@ -1035,7 +1034,6 @@
 XJ098.S=\uC790\uB3D9 \uC0DD\uC131 \uD0A4 \uAC12({0})\uC774 \uC720\uD6A8\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
 XJ099.S=Reader/Stream \uC624\uBE0C\uC81D\uD2B8\uC5D0 \uAE38\uC774 \uBB38\uC790\uAC00 \uB4E4\uC5B4
\uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
 XJ100.S=registerOutParameter \uBA54\uC18C\uB4DC\uAC00 \uC81C\uACF5\uD55C \uC2A4\uCF00\uC77C\uC774
setter \uBA54\uC18C\uB4DC\uC640 \uC77C\uCE58\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. \uC815\uBC00\uB3C4\uAC00
\uC190\uC2E4\uB418\uC5C8\uC744 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
-XJ102.S=\uD604\uC7AC \uC704\uCE58\uC5D0\uC11C \uC0BD\uC785\uC744 \uC218\uD589\uD560 \uC218
\uC5C6\uC2B5\uB2C8\uB2E4.
 XJ103.S=\uD14C\uC774\uBE14 \uC774\uB984\uC740 \uB110\uC774 \uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
 XJ104.S=\uC720\uD6A8\uD558\uC9C0 \uC54A\uC740 \uACF5\uC720 \uD0A4 \uAE38\uC774\: {0}.
 XJ105.S=DES \uD0A4\uC758 \uAE38\uC774\uAC00 \uC798\uBABB\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uC608\uC0C1
\uAE38\uC774\: {0}, \uBC1B\uC740 \uAE38\uC774\: {1}.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties?rev=704290&r1=704289&r2=704290&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties Mon Oct 13
18:11:53 2008
@@ -55,7 +55,6 @@
 
 # COntext service
 08000=Po\u0142\u0105czenie zosta\u0142o zamkni\u0119te przez nieznane przerwanie.
-08000.S.1=Nie mo\u017cna zamkn\u0105\u0107 po\u0142\u0105czenia z aktywn\u0105 transakcj\u0105.
Transakcja pozostaje otwarta, a po\u0142\u0105czenie nie zostanie zamkni\u0119te.
 
 
 #../java/com/ibm/db2j/protocol/BasicServices/LockManager/messages.properties
@@ -1236,7 +1235,6 @@
 XJ098.S=Automatycznie generowana warto\u015b\u0107 kluczy {0} jest niepoprawna
 XJ099.S=Obiekt Reader/Stream nie zawiera znak\u00f3w d\u0142ugo\u015bci
 XJ100.S=Skala podana przez metod\u0119 registerOutParameter nie jest zgodna z metod\u0105
procedury ustawiaj\u0105cej. Prawdopodobna jest utrata dok\u0142adno\u015bci!
-XJ102.S=Dla aktualnej pozycji nie mo\u017cna przeprowadzi\u0107 wstawiania.
 XJ103.S=Nazwa tabeli nie mo\u017ce by\u0107 warto\u015bci\u0105 null
 XJ104.S=D\u0142ugo\u015b\u0107 klucza wsp\u00f3\u0142u\u017cytkowanego jest niepoprawna:
{0}.
 XJ105.S=Klucz DES ma z\u0142\u0105 d\u0142ugo\u015b\u0107. Oczekiwana d\u0142ugo\u015b\u0107
{0}, otrzymano {1}.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pt_BR.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pt_BR.properties?rev=704290&r1=704289&r2=704290&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pt_BR.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pt_BR.properties Mon Oct
13 18:11:53 2008
@@ -56,7 +56,6 @@
 
 # COntext service
 08000=Conex\u00e3o encerrada por interrup\u00e7\u00e3o desconhecida.
-08000.S.1=N\u00e3o \u00e9 poss\u00edvel fechar uma conex\u00e3o com uma transa\u00e7\u00e3o
ativa.  A transa\u00e7\u00e3o permanece aberta e a conex\u00e3o n\u00e3o foi fechada.
 
 
 #../java/com/ibm/db2j/protocol/BasicServices/LockManager/messages.properties
@@ -1231,7 +1230,6 @@
 XJ098.S=O valor das chaves autogeradas {0} n\u00e3o \u00e9 v\u00e1lida.
 XJ099.S=O objeto Reader/Stream n\u00e3o cont\u00e9m caracteres de comprimento
 XJ100.S=A escala fornecida pelo m\u00e9todo ''registerOutParameter'' n\u00e3o corresponde
\u00e0 do m\u00e9todo definidor. Poss\u00edvel perda de precis\u00e3o!
-XJ102.S=N\u00e3o \u00e9 poss\u00edvel realizar uma inser\u00e7\u00e3o na posi\u00e7\u00e3o
corrente.
 XJ103.S=O nome da tabela n\u00e3o pode ser nulo.
 XJ104.S=O comprimento da chave compartilhada n\u00e3o \u00e9 v\u00e1lido: {0}.
 XJ105.S=A chave DES possui um comprimento errado, comprimento esperado {0}, comprimento obtido
{1}.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties?rev=704290&r1=704289&r2=704290&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties Mon Oct 13
18:11:53 2008
@@ -55,7 +55,6 @@
 
 # COntext service
 08000=\u0421\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435 \u0437\u0430\u043a\u0440\u044b\u0442\u043e
\u043d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u044b\u043c \u043f\u0440\u0435\u0440\u044b\u0432\u0430\u043d\u0438\u0435\u043c.
-08000.S.1=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0437\u0430\u043a\u0440\u044b\u0442\u044c
\u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435 \u0441 \u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0439
\u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0435\u0439.  \u0422\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f
\u043e\u0441\u0442\u0430\u0435\u0442\u0441\u044f \u043e\u0442\u043a\u0440\u044b\u0442\u043e\u0439,
\u0438 \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435 \u043d\u0435 \u0437\u0430\u043a\u0440\u044b\u0442\u043e.
 
 
 #../java/com/ibm/db2j/protocol/BasicServices/LockManager/messages.properties
@@ -1236,7 +1235,6 @@
 XJ098.S=\u0417\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438
\u0441\u0433\u0435\u043d\u0435\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0445
\u043a\u043b\u044e\u0447\u0435\u0439 {0} \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f
\u043d\u0435\u0432\u0435\u0440\u043d\u044b\u043c
 XJ099.S=\u041e\u0431\u044a\u0435\u043a\u0442 Reader/Stream \u043d\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u0442
\u0441\u0438\u043c\u0432\u043e\u043b\u043e\u0432 \u0434\u043b\u0438\u043d\u044b
 XJ100.S=\u041e\u0431\u043b\u0430\u0441\u0442\u044c, \u043a\u043e\u0442\u043e\u0440\u0443\u044e
\u0432\u044b\u0434\u0430\u043b \u043c\u0435\u0442\u043e\u0434 registerOutParameter, \u043d\u0435
\u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0443\u0435\u0442 \u043c\u0435\u0442\u043e\u0434\u0443
\u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u0430
\u043f\u043e\u0442\u0435\u0440\u044f \u0442\u043e\u0447\u043d\u043e\u0441\u0442\u0438!
-XJ102.S=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0441\u0442\u0438
\u0432\u0441\u0442\u0430\u0432\u043a\u0443 \u0432 \u0442\u0435\u043a\u0443\u0449\u0435\u0439
\u043f\u043e\u0437\u0438\u0446\u0438\u0438.
 XJ103.S=\u0418\u043c\u044f \u0442\u0430\u0431\u043b\u0438\u0446\u044b \u043d\u0435 \u043c\u043e\u0436\u0435\u0442
\u0431\u044b\u0442\u044c \u043d\u0443\u043b\u0435\u0432\u044b\u043c
 XJ104.S=\u041d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u0430\u044f \u0434\u043b\u0438\u043d\u0430
\u0441\u043e\u0432\u043c\u0435\u0441\u0442\u043d\u043e \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u043c\u043e\u0433\u043e
\u043a\u043b\u044e\u0447\u0430: {0}.
 XJ105.S=\u041d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u0430\u044f \u0434\u043b\u0438\u043d\u0430
\u043a\u043b\u044e\u0447\u0430 DES; \u043e\u0436\u0438\u0434\u0430\u0435\u043c\u0430\u044f
\u0434\u043b\u0438\u043d\u0430 \u0440\u0430\u0432\u043d\u0430 {0}, \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0430
\u0434\u043b\u0438\u043d\u0430, \u0440\u0430\u0432\u043d\u0430\u044f {1}.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties?rev=704290&r1=704289&r2=704290&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties Mon Oct
13 18:11:53 2008
@@ -41,7 +41,6 @@
 07000=\u5F53\u524D\u8BED\u53E5\u4E2D\u81F3\u5C11\u4E00\u4E2A\u53C2\u6570\u672A\u521D\u59CB\u5316\u3002
 07004=\u53C2\u6570 {0} \u662F {1} \u8FC7\u7A0B\u53C2\u6570\uFF0C\u800C\u4E14\u5FC5\u987B\u5728\u6267\u884C\u524D\u4F7F\u7528
CallableStatement.registerOutParameter \u8FDB\u884C\u6CE8\u518C\u3002
 07009=\u65E0\u8F93\u5165\u53C2\u6570\u3002
-08000.S.1=\u4E0D\u80FD\u5173\u95ED\u4E0E\u6D3B\u52A8\u4E8B\u52A1\u7684\u8FDE\u63A5\u3002\u4E8B\u52A1\u4FDD\u6301\u6253\u5F00\u72B6\u6001\u5E76\u4E14\u672A\u5173\u95ED\u8FDE\u63A5\u3002
 08000=\u672A\u77E5\u4E2D\u65AD\u5173\u95ED\u4E86\u8FDE\u63A5\u3002
 08001.C.10=\u65E0\u6CD5\u5EFA\u7ACB\u8FDE\u63A5\uFF0C\u56E0\u4E3A\u5B89\u5168\u6027\u4EE4\u724C\u5927\u4E8E\u7F51\u7EDC\u534F\u8BAE\u5141\u8BB8\u7684\u6700\u5927\u503C\u3002
 08001.C.11=\u65E0\u6CD5\u5EFA\u7ACB\u8FDE\u63A5\uFF0C\u56E0\u4E3A\u7528\u6237\u6807\u8BC6\u7684\u957F\u5EA6\u4E3A\u96F6\u6216\u5927\u4E8E\u7F51\u7EDC\u534F\u8BAE\u5141\u8BB8\u7684\u6700\u5927\u503C\u3002
@@ -1035,7 +1034,6 @@
 XJ098.S=\u81EA\u52A8\u751F\u6210\u7684\u5BC6\u94A5\u503C {0} \u65E0\u6548
 XJ099.S=Reader/Stream \u5BF9\u8C61\u672A\u5305\u542B\u957F\u5EA6\u5B57\u7B26
 XJ100.S=registerOutParameter \u65B9\u6CD5\u6240\u63D0\u4F9B\u7684\u5C0F\u6570\u4F4D\u4E0E
setter \u65B9\u6CD5\u4E0D\u5339\u914D\u3002\u53EF\u80FD\u4F1A\u4E22\u5931\u7CBE\u5EA6\uFF01
-XJ102.S=\u4E0D\u80FD\u5728\u5F53\u524D\u4F4D\u7F6E\u6267\u884C\u63D2\u5165\u64CD\u4F5C\u3002
 XJ103.S=\u8868\u540D\u4E0D\u80FD\u4E3A\u7A7A
 XJ104.S=\u5171\u4EAB\u5BC6\u94A5\u957F\u5EA6\u65E0\u6548\uFF1A{0}\u3002
 XJ105.S=DES \u5BC6\u94A5\u7684\u957F\u5EA6\u4E0D\u6B63\u786E\uFF0C\u671F\u671B\u7684\u957F\u5EA6\u4E3A
{0}\uFF0C\u83B7\u5F97\u7684\u957F\u5EA6\u4E3A {1}\u3002

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties?rev=704290&r1=704289&r2=704290&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties Mon Oct
13 18:11:53 2008
@@ -41,7 +41,6 @@
 07000=\u73FE\u884C\u9673\u8FF0\u5F0F\u81F3\u5C11\u6709\u4E00\u500B\u53C3\u6578\u6C92\u6709\u8D77\u59CB\u8A2D\u5B9A\u3002
 07004=\u53C3\u6578 {0} \u662F {1} \u7A0B\u5E8F\u53C3\u6578\uFF0C\u4E14\u5FC5\u9808\u5148\u767B\u9304\u5728
CallableStatement.registerOutParameter\uFF0C\u624D\u80FD\u57F7\u884C\u3002
 07009=\u6C92\u6709\u8F38\u5165\u53C3\u6578\u3002
-08000.S.1=\u7121\u6CD5\u95DC\u9589\u5177\u6709\u4F5C\u7528\u4E2D\u4EA4\u6613\u7684\u9023\u7DDA\u3002\u4EA4\u6613\u7DAD\u6301\u958B\u555F\u4E14\u9023\u7DDA\u672A\u95DC\u9589\u3002
 08000=\u4E0D\u660E\u5C94\u65B7\u5DF2\u95DC\u9589\u9023\u7DDA\u3002
 08001.C.10=\u7531\u65BC\u5B89\u5168\u8A18\u865F\u5927\u65BC\u7DB2\u8DEF\u901A\u8A0A\u5354\u5B9A\u63A5\u53D7\u7684\u4E0A\u9650\uFF0C\u56E0\u6B64\u7121\u6CD5\u5EFA\u7ACB\u9023\u7DDA\u3002
 08001.C.11=\u7531\u65BC\u4F7F\u7528\u8005 ID \u9577\u5EA6\u70BA\u96F6\u6216\u5927\u65BC\u7DB2\u8DEF\u901A\u8A0A\u5354\u5B9A\u63A5\u53D7\u7684\u4E0A\u9650\uFF0C\u56E0\u6B64\u7121\u6CD5\u5EFA\u7ACB\u9023\u7DDA\u3002
@@ -1035,7 +1034,6 @@
 XJ098.S=\u81EA\u52D5\u7522\u751F\u7684\u7D22\u5F15\u9375\u503C {0} \u7121\u6548
 XJ099.S=\u8B80\u53D6\u5668/\u4E32\u6D41\u7269\u4EF6\u4E0D\u5305\u542B\u9577\u5EA6\u5B57\u5143
 XJ100.S=registerOutParameter \u65B9\u6CD5\u6240\u63D0\u4F9B\u7684\u6BD4\u4F8B\u4E0D\u7B26\u5408
setter \u65B9\u6CD5\u3002\u7CBE\u6E96\u5EA6\u53EF\u80FD\u6D41\u5931\uFF01
-XJ102.S=\u7121\u6CD5\u5728\u73FE\u884C\u4F4D\u7F6E\u57F7\u884C\u63D2\u5165\u3002
 XJ103.S=\u8868\u683C\u540D\u7A31\u4E0D\u53EF\u70BA\u7A7A\u503C
 XJ104.S=\u5171\u7528\u7D22\u5F15\u9375\u9577\u5EA6\u7121\u6548\uFF1A{0}\u3002
 XJ105.S=DES \u7D22\u5F15\u9375\u9577\u5EA6\u932F\u8AA4\uFF0C\u539F\u9810\u671F\u9577\u5EA6\u70BA
{0}\uFF0C\u4F46\u5F97\u5230\u9577\u5EA6 {1}\u3002

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=704290&r1=704289&r2=704290&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
Mon Oct 13 18:11:53 2008
@@ -128,7 +128,12 @@
     String CONN_NETWORK_SERVER_START_EXCEPTION = "J102";
     String CONN_NETWORK_SERVER_SHUTDOWN_EXCEPTION = "J103";
     String CONN_ALREADY_CLOSED                              = "J104";
-    String CONN_PRECISION_TOO_LARGE                         = "J105";
+    String CONN_PRECISION_TOO_LARGE                         = "J105";   
+    //  following only used in text we print out - see client.am.SqlException:
+    String BATCH_POSITION_ID                                = "J107";
+    // following two only used in client.am.Version
+    String SECURITY_MANAGER_NO_ACCESS_ID                    = "J108";
+    String UNKNOWN_HOST_ID                                  = "J109";
     String CONN_SECMECH_NOT_SUPPORTED                       = "J110";
     String CONN_PASSWORD_MISSING                            = "J111";
     String CONN_USERID_MISSING                              = "J112";

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/MessageBundleTest.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/MessageBundleTest.out?rev=704290&r1=704289&r2=704290&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/MessageBundleTest.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/MessageBundleTest.out
Mon Oct 13 18:11:53 2008
@@ -1,10 +1,8 @@
-...WARNING: Message id J107 in messages_en.properties is not referenced in either SQLState.java
or MessageId.java
-WARNING: Message id 08000.S.1 in messages_en.properties is not referenced in either SQLState.java
or MessageId.java
-WARNING: Message id J108 in messages_en.properties is not referenced in either SQLState.java
or MessageId.java
-WARNING: Message id XJ102.S in messages_en.properties is not referenced in either SQLState.java
or MessageId.java
-WARNING: Message id J109 in messages_en.properties is not referenced in either SQLState.java
or MessageId.java
-
-Time: 0.094
+.
+testSQLStateOrphanedIds used 188 ms .
+testMessageIdOrphanedIds used 0 ms .
+testMessageBundleOrphanedMessages used 0 ms 
+Time: 0.203
 
 OK (3 tests)
 



Mime
View raw message