db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1089156 - in /db/derby/code/trunk/java: engine/org/apache/derby/jdbc/ engine/org/apache/derby/loc/ shared/org/apache/derby/shared/common/reference/ testing/org/apache/derbyTesting/functionTests/tests/lang/
Date Tue, 05 Apr 2011 18:45:43 GMT
Author: rhillegas
Date: Tue Apr  5 18:45:42 2011
New Revision: 1089156

URL: http://svn.apache.org/viewvc?rev=1089156&view=rev
Log:
DERBY-2066: Make the unregistered driver message a SQLState to improve error handling in the
network driver.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedSimpleDataSource.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/shared/org/apache/derby/shared/common/reference/SQLState.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java?rev=1089156&r1=1089155&r2=1089156&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java Tue Apr  5
18:45:42 2011
@@ -32,8 +32,10 @@ import java.util.Properties;
 
 import org.apache.derby.iapi.reference.MessageId;
 import org.apache.derby.iapi.reference.Attribute;
+import org.apache.derby.iapi.reference.SQLState;
 import org.apache.derby.iapi.services.i18n.MessageService;
 import org.apache.derby.iapi.jdbc.JDBCBoot;
+import org.apache.derby.impl.jdbc.Util;
 import org.apache.derby.shared.common.sanity.SanityManager;
 
 
@@ -207,9 +209,8 @@ public class AutoloadedDriver implements
 
 		if ( _engineForcedDown && (_autoloadedDriver == null))
 		{
-			// Driver not registered 
-			throw new SQLException
-				(MessageService.getTextMessage(MessageId.CORE_JDBC_DRIVER_UNREGISTERED));
+			// Driver not registered
+            throw Util.generateCsSQLException( SQLState.CORE_JDBC_DRIVER_UNREGISTERED );
 		}
 
 		if ( !isBooted() ) { EmbeddedDriver.boot(); }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedSimpleDataSource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedSimpleDataSource.java?rev=1089156&r1=1089155&r2=1089156&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedSimpleDataSource.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedSimpleDataSource.java Tue
Apr  5 18:45:42 2011
@@ -24,6 +24,7 @@ package org.apache.derby.jdbc;
 import org.apache.derby.iapi.jdbc.JDBCBoot;
 import org.apache.derby.iapi.reference.Attribute;
 import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.iapi.reference.SQLState;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -432,7 +433,9 @@ public final class EmbeddedSimpleDataSou
 					driver = InternalDriver.activeDriver();
 					
 					if (driver == null)
-						throw new SQLException(MessageService.getTextMessage(MessageId.CORE_JDBC_DRIVER_UNREGISTERED));
+                    {
+                        throw Util.generateCsSQLException( SQLState.CORE_JDBC_DRIVER_UNREGISTERED
);
+                    }
 				}
 			}
 		}

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=1089156&r1=1089155&r2=1089156&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 Tue Apr  5 18:45:42
2011
@@ -462,12 +462,18 @@ Guide.
                 <arg>number</arg>
                 <arg>number</arg>
             </msg>
+
             <msg>
                 <name>08006.C.6</name>
                 <text>Attempt to fully materialize lob data that is too large for the
JVM.  The connection has been terminated.</text>
             </msg>
 
             <msg>
+                <name>08006.C.8</name>
+                <text>org.apache.derby.jdbc.EmbeddedDriver is not registered with the
JDBC driver manager</text>
+            </msg>
+
+            <msg>
                 <name>08006.D</name>
                 <text>Database '{0}' shutdown.</text>
                 <arg>databaseName</arg>
@@ -7595,11 +7601,6 @@ Shutting down instance {0} on database d
             <title>Undocumented Messages for Interface in com.ibm.db2j.core.* from
MessageId.java</title>
 
             <msg>
-                <name>I015</name>
-                <text>org.apache.derby.jdbc.EmbeddedDriver is not registered with the
JDBC driver manager</text>
-            </msg>
-
-            <msg>
                 <name>I024</name>
                 <text>Database not available</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=1089156&r1=1089155&r2=1089156&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 Tue Apr  5
18:45:42 2011
@@ -1351,6 +1351,7 @@ XXXXX.C.6=Norm\u00e1ln\u00ed zav\u0159en
 08006.C.4=Vyskytla se chyba b\u011bhem odlo\u017een\u00e9ho resetov\u00e1n\u00ed spojen\u00ed
a spojen\u00ed bylo ukon\u010deno. Podrobnosti viz z\u0159et\u011bzen\u00e9 v\u00fdjimky.
 08006.C.5=Nedostatek dat p\u0159i na\u010d\u00edt\u00e1n\u00ed ze s\u00edt\u011b - o\u010dek\u00e1valo
se minim\u00e1ln\u011b {0} bajt\u016f a bylo p\u0159ijato pouze {1} bajt\u016f. Spojen\u00ed
bylo ukon\u010deno.
 08006.C.6=Pokus o \u00fapln\u00e9 uskute\u010dn\u011bn\u00ed dat protokolu, kter\u00e1 jsou
p\u0159\u00edli\u0161 velk\u00e1 pro JVM. Spojen\u00ed bylo ukon\u010deno.
+08006.C.8=org.apache.derby.jdbc.EmbeddedDriver nen\u00ed registrov\u00e1n ve spr\u00e1vci
ovlada\u010d\u016f JDBC
 
 XJ015.M=Vypnut\u00ed syst\u00e9mu Derby.
 
@@ -1494,7 +1495,6 @@ A001=FAT\u00c1LN\u00cd CHYBA: Neexistuje
 A002=FAT\u00c1LN\u00cd CHYBA: Neexistuje ov\u011b\u0159ovac\u00ed slu\u017eba pro datab\u00e1zi
 A011=VAROV\u00c1N\u00cd: Ve vlastnosti {0} nebylo uvedeno jm\u00e9no serveru/hostitele LDAP;
p\u0159edpokl\u00e1d\u00e1 se localhost:389
 
-I015=org.apache.derby.jdbc.EmbeddedDriver nen\u00ed registrov\u00e1n ve spr\u00e1vci ovlada\u010d\u016f
JDBC
 I024=Datab\u00e1ze nen\u00ed k dispozici
 I025=Ovlada\u010d JDBC nen\u00ed k dispozici
 I026=Selh\u00e1n\u00ed registrace ovlada\u010de JDBC v java.sql.DriverManager: {0}

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=1089156&r1=1089155&r2=1089156&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 Tue Apr
 5 18:45:42 2011
@@ -78,6 +78,7 @@
 08006.C.4=W\u00E4hrend des verz\u00F6gerten Zur\u00FCcksetzens einer Verbindung ist ein Fehler
aufgetreten. Die Verbindung wurde beendet. Details finden Sie in den zugeh\u00F6rigen Ausnahmen.
 08006.C.5=Unzureichende Daten beim Lesen aus dem Netz. Erwartet wurden mindestens {0} Bytes,
empfangen wurden jedoch nur {1} Bytes. Die Verbindung wurde beendet.
 08006.C.6=Es wurde versucht, LOB-Daten vollst\u00E4ndig zu speichern, die f\u00FCr die JVM
zu umfangreich sind. Die Verbindung wurde beendet.
+08006.C.8=org.apache.derby.jdbc.EmbeddedDriver wurde nicht im JDBC-Treibermanager registriert.
 08006.C=Es wurde ein Netzprotokollfehler gefunden. Die Verbindung wurde beendet. {0}
 08006.D=Die Datenbank ''{0}'' wird heruntergefahren.
 08006.D.1=Die Datenbank ''{0}'' wurde gel\u00F6scht.
@@ -716,7 +717,6 @@ D012=Die Sicherung ist abgeschlossen. Pr
 D013=WARNUNG\: Die Datenbank wird mit {0}\={1} gebootet. Bei Verwendung dieses Modus kann
die Datenbank m\u00F6glicherweise nicht wiederhergestellt werden. Festgeschriebene Transaktionen
k\u00F6nnen verloren gehen. Es ist m\u00F6glich, dass die Datenbank einen inkonsistenten Status
hat. Verwenden Sie diesen Modus nur, wenn Sie die genannten Folgen bewusst in Kauf nehmen
m\u00F6chten.  \n
 D014=Lesezugriff
 D015=Weiterlesen nicht m\u00F6glich, da der Wert von einer anderen Transaktion ge\u00E4ndert
wurde.
-I015=org.apache.derby.jdbc.EmbeddedDriver wurde nicht im JDBC-Treibermanager registriert.
 I024=Die Datenbank ist nicht verf\u00FCgbar.
 I025=Der JDBC-Treiber ist nicht verf\u00FCgbar.
 I026=Die JDBC-Treiberregistrierung mit java.sql.DriverManager ist gescheitert. {0} 

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=1089156&r1=1089155&r2=1089156&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 Tue Apr  5
18:45:42 2011
@@ -78,6 +78,7 @@
 08006.C.4=Se ha producido un error durante un restablecimiento de conexi\u00F3n diferido
y la conexi\u00F3n se ha finalizado.  Consulte las excepciones encadenadas para obtener detalles.
 08006.C.5=No hay suficientes datos mientras se lee desde la red - se esperaba un m\u00EDnimo
de {0} y s\u00F3lo se han recibido {1} bytes.  La conexi\u00F3n se ha finalizado.
 08006.C.6=Se ha intentado materializar por completo datos lob demasiado grandes para JVM.
 La conexi\u00F3n se ha finalizado.
+08006.C.8=org.apache.derby.jdbc.EmbeddedDriver no se ha registrado con el gestor de controladores
JDBC
 08006.C=Se ha encontrado un error de protocolo de red y se ha finalizado la conexi\u00F3n\:
{0}
 08006.D=Conclusi\u00F3n de la base de datos ''{0}''.
 08006.D.1=Base de datos ''{0}'' eliminada.
@@ -716,7 +717,6 @@ D012=Copia de seguridad completada, inst
 D013=AVISO\: La base de datos se ha arrancado mediante {0}\={1}. En esta modalidad, es posible
que la base de datos no se pueda recuperar, las transacciones comprometidas se podr\u00EDan
perder, y la base de datos podr\u00EDa estar en un estado no coherente. Por favor, utilice
esta modalidad \u00FAnicamente cuando estas consecuencias sean aceptables.  \n
 D014=en modalidad S\u00D3LO LECTURA
 D015=No se puede leer m\u00E1s porque otra transacci\u00F3n ha modificado el valor.
-I015=org.apache.derby.jdbc.EmbeddedDriver no se ha registrado con el gestor de controladores
JDBC
 I024=Base de datos no disponible
 I025=Controlador JDBC no disponible
 I026=El registro de controlador JDBC con java.sql.DriverManager ha fallado\: {0}

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=1089156&r1=1089155&r2=1089156&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 Tue Apr  5
18:45:42 2011
@@ -78,6 +78,7 @@
 08006.C.4=Une erreur s''est produite au cours d''une r\u00E9initialisation de connexion diff\u00E9r\u00E9e
et la connexion a \u00E9t\u00E9 ferm\u00E9e.  Pour plus d''informations, voir les exceptions
en cha\u00EEne.
 08006.C.5=Donn\u00E9es insuffisantes lors de la lecture depuis le r\u00E9seau \: {0} octets
\u00E9taient attendus, mais seulement {1} octets ont \u00E9t\u00E9 re\u00E7us.  La connexion
a \u00E9t\u00E9 ferm\u00E9e.
 08006.C.6=Tentative de mat\u00E9rialisation totale de donn\u00E9es d''objet LOB trop importantes
pour la machine virtuelle Java.  La connexion a \u00E9t\u00E9 ferm\u00E9e.
+08006.C.8=org.apache.derby.jdbc.EmbeddedDriver n''est pas enregistr\u00E9 aupr\u00E8s du
gestionnaire de pilotes JDBC.
 08006.C=Une erreur de protocole r\u00E9seau s''est produite et la connexion a \u00E9t\u00E9
ferm\u00E9e \: {0}
 08006.D=Arr\u00EAt de la base de donn\u00E9es ''{0}''.
 08006.D.1=Base de donn\u00E9es ''{0}'' d\u00E9pos\u00E9e.
@@ -716,7 +717,6 @@ D012=Sauvegarde termin\u00E9e, l''instan
 D013=AVERTISSEMENT \: La base de donn\u00E9es est initialis\u00E9e avec {0}\={1}. Lorsque
ce mode est utilis\u00E9, il est possible que la base de donn\u00E9es ne puisse pas \u00EAtre
restaur\u00E9e, que des transactions valid\u00E9es soient perdues et que la base de donn\u00E9es
soit dans un \u00E9tat incoh\u00E9rent. Utilisez ce mode uniquement lorsque ces cons\u00E9quences
sont acceptables  \n
 D014=en mode LECTURE SEULE
 D015=Impossible de poursuivre la lecture car une autre transaction a modifi\u00E9 la valeur.
-I015=org.apache.derby.jdbc.EmbeddedDriver n''est pas enregistr\u00E9 aupr\u00E8s du gestionnaire
de pilotes JDBC.
 I024=La base de donn\u00E9es n''est pas disponible.
 I025=Pilote JDBC non disponible
 I026=Echec de l''enregistrement du pilote JDBC avec java.sql.DriverManager \: {0}

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=1089156&r1=1089155&r2=1089156&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 Tue Apr  5
18:45:42 2011
@@ -1353,6 +1353,7 @@ XXXXX.C.6=Norm\u00e1l adatb\u00e1zis-mun
 08006.C.4=Hiba t\u00f6rt\u00e9nt egy visszautas\u00edtott csatlakoz\u00e1s alaphelyzetbe
\u00e1ll\u00edt\u00e1s sor\u00e1n \u00e9s a kapcsolat lez\u00e1r\u00e1sra ker\u00fclt.  R\u00e9szletek\u00e9rt
tekintse meg a l\u00e1ncolt kiv\u00e9teleket.
 08006.C.5=Nem \u00e9rkezett elegend\u0151 adat a h\u00e1l\u00f3zatr\u00f3l olvas\u00e1s k\u00f6zben
- a minim\u00e1lisan v\u00e1rt {0} byte helyett csak {1} byte \u00e9rkezett.  A kapcsolat
lez\u00e1r\u00e1sra ker\u00fclt.
 08006.C.6=A lob adatok teljes megval\u00f3sul\u00e1s\u00edt\u00e1s\u00e1ra t\u00f6rt\u00e9nt
k\u00eds\u00e9rlet, amely a JVM-hez t\u00fal nagy.  A kapcsolat lez\u00e1r\u00e1sra ker\u00fclt.
+08006.C.8=Az org.apache.derby.jdbc.EmbeddedDriver nincs bejegyezve a JDBC illeszt\u0151program-kezel\u0151h\u00f6z
 
 XJ015.M=A Derby rendszer le\u00e1ll.
 
@@ -1496,7 +1497,6 @@ A001=FATAL: A rendszerhez nem tal\u00e1l
 A002=FATAL: Az adatb\u00e1zishoz nem tal\u00e1lhat\u00f3 hiteles\u00edt\u00e9si szolg\u00e1ltat\u00e1s
 A011=WARNING: A(z) {0} tulajdons\u00e1gban nincs eml\u00edtve LDAP kiszolg\u00e1l\u00f3/gazdan\u00e9v;
felt\u00e9telezett localhost:389
 
-I015=Az org.apache.derby.jdbc.EmbeddedDriver nincs bejegyezve a JDBC illeszt\u0151program-kezel\u0151h\u00f6z
 I024=Az adatb\u00e1zis nem el\u00e9rhet\u0151
 I025=A JDBC illeszt\u0151program nem el\u00e9rhet\u0151
 I026=A JDBC illeszt\u0151program regisztr\u00e1ci\u00f3ja meghi\u00fasult a java.sql.DriverManagerhez:
{0}

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=1089156&r1=1089155&r2=1089156&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 Tue Apr  5
18:45:42 2011
@@ -78,6 +78,7 @@
 08006.C.4=Si \u00E8 verificato un errore durante una reimpostazione di connessione rinviata
e la connessione \u00E8 stata terminata.  Per dettagli, consultare l''eccezione correlata.
 08006.C.5=Dati insufficienti durante la lettura dalla rete - previsto un minimo di {0} byte
e ricevuti solo {1} byte.  La connessione \u00E8 stata terminata.
 08006.C.6=Tentativo di materializzare in modo completo dati lob troppo grandi per la JVM.
 La connessione \u00E8 stata terminata.
+08006.C.8=org.apache.derby.jdbc.EmbeddedDriver non registrato con il gestore driver JDBC
 08006.C=Si \u00E8 verificato un errore del protocollo di rete e la connessione \u00E8 stata
terminata\: {0}
 08006.D=Arresto database ''{0}''.
 08006.D.1=Database ''{0}'' scartato.
@@ -716,7 +717,6 @@ D012=Backup completato, classe instant d
 D013=AVVERTENZA\: Il database viene avviato con {0}\={1}. In questa modalit\u00E0, \u00E8
possibile che il database non possa essere ripristinato, che le transazioni di cui \u00E8
stato eseguito il commit vadano perdute e che il database si trovi in uno stato incoerente.
Utilizzare questa modalit\u00E0 solo quando tali conseguenze sono accettabili \n
 D014=In modalit\u00E0 READ ONLY
 D015=Un''altra transazione ha modificato il valore. Impossibile continuare a leggere.
-I015=org.apache.derby.jdbc.EmbeddedDriver non registrato con il gestore driver JDBC
 I024=Database non disponibile
 I025=Driver JDBC non disponibile
 I026=Registrazione Driver JDBC con java.sql.DriverManager non riuscita\: {0}

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=1089156&r1=1089155&r2=1089156&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 Tue Apr
 5 18:45:42 2011
@@ -78,6 +78,7 @@
 08006.C.4=\u636E\u3048\u7F6E\u304D\u63A5\u7D9A\u306E\u30EA\u30BB\u30C3\u30C8\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u3001\u63A5\u7D9A\u304C\u7D42\u4E86\u3055\u308C\u307E\u3057\u305F\u3002
 \u8A73\u7D30\u306B\u3064\u3044\u3066\u306F\u3001\u4ED8\u968F\u3059\u308B\u4F8B\u5916\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 08006.C.5=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u304B\u3089\u8AAD\u307F\u53D6\u308A\u4E2D\u306E\u30C7\u30FC\u30BF\u304C\u4E0D\u5341\u5206\u3067\u3059\u3002{0}
\u30D0\u30A4\u30C8\u4EE5\u4E0A\u306E\u30C7\u30FC\u30BF\u3092\u4E88\u671F\u3057\u3066\u3044\u307E\u3057\u305F\u304C\u53D7\u4FE1\u3057\u305F\u30C7\u30FC\u30BF\u306F
{1} \u30D0\u30A4\u30C8\u306E\u307F\u3067\u3057\u305F\u3002  \u63A5\u7D9A\u306F\u7D42\u4E86\u3055\u308C\u307E\u3057\u305F\u3002
 08006.C.6=JVM \u306B\u5BFE\u3057\u3066\u5927\u304D\u3059\u304E\u308B LOB \u30C7\u30FC\u30BF\u3092\u5B8C\u5168\u306B\u30DE\u30C6\u30EA\u30A2\u30E9\u30A4\u30BA\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F\u3002
 \u63A5\u7D9A\u306F\u7D42\u4E86\u3055\u308C\u307E\u3057\u305F\u3002
+08006.C.8=org.apache.derby.jdbc.EmbeddedDriver \u306F\u3001JDBC \u30C9\u30E9\u30A4\u30D0\u30FC\u30FB\u30DE\u30CD\u30FC\u30B8\u30E3\u30FC\u306B\u767B\u9332\u3055\u308C\u3066\u3044\u307E\u305B\u3093
 08006.C=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u30D7\u30ED\u30C8\u30B3\u30EB\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u3001\u63A5\u7D9A\u304C\u7D42\u4E86\u3055\u308C\u307E\u3057\u305F\:
{0}
 08006.D=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9 ''{0}'' \u304C\u30B7\u30E3\u30C3\u30C8\u30C0\u30A6\u30F3\u3055\u308C\u307E\u3057\u305F\u3002
 08006.D.1=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9 ''{0}'' \u304C\u30C9\u30ED\u30C3\u30D7\u3055\u308C\u307E\u3057\u305F\u3002
@@ -714,7 +715,6 @@ D012=\u30D0\u30C3\u30AF\u30A2\u30C3\u30D
 D013=\u8B66\u544A\: \u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306F {0}\={1} \u3067\u30D6\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u3059\u3002
\u3053\u306E\u30E2\u30FC\u30C9\u3067\u306F\u3001\u305D\u306E\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u30EA\u30AB\u30D0\u30EA\u3067\u304D\u306A\u3044\u3053\u3068\u3001\u30B3\u30DF\u30C3\u30C8\u3055\u308C\u305F\u30C8\u30E9\u30F3\u30B6\u30AF\u30B7\u30E7\u30F3\u304C\u5931\u308F\u308C\u3066\u3044\u308B\u3053\u3068\u3001\u304A\u3088\u3073\u305D\u306E\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304C\u4E0D\u6574\u5408\u306A\u72B6\u614B\u306B\u306A\u3063\u3066\u3044\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
\u3053\u308C\u3089\u306E\u7D50\u679C\u3092\u8A31\u5BB9\u3067\u304D\u308B\u5834\u5408\u306B\u306E\u307F\u3001\u3053\u306E\u30E2\u30FC\u30C9\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
 \n
 D014=\u8AAD\u307F\u53D6\u308A\u5C02\u7528\u30E2\u30FC\u30C9\u3067\u3059
 D015=\u5225\u306E\u30C8\u30E9\u30F3\u30B6\u30AF\u30B7\u30E7\u30F3\u306B\u3088\u3063\u3066\u5024\u304C\u5909\u66F4\u3055\u308C\u305F\u305F\u3081\u3001\u3053\u308C\u4EE5\u4E0A\u8AAD\u307F\u8FBC\u3080\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-I015=org.apache.derby.jdbc.EmbeddedDriver \u306F\u3001JDBC \u30C9\u30E9\u30A4\u30D0\u30FC\u30FB\u30DE\u30CD\u30FC\u30B8\u30E3\u30FC\u306B\u767B\u9332\u3055\u308C\u3066\u3044\u307E\u305B\u3093
 I024=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306F\u5229\u7528\u4E0D\u80FD\u3067\u3059
 I025=JDBC \u30C9\u30E9\u30A4\u30D0\u30FC\u306F\u5229\u7528\u4E0D\u80FD\u3067\u3059
 I026=java.sql.DriverManager \u3078\u306E JDBC \u30C9\u30E9\u30A4\u30D0\u306E\u767B\u9332\u306B\u5931\u6557\u3057\u307E\u3057\u305F\:
{0}

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=1089156&r1=1089155&r2=1089156&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 Tue Apr
 5 18:45:42 2011
@@ -78,6 +78,7 @@
 08006.C.4=\uC9C0\uC5F0\uB41C \uC5F0\uACB0\uC744 \uC7AC\uC124\uC815\uD558\uB294 \uC911\uC5D0
\uC624\uB958\uAC00 \uBC1C\uC0DD\uD558\uC5EC \uC5F0\uACB0\uC774 \uC885\uB8CC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
\uC138\uBD80\uC0AC\uD56D\uC740 \uAD00\uB828\uB41C \uC608\uC678\uB97C \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.
 08006.C.5=\uB124\uD2B8\uC6CC\uD06C\uB85C\uBD80\uD130 \uC77D\uC740 \uB370\uC774\uD130 \uC6A9\uB7C9\uC774
\uCDA9\uBD84\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. \uC608\uC0C1 \uCD5C\uC18C \uC6A9\uB7C9\uC740
{0}\uBC14\uC774\uD2B8\uC774\uC9C0\uB9CC \uC218\uC2E0\uB41C \uC6A9\uB7C9\uC740 {1}\uBC14\uC774\uD2B8\uC785\uB2C8\uB2E4.\uC5F0\uACB0\uC774
\uC885\uB8CC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
 08006.C.6=JVM\uC5D0 \uB300\uD574 \uB108\uBB34 \uD070 LOB \uB370\uC774\uD130\uB97C \uC644\uC804
\uAD6C\uCCB4\uD654\uD558\uB824\uACE0 \uC2DC\uB3C4\uD569\uB2C8\uB2E4. \uC5F0\uACB0\uC774 \uC885\uB8CC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+08006.C.8=org.apache.derby.jdbc.EmbeddedDriver\uAC00 JDBC \uB4DC\uB77C\uC774\uBC84 \uAD00\uB9AC\uC790\uB97C
\uC0AC\uC6A9\uD558\uC5EC \uB4F1\uB85D\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
 08006.C=\uB124\uD2B8\uC6CC\uD06C \uD504\uB85C\uD1A0\uCF5C \uC624\uB958\uAC00 \uBC1C\uC0DD\uD558\uC5EC
\uC5F0\uACB0\uC774 \uC885\uB8CC\uB418\uC5C8\uC2B5\uB2C8\uB2E4. {0}.
 08006.D=\uB370\uC774\uBCA0\uC774\uC2A4 ''{0}'' \uC885\uB8CC.
 08006.D.1=\uB370\uC774\uD130\uBCA0\uC774\uC2A4 ''{0}''\uC774(\uAC00) \uC0AD\uC81C\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
@@ -717,7 +718,6 @@ D012=\uBC31\uC5C5\uC774 \uC644\uB8CC\uB4
 D013=\uACBD\uACE0\: \uB370\uC774\uD130\uBCA0\uC774\uC2A4\uAC00 {0}\={1}(\uC73C)\uB85C \uBD80\uD305\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
\uC774 \uBAA8\uB4DC\uC5D0\uC11C \uB370\uC774\uD130\uBCA0\uC774\uC2A4\uB294 \uBCF5\uAD6C\uB418\uC9C0
\uC54A\uC744 \uC218 \uC788\uC73C\uBA70, \uD655\uC57D\uB41C \uD2B8\uB79C\uC7AD\uC158\uC774
\uC720\uC2E4\uB420 \uC218 \uC788\uC73C\uBA70, \uB370\uC774\uD130\uBCA0\uC774\uC2A4\uAC00 \uBD88\uC77C\uCE58
\uC0C1\uD0DC\uC5D0 \uC788\uC744 \uC218 \uC788\uC2B5\uB2C8\uB2E4. \uC774\uB7EC\uD55C \uACB0\uACFC\uB97C
\uD5C8\uC6A9\uD560 \uC218 \uC788\uB294 \uACBD\uC6B0\uC5D0\uB9CC \uC774 \uBAA8\uB4DC\uB97C
\uC0AC\uC6A9\uD558\uC2ED\uC2DC\uC624.  \n
 D014=\uC77D\uAE30 \uC804\uC6A9 \uBAA8\uB4DC\uC5D0\uC11C \uB370\uC774\uD130\uBCA0\uC774\uC2A4\uAC00
\uC561\uC138\uC2A4\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
 D015=\uB2E4\uB978 \uD2B8\uB79C\uC7AD\uC158\uC774 \uAC12\uC744 \uC218\uC815\uD588\uAE30 \uB54C\uBB38\uC5D0
\uB354 \uC774\uC0C1 \uC77D\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-I015=org.apache.derby.jdbc.EmbeddedDriver\uAC00 JDBC \uB4DC\uB77C\uC774\uBC84 \uAD00\uB9AC\uC790\uB97C
\uC0AC\uC6A9\uD558\uC5EC \uB4F1\uB85D\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
 I024=\uB370\uC774\uD130\uBCA0\uC774\uC2A4\uB97C \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC74C
 I025=JDBC \uB4DC\uB77C\uC774\uBC84\uB97C \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC74C
 I026=java.sql.DriverManager\uB97C \uC0AC\uC6A9\uD55C JDBC \uB4DC\uB77C\uC774\uBC84 \uB4F1\uB85D\uC5D0
\uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4. {0}

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=1089156&r1=1089155&r2=1089156&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 Tue Apr  5
18:45:42 2011
@@ -1353,6 +1353,7 @@ XXXXX.C.6=Zamkni\u0119cie zwyk\u0142ej s
 08006.C.4=Wyst\u0105pi\u0142 b\u0142\u0105d podczas odroczonego resetowania po\u0142\u0105czenia
i po\u0142\u0105czenie zosta\u0142o zako\u0144czone. Szczeg\u00f3\u0142y zawieraj\u0105 kolejne
wyj\u0105tki.
 08006.C.5=Niewystarczaj\u0105ca ilo\u015b\u0107 danych podczas odczytu z sieci - oczekiwano
minimum {0} bajt\u00f3w, a otrzymano tylko {1} bajt\u00f3w. Po\u0142\u0105czenie zosta\u0142o
przerwane.
 08006.C.6=Pr\u00f3ba pe\u0142nego zmaterializowania danych LOB, kt\u00f3re s\u0105 zbyt du\u017ce
dla \u015brodowiska JVM. Po\u0142\u0105czenie zosta\u0142o przerwane.
+08006.C.8=Klasa org.apache.derby.jdbc.EmbeddedDriver nie jest zarejestrowana za pomoc\u0105
mened\u017cera sterownika JDBC
 XJ015.M=System Derby zosta\u0142 wy\u0142\u0105czony.
 
 01J01=Baza danych ''{0}'' nie zosta\u0142a utworzona. Zamiast tego utworzone zosta\u0142o
po\u0142\u0105czenie z istniej\u0105c\u0105 baz\u0105 danych.
@@ -1495,7 +1496,6 @@ A001=B\u0141\u0104D KRYTYCZNY: W systemi
 A002=B\u0141\u0104D KRYTYCZNY: W bazie danych brakuje us\u0142ugi uwierzytelniania
 A011=OSTRZE\u017bENIE: Brak nazwy serwera/hosta LDAP wymienionej we w\u0142a\u015bciwo\u015bci
{0}. Przyj\u0119to nazw\u0119 localhost:389
 
-I015=Klasa org.apache.derby.jdbc.EmbeddedDriver nie jest zarejestrowana za pomoc\u0105 mened\u017cera
sterownika JDBC
 I024=Baza danych jest niedost\u0119pna
 I025=Sterownik JDBC nie jest dost\u0119pny
 I026=Rejestrowanie sterownika JDBC za pomoc\u0105 klasy java.sql.DriverManager nie powiod\u0142o
si\u0119: {0}

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=1089156&r1=1089155&r2=1089156&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 Tue Apr
 5 18:45:42 2011
@@ -1349,6 +1349,7 @@ XXXXX.C.6=Encerramento normal da sess\u0
 08006.C.4=Ocorreu um erro durante uma redefini\u00e7\u00e3o de conex\u00e3o postergada e
a conex\u00e3o foi encerrada.  Consulte as exce\u00e7\u00f5es encadeadas para obter detalhes.
 08006.C.5=Dados insuficientes ao ler da rede - esperado um m\u00ednimo de {0} bytes mas recebido
apenas {1} bytes.  A conex\u00e3o foi encerrada.
 08006.C.6=Tentativa de materializar completamente dados LOB muito grandes para a JVM.  A
conex\u00e3o foi encerrada.
+08006.C.8=org.apache.derby.jdbc.EmbeddedDriver n\u00e3o est\u00e1 registrado com o gerenciador
do driver JDBC
 
 XJ015.M=Encerramento do sistema Derby.
 
@@ -1491,7 +1492,6 @@ A001=FATAL: N\u00e3o h\u00e1 nenhum Serv
 A002=FATAL: N\u00e3o h\u00e1 nenhum Servi\u00e7o de Autentica\u00e7\u00e3o para o banco de
dados
 A011=ADVERT\u00caNCIA: Nenhum nome de Hospedeiro/Servidor LDAP mencionado na propriedade
{0}; assumindo localhost:389
 
-I015=org.apache.derby.jdbc.EmbeddedDriver n\u00e3o est\u00e1 registrado com o gerenciador
do driver JDBC
 I024=O banco de dados n\u00e3o est\u00e1 dispon\u00edvel
 I025=O driver JDBC n\u00e3o est\u00e1 dispon\u00edvel
 I026=O registro do Driver JDBC com java.sql.DriverManager falhou: {0}

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=1089156&r1=1089155&r2=1089156&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 Tue Apr  5
18:45:42 2011
@@ -1353,6 +1353,7 @@ XXXXX.C.6=\u041e\u0431\u044b\u0447\u043d
 08006.C.4=\u041f\u0440\u043e\u0438\u0437\u043e\u0448\u043b\u0430 \u043e\u0448\u0438\u0431\u043a\u0430
\u043f\u0440\u0438 \u043f\u0435\u0440\u0435\u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0435
\u043e\u0442\u043b\u043e\u0436\u0435\u043d\u043d\u043e\u0433\u043e \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u044f,
\u0438 \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435 \u0431\u044b\u043b\u043e
\u043f\u0440\u0435\u0440\u0432\u0430\u043d\u043e.  \u0411\u043e\u043b\u0435\u0435 \u043f\u043e\u0434\u0440\u043e\u0431\u043d\u0443\u044e
\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e \u0441\u043c\u043e\u0442\u0440\u0438\u0442\u0435
\u0432 \u0446\u0435\u043f\u0438 \u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0439.
 08006.C.5=\u041d\u0435\u0434\u043e\u0441\u0442\u0430\u0442\u043e\u0447\u043d\u043e \u0434\u0430\u043d\u043d\u044b\u0445
\u043f\u0440\u0438 \u0447\u0442\u0435\u043d\u0438\u0438 \u0438\u0437 \u0441\u0435\u0442\u0438
- \u043e\u0436\u0438\u0434\u0430\u043b\u043e\u0441\u044c \u043c\u0438\u043d\u0438\u043c\u0443\u043c
{0} \u0431\u0430\u0439\u0442, \u0430 \u0431\u044b\u043b\u043e \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u043e
\u0442\u043e\u043b\u044c\u043a\u043e {1} \u0431\u0430\u0439\u0442.  \u0421\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435
\u043f\u0440\u0435\u0440\u0432\u0430\u043d\u043e.
 08006.C.6=\u041f\u043e\u043f\u044b\u0442\u043a\u0430 \u043f\u043e\u043b\u043d\u043e\u0441\u0442\u044c\u044e
\u043c\u0430\u0442\u0435\u0440\u0438\u0430\u043b\u0438\u0437\u043e\u0432\u0430\u0442\u044c
\u0434\u0430\u043d\u043d\u044b\u0435 LOB, \u043e\u0431\u044a\u0435\u043c \u043a\u043e\u0442\u043e\u0440\u044b\u0445
\u0441\u043b\u0438\u0448\u043a\u043e\u043c \u0432\u0435\u043b\u0438\u043a \u0434\u043b\u044f
JVM.  \u0421\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435 \u043f\u0440\u0435\u0440\u0432\u0430\u043d\u043e.
+08006.C.8=org.apache.derby.jdbc.EmbeddedDriver \u043d\u0435 \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d
\u0432 \u043c\u0435\u043d\u0435\u0434\u0436\u0435\u0440\u0435 \u0434\u0440\u0430\u0439\u0432\u0435\u0440\u043e\u0432
JDBC
 XJ015.M=\u0421\u0438\u0441\u0442\u0435\u043c\u0430 Derby \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u043b\u0430
\u0440\u0430\u0431\u043e\u0442\u0443.
 
 01J01=\u0411\u0430\u0437\u0430 \u0434\u0430\u043d\u043d\u044b\u0445 ''{0}'' \u043d\u0435
\u0441\u043e\u0437\u0434\u0430\u043d\u0430; \u0432\u043c\u0435\u0441\u0442\u043e \u044d\u0442\u043e\u0433\u043e
\u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043e \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435
\u0441 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0435\u0439 \u0431\u0430\u0437\u043e\u0439
\u0434\u0430\u043d\u043d\u044b\u0445.
@@ -1495,7 +1496,6 @@ A001=\u041d\u0415\u0412\u041e\u0421\u042
 A002=\u041d\u0415\u0412\u041e\u0421\u0421\u0422\u0410\u041d\u041e\u0412\u0418\u041c\u0410\u042f
\u041e\u0428\u0418\u0411\u041a\u0410: \u041d\u0435\u0442 \u0441\u043b\u0443\u0436\u0431\u044b
\u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u0438 \u0434\u043b\u044f
\u0431\u0430\u0437\u044b \u0434\u0430\u043d\u043d\u044b\u0445
 A011=\u041f\u0420\u0415\u0414\u0423\u041f\u0420\u0415\u0416\u0414\u0415\u041d\u0418\u0415:
\u0412 \u0441\u0432\u043e\u0439\u0441\u0442\u0432\u0435 {0} \u043d\u0435 \u0443\u043a\u0430\u0437\u0430\u043d\u043e
\u0438\u043c\u044f \u0441\u0435\u0440\u0432\u0435\u0440\u0430/\u0445\u043e\u0441\u0442\u0430
LDAP; \u0431\u0443\u0434\u0435\u0442 \u043f\u0440\u0438\u043d\u044f\u0442\u043e \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435
localhost:389
 
-I015=org.apache.derby.jdbc.EmbeddedDriver \u043d\u0435 \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d
\u0432 \u043c\u0435\u043d\u0435\u0434\u0436\u0435\u0440\u0435 \u0434\u0440\u0430\u0439\u0432\u0435\u0440\u043e\u0432
JDBC
 I024=\u0411\u0430\u0437\u0430 \u0434\u0430\u043d\u043d\u044b\u0445 \u043d\u0435\u0434\u043e\u0441\u0442\u0443\u043f\u043d\u0430
 I025=\u0414\u0440\u0430\u0439\u0432\u0435\u0440 JDBC \u043d\u0435\u0434\u043e\u0441\u0442\u0443\u043f\u0435\u043d
 I026=\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044f \u0434\u0440\u0430\u0439\u0432\u0435\u0440\u0430
JDBC \u0432 java.sql.DriverManager \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u043b\u0430\u0441\u044c
\u043d\u0435\u0443\u0434\u0430\u0447\u043d\u043e: {0}

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=1089156&r1=1089155&r2=1089156&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 Tue Apr
 5 18:45:42 2011
@@ -78,6 +78,7 @@
 08006.C.4=\u5EF6\u8FDF\u8FDE\u63A5\u590D\u4F4D\u671F\u95F4\u53D1\u751F\u9519\u8BEF\uFF0C\u8FDE\u63A5\u5DF2\u7EC8\u6B62\u3002\u8BF7\u53C2\u9605\u94FE\u63A5\u5F02\u5E38\uFF0C\u4EE5\u4E86\u89E3\u8BE6\u7EC6\u4FE1\u606F\u3002
 08006.C.5=\u4ECE\u7F51\u7EDC\u4E2D\u8BFB\u53D6\u65F6\u6570\u636E\u4E0D\u8DB3 \uFF0D \u671F\u671B\u6700\u5C11\u6709
{0} \u5B57\u8282\uFF0C\u4EC5\u63A5\u6536\u5230 {1} \u5B57\u8282\u3002\u8FDE\u63A5\u5DF2\u7EC8\u6B62\u3002
 08006.C.6=\u5C1D\u8BD5\u5B8C\u5168\u5177\u4F53\u5316\u5BF9\u4E8E JVM \u6765\u8BF4\u592A\u5927\u7684
lob \u6570\u636E\u3002\u8FDE\u63A5\u5DF2\u7EC8\u6B62\u3002
+08006.C.8=\u672A\u5411 JDBC \u9A71\u52A8\u7A0B\u5E8F\u7BA1\u7406\u5668\u6CE8\u518C org.apache.derby.jdbc.EmbeddedDriver
 08006.C=\u9047\u5230\u4E86\u7F51\u7EDC\u534F\u8BAE\u9519\u8BEF\uFF0C\u8FDE\u63A5\u5DF2\u7EC8\u6B62\uFF1A{0}
 08006.D=\u6570\u636E\u5E93\u201C{0}\u201D\u5173\u95ED\u3002
 08006.D.1=\u6570\u636E\u5E93 ''{0}'' \u5DF2\u5220\u9664\u3002
@@ -714,7 +715,6 @@ D012=\u5907\u4EFD\u5B8C\u6210\uFF0C\u65E
 D013=\u8B66\u544A\uFF1A\u6570\u636E\u5E93\u4F7F\u7528 {0}\={1} \u5F15\u5BFC\u3002\u5728\u6B64\u65B9\u5F0F\u4E2D\uFF0C\u6570\u636E\u5E93\u53EF\u80FD\u65E0\u6CD5\u6062\u590D\uFF0C\u843D\u5B9E\u7684\u4E8B\u52A1\u53EF\u80FD\u4E22\u5931\uFF0C\u5E76\u4E14\u6570\u636E\u5E93\u53EF\u80FD\u5904\u4E8E\u4E0D\u4E00\u81F4\u72B6\u6001\u3002\u8BF7\u4EC5\u5728\u8FD9\u4E9B\u7ED3\u679C\u53EF\u4EE5\u63A5\u53D7\u7684\u60C5\u51B5\u4E0B\u4F7F\u7528\u6B64\u65B9\u5F0F
 \n
 D014=\u5728\u53EA\u8BFB\u65B9\u5F0F\u4E0B\u8BBF\u95EE\u6570\u636E\u5E93
 D015=\u65E0\u6CD5\u8FDB\u4E00\u6B65\u8BFB\u53D6\uFF0C\u56E0\u4E3A\u5176\u4ED6\u4E8B\u52A1\u5DF2\u4FEE\u6539\u4E86\u8BE5\u503C\u3002
-I015=\u672A\u5411 JDBC \u9A71\u52A8\u7A0B\u5E8F\u7BA1\u7406\u5668\u6CE8\u518C org.apache.derby.jdbc.EmbeddedDriver
 I024=\u6570\u636E\u5E93\u4E0D\u53EF\u7528
 I025=JDBC \u9A71\u52A8\u7A0B\u5E8F\u4E0D\u53EF\u7528
 I026=\u5E26\u6709 java.sql.DriverManager \u7684 JDBC \u9A71\u52A8\u7A0B\u5E8F\u6CE8\u518C\u5931\u8D25\uFF1A{0}

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=1089156&r1=1089155&r2=1089156&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 Tue Apr
 5 18:45:42 2011
@@ -78,6 +78,7 @@
 08006.C.4=\u5728\u5EF6\u9072\u9023\u63A5\u91CD\u8A2D\u671F\u9593\u767C\u751F\u932F\u8AA4\uFF0C\u4E14\u9023\u7DDA\u5DF2\u7D42\u6B62\u3002\u8ACB\u53C3\u95B1\u93C8\u63A5\u7684\u7570\u5E38\u72C0\u6CC1\uFF0C\u4EE5\u53D6\u5F97\u8A73\u7D30\u8CC7\u8A0A\u3002
 08006.C.5=\u5F9E\u7DB2\u8DEF\u8B80\u53D6\u6642\u8CC7\u6599\u4E0D\u8DB3 - \u539F\u9810\u671F\u70BA\u6700\u5C11
{0} \u500B\u4F4D\u5143\u7D44\uFF0C\u4F46\u53EA\u6536\u5230 {1} \u500B\u4F4D\u5143\u7D44\u3002\u9023\u7DDA\u5DF2\u7D42\u6B62\u3002
 08006.C.6=\u8A66\u5716\u5B8C\u5168\u5177\u9AD4\u5316\u7684 LOB \u8CC7\u6599\u5C0D JVM \u800C\u8A00\u592A\u5927\u3002\u9023\u7DDA\u5DF2\u7D42\u6B62\u3002
+08006.C.8=\u672A\u5411 JDBC \u9A45\u52D5\u7A0B\u5F0F\u7BA1\u7406\u7A0B\u5F0F\u767B\u9304
org.apache.derby.jdbc.EmbeddedDriver
 08006.C=\u767C\u73FE\u7DB2\u8DEF\u901A\u8A0A\u5354\u5B9A\u932F\u8AA4\uFF0C\u4E14\u9023\u7DDA\u5DF2\u7D42\u6B62\uFF1A{0}
 08006.D=\u5DF2\u95DC\u9589\u8CC7\u6599\u5EAB ''{0}''\u3002
 08006.D.1=\u5DF2\u6368\u68C4\u8CC7\u6599\u5EAB ''{0}''\u3002
@@ -716,7 +717,6 @@ D012=\u5099\u4EFD\u5DF2\u5B8C\u6210\uFF0
 D013=\u8B66\u544A\uFF1A\u4F7F\u7528 {0}\={1} \u555F\u52D5\u8CC7\u6599\u5EAB\u3002\u5728\u6B64\u6A21\u5F0F\u4E2D\uFF0C\u8CC7\u6599\u5EAB\u53EF\u80FD\u7121\u6CD5\u56DE\u5FA9\u3001\u53EF\u80FD\u6703\u907A\u5931\u5DF2\u78BA\u5B9A\u7684\u4F5C\u696D\u4E8B\u4EF6\uFF0C\u800C\u8CC7\u6599\u5EAB\u53EF\u80FD\u6703\u8655\u65BC\u4E0D\u4E00\u81F4\u7684\u72C0\u614B\u3002\u53EA\u6709\u5728\u53EF\u63A5\u53D7\u9019\u4E9B\u7D50\u679C\u6642\uFF0C\u624D\u53EF\u4F7F\u7528\u6B64\u6A21\u5F0F
 \n
 D014=\u552F\u8B80\u6A21\u5F0F
 D015=\u56E0\u70BA\u53E6\u4E00\u500B\u4F5C\u696D\u4E8B\u4EF6\u5DF2\u4FEE\u6539\u4E86\u8A72\u503C\uFF0C\u6240\u4EE5\u7121\u6CD5\u9032\u4E00\u6B65\u8B80\u53D6\u3002
-I015=\u672A\u5411 JDBC \u9A45\u52D5\u7A0B\u5F0F\u7BA1\u7406\u7A0B\u5F0F\u767B\u9304 org.apache.derby.jdbc.EmbeddedDriver
 I024=\u7121\u6CD5\u4F7F\u7528\u8CC7\u6599\u5EAB
 I025=\u7121\u6CD5\u4F7F\u7528 JDBC \u9A45\u52D5\u7A0B\u5F0F
 I026=java.sql.DriverManager \u7684 JDBC \u9A45\u52D5\u7A0B\u5F0F\u767B\u9304\u5931\u6557\uFF1A{0}

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=1089156&r1=1089155&r2=1089156&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
Tue Apr  5 18:45:42 2011
@@ -186,7 +186,6 @@ public interface MessageId {
 	** Derby interface in org.apache.derby.iapi.*
 	** These messages are thrown in both the server and the client side.
 	*/
-	String CORE_JDBC_DRIVER_UNREGISTERED= "I015"; // JDBCDriver is not registered with the JDBC
driver manager
 	String CORE_DATABASE_NOT_AVAILABLE	= "I024"; // Database not available
 	String CORE_DRIVER_NOT_AVAILABLE	= "I025"; // JDBC Driver not available
 	String JDBC_DRIVER_REGISTER_ERROR 	= "I026"; // Error while registering driver

Modified: db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java?rev=1089156&r1=1089155&r2=1089156&view=diff
==============================================================================
--- db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
(original)
+++ db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
Tue Apr  5 18:45:42 2011
@@ -1681,8 +1681,9 @@ public interface SQLState {
     String CONNECTION_FAILED_ON_DEFERRED_RESET                  = "08006.C.4";
     String NET_INSUFFICIENT_DATA                                = "08006.C.5";
     String NET_LOB_DATA_TOO_LARGE_FOR_JVM                       = "08006.C.6";
-  
     
+	String CORE_JDBC_DRIVER_UNREGISTERED                    = "08006.C.8"; // JDBCDriver is
not registered with the JDBC driver manager
+
     // 08001 is specifically about the SQL client not being able to establish
     // a connection with the server.  Should only be used for errors that
     // occur upon attempting to open a connection.

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java?rev=1089156&r1=1089155&r2=1089156&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java
Tue Apr  5 18:45:42 2011
@@ -130,6 +130,7 @@ public final class ErrorCodeTest extends
         		{"08006","Insufficient data while reading from the network - expected a minimum
of {0} bytes and received only {1} bytes.  The connection has been terminated.","40000"},
         		{"08006","Attempt to fully materialize lob data that is too large for the JVM.
 The connection has been terminated.","40000"},
         		{"08006","A network protocol error was encountered and the connection has been
terminated: {0}","40000"},
+        		{"08006","org.apache.derby.jdbc.EmbeddedDriver is not registered with the JDBC
driver manager","40000"},
         		{"08006","Database '{0}' shutdown.","45000"},
                 {"08006","Database '{0}' dropped.","45000"},
         		{"0A000","The DRDA command {0} is not currently implemented.  The connection has
been terminated.","40000"},



Mime
View raw message