Repository: sqoop Updated Branches: refs/heads/trunk b56b1767d -> c3d916ab2
SQOOP-3357: Change MainframeImportTool to refer to MainframeManager class directly (Nguyen Truong via Szabolcs Vasas) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/c3d916ab Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/c3d916ab Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/c3d916ab Branch: refs/heads/trunk Commit: c3d916ab20ca02c9d6b85bb51d6c31eb31aaff88 Parents: b56b176 Author: Szabolcs Vasas <[email protected]> Authored: Thu Aug 9 17:13:02 2018 +0200 Committer: Szabolcs Vasas <[email protected]> Committed: Thu Aug 9 17:13:02 2018 +0200 ---------------------------------------------------------------------- src/java/org/apache/sqoop/tool/MainframeImportTool.java | 3 ++- src/test/org/apache/sqoop/manager/TestMainframeManager.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/c3d916ab/src/java/org/apache/sqoop/tool/MainframeImportTool.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/tool/MainframeImportTool.java b/src/java/org/apache/sqoop/tool/MainframeImportTool.java index 8883301..cdd9d6d 100644 --- a/src/java/org/apache/sqoop/tool/MainframeImportTool.java +++ b/src/java/org/apache/sqoop/tool/MainframeImportTool.java @@ -23,6 +23,7 @@ import org.apache.commons.cli.OptionBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.util.ToolRunner; +import org.apache.sqoop.manager.MainframeManager; import org.apache.sqoop.mapreduce.mainframe.MainframeConfiguration; import org.apache.sqoop.SqoopOptions; @@ -148,7 +149,7 @@ public class MainframeImportTool extends ImportTool { if (!in.hasOption(CONN_MANAGER_CLASS_NAME)) { // set default ConnManager - out.setConnManagerClassName("org.apache.sqoop.manager.MainframeManager"); + out.setConnManagerClassName(MainframeManager.class.getName()); } if (in.hasOption(DS_ARG)) { out.setMainframeInputDatasetName(in.getOptionValue(DS_ARG)); http://git-wip-us.apache.org/repos/asf/sqoop/blob/c3d916ab/src/test/org/apache/sqoop/manager/TestMainframeManager.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/TestMainframeManager.java b/src/test/org/apache/sqoop/manager/TestMainframeManager.java index 97e48e8..c84f05f 100644 --- a/src/test/org/apache/sqoop/manager/TestMainframeManager.java +++ b/src/test/org/apache/sqoop/manager/TestMainframeManager.java @@ -67,7 +67,7 @@ public class TestMainframeManager extends BaseSqoopTestCase { opts = getSqoopOptions(conf); opts.setConnectString("dummy.server"); opts.setTableName("dummy.pds"); - opts.setConnManagerClassName("org.apache.sqoop.manager.MainframeManager"); + opts.setConnManagerClassName(MainframeManager.class.getName()); context = new ImportJobContext(getTableName(), null, opts, null); ConnFactory f = new ConnFactory(conf); try {
