db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From be...@apache.org
Subject svn commit: r548322 - in /db/derby/code/branches/10.3/java: drda/org/apache/derby/impl/drda/ drda/org/apache/derby/loc/drda/ engine/org/apache/derby/loc/ testing/org/apache/derbyTesting/functionTests/master/
Date Mon, 18 Jun 2007 11:30:00 GMT
Author: bernt
Date: Mon Jun 18 04:29:43 2007
New Revision: 548322

URL: http://svn.apache.org/viewvc?view=rev&rev=548322
Log:
DERBY-2796 Merged from trunk with svn merge -r 548300:548301 https://svn.apache.org/repos/asf/db/derby/code/trunk

Modified:
    db/derby/code/branches/10.3/java/drda/org/apache/derby/impl/drda/DRDAProtocolException.java
    db/derby/code/branches/10.3/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
    db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_cs.properties
    db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_de_DE.properties
    db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_en.properties
    db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_es.properties
    db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_fr.properties
    db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_hu.properties
    db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_it.properties
    db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_ja_JP.properties
    db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_ko_KR.properties
    db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_pl.properties
    db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_pt_BR.properties
    db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_ru.properties
    db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_zh_CN.properties
    db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_zh_TW.properties
    db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages.xml
    db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_cs.properties
    db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_de_DE.properties
    db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_es.properties
    db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_fr.properties
    db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_hu.properties
    db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_it.properties
    db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_ja_JP.properties
    db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_ko_KR.properties
    db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_pl.properties
    db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_pt_BR.properties
    db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_ru.properties
    db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_zh_TW.properties
    db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/master/testconnection.out

Modified: db/derby/code/branches/10.3/java/drda/org/apache/derby/impl/drda/DRDAProtocolException.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/drda/org/apache/derby/impl/drda/DRDAProtocolException.java?view=diff&rev=548322&r1=548321&r2=548322
==============================================================================
--- db/derby/code/branches/10.3/java/drda/org/apache/derby/impl/drda/DRDAProtocolException.java (original)
+++ db/derby/code/branches/10.3/java/drda/org/apache/derby/impl/drda/DRDAProtocolException.java Mon Jun 18 04:29:43 2007
@@ -275,6 +275,9 @@
 				+ messageid +
 				"; CODPNT arg  = " + java.lang.Integer.toHexString(cpArg)  +
 				"; Error Code Value = " + java.lang.Integer.toHexString(errCdArg);
+			if (msgid.equals(DRDA_Proto_SYNTAXRM)) {
+				msg += ". Plaintext connection attempt from an SSL enabled client?";
+			}
 		}
 		
 		

Modified: db/derby/code/branches/10.3/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java?view=diff&rev=548322&r1=548321&r2=548322
==============================================================================
--- db/derby/code/branches/10.3/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java (original)
+++ db/derby/code/branches/10.3/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java Mon Jun 18 04:29:43 2007
@@ -36,6 +36,7 @@
 import javax.net.SocketFactory;
 import javax.net.ServerSocketFactory;
 import javax.net.ssl.SSLServerSocket;
+import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.SSLServerSocketFactory;
 import java.net.UnknownHostException;
@@ -2244,20 +2245,26 @@
 										else
 											connectAddress = hostAddress;
 
-										SocketFactory sf;
 										switch(getSSLMode()) {
 										case SSL_BASIC:
-											sf = NaiveTrustManager.getSocketFactory();
-											break;
+											SSLSocket s1 = (SSLSocket)NaiveTrustManager.getSocketFactory().
+												createSocket(connectAddress, portNumber);
+											// Need to handshake now to get proper error reporting.
+											s1.startHandshake();
+											return s1;
+
 										case SSL_PEER_AUTHENTICATION:
-											sf = SSLSocketFactory.getDefault();
-											break;
+											SSLSocket s2 = (SSLSocket)SSLSocketFactory.getDefault().
+												createSocket(connectAddress, portNumber);
+											// Need to handshake now to get proper error reporting.
+											s2.startHandshake();
+											return s2;
+
 										case SSL_OFF:
 										default:
-											sf = SocketFactory.getDefault();
-											break;
+											return SocketFactory.getDefault().
+												createSocket(connectAddress, portNumber);
 										}
-										return sf.createSocket(connectAddress, portNumber);
 									}
 								}
 							);
@@ -2268,7 +2275,9 @@
 			}
 			else if (e1 instanceof IOException) {
 					consolePropertyMessage("DRDA_NoIO.S",
-						new String [] {hostArg, (new Integer(portNumber)).toString()});
+										   new String [] {hostArg, 
+														  (new Integer(portNumber)).toString(), 
+														  e1.getMessage()});
 			}
 		} catch (Exception e) {
 		// If we find other (unexpected) errors, we ultimately exit--so make
@@ -2276,9 +2285,9 @@
 			throwUnexpectedException(e);
 		}
 
-        try
-        {
-	       clientIs = clientSocket.getInputStream();
+		try
+		{
+		   clientIs = clientSocket.getInputStream();
 	       clientOs = clientSocket.getOutputStream();
 		} catch (IOException e) {
 			consolePropertyMessage("DRDA_NoInputStream.I");

Modified: db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_cs.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_cs.properties?view=diff&rev=548322&r1=548321&r2=548322
==============================================================================
--- db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_cs.properties (original)
+++ db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_cs.properties Mon Jun 18 04:29:43 2007
@@ -56,9 +56,9 @@
 DRDA_UnknownHost.S=Nelze vyhledat hostitele: {0}.
 DRDA_UnknownHostWarning.I=Varov\u00e1n\u00ed: Nezn\u00e1m\u00e1 v\u00fdjimka hostitele: {0}.
 DRDA_NeedLocalHost.S=hostitel: {0} nen\u00ed lok\u00e1ln\u00ed pro server spu\u0161t\u011bn\u00fd na {1}, tud\u00ed\u017e jej nelze pou\u017e\u00edt pro p\u0159\u00edkazy NetworkServerControl  
-DRDA_NoIO.S=Nelze nav\u00e1zat spojen\u00ed se s\u00ed\u0165ov\u00fdm serverem Derby na hostiteli {0}, portu {1}.
+# DRDA_NoIO.S=Nelze nav\u00e1zat spojen\u00ed se s\u00ed\u0165ov\u00fdm serverem Derby na hostiteli {0}, portu {1}.
 DRDA_InvalidReplyHeader1.S=Neplatn\u00e1 hlavi\u010dka odpov\u011bdi ze s\u00ed\u0165ov\u00e9ho serveru: D\u00e9lka {0} je p\u0159\u00edli\u0161 kr\u00e1tk\u00e1.
-DRDA_InvalidReplyHeader2.S=Neplatn\u00e1 hlavi\u010dka odpov\u011bdi ze s\u00ed\u0165ov\u00e9ho serveru: Neplatn\u00fd \u0159et\u011bzec {0}.
+# DRDA_InvalidReplyHeader2.S=Neplatn\u00e1 hlavi\u010dka odpov\u011bdi ze s\u00ed\u0165ov\u00e9ho serveru: Neplatn\u00fd \u0159et\u011bzec {0}.
 DRDA_InvalidReplyTooShort.S=Neplatn\u00e1 odpov\u011b\u010f ze s\u00ed\u0165ov\u00e9ho serveru: Nedostatek dat.
 DRDA_SysInfoError.S=Chyba p\u0159i z\u00edsk\u00e1n\u00ed informac\u00ed SysInfo.
 DRDA_SysInfoWriteError.S=Chyba p\u0159i z\u00e1pisu informac\u00ed SysInfo:\n {0}

Modified: db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_de_DE.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_de_DE.properties?view=diff&rev=548322&r1=548321&r2=548322
==============================================================================
--- db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_de_DE.properties (original)
+++ db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_de_DE.properties Mon Jun 18 04:29:43 2007
@@ -56,9 +56,9 @@
 DRDA_UnknownHost.S=Der folgende Host kann nicht gefunden werden: {0}.
 DRDA_UnknownHostWarning.I=Warnung: UnknkownHostException: {0}.
 DRDA_NeedLocalHost.S=Der Host {0} ist f\u00fcr den auf {1} ausgef\u00fchrten Server nicht lokal und kann deshalb nicht f\u00fcr NetworkServerControl-Befehle verwendet werden. 
-DRDA_NoIO.S=Es konnte keine Verbindung zu Derby Network Server auf dem Host {0}, Port {1}, hergestellt werden.
+# DRDA_NoIO.S=Es konnte keine Verbindung zu Derby Network Server auf dem Host {0}, Port {1}, hergestellt werden.
 DRDA_InvalidReplyHeader1.S=Ung\u00fcltiger Antwort-Header von Network Server: Die L\u00e4nge {0} ist zu kurz.
-DRDA_InvalidReplyHeader2.S=Ung\u00fcltiger Antwort-Header von Network Server: Ung\u00fcltige Zeichenfolge {0}.
+# DRDA_InvalidReplyHeader2.S=Ung\u00fcltiger Antwort-Header von Network Server: Ung\u00fcltige Zeichenfolge {0}.
 DRDA_InvalidReplyTooShort.S=Ung\u00fcltige Antwort von Network Server: Keine ausreichenden Daten.
 DRDA_SysInfoError.S=Fehler beim Abrufen von SysInfo-Daten.
 DRDA_SysInfoWriteError.S=Fehler beim Schreiben von SysInfo-Daten:\n {0}

Modified: db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_en.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_en.properties?view=diff&rev=548322&r1=548321&r2=548322
==============================================================================
--- db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_en.properties (original)
+++ db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_en.properties Mon Jun 18 04:29:43 2007
@@ -59,9 +59,9 @@
 DRDA_UnknownHost.S=Unable to find host: {0}.
 DRDA_UnknownHostWarning.I=Warning: UnknkownHostException: {0}.
 DRDA_NeedLocalHost.S=host: {0} is not local to the server running on {1}, so cannot be used for NetworkServerControl commands  
-DRDA_NoIO.S=Could not connect to Derby Network Server on host {0}, port {1}.
+DRDA_NoIO.S=Could not connect to Derby Network Server on host {0}, port {1}: {2}
 DRDA_InvalidReplyHeader1.S=Invalid reply header from network server: Length {0} too short.
-DRDA_InvalidReplyHeader2.S=Invalid reply header from network server: Invalid string {0}.
+DRDA_InvalidReplyHeader2.S=Invalid reply header from network server: Invalid string {0}. Plaintext connection attempt to an SSL enabled server?
 DRDA_InvalidReplyTooShort.S=Invalid reply from network server: Insufficient data.
 DRDA_SysInfoError.S=Error getting SysInfo information.
 DRDA_SysInfoWriteError.S=Error in writing SysInfo information:\n {0}

Modified: db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_es.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_es.properties?view=diff&rev=548322&r1=548321&r2=548322
==============================================================================
--- db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_es.properties (original)
+++ db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_es.properties Mon Jun 18 04:29:43 2007
@@ -56,9 +56,9 @@
 DRDA_UnknownHost.S=No se pudo encontrar el sistema principal: {0}.
 DRDA_UnknownHostWarning.I=Aviso: UnknkownHostException: {0}.
 DRDA_NeedLocalHost.S=sistema principal: {0} no es local para el servidor que se ejecuta en {1}, as\u00ed que no se puede utilizar para mandatos NetworkServerControl  
-DRDA_NoIO.S=No se ha podido conectar con Derby Network Server en el sistema principal {0}, puerto {1}.
+# DRDA_NoIO.S=No se ha podido conectar con Derby Network Server en el sistema principal {0}, puerto {1}.
 DRDA_InvalidReplyHeader1.S=Cabecera de respuesta no v\u00e1lida del servidor de red. Longitud demasiado corta con {0}.
-DRDA_InvalidReplyHeader2.S=Cabecera de respuesta no v\u00e1lida del servidor de red. Serie no v\u00e1lida con {0}.
+# DRDA_InvalidReplyHeader2.S=Cabecera de respuesta no v\u00e1lida del servidor de red. Serie no v\u00e1lida con {0}.
 DRDA_InvalidReplyTooShort.S=Respuesta no v\u00e1lida del servidor de red: No hay suficientes datos.
 DRDA_SysInfoError.S=Error obteniendo la informaci\u00f3n SysInfo.
 DRDA_SysInfoWriteError.S=Error grabando la informaci\u00f3n SysInfo: \n {0}

Modified: db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_fr.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_fr.properties?view=diff&rev=548322&r1=548321&r2=548322
==============================================================================
--- db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_fr.properties (original)
+++ db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_fr.properties Mon Jun 18 04:29:43 2007
@@ -56,9 +56,9 @@
 DRDA_UnknownHost.S=H\u00f4te introuvable : {0}.
 DRDA_UnknownHostWarning.I=Avertissement : Exception d''h\u00f4te inconnu (UnknkownHostException) : {0}.
 DRDA_NeedLocalHost.S=L''h\u00f4te {0} n''est pas local pour le serveur en cours d''ex\u00e9cution sur {1} et par cons\u00e9quent, ne peut pas \u00eatre utilis\u00e9 pour les commandes NetworkServerControl.  
-DRDA_NoIO.S=Connexion impossible \u00e0 Derby Network Server sur l''h\u00f4te {0}, port {1}.
+# DRDA_NoIO.S=Connexion impossible \u00e0 Derby Network Server sur l''h\u00f4te {0}, port {1}.
 DRDA_InvalidReplyHeader1.S=En-t\u00eate de r\u00e9ponse non valide du serveur de r\u00e9seau : la longueur {0} est insuffisante.
-DRDA_InvalidReplyHeader2.S=En-t\u00eate de r\u00e9ponse non valide du serveur de r\u00e9seau : cha\u00eene {0} non valide.
+# DRDA_InvalidReplyHeader2.S=En-t\u00eate de r\u00e9ponse non valide du serveur de r\u00e9seau : cha\u00eene {0} non valide.
 DRDA_InvalidReplyTooShort.S=En-t\u00eate de r\u00e9ponse non valide du serveur de r\u00e9seau : donn\u00e9es insuffisantes.
 DRDA_SysInfoError.S=Erreur d''obtention des informations syst\u00e8me SysInfo.
 DRDA_SysInfoWriteError.S=Erreur d''\u00e9criture des informations syst\u00e8me SysInfo :\n{0}

Modified: db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_hu.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_hu.properties?view=diff&rev=548322&r1=548321&r2=548322
==============================================================================
--- db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_hu.properties (original)
+++ db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_hu.properties Mon Jun 18 04:29:43 2007
@@ -56,9 +56,9 @@
 DRDA_UnknownHost.S=A gazda nem tal\u00e1lhat\u00f3: {0}.
 DRDA_UnknownHostWarning.I=Figyelmeztet\u00e9s: UnknkownHostException: {0}.
 DRDA_NeedLocalHost.S=gazda: {0} nem helyi a(z) {1} rendszeren fut\u00f3 kiszolg\u00e1l\u00f3hoz, \u00edgy nem haszn\u00e1lhat\u00f3 a NetworkServerControl parancsokkal  
-DRDA_NoIO.S=Nem lehet csatlakozni a Derby h\u00e1l\u00f3zati kiszolg\u00e1l\u00f3hoz a(z) {0} gazda {1} portj\u00e1n.
+# DRDA_NoIO.S=Nem lehet csatlakozni a Derby h\u00e1l\u00f3zati kiszolg\u00e1l\u00f3hoz a(z) {0} gazda {1} portj\u00e1n.
 DRDA_InvalidReplyHeader1.S=\u00c9rv\u00e9nytelen v\u00e1laszfejl\u00e9c a h\u00e1l\u00f3zati kiszolg\u00e1l\u00f3t\u00f3l: a(z) {0} hossz t\u00fal r\u00f6vid.
-DRDA_InvalidReplyHeader2.S=\u00c9rv\u00e9nytelen v\u00e1laszfejl\u00e9c a h\u00e1l\u00f3zati kiszolg\u00e1l\u00f3t\u00f3l: \u00e9rv\u00e9nytelen karaktersorozat: {0}.
+# DRDA_InvalidReplyHeader2.S=\u00c9rv\u00e9nytelen v\u00e1laszfejl\u00e9c a h\u00e1l\u00f3zati kiszolg\u00e1l\u00f3t\u00f3l: \u00e9rv\u00e9nytelen karaktersorozat: {0}.
 DRDA_InvalidReplyTooShort.S=\u00c9rv\u00e9nytelen v\u00e1lasz a h\u00e1l\u00f3zati kiszolg\u00e1l\u00f3t\u00f3l: nem elegend\u0151 adat.
 DRDA_SysInfoError.S=Hiba a SysInfo inform\u00e1ci\u00f3k lek\u00e9r\u00e9sekor.
 DRDA_SysInfoWriteError.S=Hiba a SysInfo inform\u00e1ci\u00f3k \u00edr\u00e1sakor:\n {0}

Modified: db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_it.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_it.properties?view=diff&rev=548322&r1=548321&r2=548322
==============================================================================
--- db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_it.properties (original)
+++ db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_it.properties Mon Jun 18 04:29:43 2007
@@ -56,9 +56,9 @@
 DRDA_UnknownHost.S=impossibile trovare l''host: {0}.
 DRDA_UnknownHostWarning.I=Avvertenza: UnknkownHostException: {0}.
 DRDA_NeedLocalHost.S=host: {0} non \u00e8 un host locale rispetto al server in esecuzione su {1}, per cui non pu\u00f2 essere utilizzato per i comandi  NetworkServerControl  
-DRDA_NoIO.S=Impossibile collegarsi a Derby Network Server sull''host {0}, porta {1}.
+# DRDA_NoIO.S=Impossibile collegarsi a Derby Network Server sull''host {0}, porta {1}.
 DRDA_InvalidReplyHeader1.S=Intestazione della risposta non valida dal server di rete: lunghezza {0} troppo breve.
-DRDA_InvalidReplyHeader2.S=Intestazione della risposta non valida dal server di rete: stringa {0} non valida.
+# DRDA_InvalidReplyHeader2.S=Intestazione della risposta non valida dal server di rete: stringa {0} non valida.
 DRDA_InvalidReplyTooShort.S=Risposta non valida dal server di rete: dati non sufficienti.
 DRDA_SysInfoError.S=Errore durante il richiamo delle informazioni SysInfo.
 DRDA_SysInfoWriteError.S=Errore durante la scrittura delle informazioni SysInfo:\n {0}

Modified: db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_ja_JP.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_ja_JP.properties?view=diff&rev=548322&r1=548321&r2=548322
==============================================================================
--- db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_ja_JP.properties (original)
+++ db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_ja_JP.properties Mon Jun 18 04:29:43 2007
@@ -56,9 +56,9 @@
 DRDA_UnknownHost.S=\u30db\u30b9\u30c8\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093: {0}\u3002
 DRDA_UnknownHostWarning.I=\u8b66\u544a: UnknkownHostException: {0}\u3002
 DRDA_NeedLocalHost.S=\u30db\u30b9\u30c8: {0} \u304c {1} \u3067\u7a3c\u50cd\u4e2d\u306e\u30b5\u30fc\u30d0\u30fc\u306b\u5bfe\u3057\u3066\u30ed\u30fc\u30ab\u30eb\u3067\u306f\u306a\u3044\u305f\u3081\u3001NetworkServerControl \u30b3\u30de\u30f3\u30c9\u306b\u306f\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093\u3002  
-DRDA_NoIO.S=\u30db\u30b9\u30c8 {0}\u3001\u30dd\u30fc\u30c8 {1} \u306e Derby Network Server \u306b\u63a5\u7d9a\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+# DRDA_NoIO.S=\u30db\u30b9\u30c8 {0}\u3001\u30dd\u30fc\u30c8 {1} \u306e Derby Network Server \u306b\u63a5\u7d9a\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
 DRDA_InvalidReplyHeader1.S=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u30fb\u30b5\u30fc\u30d0\u30fc\u304b\u3089\u306e\u5fdc\u7b54\u30d8\u30c3\u30c0\u30fc\u304c\u7121\u52b9\u3067\u3059: \u9577\u3055 {0} \u306f\u77ed\u3059\u304e\u307e\u3059\u3002
-DRDA_InvalidReplyHeader2.S=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u30fb\u30b5\u30fc\u30d0\u30fc\u304b\u3089\u306e\u5fdc\u7b54\u30d8\u30c3\u30c0\u30fc\u304c\u7121\u52b9\u3067\u3059: \u30b9\u30c8\u30ea\u30f3\u30b0 {0} \u306f\u7121\u52b9\u3067\u3059\u3002
+# DRDA_InvalidReplyHeader2.S=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u30fb\u30b5\u30fc\u30d0\u30fc\u304b\u3089\u306e\u5fdc\u7b54\u30d8\u30c3\u30c0\u30fc\u304c\u7121\u52b9\u3067\u3059: \u30b9\u30c8\u30ea\u30f3\u30b0 {0} \u306f\u7121\u52b9\u3067\u3059\u3002
 DRDA_InvalidReplyTooShort.S=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u30fb\u30b5\u30fc\u30d0\u30fc\u304b\u3089\u306e\u5fdc\u7b54\u304c\u7121\u52b9\u3067\u3059: \u30c7\u30fc\u30bf\u304c\u4e0d\u5341\u5206\u3067\u3059\u3002
 DRDA_SysInfoError.S=SysInfo \u60c5\u5831\u306e\u53d6\u5f97\u4e2d\u306b\u30a8\u30e9\u30fc\u3067\u3059\u3002
 DRDA_SysInfoWriteError.S=SysInfo \u60c5\u5831\u306e\u66f8\u304d\u8fbc\u307f\u4e2d\u306b\u30a8\u30e9\u30fc\u3067\u3059:\n {0}

Modified: db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_ko_KR.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_ko_KR.properties?view=diff&rev=548322&r1=548321&r2=548322
==============================================================================
--- db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_ko_KR.properties (original)
+++ db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_ko_KR.properties Mon Jun 18 04:29:43 2007
@@ -56,9 +56,9 @@
 DRDA_UnknownHost.S={0} \ud638\uc2a4\ud2b8\ub97c \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
 DRDA_UnknownHostWarning.I=\uacbd\uace0: UnknkownHostException: {0}.
 DRDA_NeedLocalHost.S=\ud638\uc2a4\ud2b8: {0}\uc774(\uac00) {1}\uc5d0\uc11c \uc2e4\ud589 \uc911\uc778 \uc11c\ubc84\uc5d0 \ub300\ud55c \ub85c\uceec\uc774 \uc544\ub2c8\ubbc0\ub85c, NetworkServerControl \uba85\ub839\uc5d0 \uc0ac\uc6a9\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
-DRDA_NoIO.S=\ud638\uc2a4\ud2b8 {0}, \ud3ec\ud2b8 {1}\uc5d0\uc11c Derby Network Server\uc5d0 \uc5f0\uacb0\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
+# DRDA_NoIO.S=\ud638\uc2a4\ud2b8 {0}, \ud3ec\ud2b8 {1}\uc5d0\uc11c Derby Network Server\uc5d0 \uc5f0\uacb0\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
 DRDA_InvalidReplyHeader1.S=\ub124\ud2b8\uc6cc\ud06c \uc11c\ubc84\uc5d0\uc11c\uc758 \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \uc751\ub2f5 \uba38\ub9ac\uae00: \uae38\uc774({0})\uac00 \ub108\ubb34 \uc9e7\uc2b5\ub2c8\ub2e4.
-DRDA_InvalidReplyHeader2.S=\ub124\ud2b8\uc6cc\ud06c \uc11c\ubc84\uc5d0\uc11c\uc758 \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \uc751\ub2f5 \uba38\ub9ac\uae00: \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \ubb38\uc790\uc5f4 {0}.
+# DRDA_InvalidReplyHeader2.S=\ub124\ud2b8\uc6cc\ud06c \uc11c\ubc84\uc5d0\uc11c\uc758 \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \uc751\ub2f5 \uba38\ub9ac\uae00: \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \ubb38\uc790\uc5f4 {0}.
 DRDA_InvalidReplyTooShort.S=\ub124\ud2b8\uc6cc\ud06c \uc11c\ubc84\uc5d0\uc11c\uc758 \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \uc751\ub2f5: \ucda9\ubd84\ud558\uc9c0 \uc54a\uc740 \ub370\uc774\ud130.
 DRDA_SysInfoError.S=SysInfo \uc815\ubcf4 \uac00\uc838\uc624\uae30 \uc624\ub958.
 DRDA_SysInfoWriteError.S=SysInfo \uc815\ubcf4 \uc4f0\uae30 \uc624\ub958:\n {0}

Modified: db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_pl.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_pl.properties?view=diff&rev=548322&r1=548321&r2=548322
==============================================================================
--- db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_pl.properties (original)
+++ db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_pl.properties Mon Jun 18 04:29:43 2007
@@ -56,9 +56,9 @@
 DRDA_UnknownHost.S=Nie mo\u017cna znale\u017a\u0107 hosta: {0}.
 DRDA_UnknownHostWarning.I=Ostrze\u017cenie: NieznanyWyj\u0105tekHosta: {0}.
 DRDA_NeedLocalHost.S=host: {0} nie jest hostem lokalnym dla serwera uruchomionego na {1}, dlatego nie mo\u017ce by\u0107 wykorzystany dla komend NetworkServerControl  
-DRDA_NoIO.S=Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z serwerem sieciowym bazy danych Derby na ho\u015bcie {0}, port {1}.
+# DRDA_NoIO.S=Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z serwerem sieciowym bazy danych Derby na ho\u015bcie {0}, port {1}.
 DRDA_InvalidReplyHeader1.S=Niepoprawny nag\u0142\u00f3wek odpowiedzi z serwera sieciowego: D\u0142ugo\u015b\u0107 {0} jest za ma\u0142a.
-DRDA_InvalidReplyHeader2.S=Niepoprawny nag\u0142\u00f3wek odpowiedzi z serwera sieciowego: Niepoprawny \u0142a\u0144cuch {0}.
+# DRDA_InvalidReplyHeader2.S=Niepoprawny nag\u0142\u00f3wek odpowiedzi z serwera sieciowego: Niepoprawny \u0142a\u0144cuch {0}.
 DRDA_InvalidReplyTooShort.S=Niepoprawna odpowied\u017a z serwera sieciowego: Niewystarczaj\u0105ca ilo\u015b\u0107 danych.
 DRDA_SysInfoError.S=B\u0142\u0105d podczas pobierania informacji SysInfo.
 DRDA_SysInfoWriteError.S=B\u0142\u0105d podczas zapisywania informacji SysInfo:\n {0}

Modified: db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_pt_BR.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_pt_BR.properties?view=diff&rev=548322&r1=548321&r2=548322
==============================================================================
--- db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_pt_BR.properties (original)
+++ db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_pt_BR.properties Mon Jun 18 04:29:43 2007
@@ -56,9 +56,9 @@
 DRDA_UnknownHost.S=N\u00e3o foi poss\u00edvel localizar o hospedeiro: {0}.
 DRDA_UnknownHostWarning.I=Aviso: UnknkownHostException: {0}.
 DRDA_NeedLocalHost.S=hospedeiro: {0} n\u00e3o \u00e9 local para o servidor em execu\u00e7\u00e3o em {1}; dessa forma ele n\u00e3o pode ser utilizado para comandos NetworkServerControl
-DRDA_NoIO.S=N\u00e3o foi poss\u00edvel conectar-se ao Derby Network Server no hospedeiro {0}, porta {1}.
+# DRDA_NoIO.S=N\u00e3o foi poss\u00edvel conectar-se ao Derby Network Server no hospedeiro {0}, porta {1}.
 DRDA_InvalidReplyHeader1.S=Cabe\u00e7alho de resposta inv\u00e1lido do servidor de rede: Comprimento {0} insuficiente.
-DRDA_InvalidReplyHeader2.S=Cabe\u00e7alho de resposta inv\u00e1lido do servidor de rede: Cadeia {0} inv\u00e1lida.
+# DRDA_InvalidReplyHeader2.S=Cabe\u00e7alho de resposta inv\u00e1lido do servidor de rede: Cadeia {0} inv\u00e1lida.
 DRDA_InvalidReplyTooShort.S=Resposta inv\u00e1lida do servidor de rede: Dados insuficientes.
 DRDA_SysInfoError.S=Erro ao obter informa\u00e7\u00f5es de SysInfo.
 DRDA_SysInfoWriteError.S=Erro ao gravar informa\u00e7\u00f5es de SysInfo:\n {0}

Modified: db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_ru.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_ru.properties?view=diff&rev=548322&r1=548321&r2=548322
==============================================================================
--- db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_ru.properties (original)
+++ db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_ru.properties Mon Jun 18 04:29:43 2007
@@ -56,9 +56,9 @@
 DRDA_UnknownHost.S=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043d\u0430\u0439\u0442\u0438 \u0445\u043e\u0441\u0442: {0}.
 DRDA_UnknownHostWarning.I=\u041f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0436\u0434\u0435\u043d\u0438\u0435: UnknkownHostException: {0}.
 DRDA_NeedLocalHost.S=\u0445\u043e\u0441\u0442 {0} \u043d\u0435 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u043b\u043e\u043a\u0430\u043b\u044c\u043d\u044b\u043c \u0434\u043b\u044f \u0441\u0435\u0440\u0432\u0435\u0440\u0430, \u0440\u0430\u0431\u043e\u0442\u0430\u044e\u0449\u0435\u0433\u043e \u043d\u0430 {1}, \u043f\u043e\u044d\u0442\u043e\u043c\u0443 \u043e\u043d \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f \u0434\u043b\u044f \u043a\u043e\u043c\u0430\u043d\u0434 NetworkServerControl  
-DRDA_NoIO.S=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0441\u043e\u0435\u0434\u0438\u043d\u0438\u0442\u044c\u0441\u044f \u0441 \u0441\u0435\u0442\u0435\u0432\u044b\u043c \u0441\u0435\u0440\u0432\u0435\u0440\u043e\u043c Derby Network Server \u043d\u0430 \u0445\u043e\u0441\u0442\u0435 {0} (\u043f\u043e\u0440\u0442 {1}).
+# DRDA_NoIO.S=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0441\u043e\u0435\u0434\u0438\u043d\u0438\u0442\u044c\u0441\u044f \u0441 \u0441\u0435\u0442\u0435\u0432\u044b\u043c \u0441\u0435\u0440\u0432\u0435\u0440\u043e\u043c Derby Network Server \u043d\u0430 \u0445\u043e\u0441\u0442\u0435 {0} (\u043f\u043e\u0440\u0442 {1}).
 DRDA_InvalidReplyHeader1.S=\u041d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0439 \u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a \u043e\u0442\u0432\u0435\u0442\u0430 \u043e\u0442 \u0441\u0435\u0442\u0435\u0432\u043e\u0433\u043e \u0441\u0435\u0440\u0432\u0435\u0440\u0430: \u0414\u043b\u0438\u043d\u0430 {0} \u0441\u043b\u0438\u0448\u043a\u043e\u043c \u043c\u0430\u043b\u0430.
-DRDA_InvalidReplyHeader2.S=\u041d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0439 \u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a \u043e\u0442\u0432\u0435\u0442\u0430 \u043e\u0442 \u0441\u0435\u0442\u0435\u0432\u043e\u0433\u043e \u0441\u0435\u0440\u0432\u0435\u0440\u0430: \u041d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u0430\u044f \u0441\u0442\u0440\u043e\u043a\u0430 {0}.
+# DRDA_InvalidReplyHeader2.S=\u041d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0439 \u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a \u043e\u0442\u0432\u0435\u0442\u0430 \u043e\u0442 \u0441\u0435\u0442\u0435\u0432\u043e\u0433\u043e \u0441\u0435\u0440\u0432\u0435\u0440\u0430: \u041d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u0430\u044f \u0441\u0442\u0440\u043e\u043a\u0430 {0}.
 DRDA_InvalidReplyTooShort.S=\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u043e\u0442\u0432\u0435\u0442 \u043e\u0442 \u0441\u0435\u0442\u0435\u0432\u043e\u0433\u043e \u0441\u0435\u0440\u0432\u0435\u0440\u0430: \u041d\u0435\u0434\u043e\u0441\u0442\u0430\u0442\u043e\u0447\u043d\u043e \u0434\u0430\u043d\u043d\u044b\u0445.
 DRDA_SysInfoError.S=\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u0438 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438 SysInfo.
 DRDA_SysInfoWriteError.S=\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u0437\u0430\u043f\u0438\u0441\u0438 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438 SysInfo:\n {0}

Modified: db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_zh_CN.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_zh_CN.properties?view=diff&rev=548322&r1=548321&r2=548322
==============================================================================
--- db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_zh_CN.properties (original)
+++ db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_zh_CN.properties Mon Jun 18 04:29:43 2007
@@ -56,9 +56,9 @@
 DRDA_UnknownHost.S=\u627e\u4e0d\u5230\u4e3b\u673a\uff1a{0}\u3002
 DRDA_UnknownHostWarning.I=\u8b66\u544a\uff1aUnknkownHostException\uff1a{0}\u3002
 DRDA_NeedLocalHost.S=\u4e3b\u673a\uff1a{0} \u5bf9\u4e8e\u8fd0\u884c\u4e8e {1} \u4e0a\u7684\u670d\u52a1\u5668\u800c\u8a00\u4e0d\u662f\u672c\u5730\u7684\uff0c\u56e0\u6b64\u65e0\u6cd5\u7528\u4e8e NetworkServerControl \u547d\u4ee4  
-DRDA_NoIO.S=\u65e0\u6cd5\u8fde\u63a5\u5230\u4e3b\u673a {0} \u7684\u7aef\u53e3 {1} \u4e0a\u7684 Derby \u7f51\u7edc\u670d\u52a1\u5668\u3002
+# DRDA_NoIO.S=\u65e0\u6cd5\u8fde\u63a5\u5230\u4e3b\u673a {0} \u7684\u7aef\u53e3 {1} \u4e0a\u7684 Derby \u7f51\u7edc\u670d\u52a1\u5668\u3002
 DRDA_InvalidReplyHeader1.S=\u6765\u81ea\u7f51\u7edc\u670d\u52a1\u5668\u7684\u5e94\u7b54\u5934\u65e0\u6548\uff1a\u957f\u5ea6 {0} \u592a\u77ed\u3002
-DRDA_InvalidReplyHeader2.S=\u6765\u81ea\u7f51\u7edc\u670d\u52a1\u5668\u7684\u5e94\u7b54\u5934\u65e0\u6548\uff1a\u5b57\u7b26\u4e32 {0} \u65e0\u6548\u3002
+# DRDA_InvalidReplyHeader2.S=\u6765\u81ea\u7f51\u7edc\u670d\u52a1\u5668\u7684\u5e94\u7b54\u5934\u65e0\u6548\uff1a\u5b57\u7b26\u4e32 {0} \u65e0\u6548\u3002
 DRDA_InvalidReplyTooShort.S=\u6765\u81ea\u7f51\u7edc\u670d\u52a1\u5668\u7684\u5e94\u7b54\u65e0\u6548\uff1a\u6570\u636e\u4e0d\u8db3\u3002
 DRDA_SysInfoError.S=\u83b7\u53d6 SysInfo \u4fe1\u606f\u65f6\u51fa\u9519\u3002
 DRDA_SysInfoWriteError.S=\u5199 SysInfo \u4fe1\u606f\u65f6\u51fa\u9519\uff1a\n {0}

Modified: db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_zh_TW.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_zh_TW.properties?view=diff&rev=548322&r1=548321&r2=548322
==============================================================================
--- db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_zh_TW.properties (original)
+++ db/derby/code/branches/10.3/java/drda/org/apache/derby/loc/drda/messages_zh_TW.properties Mon Jun 18 04:29:43 2007
@@ -56,9 +56,9 @@
 DRDA_UnknownHost.S=\u627e\u4e0d\u5230\u4e3b\u6a5f\uff1a{0}\u3002
 DRDA_UnknownHostWarning.I=\u8b66\u544a\uff1aUnknkownHostException\uff1a{0}\u3002
 DRDA_NeedLocalHost.S=\u4e3b\u6a5f\uff1a{0} \u4e0d\u5728\u65bc {1} \u4e0a\u57f7\u884c\u4e4b\u4f3a\u670d\u5668\u7684\u672c\u7aef\uff0c\u56e0\u6b64\u7121\u6cd5\u7528\u65bc NetworkServerControl \u6307\u4ee4  
-DRDA_NoIO.S=\u7121\u6cd5\u9023\u63a5\u81f3\u4e3b\u6a5f {0}\u3001\u57e0 {1} \u4e0a\u7684 Derby Network Server\u3002
+# DRDA_NoIO.S=\u7121\u6cd5\u9023\u63a5\u81f3\u4e3b\u6a5f {0}\u3001\u57e0 {1} \u4e0a\u7684 Derby Network Server\u3002
 DRDA_InvalidReplyHeader1.S=\u4f86\u81ea\u7db2\u8def\u4f3a\u670d\u5668\u7684\u56de\u8986\u6a19\u982d\u7121\u6548\uff1a\u9577\u5ea6 {0} \u592a\u77ed\u3002
-DRDA_InvalidReplyHeader2.S=\u4f86\u81ea\u7db2\u8def\u4f3a\u670d\u5668\u7684\u56de\u8986\u6a19\u982d\u7121\u6548\uff1a\u5b57\u4e32 {0} \u7121\u6548\u3002
+# DRDA_InvalidReplyHeader2.S=\u4f86\u81ea\u7db2\u8def\u4f3a\u670d\u5668\u7684\u56de\u8986\u6a19\u982d\u7121\u6548\uff1a\u5b57\u4e32 {0} \u7121\u6548\u3002
 DRDA_InvalidReplyTooShort.S=\u4f86\u81ea\u7db2\u8def\u4f3a\u670d\u5668\u7684\u56de\u8986\u7121\u6548\uff1a\u8cc7\u6599\u4e0d\u8db3\u3002
 DRDA_SysInfoError.S=\u5728\u53d6\u5f97 SysInfo \u8cc7\u8a0a\u6642\u767c\u751f\u932f\u8aa4\u3002
 DRDA_SysInfoWriteError.S=\u5728\u5beb\u5165 SysInfo \u8cc7\u8a0a\u6642\u767c\u751f\u932f\u8aa4\uff1a\n {0}

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages.xml?view=diff&rev=548322&r1=548321&r2=548322
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages.xml (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages.xml Mon Jun 18 04:29:43 2007
@@ -7242,7 +7242,7 @@
 
             <msg>
                 <name>J131</name>
-                <text>A PROTOCOL Data Stream Syntax Error was detected.  Reason: 0x{0}.</text>
+                <text>A PROTOCOL Data Stream Syntax Error was detected.  Reason: 0x{0}. Plaintext connection attempt to an SSL enabled server?</text>
                 <arg>hexNumber</arg>
             </msg>
 

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_cs.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_cs.properties?view=diff&rev=548322&r1=548321&r2=548322
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_cs.properties (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_cs.properties Mon Jun 18 04:29:43 2007
@@ -1495,7 +1495,7 @@
 J128=kurzor nen\u00ed otev\u0159en
 J129=byl vyd\u00e1n p\u0159\u00edkaz Open Query pro dotaz, kter\u00fd ji\u017e byl otev\u0159en
 J130=Byla detekov\u00e1na chyba neplatn\u00e9ho popisu FDOCA PROTOKOLU
-J131=Byla detekov\u00e1na chyba syntaxe toku dat PROTOKOLU. P\u0159\u00ed\u010dina: 0x{0}.
+# J131=Byla detekov\u00e1na chyba syntaxe toku dat PROTOKOLU. P\u0159\u00ed\u010dina: 0x{0}.
 J132=Jm\u00e9no u\u017eivatele pro p\u0159ipojen\u00ed
 J133=Heslo u\u017eivatele pro p\u0159ipojen\u00ed
 

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_de_DE.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_de_DE.properties?view=diff&rev=548322&r1=548321&r2=548322
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_de_DE.properties (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_de_DE.properties Mon Jun 18 04:29:43 2007
@@ -1510,7 +1510,7 @@
 J128=Der Cursor ist nicht offen.
 J129=F\u00fcr eine bereits ge\u00f6ffnete Abfrage wurde ein Befehl Open Query abgesetzt.
 J130=Es wurde ein Fehler wegen einer ung\u00fcltigen FDOCA-Beschreibung festgestellt.
-J131=Es wurde ein Fehler in der Datenstromsyntax festgestellt. Ursache: 0x{0}.
+# J131=Es wurde ein Fehler in der Datenstromsyntax festgestellt. Ursache: 0x{0}.
 J132=Benutzername f\u00fcr die Verbindung
 J133=Kennwort des Benutzers f\u00fcr die Verbindung
 

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_es.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_es.properties?view=diff&rev=548322&r1=548321&r2=548322
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_es.properties (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_es.properties Mon Jun 18 04:29:43 2007
@@ -1495,7 +1495,7 @@
 J128=el cursor no est\u00e1 abierto
 J129=se ha emitido un mandato Open Query (Abrir consulta) para una consulta que ya estaba abierta
 J130=Se ha detectado un error de descripci\u00f3n de FDOCA no v\u00e1lido de PROTOCOL
-J131=Se ha detectado un error de sintaxis de corriente de datos de PROTOCOL.  Raz\u00f3n: 0x{0}.
+# J131=Se ha detectado un error de sintaxis de corriente de datos de PROTOCOL.  Raz\u00f3n: 0x{0}.
 J132=El nombre de usuario para la conexi\u00f3n
 J133=La contrase\u00f1a de usuario para la conexi\u00f3n
 

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_fr.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_fr.properties?view=diff&rev=548322&r1=548321&r2=548322
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_fr.properties (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_fr.properties Mon Jun 18 04:29:43 2007
@@ -1495,7 +1495,7 @@
 J128=Le curseur n''est pas ouvert
 J129=Une commande Open Query a \u00e9t\u00e9 \u00e9mise pour une requ\u00eate d\u00e9j\u00e0 ouverte
 J130=Une erreur de description FDOCA incorrecte a \u00e9t\u00e9 d\u00e9tect\u00e9e
-J131=Une erreur de syntaxe du flux de donn\u00e9es a \u00e9t\u00e9 d\u00e9tect\u00e9e.  Motif : 0x{0}.
+# J131=Une erreur de syntaxe du flux de donn\u00e9es a \u00e9t\u00e9 d\u00e9tect\u00e9e.  Motif : 0x{0}.
 J132=Le nom d''utilisateur pour la connexion
 J133=Le mot de passe de l''utilisateur pour la connexion
 

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_hu.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_hu.properties?view=diff&rev=548322&r1=548321&r2=548322
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_hu.properties (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_hu.properties Mon Jun 18 04:29:43 2007
@@ -1495,7 +1495,7 @@
 J128=a kurzor nincs megnyitva
 J129=Lek\u00e9rdez\u00e9s megnyit\u00e1sa parancs ker\u00fclt kiad\u00e1sra egy m\u00e1r megnyitott lek\u00e9rdez\u00e9shez
 J130=A PROTOCOL \u00e9rv\u00e9nytelen FDOCA le\u00edr\u00e1shiba t\u00f6rt\u00e9nt
-J131=A PROTOCOL adatfolyam szintaktikai hiba t\u00f6rt\u00e9nt.  Ok: 0x{0}.
+# J131=A PROTOCOL adatfolyam szintaktikai hiba t\u00f6rt\u00e9nt.  Ok: 0x{0}.
 J132=A kapcsolat felhaszn\u00e1l\u00f3neve
 J133=A kapcsolat felhaszn\u00e1l\u00f3i jelszava
 

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_it.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_it.properties?view=diff&rev=548322&r1=548321&r2=548322
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_it.properties (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_it.properties Mon Jun 18 04:29:43 2007
@@ -1495,7 +1495,7 @@
 J128=Il cursore non \u00e8 aperto
 J129=E'' stato inoltrato un comando di apertura query per una query gi\u00e0 aperta
 J130=E'' stato rilevato un Errore di descrizione FDOCA non valida di PROTOCOL
-J131=E'' stato rilevato un Errore di sintassi del flusso di dati di PROTOCOL.  Motivo: 0x{0}.
+# J131=E'' stato rilevato un Errore di sintassi del flusso di dati di PROTOCOL.  Motivo: 0x{0}.
 J132=Il nome utente per la connessione
 J133=La password utente per la connessione
 

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_ja_JP.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_ja_JP.properties?view=diff&rev=548322&r1=548321&r2=548322
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_ja_JP.properties (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_ja_JP.properties Mon Jun 18 04:29:43 2007
@@ -1497,7 +1497,7 @@
 J128=\u30ab\u30fc\u30bd\u30eb\u304c\u30aa\u30fc\u30d7\u30f3\u3055\u308c\u3066\u3044\u307e\u305b\u3093
 J129=\u65e2\u306b\u30aa\u30fc\u30d7\u30f3\u3055\u308c\u3066\u3044\u308b\u7167\u4f1a\u306b\u5bfe\u3059\u308b\u7167\u4f1a\u30aa\u30fc\u30d7\u30f3\u30fb\u30b3\u30de\u30f3\u30c9\u304c\u767a\u884c\u3055\u308c\u307e\u3057\u305f
 J130=\u7121\u52b9 FDOCA \u8a18\u8ff0\u30a8\u30e9\u30fc\u304c\u691c\u51fa\u3055\u308c\u307e\u3057\u305f
-J131=\u30c7\u30fc\u30bf\u30fb\u30b9\u30c8\u30ea\u30fc\u30e0\u69cb\u6587\u30a8\u30e9\u30fc\u304c\u691c\u51fa\u3055\u308c\u307e\u3057\u305f\u3002  \u7406\u7531: 0x{0}\u3002
+# J131=\u30c7\u30fc\u30bf\u30fb\u30b9\u30c8\u30ea\u30fc\u30e0\u69cb\u6587\u30a8\u30e9\u30fc\u304c\u691c\u51fa\u3055\u308c\u307e\u3057\u305f\u3002  \u7406\u7531: 0x{0}\u3002
 J132=\u63a5\u7d9a\u306e\u30e6\u30fc\u30b6\u30fc\u540d\u3067\u3059
 J133=\u63a5\u7d9a\u306e\u30e6\u30fc\u30b6\u30fc\u30fb\u30d1\u30b9\u30ef\u30fc\u30c9\u3067\u3059
 

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_ko_KR.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_ko_KR.properties?view=diff&rev=548322&r1=548321&r2=548322
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_ko_KR.properties (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_ko_KR.properties Mon Jun 18 04:29:43 2007
@@ -1506,7 +1506,7 @@
 J128=\ucee4\uc11c\uac00 \uc5f4\ub9ac\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
 J129=Open Query \uba85\ub839\uc774 \uc774\ubbf8 \uc5f4\ub824 \uc788\ub294 \ucffc\ub9ac\uc5d0 \ub300\ud574 \ubc1c\ud589\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
 J130=\uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 FDOCA \uc124\uba85 \uc624\ub958\uac00 \ubc1c\uacac\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
-J131=\ub370\uc774\ud130 \uc2a4\ud2b8\ub9bc \uad6c\ubb38 \uc624\ub958\ub97c \ubc1c\uacac\ud558\uc600\uc2b5\ub2c8\ub2e4. \uc774\uc720: 0x{0}
+# J131=\ub370\uc774\ud130 \uc2a4\ud2b8\ub9bc \uad6c\ubb38 \uc624\ub958\ub97c \ubc1c\uacac\ud558\uc600\uc2b5\ub2c8\ub2e4. \uc774\uc720: 0x{0}
 J132=\uc5f0\uacb0\uc5d0 \ub300\ud55c \uc0ac\uc6a9\uc790 \uc774\ub984
 J133=\uc5f0\uacb0\uc5d0 \ub300\ud55c \uc0ac\uc6a9\uc790\uc758 \uc554\ud638
 

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_pl.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_pl.properties?view=diff&rev=548322&r1=548321&r2=548322
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_pl.properties (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_pl.properties Mon Jun 18 04:29:43 2007
@@ -1495,7 +1495,7 @@
 J128=kursor nie jest otwarty
 J129=dla otwartego zapytania wywo\u0142ana zosta\u0142a komenda Open Query
 J130=Wykryto b\u0142\u0105d opisu FDOCA niepoprawnej w\u0142a\u015bciwo\u015bci PROTOCOL
-J131=Wykryto b\u0142\u0105d sk\u0142adniowy strumienia danych w\u0142a\u015bciwo\u015bci PROTOCOL. Przyczyna: 0x{0}.
+# J131=Wykryto b\u0142\u0105d sk\u0142adniowy strumienia danych w\u0142a\u015bciwo\u015bci PROTOCOL. Przyczyna: 0x{0}.
 J132=Nazwa u\u017cytkownika dla po\u0142\u0105czenia
 J133=Has\u0142o u\u017cytkownika dla po\u0142\u0105czenia
 

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_pt_BR.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_pt_BR.properties?view=diff&rev=548322&r1=548321&r2=548322
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_pt_BR.properties (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_pt_BR.properties Mon Jun 18 04:29:43 2007
@@ -1491,7 +1491,7 @@
 J128=O cursor n\u00e3o est\u00e1 aberto
 J129=Foi emitido um comando Open Query para uma consulta que j\u00e1 estava aberta
 J130=Foi detectado um erro ''PROTOCOL Invalid FDOCA Description''
-J131=Foi detectado um erro ''PROTOCOL Data Stream Syntax''.  Motivo: 0x{0}.
+# J131=Foi detectado um erro ''PROTOCOL Data Stream Syntax''.  Motivo: 0x{0}.
 J132=O nome de usu\u00e1rio para a conex\u00e3o
 J133=A senha do usu\u00e1rio para a conex\u00e3o
 

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_ru.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_ru.properties?view=diff&rev=548322&r1=548321&r2=548322
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_ru.properties (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_ru.properties Mon Jun 18 04:29:43 2007
@@ -1495,7 +1495,7 @@
 J128=\u043a\u0443\u0440\u0441\u043e\u0440 \u043d\u0435 \u043e\u0442\u043a\u0440\u044b\u0442
 J129=\u0432\u0432\u0435\u0434\u0435\u043d\u0430 \u043a\u043e\u043c\u0430\u043d\u0434\u0430 Open Query \u0434\u043b\u044f \u0443\u0436\u0435 \u043e\u0442\u043a\u0440\u044b\u0442\u043e\u0433\u043e \u0437\u0430\u043f\u0440\u043e\u0441\u0430
 J130=\u041e\u0431\u043d\u0430\u0440\u0443\u0436\u0435\u043d\u0430 \u043e\u0448\u0438\u0431\u043a\u0430 \u043d\u0435\u0432\u0435\u0440\u043d\u043e\u0433\u043e \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u044f FDOCA
-J131=\u041e\u0431\u043d\u0430\u0440\u0443\u0436\u0435\u043d\u0430 \u0441\u0438\u043d\u0442\u0430\u043a\u0441\u0438\u0447\u0435\u0441\u043a\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430 \u043f\u043e\u0442\u043e\u043a\u0430 \u0434\u0430\u043d\u043d\u044b\u0445.  \u041f\u0440\u0438\u0447\u0438\u043d\u0430: 0x{0}.
+# J131=\u041e\u0431\u043d\u0430\u0440\u0443\u0436\u0435\u043d\u0430 \u0441\u0438\u043d\u0442\u0430\u043a\u0441\u0438\u0447\u0435\u0441\u043a\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430 \u043f\u043e\u0442\u043e\u043a\u0430 \u0434\u0430\u043d\u043d\u044b\u0445.  \u041f\u0440\u0438\u0447\u0438\u043d\u0430: 0x{0}.
 J132=\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0434\u043b\u044f \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u044f
 J133=\u041f\u0430\u0440\u043e\u043b\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0434\u043b\u044f \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u044f
 

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_zh_TW.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_zh_TW.properties?view=diff&rev=548322&r1=548321&r2=548322
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_zh_TW.properties (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages_zh_TW.properties Mon Jun 18 04:29:43 2007
@@ -1513,7 +1513,7 @@
 J128=\u6e38\u6a19\u672a\u958b\u555f
 J129=\u91dd\u5c0d\u5df2\u958b\u555f\u7684\u67e5\u8a62\u767c\u51fa\u4e86\u300c\u958b\u555f\u67e5\u8a62\u300d\u6307\u4ee4
 J130=\u5075\u6e2c\u5230\u300c\u901a\u8a0a\u5354\u5b9a\uff1aFDOCA \u8aaa\u660e\u7121\u6548\u932f\u8aa4\u300d
-J131=\u5075\u6e2c\u5230\u300c\u901a\u8a0a\u5354\u5b9a\uff1a\u8cc7\u6599\u4e32\u6d41\u8a9e\u6cd5\u932f\u8aa4\u300d\u3002\u539f\u56e0\uff1a0x{0}\u3002
+# J131=\u5075\u6e2c\u5230\u300c\u901a\u8a0a\u5354\u5b9a\uff1a\u8cc7\u6599\u4e32\u6d41\u8a9e\u6cd5\u932f\u8aa4\u300d\u3002\u539f\u56e0\uff1a0x{0}\u3002
 J132=\u9023\u7dda\u7684\u4f7f\u7528\u8005\u540d\u7a31
 J133=\u9023\u7dda\u7684\u4f7f\u7528\u8005\u5bc6\u78bc
 

Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/master/testconnection.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/master/testconnection.out?view=diff&rev=548322&r1=548321&r2=548322
==============================================================================
--- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/master/testconnection.out (original)
+++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/master/testconnection.out Mon Jun 18 04:29:43 2007
@@ -10,9 +10,9 @@
 org.apache.derby.drda.NetworkServerControl ping -h xxxFILTERED_HOSTNAMExxx 
 Connection obtained for host: xxxFILTERED_HOSTNAMExxx, port number 1527.
 org.apache.derby.drda.NetworkServerControl ping -h xxxFILTERED_HOSTNAMExxx -p 9393 
-Could not connect to Derby Network Server on host xxxFILTERED_HOSTNAMExxx, port 9393.
+Could not connect to Derby Network Server on host xxxFILTERED_HOSTNAMExxx, port 9393: Connection refused
 org.apache.derby.drda.NetworkServerControl ping...
 Connection obtained for host: xxxFILTERED_HOSTNAMExxx, port number 1527.
 org.apache.derby.drda.NetworkServerControl ping...
-Could not connect to Derby Network Server on host xxxFILTERED_HOSTNAMExxx, port 9393.
+Could not connect to Derby Network Server on host xxxFILTERED_HOSTNAMExxx, port 9393: Connection refused
 End test



Mime
View raw message