db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r515793 - in /db/derby/code/trunk/java: client/org/apache/derby/jdbc/ demo/toursdb/ drda/org/apache/derby/drda/ drda/org/apache/derby/impl/drda/ drda/org/apache/derby/loc/drda/ shared/org/apache/derby/shared/common/error/ shared/org/apache/...
Date Wed, 07 Mar 2007 22:01:39 GMT
Author: fuzzylogic
Date: Wed Mar  7 14:01:37 2007
New Revision: 515793

URL: http://svn.apache.org/viewvc?view=rev&rev=515793
Log:
DERBY-2400 (partial): Replace references to Cloudscape with Derby. This commit
takes care of the rest of the separate source trees, except for engine, build
and testing.

Modified:
    db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java
    db/derby/code/trunk/java/demo/toursdb/insertMaps.java
    db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_cs.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_de_DE.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_en.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_es.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_fr.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_hu.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_it.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ja_JP.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ko_KR.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_pl.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_pt_BR.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ru.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_zh_CN.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_zh_TW.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_ja_JP.properties
    db/derby/code/trunk/java/shared/org/apache/derby/shared/common/error/ExceptionUtil.java
    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/master/checkToursDB.out
    db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java
    db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/ZipInfoProperties.java

Modified: db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java?view=diff&rev=515793&r1=515792&r2=515793
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java Wed Mar
 7 14:01:37 2007
@@ -864,7 +864,7 @@
      * settings in connectionAttributes and properties of the DataSource will lead to
      * unexpected behaviour. 
      *
-     * @param prop set to the list of Cloudscape connection attributes separated by semi-colons.
  E.g., to specify an
+     * @param prop set to the list of Derby connection attributes separated by semi-colons.
  E.g., to specify an
      *             encryption bootPassword of "x8hhk2adf", and set upgrade to true, do the
following: <PRE>
      *             ds.setConnectionAttributes("bootPassword=x8hhk2adf;upgrade=true"); </PRE>
See Derby documentation for
      *             complete list.

Modified: db/derby/code/trunk/java/demo/toursdb/insertMaps.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/demo/toursdb/insertMaps.java?view=diff&rev=515793&r1=515792&r2=515793
==============================================================================
--- db/derby/code/trunk/java/demo/toursdb/insertMaps.java (original)
+++ db/derby/code/trunk/java/demo/toursdb/insertMaps.java Wed Mar  7 14:01:37 2007
@@ -42,12 +42,12 @@
 		try {
 			Connection connCS = null;
 
-			System.out.println("Loading the Cloudscape jdbc driver...");
+			System.out.println("Loading the Derby jdbc driver...");
 			Class.forName(CSdriver).newInstance();
 	
-			System.out.println("Getting Cloudscape database connection...");
+			System.out.println("Getting Derby database connection...");
 			connCS = DriverManager.getConnection(dbURLCS);
-			System.out.println("Successfully got the Cloudscape database connection...");
+			System.out.println("Successfully got the Derby database connection...");
 
 			PreparedStatement ps = null;
 

Modified: db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java?view=diff&rev=515793&r1=515792&r2=515793
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java Wed Mar
 7 14:01:37 2007
@@ -309,7 +309,7 @@
 	 * <P>
 	 *  Note: an alternate method to starting the Network Server with the API,
 	 *  is to use the derby.drda.startNetworkServer property in 
-	 *  cloudscape.properties.
+	 *  derby.properties.
 	 *  
 	 * 
 	 * @param consoleWriter   PrintWriter to which server console will be 

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java?view=diff&rev=515793&r1=515792&r2=515793
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java Wed Mar 
7 14:01:37 2007
@@ -19,7 +19,7 @@
 */
 /**
  * This class translates DRDA protocol from an application requester to JDBC
- * for Cloudscape and then translates the results from Cloudscape to DRDA
+ * for Derby and then translates the results from Derby to DRDA
  * for return to the application requester.
  */
 package org.apache.derby.impl.drda;
@@ -1246,7 +1246,7 @@
 	  	} catch (SQLException se) {
 			String sqlState = se.getSQLState();
 			// need to set the security check code based on the reason the connection     
-			// was denied, Cloudscape doesn't say whether the userid or password caused
+			// was denied, Derby doesn't say whether the userid or password caused
 			// the problem, so we will just return userid invalid
 			databaseAccessException = se;
 			for (; se != null; se = se.getNextException())
@@ -1263,7 +1263,7 @@
 		}
 		catch (Exception e)
 		{
-			// If cloudscape has shut down for some reason,
+			// If Derby has shut down for some reason,
 			// we will send  an agent error and then try to 
 			// get the driver loaded again.  We have to get
 			// rid of the client first in case they are holding
@@ -1740,7 +1740,7 @@
                         }
                     }
 					break;
-                //optional (currently required for Cloudscape - needed for
+                //optional (currently required for Derby - needed for
                 //          DERBY-528 as well)
 				case CodePoint.RDBNAM:
 					String dbname = parseRDBNAM();
@@ -3530,7 +3530,7 @@
 		String attrs = parseEncodedString();
 		if (SanityManager.DEBUG)
 			trace("sqlattr = '" + attrs+"'");
-		//let Cloudscape handle any errors in the types it doesn't support
+		//let Derby handle any errors in the types it doesn't support
 		//just set the attributes
 
 		boolean validAttribute = false;
@@ -3626,7 +3626,7 @@
 	 *  PKGNAMCSN - RDB Package Name, Consistency Token and Section Number - required
 	 *  OUTEXP - Output expected
 	 *  NBRROW - Number of rows to be inserted if it's an insert
-	 *  PRCNAM - procedure name if specified by host variable, not needed for Cloudscape
+	 *  PRCNAM - procedure name if specified by host variable, not needed for Derby
 	 *  QRYBLKSZ - query block size
 	 *  MAXRSLCNT - max resultset count
 	 *  MAXBLKEXT - Max number of extra blocks
@@ -4877,7 +4877,7 @@
                         }
 
 						if (canIgnoreStmt(sqlStmt)) {
-						// We _know_ Cloudscape doesn't recognize this
+						// We _know_ Derby doesn't recognize this
 						// statement; don't bother trying to execute it.
 						// NOTE: at time of writing, this only applies
 						// to "SET CLIENT" commands, and it was decided
@@ -5477,7 +5477,7 @@
 	}
 
 	/**
-	 * Translate from Cloudscape exception severity to SVRCOD
+	 * Translate from Derby exception severity to SVRCOD
 	 *
 	 * @param e SQLException
 	 */
@@ -8076,7 +8076,7 @@
             // database level).
             // 
             // if monitor is never setup by any ModuleControl, getMonitor
-            // returns null and no cloudscape database has been booted. 
+            // returns null and no Derby database has been booted. 
             if (Monitor.getMonitor() != null)
                 databaseObj = (org.apache.derby.iapi.db.Database)
                     Monitor.findService(Property.DATABASE_MODULE, dbName);

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java?view=diff&rev=515793&r1=515792&r2=515793
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java Wed Mar  7
14:01:37 2007
@@ -710,16 +710,16 @@
 	 * For dyamic packages The package name is encoded as follows
 	 * SYS(S/L)(H/N)xyy 
 	 * where 'S' represents Small package and 'L' large 
-	 *                      (ignored by cloudscape) 
+	 *                      (ignored by Derby) 
 	 * Where 'H' represents WITH HOLD, and 'N' represents NO WITH HOLD. 
 	 *                      (May be overridden by SQLATTR for WITH
 	 *                       HOLD")
 	 *
-	 * Where 'www' is the package iteration (ignored by cloudcape)
+	 * Where 'www' is the package iteration (ignored by Derby)
 	 * Where 'x' is the isolation level: 0=NC, 1=UR, 2=CS, 3=RS, 4=RR 
 	 * Where 'yy' is the package iteration 00 through FF 
 	 * Where 'zz' is unique for each platform
-	 * Happilly, these values correspond precisely to the internal cloudscape
+	 * Happilly, these values correspond precisely to the internal Derby
 	 * isolation levels  in ExecutionContext.java
 	 * x   Isolation Level                                           
 	 * --  ---------------------

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java?view=diff&rev=515793&r1=515792&r2=515793
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
(original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
Wed Mar  7 14:01:37 2007
@@ -561,7 +561,7 @@
 	/**
 	 * Start a network server.  Launches a separate thread with 
 	 * DRDAServerStarter.  Want to use Monitor.startModule,
-	 * so it can all get shutdown when cloudscape shuts down, but 
+	 * so it can all get shutdown when Derby shuts down, but 
 	 * can't get it working right now.
 	 *
 	 * @param consoleWriter   PrintWriter to which server console will be 
@@ -771,13 +771,13 @@
 
 		if (shutdownDatabasesOnShutdown) {
 
-			// Shutdown Cloudscape
+			// Shutdown Derby
 			try {
 				if (cloudscapeDriver != null)
 					cloudscapeDriver.connect("jdbc:derby:;shutdown=true",
 											 (Properties) null);
 			} catch (SQLException sqle) {
-				// If we can't shutdown cloudscape. Perhaps authentication is
+				// If we can't shutdown Derby. Perhaps authentication is
 				// set to true or some other reason. We will just print a
 				// message to the console and proceed.
 				String expectedState =
@@ -798,7 +798,7 @@
     }
 	
 	/** 
-	 * Load Cloudscape and save driver for future use.
+	 * Load Derby and save driver for future use.
 	 * We can't call Driver Manager when the client connects, 
 	 * because they might be holding the DriverManager lock.
 	 *
@@ -811,7 +811,7 @@
 	protected void startNetworkServer() throws Exception
 	{
 
-		// we start the cloudscape server here.
+		// we start the Derby server here.
 		boolean restartCheck = this.restartFlag;
 		synchronized (serverStartSync) {
 
@@ -1702,7 +1702,7 @@
 	 * Send SQL Exception from server to client after processing a command
 	 *
 	 * @param writer	writer to use for sending message
-	 * @param se		Cloudscape exception
+	 * @param se		Derby exception
 	 * @param type		type of exception, SQLERROR or SQLWARNING
 	 *
 	 * @throws Exception if a problem occurs sending message
@@ -1840,9 +1840,9 @@
 	}
 
 	/**
-	 * Get Cloudscape information
+	 * Get Derby information
 	 *
-	 * @return system information for Cloudscape
+	 * @return system information for Derby
 	 *
 	 * @throws IOException if a problem occurs encoding string
 	 */
@@ -3476,7 +3476,7 @@
 	/**
 	 * Wrap SQL Error - display to console and raise exception
 	 *
-	 * @param messageKey	Cloudscape SQL Exception message id
+	 * @param messageKey	Derby SQL Exception message id
 	 *
 	 * @exception Exception raises exception for message
 	 */
@@ -3489,7 +3489,7 @@
 	/**
 	 * Wrap SQL Warning - display to console and raise exception
 	 *
-	 * @param messageKey	Cloudscape SQL Exception message id
+	 * @param messageKey	Derby SQL Exception message id
 	 *
 	 * @exception Exception raises exception for message
 	 */

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_cs.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_cs.properties?view=diff&rev=515793&r1=515792&r2=515793
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_cs.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_cs.properties Wed Mar
 7 14:01:37 2007
@@ -18,7 +18,7 @@
 # Severity values are I - information, S - severe, U - user
 
 DRDA_LoadException.S=Neo\u010dek\u00e1van\u00e1 v\u00fdjimka p\u0159i zav\u00e1d\u011bn\u00ed
ovlada\u010de JDBC Derby:\n {0}
-DRDA_PropertyException.S=Neo\u010dek\u00e1van\u00e1 v\u00fdjimka p\u0159i na\u010d\u00edt\u00e1n\u00ed
souboru cloudscape.properties:\n {0}
+DRDA_PropertyException.S=Neo\u010dek\u00e1van\u00e1 v\u00fdjimka p\u0159i na\u010d\u00edt\u00e1n\u00ed
souboru derby.properties:\n {0}
 DRDA_UnexpectedException.S=Neo\u010dek\u00e1van\u00e1 v\u00fdjimka:\n {0}
 DRDA_NoInputStream.S=Nelze z\u00edskat vstupn\u00ed tok dat pro soket klienta.
 DRDA_Ready.I=S\u00ed\u0165ov\u00fd server {1} - {2}: spu\u0161t\u011bn a p\u0159ipraven p\u0159ij\u00edmat
p\u0159ipojen\u00ed na portu {0} v {3} 

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_de_DE.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_de_DE.properties?view=diff&rev=515793&r1=515792&r2=515793
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_de_DE.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_de_DE.properties Wed
Mar  7 14:01:37 2007
@@ -18,7 +18,7 @@
 # Severity values are I - information, S - severe, U - user
 
 DRDA_LoadException.S=Unerwartete Ausnahme beim Laden des Derby-JDBC-Treibers:\n {0}
-DRDA_PropertyException.S=Unerwartete Ausnahme beim Lesen von cloudscape.properties:\n {0}
+DRDA_PropertyException.S=Unerwartete Ausnahme beim Lesen von derby.properties:\n {0}
 DRDA_UnexpectedException.S=Unerwartete Ausnahme:\n {0}
 DRDA_NoInputStream.S=F\u00fcr den Client-Socket konnte kein Eingabedatenstrom angefordert
werden.
 DRDA_Ready.I={1} Network Server {2} wurde gestartet und ist seit {3} bereit, Verbindungen
am Port {0} zu akzeptieren. 

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_en.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_en.properties?view=diff&rev=515793&r1=515792&r2=515793
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_en.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_en.properties Wed Mar
 7 14:01:37 2007
@@ -18,7 +18,7 @@
 # Severity values are I - information, S - severe, U - user
 
 DRDA_LoadException.S=Unexpected exception while loading Derby JDBC Driver:\n {0}
-DRDA_PropertyException.S=Unexpected exception while reading cloudscape.properties:\n {0}
+DRDA_PropertyException.S=Unexpected exception while reading derby.properties:\n {0}
 DRDA_UnexpectedException.S=Unexpected exception:\n {0}
 DRDA_ListenPort.S=Could not listen on port {0} on host {1}:\n {2}
 DRDA_NoInputStream.S=Could not get input stream for client socket.

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_es.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_es.properties?view=diff&rev=515793&r1=515792&r2=515793
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_es.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_es.properties Wed Mar
 7 14:01:37 2007
@@ -18,7 +18,7 @@
 # Severity values are I - information, S - severe, U - user
 
 DRDA_LoadException.S=Se ha producido una excepci\u00f3n no esperada al cargar el controlador
JDBC de Derby:\n {0}
-DRDA_PropertyException.S=Excepci\u00f3n no esperada al leer cloudscape.properties:\n {0}
+DRDA_PropertyException.S=Excepci\u00f3n no esperada al leer derby.properties:\n {0}
 DRDA_UnexpectedException.S=Excepci\u00f3n no esperada:\n {0}
 DRDA_NoInputStream.S=No se pudo obtener una corriente de datos de entrada para el socket
de cliente.
 DRDA_Ready.I=Servidor de red {1} - {2} se ha iniciado y est\u00e1 listo para aceptar conexiones
en el puerto {0} a las {3} 

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_fr.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_fr.properties?view=diff&rev=515793&r1=515792&r2=515793
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_fr.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_fr.properties Wed Mar
 7 14:01:37 2007
@@ -18,7 +18,7 @@
 # Severity values are I - information, S - severe, U - user
 
 DRDA_LoadException.S=Exception inattendue lors du chargement du pilote JDBC Derby :\n {0}
-DRDA_PropertyException.S=Exception inattendue lors de la lecture du fichier cloudscape.properties
:\n {0}
+DRDA_PropertyException.S=Exception inattendue lors de la lecture du fichier derby.properties
:\n {0}
 DRDA_UnexpectedException.S=Exception inattendue :\n {0}
 DRDA_NoInputStream.S=Impossible d''obtenir le flux de donn\u00e9es en entr\u00e9e pour le
socket client.
 DRDA_Ready.I=Serveur r\u00e9seau {1} - {2} d\u00e9marr\u00e9 et pr\u00eat \u00e0 accepter
les connexions au port {0} \u00e0 {3} 

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_hu.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_hu.properties?view=diff&rev=515793&r1=515792&r2=515793
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_hu.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_hu.properties Wed Mar
 7 14:01:37 2007
@@ -18,7 +18,7 @@
 # Severity values are I - information, S - severe, U - user
 
 DRDA_LoadException.S=V\u00e1ratlan kiv\u00e9tel t\u00f6rt\u00e9nt a Derby JDBC illeszt\u0151program
bet\u00f6lt\u00e9se sor\u00e1n: \n {0}
-DRDA_PropertyException.S=V\u00e1ratlan kiv\u00e9tel t\u00f6rt\u00e9nt a cloudscape.properties
olvas\u00e1sa k\u00f6zben:\n{0}
+DRDA_PropertyException.S=V\u00e1ratlan kiv\u00e9tel t\u00f6rt\u00e9nt a derby.properties
olvas\u00e1sa k\u00f6zben:\n{0}
 DRDA_UnexpectedException.S=V\u00e1ratlan kiv\u00e9tel:\n {0}
 DRDA_NoInputStream.S=Nem k\u00e9rdezhet\u0151 le az \u00fcgyf\u00e9lsocket bemeneti adatfolyama.
 DRDA_Ready.I={1} H\u00e1l\u00f3zati kiszolg\u00e1l\u00f3 - {2} elindult \u00e9s k\u00e9sz
a kapcsolatok fogad\u00e1s\u00e1ra a(z) {3} {0} portj\u00e1n 

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_it.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_it.properties?view=diff&rev=515793&r1=515792&r2=515793
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_it.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_it.properties Wed Mar
 7 14:01:37 2007
@@ -18,7 +18,7 @@
 # Severity values are I - information, S - severe, U - user
 
 DRDA_LoadException.S=Eccezione imprevista durante il caricamento di Derby JDBC Driver:\n{0}
-DRDA_PropertyException.S=Eccezione imprevista durante la lettura di cloudscape.properties:\n{0}
+DRDA_PropertyException.S=Eccezione imprevista durante la lettura di derby.properties:\n{0}
 DRDA_UnexpectedException.S=Eccezione imprevista:\n {0}
 DRDA_NoInputStream.S=Impossibile richiamare il flusso di input per il socket client.
 DRDA_Ready.I={1} Server di rete - {2} avviato e pronto ad accettare connessioni sulla porta
{0} a {3} 

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ja_JP.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ja_JP.properties?view=diff&rev=515793&r1=515792&r2=515793
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ja_JP.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ja_JP.properties Wed
Mar  7 14:01:37 2007
@@ -17,8 +17,8 @@
 # The format is DRDA_X[xxxxx].Y where X[xxxxx] is the message id and Y is the severity
 # Severity values are I - information, S - severe, U - user
 
-DRDA_LoadException.S=Cloudscape JDBC \u30c9\u30e9\u30a4\u30d0\u30fc\u306e\u30ed\u30fc\u30c9\u4e2d\u306b\u4e88\u671f\u3057\u306a\u3044\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\n
{0}
-DRDA_PropertyException.S=cloudscape.properties \u306e\u8aad\u307f\u53d6\u308a\u4e2d\u306b\u4e88\u671f\u3057\u306a\u3044\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\n
{0}
+DRDA_LoadException.S=Derby JDBC \u30c9\u30e9\u30a4\u30d0\u30fc\u306e\u30ed\u30fc\u30c9\u4e2d\u306b\u4e88\u671f\u3057\u306a\u3044\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\n
{0}
+DRDA_PropertyException.S=derby.properties \u306e\u8aad\u307f\u53d6\u308a\u4e2d\u306b\u4e88\u671f\u3057\u306a\u3044\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\n
{0}
 DRDA_UnexpectedException.S=\u4e88\u671f\u3057\u306a\u3044\u4f8b\u5916:\n {0}
 DRDA_NoInputStream.S=\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u30fb\u30bd\u30b1\u30c3\u30c8\u306e\u5165\u529b\u30b9\u30c8\u30ea\u30fc\u30e0\u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
 DRDA_Ready.I={1} Network Server - {3} \u306b {2} \u304c\u958b\u59cb\u3055\u308c\u3001\u30dd\u30fc\u30c8
{0} \u3067\u63a5\u7d9a\u3092\u53d7\u3051\u5165\u308c\u308b\u6e96\u5099\u304c\u3067\u304d\u307e\u3057\u305f\u3002

@@ -27,7 +27,7 @@
 DRDA_ClientSocketError.S=\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u30fb\u30bd\u30b1\u30c3\u30c8\u3067\u30a8\u30e9\u30fc\u3067\u3059:\n
{0}
 DRDA_ListenerClose.S=\u30ea\u30b9\u30ca\u30fc\u30fb\u30b9\u30ec\u30c3\u30c9\u3092\u30af\u30ed\u30fc\u30ba\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3002
 DRDA_ShutdownSuccess.I={0} Network Server - {1} \u306f\u3001{2} \u306b\u30b7\u30e3\u30c3\u30c8\u30c0\u30a6\u30f3\u3057\u307e\u3057\u305f\u3002
-DRDA_ShutdownWarning.I=Cloudscape \u30b7\u30e3\u30c3\u30c8\u30c0\u30a6\u30f3\u306e\u8b66\u544a:\n
{0}
+DRDA_ShutdownWarning.I=Derby \u30b7\u30e3\u30c3\u30c8\u30c0\u30a6\u30f3\u306e\u8b66\u544a:\n
{0}
 DRDA_ShutdownError.S=\u30db\u30b9\u30c8 {1} \u306e\u30dd\u30fc\u30c8 {0} \u306e\u30b5\u30fc\u30d0\u30fc\u3092\u30b7\u30e3\u30c3\u30c8\u30c0\u30a6\u30f3\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
 DRDA_BootSuccess.I=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 {0} \u306e\u30d6\u30fc\u30c8\u304c\u6b63\u5e38\u306b\u884c\u308f\u308c\u307e\u3057\u305f\u3002
 DRDA_DBShutdownSuccess.I=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 {0} \u306e\u30b7\u30e3\u30c3\u30c8\u30c0\u30a6\u30f3\u304c\u6b63\u5e38\u306b\u884c\u308f\u308c\u307e\u3057\u305f\u3002
@@ -56,7 +56,7 @@
 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 Cloudscape 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_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
@@ -65,7 +65,7 @@
 DRDA_RuntimeInfoError.S=RuntimeInfo \u60c5\u5831\u306e\u53d6\u5f97\u4e2d\u306b\u30a8\u30e9\u30fc\u3067\u3059\u3002
 DRDA_PropInfoError.S=\u30d7\u30ed\u30d1\u30c6\u30a3\u30fc\u60c5\u5831\u306e\u53d6\u5f97\u4e2d\u306b\u30a8\u30e9\u30fc\u3067\u3059\u3002
 DRDA_PropInfoWriteError.S=\u30d7\u30ed\u30d1\u30c6\u30a3\u30fc\u60c5\u5831\u306e\u66f8\u304d\u8fbc\u307f\u4e2d\u306b\u30a8\u30e9\u30fc\u3067\u3059:\n
{0}
-DRDA_ProductVersionReadError.S=Cloudscape \u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u304b\u3089\u306e\u88fd\u54c1\u30d0\u30fc\u30b8\u30e7\u30f3\u60c5\u5831\u306e\u53d6\u5f97\u4e2d\u306b\u30a8\u30e9\u30fc\u3067\u3059\u3002
{0}\u3002
+DRDA_ProductVersionReadError.S=Derby \u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u304b\u3089\u306e\u88fd\u54c1\u30d0\u30fc\u30b8\u30e7\u30f3\u60c5\u5831\u306e\u53d6\u5f97\u4e2d\u306b\u30a8\u30e9\u30fc\u3067\u3059\u3002
{0}\u3002
 DRDA_ConnectionTested.I=\u6b21\u306e\u30db\u30b9\u30c8\u306e\u63a5\u7d9a\u3092\u78ba\u7acb\u3057\u307e\u3057\u305f:
{0}\u3001\u30dd\u30fc\u30c8\u756a\u53f7 {1}\u3002
 DRDA_ConnectionTested2.I=\u6b21\u306e\u30db\u30b9\u30c8\u306e\u63a5\u7d9a\u3092\u78ba\u7acb\u3057\u307e\u3057\u305f:
{0}\u3001\u30dd\u30fc\u30c8 {1}\u3001\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 {2}\u3002
 DRDA_ConnectionTested3.I=\u6b21\u306e\u30db\u30b9\u30c8\u306e\u63a5\u7d9a\u3092\u78ba\u7acb\u3057\u307e\u3057\u305f:
{0}\u3001\u30dd\u30fc\u30c8 {1}\u3001\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 {2}\u3001\u30e6\u30fc\u30b6\u30fc
{3}\u3002
@@ -83,13 +83,13 @@
 
 # Derby Network Server SYSINFO stuff
 #
-DRDA_SysInfoBanner.I=--------- Cloudscape Network Server \u60c5\u5831 --------
+DRDA_SysInfoBanner.I=--------- Derby Network Server \u60c5\u5831 --------
 DRDA_SysInfoVersion.I=\u30d0\u30fc\u30b8\u30e7\u30f3:
 DRDA_SysInfoBuild.I=\u30d3\u30eb\u30c9:
 DRDA_SysInfoDrdaPRDID.I=DRDA \u88fd\u54c1 ID:
 #
 # Derby Network Server RUNTIMEINFO stuff
-DRDA_RuntimeInfoBanner.I=--- Cloudscape Network Server \u30e9\u30f3\u30bf\u30a4\u30e0\u60c5\u5831
---
+DRDA_RuntimeInfoBanner.I=--- Derby Network Server \u30e9\u30f3\u30bf\u30a4\u30e0\u60c5\u5831
---
 DRDA_RuntimeInfoSessionBanner.I=---------- \u30bb\u30c3\u30b7\u30e7\u30f3\u60c5\u5831 ---------------
 DRDA_RuntimeInfoNumThreads.I=# \u63a5\u7d9a\u30b9\u30ec\u30c3\u30c9: 
 DRDA_RuntimeInfoNumActiveSessions.I=# \u30a2\u30af\u30c6\u30a3\u30d6\u30fb\u30bb\u30c3\u30b7\u30e7\u30f3:


Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ko_KR.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ko_KR.properties?view=diff&rev=515793&r1=515792&r2=515793
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ko_KR.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ko_KR.properties Wed
Mar  7 14:01:37 2007
@@ -18,7 +18,7 @@
 # Severity values are I - information, S - severe, U - user
 
 DRDA_LoadException.S=Derby JDBC Driver \ub85c\ub4dc \uc911\uc5d0 \uc608\uae30\uce58 \uc54a\uc740
\uc608\uc678\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4.\n {0}
-DRDA_PropertyException.S=cloudscape.properties\ub97c \uc77d\ub294 \uc911\uc5d0 \uc608\uae30\uce58
\uc54a\uc740 \uc608\uc678\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4.\n {0}
+DRDA_PropertyException.S=derby.properties\ub97c \uc77d\ub294 \uc911\uc5d0 \uc608\uae30\uce58
\uc54a\uc740 \uc608\uc678\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4.\n {0}
 DRDA_UnexpectedException.S=\uc608\uae30\uce58 \uc54a\uc740 \uc608\uc678:\n{0}
 DRDA_NoInputStream.S=\ud074\ub77c\uc774\uc5b8\ud2b8 \uc18c\ucf13\uc5d0 \ub300\ud55c \uc785\ub825
\uc2a4\ud2b8\ub9bc\uc744 \uac00\uc838\uc62c \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
 DRDA_Ready.I={1} Network Server - {2}\uc774(\uac00) {3}\uc5d0 {0} \ud3ec\ud2b8\uc5d0\uc11c\uc758
\uc5f0\uacb0\uc744 \uc2b9\uc778\ud560 \uc900\ube44\uac00 \ub418\uc5c8\uc2b5\ub2c8\ub2e4. 

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_pl.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_pl.properties?view=diff&rev=515793&r1=515792&r2=515793
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_pl.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_pl.properties Wed Mar
 7 14:01:37 2007
@@ -18,7 +18,7 @@
 # Severity values are I - information, S - severe, U - user
 
 DRDA_LoadException.S=Nieoczekiwany wyj\u0105tek podczas \u0142adowania sterownika JDBC bazy
danych Derby:\n {0}
-DRDA_PropertyException.S=Nieoczekiwany wyj\u0105tek podczas odczytu pliku cloudscape.properties:\n
{0}
+DRDA_PropertyException.S=Nieoczekiwany wyj\u0105tek podczas odczytu pliku derby.properties:\n
{0}
 DRDA_UnexpectedException.S=Nieoczekiwany wyj\u0105tek:\n {0}
 DRDA_NoInputStream.S=Nie mo\u017cna pobra\u0107 strumienia wej\u015bciowego dla gniazda klienta.
 DRDA_Ready.I=Serwer sieciowy {1} - {2} uruchomiony i gotowy do zaakceptowania po\u0142\u0105cze\u0144
na porcie {0} w {3} 

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_pt_BR.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_pt_BR.properties?view=diff&rev=515793&r1=515792&r2=515793
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_pt_BR.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_pt_BR.properties Wed
Mar  7 14:01:37 2007
@@ -18,7 +18,7 @@
 # Severity values are I - information, S - severe, U - user
 
 DRDA_LoadException.S=Exce\u00e7\u00e3o inesperada ao carregar o driver de JDBC do Derby:\n
{0}
-DRDA_PropertyException.S=Exce\u00e7\u00e3o inesperada ao ler cloudscape.properties:\n {0}
+DRDA_PropertyException.S=Exce\u00e7\u00e3o inesperada ao ler derby.properties:\n {0}
 DRDA_UnexpectedException.S=Exce\u00e7\u00e3o inesperada:\n {0}
 DRDA_NoInputStream.S=N\u00e3o foi poss\u00edvel obter fluxo de entrada para o soquete do
cliente.
 DRDA_Ready.I={1} Servidor de Rede - {2} iniciado e pronto para aceitar conex\u00f5es na porta
{0} em {3}

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ru.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ru.properties?view=diff&rev=515793&r1=515792&r2=515793
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ru.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ru.properties Wed Mar
 7 14:01:37 2007
@@ -18,7 +18,7 @@
 # Severity values are I - information, S - severe, U - user
 
 DRDA_LoadException.S=\u041d\u0435\u043e\u0436\u0438\u0434\u0430\u043d\u043d\u043e\u0435 \u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435
\u043f\u0440\u0438 \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0435 \u0434\u0440\u0430\u0439\u0432\u0435\u0440\u0430
JDBC Derby:\n {0}
-DRDA_PropertyException.S=\u041d\u0435\u043e\u0436\u0438\u0434\u0430\u043d\u043d\u043e\u0435
\u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u043f\u0440\u0438 \u0447\u0442\u0435\u043d\u0438\u0438
cloudscape.properties:\n {0}
+DRDA_PropertyException.S=\u041d\u0435\u043e\u0436\u0438\u0434\u0430\u043d\u043d\u043e\u0435
\u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u043f\u0440\u0438 \u0447\u0442\u0435\u043d\u0438\u0438
derby.properties:\n {0}
 DRDA_UnexpectedException.S=\u041d\u0435\u043e\u0436\u0438\u0434\u0430\u043d\u043d\u043e\u0435
\u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435:\n {0}
 DRDA_NoInputStream.S=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c
\u043f\u043e\u0442\u043e\u043a \u0432\u0432\u043e\u0434\u0430 \u0434\u043b\u044f \u0433\u043d\u0435\u0437\u0434\u0430
\u043a\u043b\u0438\u0435\u043d\u0442\u0430.
 DRDA_Ready.I=\u0421\u0435\u0442\u0435\u0432\u043e\u0439 \u0441\u0435\u0440\u0432\u0435\u0440
{1} Network Server - {2} \u0437\u0430\u043f\u0443\u0449\u0435\u043d \u0438 \u0433\u043e\u0442\u043e\u0432
\u043f\u0440\u0438\u043d\u0438\u043c\u0430\u0442\u044c \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u044f
\u043d\u0430 \u043f\u043e\u0440\u0442\u0443 {0} \u043d\u0430 {3} 

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_zh_CN.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_zh_CN.properties?view=diff&rev=515793&r1=515792&r2=515793
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_zh_CN.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_zh_CN.properties Wed
Mar  7 14:01:37 2007
@@ -18,7 +18,7 @@
 # Severity values are I - information, S - severe, U - user
 
 DRDA_LoadException.S=\u5f53\u88c5\u5165 Derby JDBC \u9a71\u52a8\u7a0b\u5e8f\u65f6\uff0c\u53d1\u751f\u610f\u5916\u5f02\u5e38\uff1a\n
{0}
-DRDA_PropertyException.S=\u5f53\u8bfb\u53d6 cloudscape.properties \u65f6\uff0c\u53d1\u751f\u610f\u5916\u5f02\u5e38\uff1a\n
{0}
+DRDA_PropertyException.S=\u5f53\u8bfb\u53d6 derby.properties \u65f6\uff0c\u53d1\u751f\u610f\u5916\u5f02\u5e38\uff1a\n
{0}
 DRDA_UnexpectedException.S=\u610f\u5916\u5f02\u5e38\uff1a\n {0}
 DRDA_NoInputStream.S=\u65e0\u6cd5\u83b7\u53d6\u5ba2\u6237\u673a\u5957\u63a5\u5b57\u7684\u8f93\u5165\u6d41\u3002
 DRDA_Ready.I={1} Network Server \uff0d {2} \u5df2\u542f\u52a8\u5e76\u4e14\u5df2\u51c6\u5907\u597d
{3} \u65f6\u5728\u7aef\u53e3 {0} \u4e0a\u63a5\u53d7\u8fde\u63a5

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_zh_TW.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_zh_TW.properties?view=diff&rev=515793&r1=515792&r2=515793
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_zh_TW.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_zh_TW.properties Wed
Mar  7 14:01:37 2007
@@ -18,7 +18,7 @@
 # Severity values are I - information, S - severe, U - user
 
 DRDA_LoadException.S=\u5728\u8f09\u5165 Derby JDBC \u9a45\u52d5\u7a0b\u5f0f\u6642\uff0c\u767c\u751f\u975e\u9810\u671f\u7684\u7570\u5e38\u72c0\u6cc1\uff1a\n
{0}
-DRDA_PropertyException.S=\u5728\u8b80\u53d6 cloudscape.properties \u6642\uff1a\u767c\u751f\u975e\u9810\u671f\u7684\u7570\u5e38\u72c0\u6cc1\uff1a\n
{0}
+DRDA_PropertyException.S=\u5728\u8b80\u53d6 derby.properties \u6642\uff1a\u767c\u751f\u975e\u9810\u671f\u7684\u7570\u5e38\u72c0\u6cc1\uff1a\n
{0}
 DRDA_UnexpectedException.S=\u975e\u9810\u671f\u7684\u7570\u5e38\u72c0\u6cc1\uff1a\n {0}
 DRDA_NoInputStream.S=\u7121\u6cd5\u5f9e\u7528\u6236\u7aef Socket \u53d6\u5f97\u8f38\u5165\u4e32\u6d41\u3002
 DRDA_Ready.I={1} \u7db2\u8def\u4f3a\u670d\u5668 - {2} \u5df2\u555f\u52d5\u4e14\u53ef\u63a5\u53d7\u57e0
{0} \u7684\u9023\u7dda\uff0c\u65bc {3} 

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_ja_JP.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_ja_JP.properties?view=diff&rev=515793&r1=515792&r2=515793
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_ja_JP.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_ja_JP.properties Wed Mar
 7 14:01:37 2007
@@ -16,10 +16,10 @@
 # This file contains the text for Net Server servlet
 # The format is SRV_<short desc>
 
-SRV_Banner=Cloudscape Network Server 
-SRV_Started=Cloudscape Network Server \u304c\u958b\u59cb\u3055\u308c\u307e\u3057\u305f\u3002
+SRV_Banner=Derby Network Server 
+SRV_Started=Derby Network Server \u304c\u958b\u59cb\u3055\u308c\u307e\u3057\u305f\u3002
 SRV_StopButton=Network Server \u3092\u505c\u6b62\u3059\u308b\u306b\u306f\u3001\u30dc\u30bf\u30f3\u3092\u62bc\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-SRV_NotStarted=Cloudscape Network Server \u304c\u958b\u59cb\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
+SRV_NotStarted=Derby Network Server \u304c\u958b\u59cb\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
 SRV_LogOnButton=\u30b5\u30fc\u30d0\u30fc\u304c\u958b\u59cb\u3055\u308c\u305f\u6642\u306b\u30ed\u30ae\u30f3\u30b0\u3092\u30aa\u30f3\u306b\u5207\u308a\u66ff\u3048\u308b\u306b\u306f\u3001\u30dc\u30bf\u30f3\u3092\u62bc\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 SRV_LogOffButton=\u30b5\u30fc\u30d0\u30fc\u304c\u958b\u59cb\u3055\u308c\u305f\u6642\u306b\u30ed\u30ae\u30f3\u30b0\u3092\u30aa\u30d5\u306b\u5207\u308a\u66ff\u3048\u308b\u306b\u306f\u3001\u30dc\u30bf\u30f3\u3092\u62bc\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 SRV_TraceOnButton=\u30b5\u30fc\u30d0\u30fc\u304c\u958b\u59cb\u3055\u308c\u305f\u6642\u306b\u3059\u3079\u3066\u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u306e\u30c8\u30ec\u30fc\u30b9\u3092\u30aa\u30f3\u306b\u5207\u308a\u66ff\u3048\u308b\u306b\u306f\u3001\u30dc\u30bf\u30f3\u3092\u62bc\u3057\u3066\u304f\u3060\u3055\u3044\u3002

Modified: db/derby/code/trunk/java/shared/org/apache/derby/shared/common/error/ExceptionUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/shared/org/apache/derby/shared/common/error/ExceptionUtil.java?view=diff&rev=515793&r1=515792&r2=515793
==============================================================================
--- db/derby/code/trunk/java/shared/org/apache/derby/shared/common/error/ExceptionUtil.java
(original)
+++ db/derby/code/trunk/java/shared/org/apache/derby/shared/common/error/ExceptionUtil.java
Wed Mar  7 14:01:37 2007
@@ -31,7 +31,7 @@
      *  org.apache.derby.shared.common.reference.SQLState to
 	 *  a SQLState five character string.
      *
-	 *	@param messageID - the sql state id of the message from cloudscape
+	 *	@param messageID - the sql state id of the message from Derby
 	 *	@return String 	 - the 5 character code of the SQLState ID to returned to the user 
 	*/
 	public static String getSQLStateFromIdentifier(String messageID) {

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?view=diff&rev=515793&r1=515792&r2=515793
==============================================================================
--- 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
Wed Mar  7 14:01:37 2007
@@ -100,7 +100,7 @@
 	** Connectivity
 	*/
 	String CONN_DATABASE_IDENTITY			= "J004"; // database identity
-	String CONN_SHUT_DOWN_CLOUDSCAPE		= "J005"; // shut down Cloudscape
+	String CONN_SHUT_DOWN_CLOUDSCAPE		= "J005"; // shut down Derby
 	String CONN_CREATE_DATABASE				= "J007"; // create database
 	String CONN_NO_DETAILS					= "J008"; // no details
     String CONN_DATA_ENCRYPTION             = "J010"; // encrypt database on disk
@@ -157,7 +157,7 @@
 	String AUTH_INVALID					= "A020"; // authentication failed due to invalid password or whatever
 
 	/*
-	** cloudscape Interface in com.ibm.db2j.core.*
+	** 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

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?view=diff&rev=515793&r1=515792&r2=515793
==============================================================================
--- 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
Wed Mar  7 14:01:37 2007
@@ -1032,7 +1032,7 @@
 	String LANG_TRIGGER_RECURSION_EXCEEDED                             = "54038";
 	String LANG_TOO_MANY_PARAMETERS_FOR_STORED_PROC                    = "54023";
 
-	//following 1 does not match the DB2 sql state, it is a Cloudscape specific behavior which
is not compatible with DB2
+	//following 1 does not match the DB2 sql state, it is a Derby specific behavior which is
not compatible with DB2
 	String LANG_OPERATION_NOT_ALLOWED_ON_SESSION_SCHEMA_TABLES = "XCL51.S";
 
 	// org.apache.derby.impl.sql.execute.rts
@@ -1324,7 +1324,7 @@
 	String LANG_NO_TRUNCATE_ON_FK_REFERENCE_TABLE                      = "XCL48.S";
 	String LANG_NO_TRUNCATE_ON_ENABLED_DELETE_TRIGGERS                 = "XCL49.S";
 
-    // Initial release of DB2 Cloudscape does not support upgrade
+    // Initial release of Apache Derby did not support upgrade
 	String LANG_CANT_UPGRADE_DATABASE                                 = "XCL50.S";
 
     String LANG_STATEMENT_CANCELLED_OR_TIMED_OUT                       = "XCL52.S";

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkToursDB.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkToursDB.out?view=diff&rev=515793&r1=515792&r2=515793
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkToursDB.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkToursDB.out
Wed Mar  7 14:01:37 2007
@@ -2810,9 +2810,9 @@
 1 row inserted/updated/deleted
 ij> insert into FLIGHTAVAILABILITY values ('US1357',2,'2004-04-18',0,0,3);
 1 row inserted/updated/deleted
-ij> Loading the Cloudscape jdbc driver...
-Getting Cloudscape database connection...
-Successfully got the Cloudscape database connection...
+ij> Loading the Derby jdbc driver...
+Getting Derby database connection...
+Successfully got the Derby database connection...
 Inserted 3 rows into the ToursDB
 count for select * from table AIRLINES: 2
 count for select * from table COUNTRIES: 114

Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java?view=diff&rev=515793&r1=515792&r2=515793
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java Wed Mar 
7 14:01:37 2007
@@ -77,7 +77,7 @@
     java org.apache.derby.tools.sysinfo
   </PRE>
   Alternatively, you can use SysInfo within your program to display
-  Cloudscape information; a Cloudscape version string is returned by this Java code:
+  Derby information; a Derby version string is returned by this Java code:
   <PRE>
     new Main().toString();
   </PRE>
@@ -89,7 +89,7 @@
 
   /**
     Application entry point for SysInfo.   This will print out
-    the Cloudscape product information as well as a snapshot of
+    the Derby product information as well as a snapshot of
     the System properties.
   */
   public static void main(String args[]) {

Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/ZipInfoProperties.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/ZipInfoProperties.java?view=diff&rev=515793&r1=515792&r2=515793
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/ZipInfoProperties.java
(original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/ZipInfoProperties.java
Wed Mar  7 14:01:37 2007
@@ -33,9 +33,9 @@
 	private final ProductVersionHolder	version;
     /**
         full path to zip (or expanded zip)
-        C:/cloudscape/lib/tools.zip
+        C:/derby/lib/tools.zip
             -or-
-        D:\myWorkDir\cloudscape\lib\ *expanded*
+        D:\myWorkDir\derby\lib\ *expanded*
 
         The base name (at the end) should be the same as the zipNameString
      */



Mime
View raw message