Repository: sqoop Updated Branches: refs/heads/sqoop2 ef0a19b98 -> 7a15cc6d1
SQOOP-1679: Sqoop2: Fix inconsistent naming in shell for entity driver in sqoop2 (Veena Basavaraj via Jarek Jarcec Cecho) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/7a15cc6d Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/7a15cc6d Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/7a15cc6d Branch: refs/heads/sqoop2 Commit: 7a15cc6d1f4b4ba0b7d49e69446183ac76cfa9f6 Parents: ef0a19b Author: Jarek Jarcec Cecho <[email protected]> Authored: Wed Nov 5 06:44:00 2014 -0800 Committer: Jarek Jarcec Cecho <[email protected]> Committed: Wed Nov 5 06:44:00 2014 -0800 ---------------------------------------------------------------------- .../java/org/apache/sqoop/shell/ShowDriverFunction.java | 4 ++-- .../main/java/org/apache/sqoop/shell/core/Constants.java | 10 +++++----- shell/src/main/resources/shell-resource.properties | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/7a15cc6d/shell/src/main/java/org/apache/sqoop/shell/ShowDriverFunction.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowDriverFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowDriverFunction.java index e598bf2..421f65d 100644 --- a/shell/src/main/java/org/apache/sqoop/shell/ShowDriverFunction.java +++ b/shell/src/main/java/org/apache/sqoop/shell/ShowDriverFunction.java @@ -36,7 +36,7 @@ public class ShowDriverFunction extends SqoopFunction { @Override public boolean validateArgs(CommandLine line) { if (line.getArgs().length != 0) { - printlnResource(Constants.RES_SHOW_DRIVER_CONFIG_USAGE); + printlnResource(Constants.RES_SHOW_DRIVER_USAGE); return false; } return true; @@ -49,7 +49,7 @@ public class ShowDriverFunction extends SqoopFunction { } private void showDriver() { - printlnResource(Constants.RES_SHOW_PROMPT_DRIVER_CONFIG_OPTS, client.getDriver().getPersistenceId()); + printlnResource(Constants.RES_SHOW_PROMPT_DRIVER_OPTS, client.getDriver().getPersistenceId()); displayDriverConfigDetails(client.getDriverConfig(), client.getDriverConfigBundle()); } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/7a15cc6d/shell/src/main/java/org/apache/sqoop/shell/core/Constants.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/sqoop/shell/core/Constants.java b/shell/src/main/java/org/apache/sqoop/shell/core/Constants.java index 44d5920..98d8cbf 100644 --- a/shell/src/main/java/org/apache/sqoop/shell/core/Constants.java +++ b/shell/src/main/java/org/apache/sqoop/shell/core/Constants.java @@ -118,7 +118,7 @@ public class Constants { public static final String FN_OPTION = "option"; public static final String FN_CONNECTOR = "connector"; public static final String FN_VERSION = "version"; - public static final String FN_DRIVER_CONFIG = "driverConfig"; + public static final String FN_DRIVER_CONFIG = "driver"; public static final String PROP_HOMEDIR = "user.home"; public static final String PROP_CURDIR = "user.dir"; @@ -253,10 +253,10 @@ public class Constants { public static final String RES_SHOW_PROMPT_CONNECTOR_INFO = "show.prompt_connector_info"; - public static final String RES_SHOW_DRIVER_CONFIG_USAGE = - "show.driver_config_usage"; - public static final String RES_SHOW_PROMPT_DRIVER_CONFIG_OPTS = - "show.prompt_driver_config_opts"; + public static final String RES_SHOW_DRIVER_USAGE = + "show.driver_usage"; + public static final String RES_SHOW_PROMPT_DRIVER_OPTS = + "show.prompt_driver_opts"; public static final String RES_SHOW_PROMPT_DISPLAY_ALL_JOBS = "show.prompt_display_all_jobs"; http://git-wip-us.apache.org/repos/asf/sqoop/blob/7a15cc6d/shell/src/main/resources/shell-resource.properties ---------------------------------------------------------------------- diff --git a/shell/src/main/resources/shell-resource.properties b/shell/src/main/resources/shell-resource.properties index 0e63c50..6a64fcc 100644 --- a/shell/src/main/resources/shell-resource.properties +++ b/shell/src/main/resources/shell-resource.properties @@ -140,8 +140,8 @@ show.prompt_connectors_to_show = @|bold {0} connector(s) to show: |@ show.prompt_connector_info = Connector with id {0}:\n Name: {1} \n \ Class: {2}\n Version: {3}\n Supported Directions {4} -show.driver_config_usage = Usage: show driver config -show.prompt_driver_config_opts = @|bold Driver config specific options: |@\nPersistent id: {0} +show.driver_usage = Usage: show driver +show.prompt_driver_opts = @|bold Driver specific options: |@\nPersistent id: {0} show.prompt_display_all_jobs = Display all jobs show.prompt_display_job_jid = Display jobwith given jid
