db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bpendle...@apache.org
Subject svn commit: r1727887 - in /db/derby/code/trunk/java/tools/org/apache/derby: iapi/tools/run.java loc/toolsmessages.properties loc/toolsmessages_zh_CN.properties
Date Mon, 01 Feb 2016 03:31:27 GMT
Author: bpendleton
Date: Mon Feb  1 03:31:27 2016
New Revision: 1727887

URL: http://svn.apache.org/viewvc?rev=1727887&view=rev
Log:
DERBY-5950: PlanExporter and SignatureChecker don't appear in derbyrun.

This patch was contributed by Yun Fang (fangyuncn at gmail dot com)

This patch externalizes the help for 'java -jar derbyrun.jar' to reflect that
the PlanExporter and SignatureChecker tools are available from derbyrun.

The patch also enables PlanExporter from derbyrun, as it was not previously
available via this launch technique.


Modified:
    db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/run.java
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_CN.properties

Modified: db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/run.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/run.java?rev=1727887&r1=1727886&r2=1727887&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/run.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/run.java Mon Feb  1 03:31:27
2016
@@ -22,12 +22,14 @@
 package org.apache.derby.iapi.tools;
 
 import java.io.IOException;
+
 import org.apache.derby.drda.NetworkServerControl;
+import org.apache.derby.iapi.tools.i18n.LocalizedResource;
+import org.apache.derby.tools.PlanExporter;
+import org.apache.derby.tools.SignatureChecker;
 import org.apache.derby.tools.dblook;
 import org.apache.derby.tools.ij;
 import org.apache.derby.tools.sysinfo;
-import org.apache.derby.tools.SignatureChecker;
-import org.apache.derby.iapi.tools.i18n.LocalizedResource;
 
 /**
   <p>
@@ -59,6 +61,8 @@ public class run {
           NetworkServerControl.main(trimArgs(args));
       } else if (args[0].equals("SignatureChecker")) {
           SignatureChecker.main(trimArgs(args));
+      } else if (args[0].equals("PlanExporter")) {
+    	  PlanExporter.main(trimArgs(args));  
       } else printUsage();
   }
 

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=1727887&r1=1727886&r2=1727887&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 Mon Feb 
1 03:31:27 2016
@@ -375,7 +375,9 @@ RUN_Usage=Usage:\n\
 java -jar derbyrun.jar ij [-p propertiesfile] [sql script]\n\
 java -jar derbyrun.jar sysinfo [-cp ...] [-cp help] \n\
 java -jar derbyrun.jar dblook [args] (or no arguments for usage)\n\
-java -jar derbyrun.jar server [args] (or no arguments for usage)
+java -jar derbyrun.jar server [args] (or no arguments for usage)\n\
+java -jar derbyrun.jar SignatureChecker [args]\n\
+java -jar derbyrun.jar PlanExporter [args]
 
 #
 # Messages for SignatureChecker.java

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=1727887&r1=1727886&r2=1727887&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 Mon
Feb  1 03:31:27 2016
@@ -260,7 +260,9 @@ DBLOOK_AtLeastOneDebug=-- \u6CE8\uFF1A\u
 # which tell the program that all of this text is part of one, big message.
 # These backslashes should appear in translations also.
 #
-RUN_Usage=\u7528\u6CD5\uFF1A\njava -jar derbyrun.jar ij [-p propertiesfile] [sql script]\njava
-jar derbyrun.jar sysinfo [-cp ...] [-cp help] \njava -jar derbyrun.jar dblook [args]\uFF08\u6216\u6CA1\u6709\u7528\u6CD5\u81EA\u53D8\u91CF\uFF09\njava
-jar derbyrun.jar server [args]\uFF08\u6216\u6CA1\u6709\u7528\u6CD5\u81EA\u53D8\u91CF\uFF09
+RUN_Usage=\u7528\u6CD5\uFF1A\njava -jar derbyrun.jar ij [-p propertiesfile] [sql script]\njava
-jar derbyrun.jar sysinfo [-cp ...] [-cp help] \njava -jar derbyrun.jar dblook [args]\uFF08\u6216\u6CA1\u6709\u7528\u6CD5\u81EA\u53D8\u91CF\uFF09\njava
-jar derbyrun.jar server [args]\uFF08\u6216\u6CA1\u6709\u7528\u6CD5\u81EA\u53D8\u91CF\uFF09\n\
+java -jar derbyrun.jar SignatureChecker [args]\n\
+java -jar derbyrun.jar PlanExporter [args]
 
 #
 # Messages for SignatureChecker.java



Mime
View raw message