You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2017/10/31 21:39:17 UTC

[1/2] incubator-trafodion git commit: TRAFODION-2784 trafci help has no description for jline

Repository: incubator-trafodion
Updated Branches:
  refs/heads/master e0ee8e430 -> d669b6b19


TRAFODION-2784 trafci help has no description for jline


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/9471d8c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/9471d8c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/9471d8c9

Branch: refs/heads/master
Commit: 9471d8c94b4ba086293a605a335bbcc6fda0b0f7
Parents: 371cb71
Author: gpj1987 <gp...@gmail.com>
Authored: Fri Oct 27 16:41:29 2017 +0800
Committer: gpj1987 <gp...@gmail.com>
Committed: Fri Oct 27 16:41:29 2017 +0800

----------------------------------------------------------------------
 .../trafci/src/main/java/org/trafodion/ci/ParseArguments.java     | 3 +++
 .../conn/trafci/src/main/java/org/trafodion/ci/UserInterface.java | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9471d8c9/core/conn/trafci/src/main/java/org/trafodion/ci/ParseArguments.java
----------------------------------------------------------------------
diff --git a/core/conn/trafci/src/main/java/org/trafodion/ci/ParseArguments.java b/core/conn/trafci/src/main/java/org/trafodion/ci/ParseArguments.java
index eb2d0cc..9ec5390 100644
--- a/core/conn/trafci/src/main/java/org/trafodion/ci/ParseArguments.java
+++ b/core/conn/trafci/src/main/java/org/trafodion/ci/ParseArguments.java
@@ -375,6 +375,8 @@ public class ParseArguments
               spacedOutLine +
               " -s[cript] <scriptfilename> -q|-sql <\"querystring\">" +
               spacedOutLine +
+              " -j[line] <yes|no>" +
+              spacedOutLine +
               " -noconnect -version -help" );
 
       cwObj.println(SessionDefaults.lineSeperator+"where:");
@@ -383,6 +385,7 @@ public class ParseArguments
       cwObj.println("\t-p[assword] specifies the user's password to log into a database server.");
       cwObj.println("\t-r[ole]     specifies the role name associated with the user.");
       cwObj.println("\t-s[cript]   specifies the command file used to customize a session.");
+      cwObj.println("\t-j[line]    specifies whether the shell supports jline.");
       cwObj.println("\t-q|-sql     specifies the command to be run in non-interactive mode.");
       cwObj.println("\t-noconnect  specifies the session login mode.");
       cwObj.println("\t-version    displays the Trafodion Command Interface and JDBC Type 4 Driver versions, then exits.");

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9471d8c9/core/conn/trafci/src/main/java/org/trafodion/ci/UserInterface.java
----------------------------------------------------------------------
diff --git a/core/conn/trafci/src/main/java/org/trafodion/ci/UserInterface.java b/core/conn/trafci/src/main/java/org/trafodion/ci/UserInterface.java
index e1345f4..7f680d0 100644
--- a/core/conn/trafci/src/main/java/org/trafodion/ci/UserInterface.java
+++ b/core/conn/trafci/src/main/java/org/trafodion/ci/UserInterface.java
@@ -92,7 +92,7 @@ public class UserInterface {
 
 		banner();
         
-		System.out.println("using jline: "+ isJline);
+		System.out.println("JLine support is: "+ isJline);
 		// parse the arguments
 		ParseArguments paObj = new ParseArguments(crObj, cwObj);
 


[2/2] incubator-trafodion git commit: Merge [TRAFODION-2784] PR 1278 Add trafci description of jline parameter

Posted by db...@apache.org.
Merge [TRAFODION-2784] PR 1278 Add trafci description of jline parameter


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/d669b6b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d669b6b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d669b6b1

Branch: refs/heads/master
Commit: d669b6b199f603463b5d0361fef7345340f59864
Parents: e0ee8e4 9471d8c
Author: Dave Birdsall <db...@apache.org>
Authored: Tue Oct 31 21:38:42 2017 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Tue Oct 31 21:38:42 2017 +0000

----------------------------------------------------------------------
 .../trafci/src/main/java/org/trafodion/ci/ParseArguments.java     | 3 +++
 .../conn/trafci/src/main/java/org/trafodion/ci/UserInterface.java | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------