github/sqoop
5
0
Fork 0
mirror of https://github.com/apache/sqoop.git synced 2025-05-10 22:13:07 +08:00
Code Issues Projects Releases Wiki Activity

SQOOP-1679: Sqoop2: Fix inconsistent naming in shell for entity driver in sqoop2

Browse Source 
(Veena Basavaraj via Jarek Jarcec Cecho)
This commit is contained in:
Jarek Jarcec Cecho 2014-11-05 06:44:00 -08:00
parent ef0a19b986
commit 7a15cc6d1f
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shell/src/main/java/org/apache/sqoop/shell/ShowDriverFunction.java
View File

@ -36,7 +36,7 @@ public ShowDriverFunction() {
@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 Object executeFunction(CommandLine line, boolean isInteractive) {
}
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());
}
}

10
shell/src/main/java/org/apache/sqoop/shell/core/Constants.java
View File

@ -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";

4
shell/src/main/resources/shell-resource.properties
View File

@ -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