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/03/09 17:22:50 UTC
[1/2] incubator-trafodion git commit: fix jira 2462
Repository: incubator-trafodion
Updated Branches:
refs/heads/master ffe326136 -> 4e6456fa4
fix jira 2462
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/feb3beaf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/feb3beaf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/feb3beaf
Branch: refs/heads/master
Commit: feb3beaf55bcc96ec0476737a1af8b366b8defd6
Parents: 63ab728
Author: alex <hu...@esgyn.cn>
Authored: Tue Feb 28 07:24:42 2017 +0000
Committer: alex <hu...@esgyn.cn>
Committed: Tue Feb 28 07:24:42 2017 +0000
----------------------------------------------------------------------
core/conn/trafci/install/Installer.java-tmpl | 36 ++++++++++----------
.../java/org/trafodion/ci/QueryWrapper.java | 6 +++-
2 files changed, 23 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/feb3beaf/core/conn/trafci/install/Installer.java-tmpl
----------------------------------------------------------------------
diff --git a/core/conn/trafci/install/Installer.java-tmpl b/core/conn/trafci/install/Installer.java-tmpl
index 3b4d79a..83f3510 100644
--- a/core/conn/trafci/install/Installer.java-tmpl
+++ b/core/conn/trafci/install/Installer.java-tmpl
@@ -124,7 +124,7 @@ public class Installer
//private static String nixDefaultInstallJDBC="/usr/local/trafci/jdbcT4.jar";
//private static String defaultInstallJDBC=wDefaultInstallJDBC;
- //static String jdbcFileLoc=null;
+ static String jdbcFileLoc=null;
static String targetDirectory=null;
static String osName=null;
@@ -245,7 +245,7 @@ public class Installer
else
JOptionPane.showMessageDialog(null,"Invalid JDBC jar file specified", "Error", JOptionPane.ERROR_MESSAGE);
}
- //jdbcFileLoc=jdbcFile.getAbsolutePath();
+ jdbcFileLoc=jdbcFile.getAbsolutePath();
return JFileChooser.APPROVE_OPTION;
}
@@ -648,21 +648,21 @@ public class Installer
}
}
-// else if (event.getSource() == fileBrowseButton)
-// {
-// if (getJDBCLocation()==JFileChooser.APPROVE_OPTION)
-// jdbcFileText.setText(jdbcFileLoc);
-// if (jdbcFileLoc != null && targetDirectory != null)
-// nextButtonInstallerPath.setEnabled(true);
-//
-// }
-// else if (event.getSource() == dirBrowseButton)
-// {
-// if (getTargetInstallLocation()==JFileChooser.APPROVE_OPTION)
-// targetDirText.setText(targetDirectory);
-// if (jdbcFileLoc != null && targetDirectory != null)
-// nextButtonInstallerPath.setEnabled(true);
-// }
+ else if (event.getSource() == fileBrowseButton)
+ {
+ if (getJDBCLocation()==JFileChooser.APPROVE_OPTION)
+ jdbcFileText.setText(jdbcFileLoc);
+ if (jdbcFileLoc != null && targetDirectory != null)
+ nextButtonInstallerPath.setEnabled(true);
+
+ }
+ else if (event.getSource() == dirBrowseButton)
+ {
+ if (getTargetInstallLocation()==JFileChooser.APPROVE_OPTION)
+ targetDirText.setText(targetDirectory);
+ if (jdbcFileLoc != null && targetDirectory != null)
+ nextButtonInstallerPath.setEnabled(true);
+ }
else if (event.getSource() == choiceStandardInstall)
{
/* reset defaults */
@@ -3062,7 +3062,7 @@ void processCmdMode(String zipfile)
public static void main(String args[])
{
- //jdbcFileLoc=null;
+ jdbcFileLoc=null;
targetDirectory=null;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/feb3beaf/core/conn/trafci/src/main/java/org/trafodion/ci/QueryWrapper.java
----------------------------------------------------------------------
diff --git a/core/conn/trafci/src/main/java/org/trafodion/ci/QueryWrapper.java b/core/conn/trafci/src/main/java/org/trafodion/ci/QueryWrapper.java
index 75086c5..2adc7e5 100644
--- a/core/conn/trafci/src/main/java/org/trafodion/ci/QueryWrapper.java
+++ b/core/conn/trafci/src/main/java/org/trafodion/ci/QueryWrapper.java
@@ -185,12 +185,16 @@ public abstract class QueryWrapper
if ((matchTrigStmt)&& (utils.rtrim(queryStr).equals(crTrigTerminator)))
break;
else if ((!matchTrigStmt) && (queryStr.trim().toUpperCase().endsWith(sessObj.getSessionSQLTerminator())))
+ {this.sessObj.getConsoleReader().cr.setPrompt("SQL>");
break;
+ }
if (( (writer.getWriterMode() == SessionDefaults.CONSOLE_WRITE_MODE ||
writer.getWriterMode() == SessionDefaults.CONSOLE_SPOOL_WRITE_MODE)) )
{
if((reader.getReadMode() == SessionDefaults.OBEY_READ_MODE && !sessObj.isQuietEnabled()) || !(reader.getReadMode() == SessionDefaults.OBEY_READ_MODE) )
- writer.getConsoleWriter().print(sessObj.getSessionCprompt());
+ {//writer.getConsoleWriter().print(sessObj.getSessionCprompt());
+ this.sessObj.getConsoleReader().cr.setPrompt("+>");
+ }
}
try
{
[2/2] incubator-trafodion git commit: Merge [TRAFODION-2462] PR 982
Fix trafci GUI installer
Posted by db...@apache.org.
Merge [TRAFODION-2462] PR 982 Fix trafci GUI installer
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/4e6456fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/4e6456fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/4e6456fa
Branch: refs/heads/master
Commit: 4e6456fa4524ff6202e85e3c197c33acfa651f9a
Parents: ffe3261 feb3bea
Author: Dave Birdsall <db...@apache.org>
Authored: Thu Mar 9 17:21:56 2017 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Thu Mar 9 17:21:56 2017 +0000
----------------------------------------------------------------------
core/conn/trafci/install/Installer.java-tmpl | 36 ++++++++++----------
.../java/org/trafodion/ci/QueryWrapper.java | 6 +++-
2 files changed, 23 insertions(+), 19 deletions(-)
----------------------------------------------------------------------