db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bpendle...@apache.org
Subject svn commit: r737948 - in /db/derby/code/trunk/java: testing/org/apache/derbyTesting/functionTests/master/ tools/org/apache/derby/impl/tools/ij/ tools/org/apache/derby/loc/
Date Tue, 27 Jan 2009 00:34:01 GMT
Author: bpendleton
Date: Tue Jan 27 00:34:00 2009
New Revision: 737948

URL: http://svn.apache.org/viewvc?rev=737948&view=rev
Log:
DERBY-3420: Remove obsolete -ca option from ij.

The -ca command-line-option for the ij command is obsolete and no longer
needed, since the ij connection URL can now accept all the necessary
connection attribute information.

This change removes the implementation of the -ca option from the ij code,
and removes the option from the ij "usage" message, and from the test output.

There is a release note attached to DERBY-3420, noting that the option
has been removed, and that users of this option (hopefully there are none)
should instead pass connection attributes in the URL.


Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/derbyrunjartest.out
    db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/Main.java
    db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj
    db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtTestCase.java
    db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/util.java
    db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain.java
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_cs.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_de_DE.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_es.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_fr.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_hu.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_it.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ja_JP.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ko_KR.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_pl.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_pt_BR.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ru.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_CN.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_TW.properties

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/derbyrunjartest.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/derbyrunjartest.out?rev=737948&r1=737947&r2=737948&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/derbyrunjartest.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/derbyrunjartest.out
Tue Jan 27 00:34:00 2009
@@ -1,5 +1,5 @@
 ij --help:
-Usage: java org.apache.derby.tools.ij [-p propertyfile] [-ca connectionAttributePropertyFile]
[inputfile]
+Usage: java org.apache.derby.tools.ij [-p propertyfile] [inputfile]
 sysinfo -cp help:
 USAGE: java org.apache.derby.tools.sysinfo -cp [ [ embedded ][ server ][ client] [ db2driver
] [ tools ] [  anyClass.class ] ]
 dblook:
@@ -38,4 +38,4 @@
 maxthreads <max>[-h <host>][-p <portnumber>] [-ssl <sslmode>]
 timeslice <milliseconds>[-h <host>][-p <portnumber>] [-ssl <sslmode>]
 trace {on|off} [-s <session id>][-h <host>][-p <portnumber>] [-ssl <sslmode>]
-tracedirectory <traceDirectory>[-h <host>][-p <portnumber>] [-ssl <sslmode>]
\ No newline at end of file
+tracedirectory <traceDirectory>[-h <host>][-p <portnumber>] [-ssl <sslmode>]

Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/Main.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/Main.java?rev=737948&r1=737947&r2=737948&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/Main.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/Main.java Tue Jan 27 00:34:00
2009
@@ -82,7 +82,6 @@
 		String file;
 		String inputResourceName;
 		boolean gotProp;
-		Properties connAttributeDefaults = null;
 
 		LocalizedResource langUtil = LocalizedResource.getInstance();
 		LocalizedOutput out = langUtil.getNewOutput(System.out);
@@ -96,9 +95,6 @@
 		// load the property file if specified
 		gotProp = util.getPropertyArg(args);
 
-		// get the default connection attributes
-		connAttributeDefaults = util.getConnAttributeArg(args);
-
 		// readjust output to derby.ui.locale and derby.ui.codeset if 
                 // they were loaded from a property file.
 		langUtil.init();
@@ -178,7 +174,7 @@
 		me = main.getMain(out);
 
 		/* Let the processing begin! */
-		me.go(in, out, connAttributeDefaults);
+		me.go(in, out);
 		in.close(); out.close();
 	}
 
@@ -208,11 +204,10 @@
 		Give a shortcut to go on the utilInstance so
 		we don't expose utilMain.
 	 */
-	private void go(LocalizedInput in, LocalizedOutput out , 
-				   Properties connAttributeDefaults)
+	private void go(LocalizedInput in, LocalizedOutput out )
 	{
 		LocalizedInput[] inA = { in } ;
-		utilInstance.go(inA, out,connAttributeDefaults);
+		utilInstance.go(inA, out);
 	}
 
 	/**

Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj?rev=737948&r1=737947&r2=737948&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj Tue Jan 27 00:34:00
2009
@@ -1735,11 +1735,7 @@
 
 		// If no ATTRIBUTES on the connection get them from the
 		// defaults
-		if (connInfo == null)
-			connInfo = util.updateConnInfo(userS,passwordS, 
-			utilInstance.getConnAttributeDefaults());
-		else
-			connInfo = util.updateConnInfo(userS,passwordS, connInfo);
+		connInfo = util.updateConnInfo(userS,passwordS, connInfo);
 
 	   
 		theConnection = DriverManager.getConnection(sVal,connInfo);

Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtTestCase.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtTestCase.java?rev=737948&r1=737947&r2=737948&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtTestCase.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtTestCase.java Tue Jan
27 00:34:00 2009
@@ -243,7 +243,7 @@
 		utilInstance = new utilMain(1, out, ignoreErrors);
 		utilInstance.initFromEnvironment();
 		utilInstance.setMtUse(true);
-		utilInstance.go(in, out, (java.util.Properties) null);
+		utilInstance.go(in, out);
 		log.flush();
 		out.flush();
 	}

Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/util.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/util.java?rev=737948&r1=737947&r2=737948&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/util.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/util.java Tue Jan 27 00:34:00
2009
@@ -142,46 +142,6 @@
 		return true;
 	}
 
-	/**
-		ij is started with "-ca[r] file OtherArgs";
-		the file contains connection attibute properties 
-		to pass to getConnection
-		<p>
-		getConnAttributeArg will look at the args and take out a 
-		"-ca[r] <file>" pair and returning the Properties
-		<p>
-
-		@exception IOException thrown if file not found
-
-		@param args	the argument list to consider.
-		@return  properties in the file
-	 */
-	static public Properties getConnAttributeArg(String[] args) 
-		throws IOException 
-	{
-		String n;
-		InputStream in1;
-		Properties p = new Properties();
-
-		if ((n = getArg("-ca", args))!= null){
-			in1 = new FileInputStream(n);
-			in1 = new BufferedInputStream(in1);
-		}
-		else if ((n = getArg("-car", args)) != null) {
-			in1 = getResourceAsStream(n);
-			if (in1 == null) throw ijException.resourceNotFound();
-		}
-		else
-			return null;
-
-		// Trim off excess whitespace in property file, if any, and
-		// then load those properties into 'p'.
-		util.loadWithTrimmedValues(in1, p);
-
-		return p;
-	}
-
-
 
 	/**
 	  Convenience routine to qualify a resource name with "ij.defaultPackageName"
@@ -270,8 +230,6 @@
 		for (int ix=0; ix < args.length; ix++)
 			if(args[ix].equals("-f")  ||
 			   args[ix].equals("-fr") ||
-			   args[ix].equals("-ca")  ||
-			   args[ix].equals("-car")  ||
 			   args[ix].equals("-p")  ||
 			   args[ix].equals("-pr"))
 				ix++; //skip the parameter to these args
@@ -310,8 +268,7 @@
 				if (ix >= args.length) return true;
 			}
 
-			else if ((args[ix].equals("-p") || args[ix].equals("-pr") ||
-					  args[ix].equals("-ca") || args[ix].equals("-car") ))
+			else if ((args[ix].equals("-p") || args[ix].equals("-pr") ))
 			{
 				// next arg is the file/resource name
 				ix++;

Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain.java?rev=737948&r1=737947&r2=737948&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain.java Tue Jan 27
00:34:00 2009
@@ -65,7 +65,6 @@
 	private boolean mtUse;
 	private boolean firstRun = true;
 	private LocalizedOutput out = null;
-	private Properties connAttributeDefaults;
 	private Hashtable ignoreErrors;
 	/**
 	 * True if to display the error code when
@@ -182,13 +181,11 @@
 	 *
 	 * @param in source for input to ij
 	 * @param out sink for output from ij
-	 * @param connAttributeDefaults  connection attributes from -ca ij arg
 	 */
-	public void go(LocalizedInput[] in, LocalizedOutput out,
-				   Properties connAttributeDefaults) throws ijFatalException
+	public void go(LocalizedInput[] in, LocalizedOutput out)
+				   throws ijFatalException
 	{
 		this.out = out;
-		this.connAttributeDefaults = connAttributeDefaults;
 		
 		ijParser.setConnection(connEnv[currCE], (numConnections > 1));
 		fileInput = initialFileInput = (!in[currCE].isStandardInput());
@@ -810,11 +807,6 @@
 		return rs.getRow();
 	}
 
-	Properties getConnAttributeDefaults ()
-	{
-		return connAttributeDefaults;
-	}
-
 	public final Object run() {
 		return  getClass().getResourceAsStream(ProductGenusNames.TOOLS_INFO);
 	}

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties?rev=737948&r1=737947&r2=737948&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties Tue Jan 27
00:34:00 2009
@@ -166,7 +166,7 @@
 IJ_Rse0=RST::{0}
 IJ_Unkn0=UNKNOWN::{0}
 # From util.java
-IJ_UsageJavaComCloudToolsIjPPropeInput=Usage: java org.apache.derby.tools.ij [-p propertyfile]
[-ca connectionAttributePropertyFile] [inputfile]
+IJ_UsageJavaComCloudToolsIjPPropeInput=Usage: java org.apache.derby.tools.ij [-p propertyfile]
[inputfile]
 IJ_IjWarniAutocMayCloseUsingResulSet=IJ WARNING: Autocommit may close using result set
 # From utilMain.java
 IJ_IjVers30C199=ij version {0}

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_cs.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_cs.properties?rev=737948&r1=737947&r2=737948&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_cs.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_cs.properties Tue Jan
27 00:34:00 2009
@@ -158,7 +158,7 @@
 IJ_Rse0=RST::{0}
 IJ_Unkn0=NEZN\u00c1M\u00dd::{0}
 # From util.java
-IJ_UsageJavaComCloudToolsIjPPropeInput=Pou\u017eit\u00ed: java org.apache.derby.tools.ij
[-p souborVlastnost\u00ed] [-ca souborVlastnost\u00edAtributuP\u0159ipojen\u00ed] [vstupn\u00edSoubor]
+IJ_UsageJavaComCloudToolsIjPPropeInput=Pou\u017eit\u00ed: java org.apache.derby.tools.ij
[-p souborVlastnost\u00ed] [vstupn\u00edSoubor]
 IJ_IjWarniAutocMayCloseUsingResulSet=VAROV\u00c1N\u00cd IJ: Automatick\u00e9 potvrzov\u00e1n\u00ed
se m\u016f\u017ee zav\u0159\u00edt pomoc\u00ed mno\u017einy v\u00fdsledk\u016f
 # From utilMain.java
 IJ_IjVers30C199=verze ij {0}

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_de_DE.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_de_DE.properties?rev=737948&r1=737947&r2=737948&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_de_DE.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_de_DE.properties Tue
Jan 27 00:34:00 2009
@@ -158,7 +158,7 @@
 IJ_Rse0=RST::{0}
 IJ_Unkn0=UNKNOWN::{0}
 # From util.java
-IJ_UsageJavaComCloudToolsIjPPropeInput=Syntax: java org.apache.derby.tools.ij [-p Merkmaldatei]
[-ca Merkmaldatei_f\u00fcr_Verbindungsattribut] [Eingabedatei]
+IJ_UsageJavaComCloudToolsIjPPropeInput=Syntax: java org.apache.derby.tools.ij [-p Merkmaldatei]
[Eingabedatei]
 IJ_IjWarniAutocMayCloseUsingResulSet=IJ-WARNUNG: Beim automatischen Festschreiben kann die
verwendete Ergebnisliste geschlossen werden.
 # From utilMain.java
 IJ_IjVers30C199=IJ Version {0}

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_es.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_es.properties?rev=737948&r1=737947&r2=737948&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_es.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_es.properties Tue Jan
27 00:34:00 2009
@@ -158,7 +158,7 @@
 IJ_Rse0=RST::{0}
 IJ_Unkn0=UNKNOWN::{0}
 # From util.java
-IJ_UsageJavaComCloudToolsIjPPropeInput=Uso: java org.apache.derby.tools.ij [-p archivopropiedades]
[-ca archivo_propiedades_atributo_conexi\u00f3n] [archivoEntrada]
+IJ_UsageJavaComCloudToolsIjPPropeInput=Uso: java org.apache.derby.tools.ij [-p archivopropiedades]
[archivoEntrada]
 IJ_IjWarniAutocMayCloseUsingResulSet=AVISO IJ: AutoCommit puede cerrar utilizando el juego
de resultados
 # From utilMain.java
 IJ_IjVers30C199=Versi\u00f3n ij {0}

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_fr.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_fr.properties?rev=737948&r1=737947&r2=737948&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_fr.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_fr.properties Tue Jan
27 00:34:00 2009
@@ -155,7 +155,7 @@
 IJ_Rse0=RST::{0}
 IJ_Unkn0=INCONNU::{0}
 # From util.java
-IJ_UsageJavaComCloudToolsIjPPropeInput=Syntaxe : java org.apache.derby.tools.ij [-p fichier_propri\u00e9t\u00e9s]
[-ca fichier_propri\u00e9t\u00e9s_attributs_connexion] [fichier_entr\u00e9e]
+IJ_UsageJavaComCloudToolsIjPPropeInput=Syntaxe : java org.apache.derby.tools.ij [-p fichier_propri\u00e9t\u00e9s]
[fichier_entr\u00e9e]
 IJ_IjWarniAutocMayCloseUsingResulSet=AVERTISSEMENT IJ : La validation automatique peut se
fermer \u00e0 l'aide de l'ensemble de r\u00e9sultats
 # From utilMain.java
 IJ_IjVers30C199=version ij {0}

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_hu.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_hu.properties?rev=737948&r1=737947&r2=737948&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_hu.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_hu.properties Tue Jan
27 00:34:00 2009
@@ -155,7 +155,7 @@
 IJ_Rse0=RST::{0}
 IJ_Unkn0=ISMERETLEN::{0}
 # From util.java
-IJ_UsageJavaComCloudToolsIjPPropeInput=Haszn\u00e1lat: java org.apache.derby.tools.ij [-p
tulajdons\u00e1gf\u00e1jl] [-ca connectionAttributePropertyFile] [bemenetif\u00e1jl]
+IJ_UsageJavaComCloudToolsIjPPropeInput=Haszn\u00e1lat: java org.apache.derby.tools.ij [-p
tulajdons\u00e1gf\u00e1jl] [bemenetif\u00e1jl]
 IJ_IjWarniAutocMayCloseUsingResulSet=IJ FIGYELMEZTET\u00c9S: az automatikus v\u00e9gleges\u00edt\u00e9s
bez\u00e1r\u00f3dhat az eredm\u00e9nyhalmaz haszn\u00e1latakor
 # From utilMain.java
 IJ_IjVers30C199=ij v\u00e1ltozat: {0}

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_it.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_it.properties?rev=737948&r1=737947&r2=737948&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_it.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_it.properties Tue Jan
27 00:34:00 2009
@@ -158,7 +158,7 @@
 IJ_Rse0=RST::{0}
 IJ_Unkn0=UNKNOWN::{0}
 # From util.java
-IJ_UsageJavaComCloudToolsIjPPropeInput=Utilizzo: java org.apache.derby.tools.ij [-p propertyfile]
[-ca connectionAttributePropertyFile] [inputfile]
+IJ_UsageJavaComCloudToolsIjPPropeInput=Utilizzo: java org.apache.derby.tools.ij [-p propertyfile]
[inputfile]
 IJ_IjWarniAutocMayCloseUsingResulSet=AVVERTENZA IJ: l'autocommit pu\u00f2 eseguire la chiusura
utilizzando l'insieme di risultati
 # From utilMain.java
 IJ_IjVers30C199=Versione ij {0}

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ja_JP.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ja_JP.properties?rev=737948&r1=737947&r2=737948&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ja_JP.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ja_JP.properties Tue
Jan 27 00:34:00 2009
@@ -158,7 +158,7 @@
 IJ_Rse0=RST::{0}
 IJ_Unkn0=UNKNOWN::{0}
 # From util.java
-IJ_UsageJavaComCloudToolsIjPPropeInput=\u4f7f\u7528\u6cd5: java org.apache.derby.tools.ij
[-p propertyfile] [-ca connectionAttributePropertyFile] [inputfile]
+IJ_UsageJavaComCloudToolsIjPPropeInput=\u4f7f\u7528\u6cd5: java org.apache.derby.tools.ij
[-p propertyfile] [inputfile]
 IJ_IjWarniAutocMayCloseUsingResulSet=IJ \u8b66\u544a: \u81ea\u52d5\u30b3\u30df\u30c3\u30c8\u306f\u7d50\u679c\u30bb\u30c3\u30c8\u3092\u4f7f\u3063\u3066\u30af\u30ed\u30fc\u30ba\u3059\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059
 # From utilMain.java
 IJ_IjVers30C199=ij \u30d0\u30fc\u30b8\u30e7\u30f3 {0}

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ko_KR.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ko_KR.properties?rev=737948&r1=737947&r2=737948&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ko_KR.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ko_KR.properties Tue
Jan 27 00:34:00 2009
@@ -158,7 +158,7 @@
 IJ_Rse0=RST::{0}
 IJ_Unkn0=UNKNOWN::{0}
 # From util.java
-IJ_UsageJavaComCloudToolsIjPPropeInput=\uc0ac\uc6a9\ubc95: java org.apache.derby.tools.ij
[-p propertyfile] [-ca connectionAttributePropertyFile] [inputfile]
+IJ_UsageJavaComCloudToolsIjPPropeInput=\uc0ac\uc6a9\ubc95: java org.apache.derby.tools.ij
[-p propertyfile] [inputfile]
 IJ_IjWarniAutocMayCloseUsingResulSet=IJ \uacbd\uace0: \uc790\ub3d9 \ud655\uc57d\uc740 \uacb0\uacfc
\uc138\ud2b8\ub97c \uc0ac\uc6a9\ud558\uc5ec \ub2eb\ud790 \uc218 \uc788\uc2b5\ub2c8\ub2e4.
 # From utilMain.java
 IJ_IjVers30C199=ij \ubc84\uc804 {0}

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_pl.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_pl.properties?rev=737948&r1=737947&r2=737948&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_pl.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_pl.properties Tue Jan
27 00:34:00 2009
@@ -158,7 +158,7 @@
 IJ_Rse0=RST::{0}
 IJ_Unkn0=UNKNOWN::{0}
 # From util.java
-IJ_UsageJavaComCloudToolsIjPPropeInput=Sk\u0142adnia: java org.apache.derby.tools.ij [-p
plik_w\u0142a\u015bciwo\u015bci] [-ca plik_w\u0142a\u015bciwo\u015bci_atrybut\u00f3w_po\u0142\u0105czenia]
[plik_wej\u015bciowy]
+IJ_UsageJavaComCloudToolsIjPPropeInput=Sk\u0142adnia: java org.apache.derby.tools.ij [-p
plik_w\u0142a\u015bciwo\u015bci] [plik_wej\u015bciowy]
 IJ_IjWarniAutocMayCloseUsingResulSet=OSTRZE\u017bENIE IJ: Automatyczne zatwierdzanie mo\u017ce
zosta\u0107 zamkni\u0119te za pomoc\u0105 tabeli wynikowej
 # From utilMain.java
 IJ_IjVers30C199=wersja ij {0}

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_pt_BR.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_pt_BR.properties?rev=737948&r1=737947&r2=737948&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_pt_BR.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_pt_BR.properties Tue
Jan 27 00:34:00 2009
@@ -174,7 +174,7 @@
 IJ_Rse0=RST::{0}
 IJ_Unkn0=UNKNOWN::{0}
 # From util.java
-IJ_UsageJavaComCloudToolsIjPPropeInput=Uso: java org.apache.derby.tools.ij [-p propertyfile]
[-ca connectionAttributePropertyFile] [inputfile]
+IJ_UsageJavaComCloudToolsIjPPropeInput=Uso: java org.apache.derby.tools.ij [-p propertyfile]
[inputfile]
 IJ_IjWarniAutocMayCloseUsingResulSet=AVISO IJ: Autoefetiva\u00e7\u00e3o pode fechar o conjunto
de resultados sendo utilizado
 # From utilMain.java
 IJ_IjVers30C199=vers\u00e3o ij {0}

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ru.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ru.properties?rev=737948&r1=737947&r2=737948&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ru.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ru.properties Tue Jan
27 00:34:00 2009
@@ -158,7 +158,7 @@
 IJ_Rse0=RST::{0}
 IJ_Unkn0=\u041d\u0415\u0418\u0417\u0412\u0415\u0421\u0422\u041d\u041e::{0}
 # From util.java
-IJ_UsageJavaComCloudToolsIjPPropeInput=\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435:
java org.apache.derby.tools.ij [-p \u0444\u0430\u0439\u043b_\u0441\u0432\u043e\u0439\u0441\u0442\u0432]
[-ca \u0444\u0430\u0439\u043b_\u0441\u0432\u043e\u0439\u0441\u0442\u0432_\u0430\u0442\u0440\u0438\u0431\u0443\u0442\u043e\u0432_\u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u044f]
[\u0432\u0445\u043e\u0434\u043d\u043e\u0439_\u0444\u0430\u0439\u043b]
+IJ_UsageJavaComCloudToolsIjPPropeInput=\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435:
java org.apache.derby.tools.ij [-p \u0444\u0430\u0439\u043b_\u0441\u0432\u043e\u0439\u0441\u0442\u0432]
[\u0432\u0445\u043e\u0434\u043d\u043e\u0439_\u0444\u0430\u0439\u043b]
 IJ_IjWarniAutocMayCloseUsingResulSet=\u041f\u0420\u0415\u0414\u0423\u041f\u0420\u0415\u0416\u0414\u0415\u041d\u0418\u0415
IJ: \u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u043e\u0435 \u043f\u0440\u0438\u043d\u044f\u0442\u0438\u0435
\u043c\u043e\u0436\u0435\u0442 \u0432\u044b\u0437\u0432\u0430\u0442\u044c \u0437\u0430\u043a\u0440\u044b\u0442\u0438\u0435
\u043f\u0440\u0438 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0438
\u043d\u0430\u0431\u043e\u0440\u0430 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u043e\u0432
 # From utilMain.java
 IJ_IjVers30C199=\u0432\u0435\u0440\u0441\u0438\u044f ij {0}

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_CN.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_CN.properties?rev=737948&r1=737947&r2=737948&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_CN.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_CN.properties Tue
Jan 27 00:34:00 2009
@@ -158,7 +158,7 @@
 IJ_Rse0=RST::{0}
 IJ_Unkn0=UNKNOWN::{0}
 # From util.java
-IJ_UsageJavaComCloudToolsIjPPropeInput=\u7528\u6cd5\uff1ajava org.apache.derby.tools.ij [-p
propertyfile] [-ca connectionAttributePropertyFile] [inputfile]
+IJ_UsageJavaComCloudToolsIjPPropeInput=\u7528\u6cd5\uff1ajava org.apache.derby.tools.ij [-p
propertyfile] [inputfile]
 IJ_IjWarniAutocMayCloseUsingResulSet=IJ \u8b66\u544a\uff1a\u81ea\u52a8\u843d\u5b9e\u53ef\u80fd\u5173\u95ed
Using \u7ed3\u679c\u96c6
 # From utilMain.java
 IJ_IjVers30C199=ij \u7248\u672c {0}

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_TW.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_TW.properties?rev=737948&r1=737947&r2=737948&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_TW.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_TW.properties Tue
Jan 27 00:34:00 2009
@@ -158,7 +158,7 @@
 IJ_Rse0=RST::{0}
 IJ_Unkn0=UNKNOWN::{0}
 # From util.java
-IJ_UsageJavaComCloudToolsIjPPropeInput=\u7528\u6cd5\uff1ajava org.apache.derby.tools.ij [-p
propertyfile] [-ca connectionAttributePropertyFile] [inputfile]
+IJ_UsageJavaComCloudToolsIjPPropeInput=\u7528\u6cd5\uff1ajava org.apache.derby.tools.ij [-p
propertyfile] [inputfile]
 IJ_IjWarniAutocMayCloseUsingResulSet=IJ \u8b66\u544a\uff1a\u81ea\u52d5\u78ba\u5b9a\u53ef\u80fd\u6703\u5229\u7528\u7d50\u679c\u96c6\u95dc\u9589
 # From utilMain.java
 IJ_IjVers30C199=ij \u7248\u672c {0}



Mime
View raw message