From 42875119ddb859daf7a12bad7a0c0c31f4099eab Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Fri, 22 Jul 2011 20:03:52 +0000 Subject: [PATCH] Move org.apache.hadoop.sqoop to com.cloudera.sqoop From: Aaron Kimball git-svn-id: https://svn.apache.org/repos/asf/incubator/sqoop/trunk@1149906 13f79535-47bb-0310-9956-ffa450edef68 --- bin/sqoop | 2 +- build.xml | 2 +- conf/sqoop-default.xml | 2 +- src/docs/dev/api-reference.txt | 26 +++++++------- .../cloudera}/sqoop/ConnFactory.java | 8 ++--- .../hadoop => com/cloudera}/sqoop/Sqoop.java | 8 ++--- .../cloudera}/sqoop/SqoopOptions.java | 4 +-- .../cloudera}/sqoop/cli/RelatedOptions.java | 2 +- .../cloudera}/sqoop/cli/SqoopParser.java | 2 +- .../cloudera}/sqoop/cli/ToolOptions.java | 2 +- .../cloudera}/sqoop/hive/HiveImport.java | 10 +++--- .../cloudera}/sqoop/hive/HiveTypes.java | 2 +- .../cloudera}/sqoop/hive/TableDefWriter.java | 6 ++-- .../cloudera}/sqoop/io/CodecMap.java | 2 +- .../sqoop/io/FixedLengthInputStream.java | 2 +- .../cloudera}/sqoop/io/LobFile.java | 2 +- .../cloudera}/sqoop/io/LobReaderCache.java | 2 +- .../sqoop/io/SplittableBufferedWriter.java | 2 +- .../sqoop/io/SplittingOutputStream.java | 2 +- .../sqoop/io/UnsupportedCodecException.java | 2 +- .../sqoop/lib/BigDecimalSerializer.java | 2 +- .../cloudera}/sqoop/lib/BlobRef.java | 4 +-- .../cloudera}/sqoop/lib/ClobRef.java | 4 +-- .../cloudera}/sqoop/lib/FieldFormatter.java | 2 +- .../sqoop/lib/JdbcWritableBridge.java | 2 +- .../sqoop/lib/LargeObjectLoader.java | 4 +-- .../cloudera}/sqoop/lib/LobRef.java | 6 ++-- .../cloudera}/sqoop/lib/LobSerializer.java | 2 +- .../cloudera}/sqoop/lib/RecordParser.java | 2 +- .../cloudera}/sqoop/lib/SqoopRecord.java | 2 +- .../cloudera}/sqoop/lib/TaskId.java | 2 +- .../cloudera}/sqoop/manager/ConnManager.java | 6 ++-- .../sqoop/manager/DefaultManagerFactory.java | 4 +-- .../sqoop/manager/DirectMySQLManager.java | 12 +++---- .../manager/DirectPostgresqlManager.java | 24 ++++++------- .../sqoop/manager/ExportJobContext.java | 4 +-- .../sqoop/manager/GenericJdbcManager.java | 4 +-- .../sqoop/manager/HsqldbManager.java | 4 +-- .../sqoop/manager/ImportJobContext.java | 4 +-- .../sqoop/manager/ManagerFactory.java | 4 +-- .../cloudera}/sqoop/manager/MySQLManager.java | 6 ++-- .../cloudera}/sqoop/manager/MySQLUtils.java | 6 ++-- .../sqoop/manager/OracleManager.java | 14 ++++---- .../sqoop/manager/PostgresqlManager.java | 6 ++-- .../cloudera}/sqoop/manager/SqlManager.java | 20 +++++------ .../sqoop/mapreduce/AutoProgressMapper.java | 2 +- .../sqoop/mapreduce/DataDrivenImportJob.java | 16 ++++----- .../sqoop/mapreduce/ExportJobBase.java | 22 ++++++------ .../sqoop/mapreduce/ImportJobBase.java | 12 +++---- .../sqoop/mapreduce/JdbcExportJob.java | 8 ++--- .../cloudera}/sqoop/mapreduce/JobBase.java | 8 ++--- .../sqoop/mapreduce/MySQLDumpImportJob.java | 16 ++++----- .../sqoop/mapreduce/MySQLDumpMapper.java | 20 +++++------ .../sqoop/mapreduce/MySQLExportJob.java | 10 +++--- .../sqoop/mapreduce/MySQLExportMapper.java | 16 ++++----- .../mapreduce/MySQLRecordExportMapper.java | 4 +-- .../mapreduce/MySQLTextExportMapper.java | 4 +-- .../mapreduce/SequenceFileExportMapper.java | 4 +-- .../mapreduce/SequenceFileImportMapper.java | 6 ++-- .../sqoop/mapreduce/TextExportMapper.java | 6 ++-- .../sqoop/mapreduce/TextImportMapper.java | 6 ++-- .../cloudera}/sqoop/orm/ClassWriter.java | 24 ++++++------- .../sqoop/orm/CompilationManager.java | 8 ++--- .../cloudera}/sqoop/orm/TableClassName.java | 4 +-- .../cloudera}/sqoop/shims/HadoopShim.java | 2 +- .../cloudera}/sqoop/shims/ShimLoader.java | 14 ++++---- .../cloudera}/sqoop/tool/BaseSqoopTool.java | 18 +++++----- .../cloudera}/sqoop/tool/CodeGenTool.java | 18 +++++----- .../sqoop/tool/CreateHiveTableTool.java | 14 ++++---- .../cloudera}/sqoop/tool/EvalSqlTool.java | 10 +++--- .../cloudera}/sqoop/tool/ExportTool.java | 16 ++++----- .../cloudera}/sqoop/tool/HelpTool.java | 6 ++-- .../sqoop/tool/ImportAllTablesTool.java | 10 +++--- .../cloudera}/sqoop/tool/ImportTool.java | 18 +++++----- .../sqoop/tool/ListDatabasesTool.java | 8 ++--- .../cloudera}/sqoop/tool/ListTablesTool.java | 8 ++--- .../cloudera}/sqoop/tool/SqoopTool.java | 12 +++---- .../cloudera}/sqoop/tool/VersionTool.java | 8 ++--- .../cloudera}/sqoop/util/AsyncSink.java | 2 +- .../sqoop/util/ClassLoaderStack.java | 2 +- .../sqoop/util/DirectImportUtils.java | 8 ++--- .../sqoop/util/ErrorableAsyncSink.java | 2 +- .../cloudera}/sqoop/util/ErrorableThread.java | 2 +- .../cloudera}/sqoop/util/Executor.java | 2 +- .../cloudera}/sqoop/util/ExportException.java | 2 +- .../cloudera}/sqoop/util/FileListing.java | 2 +- .../cloudera}/sqoop/util/ImportException.java | 2 +- .../cloudera}/sqoop/util/JdbcUrl.java | 2 +- .../sqoop/util/LoggingAsyncSink.java | 2 +- .../cloudera}/sqoop/util/NullAsyncSink.java | 2 +- .../cloudera}/sqoop/util/PerfCounters.java | 2 +- .../sqoop/util/ResultSetPrinter.java | 2 +- src/perftest/ExportStressTest.java | 8 ++--- src/perftest/LobFilePerfTest.java | 2 +- src/perftest/LobFileStressTest.java | 2 +- src/scripts/write-version-info.sh | 4 +-- .../sqoop/shims/Apache22HadoopShim.java | 2 +- .../cloudera}/sqoop/shims/CDH3Shim.java | 2 +- .../mapreduce/CombineShimRecordReader.java | 2 +- .../sqoop/mapreduce/ExportInputFormat.java | 2 +- .../sqoop/mapreduce/ExportOutputFormat.java | 4 +-- .../sqoop/mapreduce/MySQLDumpInputFormat.java | 2 +- .../mapreduce/OracleExportOutputFormat.java | 4 +-- .../mapreduce/RawKeyTextOutputFormat.java | 2 +- .../sqoop/shims/CommonHadoopShim.java | 2 +- .../cloudera}/sqoop/AllTests.java | 6 ++-- .../cloudera}/sqoop/SmokeTests.java | 36 +++++++++---------- .../cloudera}/sqoop/TestAllTables.java | 10 +++--- .../cloudera}/sqoop/TestColumnTypes.java | 4 +-- .../cloudera}/sqoop/TestConnFactory.java | 8 ++--- .../cloudera}/sqoop/TestExport.java | 12 +++---- .../cloudera}/sqoop/TestMultiCols.java | 4 +-- .../cloudera}/sqoop/TestMultiMaps.java | 18 +++++----- .../cloudera}/sqoop/TestSplitBy.java | 18 +++++----- .../cloudera}/sqoop/TestSqoopOptions.java | 4 +-- .../cloudera}/sqoop/TestWhere.java | 18 +++++----- .../cloudera}/sqoop/ThirdPartyTests.java | 20 +++++------ .../cloudera}/sqoop/hive/TestHiveImport.java | 18 +++++----- .../sqoop/hive/TestTableDefWriter.java | 4 +-- .../cloudera}/sqoop/io/TestLobFile.java | 2 +- .../io/TestSplittableBufferedWriter.java | 4 +-- .../cloudera}/sqoop/lib/TestBlobRef.java | 4 +-- .../cloudera}/sqoop/lib/TestClobRef.java | 4 +-- .../sqoop/lib/TestFieldFormatter.java | 2 +- .../sqoop/lib/TestLargeObjectLoader.java | 6 ++-- .../cloudera}/sqoop/lib/TestRecordParser.java | 2 +- .../sqoop/manager/DirectMySQLExportTest.java | 8 ++--- .../sqoop/manager/DirectMySQLTest.java | 10 +++--- .../sqoop/manager/JdbcMySQLExportTest.java | 6 ++-- .../sqoop/manager/MySQLAuthTest.java | 8 ++--- .../sqoop/manager/MySQLCompatTest.java | 6 ++-- .../sqoop/manager/MySQLTestUtils.java | 2 +- .../sqoop/manager/OracleCompatTest.java | 6 ++-- .../sqoop/manager/OracleExportTest.java | 6 ++-- .../sqoop/manager/OracleManagerTest.java | 10 +++--- .../cloudera}/sqoop/manager/OracleUtils.java | 4 +-- .../sqoop/manager/PostgresqlTest.java | 10 +++--- .../sqoop/manager/TestHsqldbManager.java | 4 +-- .../sqoop/manager/TestSqlManager.java | 4 +-- .../sqoop/mapreduce/MapreduceTests.java | 6 ++-- .../sqoop/mapreduce/TestImportJob.java | 16 ++++----- .../cloudera}/sqoop/orm/TestClassWriter.java | 14 ++++---- .../cloudera}/sqoop/orm/TestParseMethods.java | 20 +++++------ .../sqoop/testutil/BaseSqoopTestCase.java | 10 +++--- .../cloudera}/sqoop/testutil/CommonArgs.java | 2 +- .../cloudera}/sqoop/testutil/DirUtil.java | 2 +- .../sqoop/testutil/ExportJobTestCase.java | 8 ++--- .../sqoop/testutil/HsqldbTestServer.java | 8 ++--- .../sqoop/testutil/ImportJobTestCase.java | 14 ++++---- .../sqoop/testutil/InjectableConnManager.java | 12 +++---- .../testutil/InjectableManagerFactory.java | 8 ++--- .../sqoop/testutil/ManagerCompatTestCase.java | 2 +- .../sqoop/testutil/MockResultSet.java | 2 +- .../sqoop/testutil/ReparseMapper.java | 6 ++-- .../sqoop/testutil/SeqFileReader.java | 2 +- .../sqoop/util/TestDirectImportUtils.java | 2 +- src/test/findbugsExcludeFile.xml | 4 +-- 157 files changed, 548 insertions(+), 548 deletions(-) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/ConnFactory.java (94%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/Sqoop.java (96%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/SqoopOptions.java (99%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/cli/RelatedOptions.java (97%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/cli/SqoopParser.java (99%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/cli/ToolOptions.java (99%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/hive/HiveImport.java (97%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/hive/HiveTypes.java (98%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/hive/TableDefWriter.java (98%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/io/CodecMap.java (98%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/io/FixedLengthInputStream.java (98%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/io/LobFile.java (99%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/io/LobReaderCache.java (99%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/io/SplittableBufferedWriter.java (98%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/io/SplittingOutputStream.java (99%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/io/UnsupportedCodecException.java (97%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/lib/BigDecimalSerializer.java (98%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/lib/BlobRef.java (98%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/lib/ClobRef.java (97%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/lib/FieldFormatter.java (98%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/lib/JdbcWritableBridge.java (99%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/lib/LargeObjectLoader.java (99%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/lib/LobRef.java (98%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/lib/LobSerializer.java (97%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/lib/RecordParser.java (99%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/lib/SqoopRecord.java (98%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/lib/TaskId.java (97%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/manager/ConnManager.java (97%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/manager/DefaultManagerFactory.java (97%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/manager/DirectMySQLManager.java (91%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/manager/DirectPostgresqlManager.java (95%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/manager/ExportJobContext.java (94%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/manager/GenericJdbcManager.java (96%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/manager/HsqldbManager.java (95%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/manager/ImportJobContext.java (96%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/manager/ManagerFactory.java (93%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/manager/MySQLManager.java (98%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/manager/MySQLUtils.java (96%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/manager/OracleManager.java (97%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/manager/PostgresqlManager.java (97%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/manager/SqlManager.java (96%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/mapreduce/AutoProgressMapper.java (99%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/mapreduce/DataDrivenImportJob.java (92%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/mapreduce/ExportJobBase.java (93%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/mapreduce/ImportJobBase.java (94%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/mapreduce/JdbcExportJob.java (94%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/mapreduce/JobBase.java (97%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/mapreduce/MySQLDumpImportJob.java (91%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/mapreduce/MySQLDumpMapper.java (97%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/mapreduce/MySQLExportJob.java (94%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/mapreduce/MySQLExportMapper.java (97%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/mapreduce/MySQLRecordExportMapper.java (94%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/mapreduce/MySQLTextExportMapper.java (95%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/mapreduce/SequenceFileExportMapper.java (94%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/mapreduce/SequenceFileImportMapper.java (93%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/mapreduce/TextExportMapper.java (95%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/mapreduce/TextImportMapper.java (93%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/orm/ClassWriter.java (98%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/orm/CompilationManager.java (98%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/orm/TableClassName.java (97%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/shims/HadoopShim.java (99%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/shims/ShimLoader.java (95%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/tool/BaseSqoopTool.java (98%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/tool/CodeGenTool.java (92%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/tool/CreateHiveTableTool.java (91%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/tool/EvalSqlTool.java (91%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/tool/ExportTool.java (94%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/tool/HelpTool.java (95%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/tool/ImportAllTablesTool.java (91%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/tool/ImportTool.java (96%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/tool/ListDatabasesTool.java (92%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/tool/ListTablesTool.java (92%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/tool/SqoopTool.java (96%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/tool/VersionTool.java (87%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/util/AsyncSink.java (97%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/util/ClassLoaderStack.java (98%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/util/DirectImportUtils.java (94%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/util/ErrorableAsyncSink.java (96%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/util/ErrorableThread.java (96%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/util/Executor.java (98%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/util/ExportException.java (97%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/util/FileListing.java (99%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/util/ImportException.java (97%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/util/JdbcUrl.java (99%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/util/LoggingAsyncSink.java (98%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/util/NullAsyncSink.java (98%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/util/PerfCounters.java (98%) rename src/java/{org/apache/hadoop => com/cloudera}/sqoop/util/ResultSetPrinter.java (98%) rename src/shims/apache/{org/apache/hadoop => com/cloudera}/sqoop/shims/Apache22HadoopShim.java (98%) rename src/shims/cloudera/{org/apache/hadoop => com/cloudera}/sqoop/shims/CDH3Shim.java (98%) rename src/shims/common/{org/apache/hadoop => com/cloudera}/sqoop/mapreduce/CombineShimRecordReader.java (98%) rename src/shims/common/{org/apache/hadoop => com/cloudera}/sqoop/mapreduce/ExportInputFormat.java (98%) rename src/shims/common/{org/apache/hadoop => com/cloudera}/sqoop/mapreduce/ExportOutputFormat.java (99%) rename src/shims/common/{org/apache/hadoop => com/cloudera}/sqoop/mapreduce/MySQLDumpInputFormat.java (98%) rename src/shims/common/{org/apache/hadoop => com/cloudera}/sqoop/mapreduce/OracleExportOutputFormat.java (97%) rename src/shims/common/{org/apache/hadoop => com/cloudera}/sqoop/mapreduce/RawKeyTextOutputFormat.java (98%) rename src/shims/common/{org/apache/hadoop => com/cloudera}/sqoop/shims/CommonHadoopShim.java (98%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/AllTests.java (86%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/SmokeTests.java (68%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/TestAllTables.java (93%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/TestColumnTypes.java (95%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/TestConnFactory.java (95%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/TestExport.java (98%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/TestMultiCols.java (98%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/TestMultiMaps.java (92%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/TestSplitBy.java (91%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/TestSqoopOptions.java (98%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/TestWhere.java (92%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/ThirdPartyTests.java (77%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/hive/TestHiveImport.java (95%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/hive/TestTableDefWriter.java (97%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/io/TestLobFile.java (99%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/io/TestSplittableBufferedWriter.java (98%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/lib/TestBlobRef.java (98%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/lib/TestClobRef.java (98%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/lib/TestFieldFormatter.java (99%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/lib/TestLargeObjectLoader.java (96%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/lib/TestRecordParser.java (99%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/manager/DirectMySQLExportTest.java (95%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/manager/DirectMySQLTest.java (98%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/manager/JdbcMySQLExportTest.java (96%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/manager/MySQLAuthTest.java (98%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/manager/MySQLCompatTest.java (97%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/manager/MySQLTestUtils.java (98%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/manager/OracleCompatTest.java (97%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/manager/OracleExportTest.java (97%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/manager/OracleManagerTest.java (98%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/manager/OracleUtils.java (96%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/manager/PostgresqlTest.java (96%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/manager/TestHsqldbManager.java (96%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/manager/TestSqlManager.java (98%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/mapreduce/MapreduceTests.java (85%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/mapreduce/TestImportJob.java (92%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/orm/TestClassWriter.java (96%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/orm/TestParseMethods.java (91%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/testutil/BaseSqoopTestCase.java (98%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/testutil/CommonArgs.java (97%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/testutil/DirUtil.java (97%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/testutil/ExportJobTestCase.java (97%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/testutil/HsqldbTestServer.java (97%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/testutil/ImportJobTestCase.java (94%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/testutil/InjectableConnManager.java (91%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/testutil/InjectableManagerFactory.java (85%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/testutil/ManagerCompatTestCase.java (99%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/testutil/MockResultSet.java (99%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/testutil/ReparseMapper.java (96%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/testutil/SeqFileReader.java (98%) rename src/test/{org/apache/hadoop => com/cloudera}/sqoop/util/TestDirectImportUtils.java (98%) diff --git a/bin/sqoop b/bin/sqoop index 8a8f0118..d374d916 100755 --- a/bin/sqoop +++ b/bin/sqoop @@ -21,4 +21,4 @@ bin=`cd ${bin} && pwd` source ${bin}/configure-sqoop ${HADOOP_HOME}/bin/hadoop jar ${SQOOP_JAR} \ - org.apache.hadoop.sqoop.Sqoop "$@" + com.cloudera.sqoop.Sqoop "$@" diff --git a/build.xml b/build.xml index cc512a9f..f1e29899 100644 --- a/build.xml +++ b/build.xml @@ -569,7 +569,7 @@ sqoop.connection.factories - org.apache.hadoop.sqoop.manager.DefaultManagerFactory + com.cloudera.sqoop.manager.DefaultManagerFactory A comma-delimited list of ManagerFactory implementations which are consulted, in order, to instantiate ConnManager instances used to drive connections to databases. diff --git a/src/docs/dev/api-reference.txt b/src/docs/dev/api-reference.txt index aef9a1c9..8dfbf6ed 100644 --- a/src/docs/dev/api-reference.txt +++ b/src/docs/dev/api-reference.txt @@ -48,10 +48,10 @@ convenience methods: The full set of methods guaranteed to exist in an auto-generated class is specified in the abstract class -+org.apache.hadoop.sqoop.lib.SqoopRecord+. ++com.cloudera.sqoop.lib.SqoopRecord+. Instances of +SqoopRecord+ may depend on Sqoop's public API. This is all classes -in the +org.apache.hadoop.sqoop.lib+ package. These are briefly described below. +in the +com.cloudera.sqoop.lib+ package. These are briefly described below. Clients of Sqoop should not need to directly interact with any of these classes, although classes generated by Sqoop will depend on them. Therefore, these APIs are considered public and care will be taken when forward-evolving them. @@ -81,11 +81,11 @@ While Sqoop uses JDBC and +DataDrivenDBInputFormat+ to read from databases, differences in the SQL supported by different vendors as well as JDBC metadata necessitates vendor-specific codepaths for most databases. Sqoop's solution to this problem is by introducing the +ConnManager+ API -(+org.apache.hadoop.sqoop.manager.ConnMananger+). +(+com.cloudera.sqoop.manager.ConnMananger+). +ConnManager+ is an abstract class defining all methods that interact with the database itself. Most implementations of +ConnManager+ will extend the -+org.apache.hadoop.sqoop.manager.SqlManager+ abstract class, which uses standard ++com.cloudera.sqoop.manager.SqlManager+ abstract class, which uses standard SQL to perform most actions. Subclasses are required to implement the +getConnection()+ method which returns the actual JDBC connection to the database. Subclasses are free to override all other methods as well. The @@ -117,7 +117,7 @@ lightweight operation, and is done reasonably infrequently. Therefore, class +ManagerFactory+ (See http://issues.apache.org/jira/browse/MAPREDUCE-750[]). One +ManagerFactory+ implementation currently serves all of Sqoop: -+org.apache.hadoop.sqoop.manager.DefaultManagerFactory+. Extensions ++com.cloudera.sqoop.manager.DefaultManagerFactory+. Extensions should not modify +DefaultManagerFactory+. Instead, an extension-specific +ManagerFactory+ implementation should be provided with the new +ConnManager+. +ManagerFactory+ has a single method of @@ -132,7 +132,7 @@ and +ConnManager+(s), and configure +sqoop-site.xml+ to use the new +ManagerFactory+. The +DefaultManagerFactory+ principly discriminates between databases by parsing the connect string stored in +SqoopOptions+. -Extension authors may make use of classes in the +org.apache.hadoop.sqoop.io+, +Extension authors may make use of classes in the +com.cloudera.sqoop.io+, +mapreduce+, and +util+ packages to facilitate their implementations. These packages and classes are described in more detail in the following section. @@ -143,7 +143,7 @@ Sqoop Internals This section describes the internal architecture of Sqoop. -The Sqoop program is driven by the +org.apache.hadoop.sqoop.Sqoop+ main class. +The Sqoop program is driven by the +com.cloudera.sqoop.Sqoop+ main class. A limited number of additional classes are in the same package; +SqoopOptions+ (described earlier) and +ConnFactory+ (which manipulates +ManagerFactory+ instances). @@ -153,7 +153,7 @@ General program flow The general program flow is as follows: -+org.apache.hadoop.sqoop.Sqoop+ is the main class and implements _Tool_. A new ++com.cloudera.sqoop.Sqoop+ is the main class and implements _Tool_. A new instance is launched with +ToolRunner+. The first argument to Sqoop is a string identifying the name of a +SqoopTool+ to run. The +SqoopTool+ itself drives the execution of the user's requested operation (e.g., @@ -178,8 +178,8 @@ the +ConnManager.importTable()+ method is left to determine how best to run the import. Each main action is actually controlled by the +ConnMananger+, except for the generating of code, which is done by the +CompilationManager+ and +ClassWriter+. (Both in the -+org.apache.hadoop.sqoop.orm+ package.) Importing into Hive is also -taken care of via the +org.apache.hadoop.sqoop.hive.HiveImport+ class ++com.cloudera.sqoop.orm+ package.) Importing into Hive is also +taken care of via the +com.cloudera.sqoop.hive.HiveImport+ class after the +importTable()+ has completed. This is done without concern for the +ConnManager+ implementation used. @@ -195,7 +195,7 @@ related data. Subpackages ^^^^^^^^^^^ -The following subpackages under +org.apache.hadoop.sqoop+ exist: +The following subpackages under +com.cloudera.sqoop+ exist: * +hive+ - Facilitates importing data to Hive. * +io+ - Implementations of +java.io.*+ interfaces (namely, _OutputStream_ and @@ -252,7 +252,7 @@ more. Consequently, these must both be handled, and preferably asynchronously. In Sqoop parlance, an "async sink" is a thread that takes an +InputStream+ and reads it to completion. These are realized by +AsyncSink+ implementations. The -+org.apache.hadoop.sqoop.util.AsyncSink+ abstract class defines the operations ++com.cloudera.sqoop.util.AsyncSink+ abstract class defines the operations this factory must perform. +processStream()+ will spawn another thread to immediately begin handling the data read from the +InputStream+ argument; it must read this stream to completion. The +join()+ method allows external threads @@ -275,7 +275,7 @@ Sqoop schedules MapReduce jobs to effect imports and exports. Configuration and execution of MapReduce jobs follows a few common steps (configuring the +InputFormat+; configuring the +OutputFormat+; setting the +Mapper+ implementation; etc...). These steps are -formalized in the +org.apache.hadoop.sqoop.mapreduce.JobBase+ class. +formalized in the +com.cloudera.sqoop.mapreduce.JobBase+ class. The +JobBase+ allows a user to specify the +InputFormat+, +OutputFormat+, and +Mapper+ to use. diff --git a/src/java/org/apache/hadoop/sqoop/ConnFactory.java b/src/java/com/cloudera/sqoop/ConnFactory.java similarity index 94% rename from src/java/org/apache/hadoop/sqoop/ConnFactory.java rename to src/java/com/cloudera/sqoop/ConnFactory.java index 05b438fa..786286dd 100644 --- a/src/java/org/apache/hadoop/sqoop/ConnFactory.java +++ b/src/java/com/cloudera/sqoop/ConnFactory.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop; +package com.cloudera.sqoop; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.sqoop.manager.ConnManager; -import org.apache.hadoop.sqoop.manager.DefaultManagerFactory; -import org.apache.hadoop.sqoop.manager.ManagerFactory; +import com.cloudera.sqoop.manager.ConnManager; +import com.cloudera.sqoop.manager.DefaultManagerFactory; +import com.cloudera.sqoop.manager.ManagerFactory; import org.apache.hadoop.util.ReflectionUtils; import java.io.IOException; diff --git a/src/java/org/apache/hadoop/sqoop/Sqoop.java b/src/java/com/cloudera/sqoop/Sqoop.java similarity index 96% rename from src/java/org/apache/hadoop/sqoop/Sqoop.java rename to src/java/com/cloudera/sqoop/Sqoop.java index 653a253d..83521dbc 100644 --- a/src/java/org/apache/hadoop/sqoop/Sqoop.java +++ b/src/java/com/cloudera/sqoop/Sqoop.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop; +package com.cloudera.sqoop; import java.util.Arrays; @@ -28,12 +28,12 @@ import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.ToolRunner; -import org.apache.hadoop.sqoop.tool.HelpTool; -import org.apache.hadoop.sqoop.tool.SqoopTool; +import com.cloudera.sqoop.tool.HelpTool; +import com.cloudera.sqoop.tool.SqoopTool; /** * Main entry-point for Sqoop - * Usage: hadoop jar (this_jar_name) org.apache.hadoop.sqoop.Sqoop (options) + * Usage: hadoop jar (this_jar_name) com.cloudera.sqoop.Sqoop (options) * See the SqoopOptions class for options. */ public class Sqoop extends Configured implements Tool { diff --git a/src/java/org/apache/hadoop/sqoop/SqoopOptions.java b/src/java/com/cloudera/sqoop/SqoopOptions.java similarity index 99% rename from src/java/org/apache/hadoop/sqoop/SqoopOptions.java rename to src/java/com/cloudera/sqoop/SqoopOptions.java index 41fb1aee..2e534ce3 100644 --- a/src/java/org/apache/hadoop/sqoop/SqoopOptions.java +++ b/src/java/com/cloudera/sqoop/SqoopOptions.java @@ -17,7 +17,7 @@ */ -package org.apache.hadoop.sqoop; +package com.cloudera.sqoop; import java.io.File; import java.io.FileInputStream; @@ -29,7 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.sqoop.lib.LargeObjectLoader; +import com.cloudera.sqoop.lib.LargeObjectLoader; /** * Command-line arguments used by Sqoop. diff --git a/src/java/org/apache/hadoop/sqoop/cli/RelatedOptions.java b/src/java/com/cloudera/sqoop/cli/RelatedOptions.java similarity index 97% rename from src/java/org/apache/hadoop/sqoop/cli/RelatedOptions.java rename to src/java/com/cloudera/sqoop/cli/RelatedOptions.java index 4a4ef10e..88efe137 100644 --- a/src/java/org/apache/hadoop/sqoop/cli/RelatedOptions.java +++ b/src/java/com/cloudera/sqoop/cli/RelatedOptions.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.cli; +package com.cloudera.sqoop.cli; import org.apache.commons.cli.Options; diff --git a/src/java/org/apache/hadoop/sqoop/cli/SqoopParser.java b/src/java/com/cloudera/sqoop/cli/SqoopParser.java similarity index 99% rename from src/java/org/apache/hadoop/sqoop/cli/SqoopParser.java rename to src/java/com/cloudera/sqoop/cli/SqoopParser.java index 9c913aa2..5498b6d5 100644 --- a/src/java/org/apache/hadoop/sqoop/cli/SqoopParser.java +++ b/src/java/com/cloudera/sqoop/cli/SqoopParser.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.cli; +package com.cloudera.sqoop.cli; import java.util.ListIterator; diff --git a/src/java/org/apache/hadoop/sqoop/cli/ToolOptions.java b/src/java/com/cloudera/sqoop/cli/ToolOptions.java similarity index 99% rename from src/java/org/apache/hadoop/sqoop/cli/ToolOptions.java rename to src/java/com/cloudera/sqoop/cli/ToolOptions.java index d09bf82b..a5891c65 100644 --- a/src/java/org/apache/hadoop/sqoop/cli/ToolOptions.java +++ b/src/java/com/cloudera/sqoop/cli/ToolOptions.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.cli; +package com.cloudera.sqoop.cli; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/src/java/org/apache/hadoop/sqoop/hive/HiveImport.java b/src/java/com/cloudera/sqoop/hive/HiveImport.java similarity index 97% rename from src/java/org/apache/hadoop/sqoop/hive/HiveImport.java rename to src/java/com/cloudera/sqoop/hive/HiveImport.java index 068f45b1..b3d9c56f 100644 --- a/src/java/org/apache/hadoop/sqoop/hive/HiveImport.java +++ b/src/java/com/cloudera/sqoop/hive/HiveImport.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.hive; +package com.cloudera.sqoop.hive; import java.io.BufferedWriter; import java.io.File; @@ -32,10 +32,10 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.sqoop.SqoopOptions; -import org.apache.hadoop.sqoop.manager.ConnManager; -import org.apache.hadoop.sqoop.util.Executor; -import org.apache.hadoop.sqoop.util.LoggingAsyncSink; +import com.cloudera.sqoop.SqoopOptions; +import com.cloudera.sqoop.manager.ConnManager; +import com.cloudera.sqoop.util.Executor; +import com.cloudera.sqoop.util.LoggingAsyncSink; /** * Utility to import a table into the Hive metastore. Manages the connection diff --git a/src/java/org/apache/hadoop/sqoop/hive/HiveTypes.java b/src/java/com/cloudera/sqoop/hive/HiveTypes.java similarity index 98% rename from src/java/org/apache/hadoop/sqoop/hive/HiveTypes.java rename to src/java/com/cloudera/sqoop/hive/HiveTypes.java index 3a58f150..7759bb1d 100644 --- a/src/java/org/apache/hadoop/sqoop/hive/HiveTypes.java +++ b/src/java/com/cloudera/sqoop/hive/HiveTypes.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.hive; +package com.cloudera.sqoop.hive; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/src/java/org/apache/hadoop/sqoop/hive/TableDefWriter.java b/src/java/com/cloudera/sqoop/hive/TableDefWriter.java similarity index 98% rename from src/java/org/apache/hadoop/sqoop/hive/TableDefWriter.java rename to src/java/com/cloudera/sqoop/hive/TableDefWriter.java index b330797c..170ddb9a 100644 --- a/src/java/org/apache/hadoop/sqoop/hive/TableDefWriter.java +++ b/src/java/com/cloudera/sqoop/hive/TableDefWriter.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.hive; +package com.cloudera.sqoop.hive; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.sqoop.SqoopOptions; -import org.apache.hadoop.sqoop.manager.ConnManager; +import com.cloudera.sqoop.SqoopOptions; +import com.cloudera.sqoop.manager.ConnManager; import java.io.File; import java.io.IOException; diff --git a/src/java/org/apache/hadoop/sqoop/io/CodecMap.java b/src/java/com/cloudera/sqoop/io/CodecMap.java similarity index 98% rename from src/java/org/apache/hadoop/sqoop/io/CodecMap.java rename to src/java/com/cloudera/sqoop/io/CodecMap.java index d97cc207..d94f541a 100644 --- a/src/java/org/apache/hadoop/sqoop/io/CodecMap.java +++ b/src/java/com/cloudera/sqoop/io/CodecMap.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.io; +package com.cloudera.sqoop.io; import java.util.Map; import java.util.Set; diff --git a/src/java/org/apache/hadoop/sqoop/io/FixedLengthInputStream.java b/src/java/com/cloudera/sqoop/io/FixedLengthInputStream.java similarity index 98% rename from src/java/org/apache/hadoop/sqoop/io/FixedLengthInputStream.java rename to src/java/com/cloudera/sqoop/io/FixedLengthInputStream.java index a4bee680..f73af3ea 100644 --- a/src/java/org/apache/hadoop/sqoop/io/FixedLengthInputStream.java +++ b/src/java/com/cloudera/sqoop/io/FixedLengthInputStream.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.io; +package com.cloudera.sqoop.io; import java.io.InputStream; import java.io.IOException; diff --git a/src/java/org/apache/hadoop/sqoop/io/LobFile.java b/src/java/com/cloudera/sqoop/io/LobFile.java similarity index 99% rename from src/java/org/apache/hadoop/sqoop/io/LobFile.java rename to src/java/com/cloudera/sqoop/io/LobFile.java index aceedf94..33012376 100644 --- a/src/java/org/apache/hadoop/sqoop/io/LobFile.java +++ b/src/java/com/cloudera/sqoop/io/LobFile.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.io; +package com.cloudera.sqoop.io; import java.io.BufferedOutputStream; import java.io.Closeable; diff --git a/src/java/org/apache/hadoop/sqoop/io/LobReaderCache.java b/src/java/com/cloudera/sqoop/io/LobReaderCache.java similarity index 99% rename from src/java/org/apache/hadoop/sqoop/io/LobReaderCache.java rename to src/java/com/cloudera/sqoop/io/LobReaderCache.java index 0cc79441..5cd5fcb5 100644 --- a/src/java/org/apache/hadoop/sqoop/io/LobReaderCache.java +++ b/src/java/com/cloudera/sqoop/io/LobReaderCache.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.io; +package com.cloudera.sqoop.io; import java.io.IOException; import java.util.Map; diff --git a/src/java/org/apache/hadoop/sqoop/io/SplittableBufferedWriter.java b/src/java/com/cloudera/sqoop/io/SplittableBufferedWriter.java similarity index 98% rename from src/java/org/apache/hadoop/sqoop/io/SplittableBufferedWriter.java rename to src/java/com/cloudera/sqoop/io/SplittableBufferedWriter.java index 7926e3eb..702cada9 100644 --- a/src/java/org/apache/hadoop/sqoop/io/SplittableBufferedWriter.java +++ b/src/java/com/cloudera/sqoop/io/SplittableBufferedWriter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.io; +package com.cloudera.sqoop.io; import java.io.BufferedWriter; import java.io.OutputStreamWriter; diff --git a/src/java/org/apache/hadoop/sqoop/io/SplittingOutputStream.java b/src/java/com/cloudera/sqoop/io/SplittingOutputStream.java similarity index 99% rename from src/java/org/apache/hadoop/sqoop/io/SplittingOutputStream.java rename to src/java/com/cloudera/sqoop/io/SplittingOutputStream.java index 241f4e2f..14331402 100644 --- a/src/java/org/apache/hadoop/sqoop/io/SplittingOutputStream.java +++ b/src/java/com/cloudera/sqoop/io/SplittingOutputStream.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.io; +package com.cloudera.sqoop.io; import java.io.OutputStream; import java.io.IOException; diff --git a/src/java/org/apache/hadoop/sqoop/io/UnsupportedCodecException.java b/src/java/com/cloudera/sqoop/io/UnsupportedCodecException.java similarity index 97% rename from src/java/org/apache/hadoop/sqoop/io/UnsupportedCodecException.java rename to src/java/com/cloudera/sqoop/io/UnsupportedCodecException.java index 1689c5b0..b5cf8ce0 100644 --- a/src/java/org/apache/hadoop/sqoop/io/UnsupportedCodecException.java +++ b/src/java/com/cloudera/sqoop/io/UnsupportedCodecException.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.io; +package com.cloudera.sqoop.io; import java.io.IOException; diff --git a/src/java/org/apache/hadoop/sqoop/lib/BigDecimalSerializer.java b/src/java/com/cloudera/sqoop/lib/BigDecimalSerializer.java similarity index 98% rename from src/java/org/apache/hadoop/sqoop/lib/BigDecimalSerializer.java rename to src/java/com/cloudera/sqoop/lib/BigDecimalSerializer.java index 7c2b9337..5eed89c1 100644 --- a/src/java/org/apache/hadoop/sqoop/lib/BigDecimalSerializer.java +++ b/src/java/com/cloudera/sqoop/lib/BigDecimalSerializer.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.lib; +package com.cloudera.sqoop.lib; import java.io.DataInput; import java.io.DataOutput; diff --git a/src/java/org/apache/hadoop/sqoop/lib/BlobRef.java b/src/java/com/cloudera/sqoop/lib/BlobRef.java similarity index 98% rename from src/java/org/apache/hadoop/sqoop/lib/BlobRef.java rename to src/java/com/cloudera/sqoop/lib/BlobRef.java index 92aef56b..acc86654 100644 --- a/src/java/org/apache/hadoop/sqoop/lib/BlobRef.java +++ b/src/java/com/cloudera/sqoop/lib/BlobRef.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.lib; +package com.cloudera.sqoop.lib; import java.io.ByteArrayInputStream; import java.io.DataInput; @@ -27,7 +27,7 @@ import java.util.regex.Matcher; import org.apache.hadoop.io.BytesWritable; -import org.apache.hadoop.sqoop.io.LobFile; +import com.cloudera.sqoop.io.LobFile; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/src/java/org/apache/hadoop/sqoop/lib/ClobRef.java b/src/java/com/cloudera/sqoop/lib/ClobRef.java similarity index 97% rename from src/java/org/apache/hadoop/sqoop/lib/ClobRef.java rename to src/java/com/cloudera/sqoop/lib/ClobRef.java index d60fd563..187cc5ab 100644 --- a/src/java/org/apache/hadoop/sqoop/lib/ClobRef.java +++ b/src/java/com/cloudera/sqoop/lib/ClobRef.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.lib; +package com.cloudera.sqoop.lib; import java.io.DataInput; import java.io.DataOutput; @@ -26,7 +26,7 @@ import java.util.regex.Matcher; import org.apache.hadoop.io.Text; -import org.apache.hadoop.sqoop.io.LobFile; +import com.cloudera.sqoop.io.LobFile; /** * ClobRef is a wrapper that holds a CLOB either directly, or a diff --git a/src/java/org/apache/hadoop/sqoop/lib/FieldFormatter.java b/src/java/com/cloudera/sqoop/lib/FieldFormatter.java similarity index 98% rename from src/java/org/apache/hadoop/sqoop/lib/FieldFormatter.java rename to src/java/com/cloudera/sqoop/lib/FieldFormatter.java index b5d7f770..1397d687 100644 --- a/src/java/org/apache/hadoop/sqoop/lib/FieldFormatter.java +++ b/src/java/com/cloudera/sqoop/lib/FieldFormatter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.lib; +package com.cloudera.sqoop.lib; /** diff --git a/src/java/org/apache/hadoop/sqoop/lib/JdbcWritableBridge.java b/src/java/com/cloudera/sqoop/lib/JdbcWritableBridge.java similarity index 99% rename from src/java/org/apache/hadoop/sqoop/lib/JdbcWritableBridge.java rename to src/java/com/cloudera/sqoop/lib/JdbcWritableBridge.java index 42441015..efe4d883 100644 --- a/src/java/org/apache/hadoop/sqoop/lib/JdbcWritableBridge.java +++ b/src/java/com/cloudera/sqoop/lib/JdbcWritableBridge.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.lib; +package com.cloudera.sqoop.lib; import org.apache.hadoop.io.BytesWritable; import java.math.BigDecimal; diff --git a/src/java/org/apache/hadoop/sqoop/lib/LargeObjectLoader.java b/src/java/com/cloudera/sqoop/lib/LargeObjectLoader.java similarity index 99% rename from src/java/org/apache/hadoop/sqoop/lib/LargeObjectLoader.java rename to src/java/com/cloudera/sqoop/lib/LargeObjectLoader.java index 6769d33b..8ebf3f75 100644 --- a/src/java/org/apache/hadoop/sqoop/lib/LargeObjectLoader.java +++ b/src/java/com/cloudera/sqoop/lib/LargeObjectLoader.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.lib; +package com.cloudera.sqoop.lib; import java.io.Closeable; import java.io.File; @@ -33,7 +33,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.sqoop.io.LobFile; +import com.cloudera.sqoop.io.LobFile; /** * Contains a set of methods which can read db columns from a ResultSet into diff --git a/src/java/org/apache/hadoop/sqoop/lib/LobRef.java b/src/java/com/cloudera/sqoop/lib/LobRef.java similarity index 98% rename from src/java/org/apache/hadoop/sqoop/lib/LobRef.java rename to src/java/com/cloudera/sqoop/lib/LobRef.java index 23b05d75..1f603e59 100644 --- a/src/java/org/apache/hadoop/sqoop/lib/LobRef.java +++ b/src/java/com/cloudera/sqoop/lib/LobRef.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.lib; +package com.cloudera.sqoop.lib; import java.io.Closeable; import java.io.DataInput; @@ -32,8 +32,8 @@ import org.apache.hadoop.mapreduce.InputSplit; import org.apache.hadoop.mapreduce.Mapper; import org.apache.hadoop.mapreduce.lib.input.FileSplit; -import org.apache.hadoop.sqoop.io.LobFile; -import org.apache.hadoop.sqoop.io.LobReaderCache; +import com.cloudera.sqoop.io.LobFile; +import com.cloudera.sqoop.io.LobReaderCache; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/src/java/org/apache/hadoop/sqoop/lib/LobSerializer.java b/src/java/com/cloudera/sqoop/lib/LobSerializer.java similarity index 97% rename from src/java/org/apache/hadoop/sqoop/lib/LobSerializer.java rename to src/java/com/cloudera/sqoop/lib/LobSerializer.java index d38ff70d..66da9fee 100644 --- a/src/java/org/apache/hadoop/sqoop/lib/LobSerializer.java +++ b/src/java/com/cloudera/sqoop/lib/LobSerializer.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.lib; +package com.cloudera.sqoop.lib; import java.io.DataInput; import java.io.DataOutput; diff --git a/src/java/org/apache/hadoop/sqoop/lib/RecordParser.java b/src/java/com/cloudera/sqoop/lib/RecordParser.java similarity index 99% rename from src/java/org/apache/hadoop/sqoop/lib/RecordParser.java rename to src/java/com/cloudera/sqoop/lib/RecordParser.java index cb6c24a4..99a469f4 100644 --- a/src/java/org/apache/hadoop/sqoop/lib/RecordParser.java +++ b/src/java/com/cloudera/sqoop/lib/RecordParser.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.lib; +package com.cloudera.sqoop.lib; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/src/java/org/apache/hadoop/sqoop/lib/SqoopRecord.java b/src/java/com/cloudera/sqoop/lib/SqoopRecord.java similarity index 98% rename from src/java/org/apache/hadoop/sqoop/lib/SqoopRecord.java rename to src/java/com/cloudera/sqoop/lib/SqoopRecord.java index 7611883c..c506ae73 100644 --- a/src/java/org/apache/hadoop/sqoop/lib/SqoopRecord.java +++ b/src/java/com/cloudera/sqoop/lib/SqoopRecord.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.lib; +package com.cloudera.sqoop.lib; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/src/java/org/apache/hadoop/sqoop/lib/TaskId.java b/src/java/com/cloudera/sqoop/lib/TaskId.java similarity index 97% rename from src/java/org/apache/hadoop/sqoop/lib/TaskId.java rename to src/java/com/cloudera/sqoop/lib/TaskId.java index b3054f9f..74580e70 100644 --- a/src/java/org/apache/hadoop/sqoop/lib/TaskId.java +++ b/src/java/com/cloudera/sqoop/lib/TaskId.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.lib; +package com.cloudera.sqoop.lib; import org.apache.hadoop.conf.Configuration; diff --git a/src/java/org/apache/hadoop/sqoop/manager/ConnManager.java b/src/java/com/cloudera/sqoop/manager/ConnManager.java similarity index 97% rename from src/java/org/apache/hadoop/sqoop/manager/ConnManager.java rename to src/java/com/cloudera/sqoop/manager/ConnManager.java index d147403f..0c7302db 100644 --- a/src/java/org/apache/hadoop/sqoop/manager/ConnManager.java +++ b/src/java/com/cloudera/sqoop/manager/ConnManager.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.manager; +package com.cloudera.sqoop.manager; import java.io.IOException; import java.sql.Connection; @@ -24,8 +24,8 @@ import java.sql.SQLException; import java.util.Map; -import org.apache.hadoop.sqoop.util.ExportException; -import org.apache.hadoop.sqoop.util.ImportException; +import com.cloudera.sqoop.util.ExportException; +import com.cloudera.sqoop.util.ImportException; /** * Abstract interface that manages connections to a database. diff --git a/src/java/org/apache/hadoop/sqoop/manager/DefaultManagerFactory.java b/src/java/com/cloudera/sqoop/manager/DefaultManagerFactory.java similarity index 97% rename from src/java/org/apache/hadoop/sqoop/manager/DefaultManagerFactory.java rename to src/java/com/cloudera/sqoop/manager/DefaultManagerFactory.java index c6decdc6..1ea22433 100644 --- a/src/java/org/apache/hadoop/sqoop/manager/DefaultManagerFactory.java +++ b/src/java/com/cloudera/sqoop/manager/DefaultManagerFactory.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.manager; +package com.cloudera.sqoop.manager; -import org.apache.hadoop.sqoop.SqoopOptions; +import com.cloudera.sqoop.SqoopOptions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/src/java/org/apache/hadoop/sqoop/manager/DirectMySQLManager.java b/src/java/com/cloudera/sqoop/manager/DirectMySQLManager.java similarity index 91% rename from src/java/org/apache/hadoop/sqoop/manager/DirectMySQLManager.java rename to src/java/com/cloudera/sqoop/manager/DirectMySQLManager.java index dafe75f8..465698ae 100644 --- a/src/java/org/apache/hadoop/sqoop/manager/DirectMySQLManager.java +++ b/src/java/com/cloudera/sqoop/manager/DirectMySQLManager.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.manager; +package com.cloudera.sqoop.manager; import java.io.IOException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.sqoop.SqoopOptions; -import org.apache.hadoop.sqoop.mapreduce.MySQLDumpImportJob; -import org.apache.hadoop.sqoop.mapreduce.MySQLExportJob; -import org.apache.hadoop.sqoop.util.ImportException; -import org.apache.hadoop.sqoop.util.ExportException; +import com.cloudera.sqoop.SqoopOptions; +import com.cloudera.sqoop.mapreduce.MySQLDumpImportJob; +import com.cloudera.sqoop.mapreduce.MySQLExportJob; +import com.cloudera.sqoop.util.ImportException; +import com.cloudera.sqoop.util.ExportException; /** * Manages direct connections to MySQL databases diff --git a/src/java/org/apache/hadoop/sqoop/manager/DirectPostgresqlManager.java b/src/java/com/cloudera/sqoop/manager/DirectPostgresqlManager.java similarity index 95% rename from src/java/org/apache/hadoop/sqoop/manager/DirectPostgresqlManager.java rename to src/java/com/cloudera/sqoop/manager/DirectPostgresqlManager.java index dccdad7d..24aacab4 100644 --- a/src/java/org/apache/hadoop/sqoop/manager/DirectPostgresqlManager.java +++ b/src/java/com/cloudera/sqoop/manager/DirectPostgresqlManager.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.manager; +package com.cloudera.sqoop.manager; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -32,17 +32,17 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.sqoop.SqoopOptions; -import org.apache.hadoop.sqoop.io.SplittableBufferedWriter; -import org.apache.hadoop.sqoop.util.AsyncSink; -import org.apache.hadoop.sqoop.util.DirectImportUtils; -import org.apache.hadoop.sqoop.util.ErrorableAsyncSink; -import org.apache.hadoop.sqoop.util.ErrorableThread; -import org.apache.hadoop.sqoop.util.Executor; -import org.apache.hadoop.sqoop.util.ImportException; -import org.apache.hadoop.sqoop.util.JdbcUrl; -import org.apache.hadoop.sqoop.util.LoggingAsyncSink; -import org.apache.hadoop.sqoop.util.PerfCounters; +import com.cloudera.sqoop.SqoopOptions; +import com.cloudera.sqoop.io.SplittableBufferedWriter; +import com.cloudera.sqoop.util.AsyncSink; +import com.cloudera.sqoop.util.DirectImportUtils; +import com.cloudera.sqoop.util.ErrorableAsyncSink; +import com.cloudera.sqoop.util.ErrorableThread; +import com.cloudera.sqoop.util.Executor; +import com.cloudera.sqoop.util.ImportException; +import com.cloudera.sqoop.util.JdbcUrl; +import com.cloudera.sqoop.util.LoggingAsyncSink; +import com.cloudera.sqoop.util.PerfCounters; /** * Manages direct dumps from Postgresql databases via psql COPY TO STDOUT diff --git a/src/java/org/apache/hadoop/sqoop/manager/ExportJobContext.java b/src/java/com/cloudera/sqoop/manager/ExportJobContext.java similarity index 94% rename from src/java/org/apache/hadoop/sqoop/manager/ExportJobContext.java rename to src/java/com/cloudera/sqoop/manager/ExportJobContext.java index b6325450..4e406dd0 100644 --- a/src/java/org/apache/hadoop/sqoop/manager/ExportJobContext.java +++ b/src/java/com/cloudera/sqoop/manager/ExportJobContext.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.manager; +package com.cloudera.sqoop.manager; -import org.apache.hadoop.sqoop.SqoopOptions; +import com.cloudera.sqoop.SqoopOptions; /** * A set of parameters describing an export operation; this is passed to diff --git a/src/java/org/apache/hadoop/sqoop/manager/GenericJdbcManager.java b/src/java/com/cloudera/sqoop/manager/GenericJdbcManager.java similarity index 96% rename from src/java/org/apache/hadoop/sqoop/manager/GenericJdbcManager.java rename to src/java/com/cloudera/sqoop/manager/GenericJdbcManager.java index 236b3e7a..0cf2471b 100644 --- a/src/java/org/apache/hadoop/sqoop/manager/GenericJdbcManager.java +++ b/src/java/com/cloudera/sqoop/manager/GenericJdbcManager.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.manager; +package com.cloudera.sqoop.manager; import java.sql.Connection; import java.sql.SQLException; @@ -24,7 +24,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.sqoop.SqoopOptions; +import com.cloudera.sqoop.SqoopOptions; /** * Database manager that is connects to a generic JDBC-compliant diff --git a/src/java/org/apache/hadoop/sqoop/manager/HsqldbManager.java b/src/java/com/cloudera/sqoop/manager/HsqldbManager.java similarity index 95% rename from src/java/org/apache/hadoop/sqoop/manager/HsqldbManager.java rename to src/java/com/cloudera/sqoop/manager/HsqldbManager.java index f4aa814f..66210571 100644 --- a/src/java/org/apache/hadoop/sqoop/manager/HsqldbManager.java +++ b/src/java/com/cloudera/sqoop/manager/HsqldbManager.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.manager; +package com.cloudera.sqoop.manager; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.sqoop.SqoopOptions; +import com.cloudera.sqoop.SqoopOptions; /** * Manages connections to hsqldb databases. diff --git a/src/java/org/apache/hadoop/sqoop/manager/ImportJobContext.java b/src/java/com/cloudera/sqoop/manager/ImportJobContext.java similarity index 96% rename from src/java/org/apache/hadoop/sqoop/manager/ImportJobContext.java rename to src/java/com/cloudera/sqoop/manager/ImportJobContext.java index a5e0dba0..27da0b15 100644 --- a/src/java/org/apache/hadoop/sqoop/manager/ImportJobContext.java +++ b/src/java/com/cloudera/sqoop/manager/ImportJobContext.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.manager; +package com.cloudera.sqoop.manager; import org.apache.hadoop.mapreduce.InputFormat; import org.apache.hadoop.mapreduce.lib.db.DataDrivenDBInputFormat; -import org.apache.hadoop.sqoop.SqoopOptions; +import com.cloudera.sqoop.SqoopOptions; /** * A set of parameters describing an import operation; this is passed to diff --git a/src/java/org/apache/hadoop/sqoop/manager/ManagerFactory.java b/src/java/com/cloudera/sqoop/manager/ManagerFactory.java similarity index 93% rename from src/java/org/apache/hadoop/sqoop/manager/ManagerFactory.java rename to src/java/com/cloudera/sqoop/manager/ManagerFactory.java index 67a4248a..7084ecde 100644 --- a/src/java/org/apache/hadoop/sqoop/manager/ManagerFactory.java +++ b/src/java/com/cloudera/sqoop/manager/ManagerFactory.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.manager; +package com.cloudera.sqoop.manager; -import org.apache.hadoop.sqoop.SqoopOptions; +import com.cloudera.sqoop.SqoopOptions; /** * Interface for factory classes for ConnManager implementations. diff --git a/src/java/org/apache/hadoop/sqoop/manager/MySQLManager.java b/src/java/com/cloudera/sqoop/manager/MySQLManager.java similarity index 98% rename from src/java/org/apache/hadoop/sqoop/manager/MySQLManager.java rename to src/java/com/cloudera/sqoop/manager/MySQLManager.java index 7153c2f9..214f2a3f 100644 --- a/src/java/org/apache/hadoop/sqoop/manager/MySQLManager.java +++ b/src/java/com/cloudera/sqoop/manager/MySQLManager.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.manager; +package com.cloudera.sqoop.manager; import java.io.IOException; import java.io.PrintWriter; @@ -32,8 +32,8 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.util.StringUtils; -import org.apache.hadoop.sqoop.SqoopOptions; -import org.apache.hadoop.sqoop.util.ImportException; +import com.cloudera.sqoop.SqoopOptions; +import com.cloudera.sqoop.util.ImportException; /** * Manages connections to MySQL databases. diff --git a/src/java/org/apache/hadoop/sqoop/manager/MySQLUtils.java b/src/java/com/cloudera/sqoop/manager/MySQLUtils.java similarity index 96% rename from src/java/org/apache/hadoop/sqoop/manager/MySQLUtils.java rename to src/java/com/cloudera/sqoop/manager/MySQLUtils.java index 5e4a541f..a5c13ff7 100644 --- a/src/java/org/apache/hadoop/sqoop/manager/MySQLUtils.java +++ b/src/java/com/cloudera/sqoop/manager/MySQLUtils.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.manager; +package com.cloudera.sqoop.manager; import java.io.BufferedWriter; import java.io.File; @@ -27,8 +27,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.sqoop.shims.HadoopShim; -import org.apache.hadoop.sqoop.util.DirectImportUtils; +import com.cloudera.sqoop.shims.HadoopShim; +import com.cloudera.sqoop.util.DirectImportUtils; /** * Helper methods and constants for MySQL imports/exports. diff --git a/src/java/org/apache/hadoop/sqoop/manager/OracleManager.java b/src/java/com/cloudera/sqoop/manager/OracleManager.java similarity index 97% rename from src/java/org/apache/hadoop/sqoop/manager/OracleManager.java rename to src/java/com/cloudera/sqoop/manager/OracleManager.java index f3ec1fdc..c5780aab 100644 --- a/src/java/org/apache/hadoop/sqoop/manager/OracleManager.java +++ b/src/java/com/cloudera/sqoop/manager/OracleManager.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.manager; +package com.cloudera.sqoop.manager; import java.io.IOException; import java.sql.Connection; @@ -32,11 +32,11 @@ import org.apache.hadoop.mapreduce.OutputFormat; import org.apache.hadoop.mapreduce.lib.db.OracleDataDrivenDBInputFormat; -import org.apache.hadoop.sqoop.SqoopOptions; -import org.apache.hadoop.sqoop.mapreduce.JdbcExportJob; -import org.apache.hadoop.sqoop.shims.ShimLoader; -import org.apache.hadoop.sqoop.util.ExportException; -import org.apache.hadoop.sqoop.util.ImportException; +import com.cloudera.sqoop.SqoopOptions; +import com.cloudera.sqoop.mapreduce.JdbcExportJob; +import com.cloudera.sqoop.shims.ShimLoader; +import com.cloudera.sqoop.util.ExportException; +import com.cloudera.sqoop.util.ImportException; /** * Manages connections to Oracle databases. @@ -303,7 +303,7 @@ public void exportTable(ExportJobContext context) try { JdbcExportJob exportJob = new JdbcExportJob(context, null, null, (Class) ShimLoader.getShimClass( - "org.apache.hadoop.sqoop.mapreduce.OracleExportOutputFormat")); + "com.cloudera.sqoop.mapreduce.OracleExportOutputFormat")); exportJob.runExport(); } catch (ClassNotFoundException cnfe) { throw new ExportException("Could not start export; could not find class", diff --git a/src/java/org/apache/hadoop/sqoop/manager/PostgresqlManager.java b/src/java/com/cloudera/sqoop/manager/PostgresqlManager.java similarity index 97% rename from src/java/org/apache/hadoop/sqoop/manager/PostgresqlManager.java rename to src/java/com/cloudera/sqoop/manager/PostgresqlManager.java index 41a4d211..7bacf4c0 100644 --- a/src/java/org/apache/hadoop/sqoop/manager/PostgresqlManager.java +++ b/src/java/com/cloudera/sqoop/manager/PostgresqlManager.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.manager; +package com.cloudera.sqoop.manager; import java.io.IOException; import java.sql.PreparedStatement; @@ -27,8 +27,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.sqoop.SqoopOptions; -import org.apache.hadoop.sqoop.util.ImportException; +import com.cloudera.sqoop.SqoopOptions; +import com.cloudera.sqoop.util.ImportException; /** * Manages connections to Postgresql databases. diff --git a/src/java/org/apache/hadoop/sqoop/manager/SqlManager.java b/src/java/com/cloudera/sqoop/manager/SqlManager.java similarity index 96% rename from src/java/org/apache/hadoop/sqoop/manager/SqlManager.java rename to src/java/com/cloudera/sqoop/manager/SqlManager.java index 8e7179d8..98a682e7 100644 --- a/src/java/org/apache/hadoop/sqoop/manager/SqlManager.java +++ b/src/java/com/cloudera/sqoop/manager/SqlManager.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.manager; +package com.cloudera.sqoop.manager; -import org.apache.hadoop.sqoop.SqoopOptions; -import org.apache.hadoop.sqoop.hive.HiveTypes; -import org.apache.hadoop.sqoop.lib.BlobRef; -import org.apache.hadoop.sqoop.lib.ClobRef; -import org.apache.hadoop.sqoop.mapreduce.DataDrivenImportJob; -import org.apache.hadoop.sqoop.mapreduce.JdbcExportJob; -import org.apache.hadoop.sqoop.util.ExportException; -import org.apache.hadoop.sqoop.util.ImportException; -import org.apache.hadoop.sqoop.util.ResultSetPrinter; +import com.cloudera.sqoop.SqoopOptions; +import com.cloudera.sqoop.hive.HiveTypes; +import com.cloudera.sqoop.lib.BlobRef; +import com.cloudera.sqoop.lib.ClobRef; +import com.cloudera.sqoop.mapreduce.DataDrivenImportJob; +import com.cloudera.sqoop.mapreduce.JdbcExportJob; +import com.cloudera.sqoop.util.ExportException; +import com.cloudera.sqoop.util.ImportException; +import com.cloudera.sqoop.util.ResultSetPrinter; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/java/org/apache/hadoop/sqoop/mapreduce/AutoProgressMapper.java b/src/java/com/cloudera/sqoop/mapreduce/AutoProgressMapper.java similarity index 99% rename from src/java/org/apache/hadoop/sqoop/mapreduce/AutoProgressMapper.java rename to src/java/com/cloudera/sqoop/mapreduce/AutoProgressMapper.java index 20d639b6..d630a170 100644 --- a/src/java/org/apache/hadoop/sqoop/mapreduce/AutoProgressMapper.java +++ b/src/java/com/cloudera/sqoop/mapreduce/AutoProgressMapper.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.mapreduce; +package com.cloudera.sqoop.mapreduce; import java.io.IOException; diff --git a/src/java/org/apache/hadoop/sqoop/mapreduce/DataDrivenImportJob.java b/src/java/com/cloudera/sqoop/mapreduce/DataDrivenImportJob.java similarity index 92% rename from src/java/org/apache/hadoop/sqoop/mapreduce/DataDrivenImportJob.java rename to src/java/com/cloudera/sqoop/mapreduce/DataDrivenImportJob.java index b67f2497..3d0bb48a 100644 --- a/src/java/org/apache/hadoop/sqoop/mapreduce/DataDrivenImportJob.java +++ b/src/java/com/cloudera/sqoop/mapreduce/DataDrivenImportJob.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.mapreduce; +package com.cloudera.sqoop.mapreduce; import java.io.IOException; import java.sql.SQLException; @@ -35,12 +35,12 @@ import org.apache.hadoop.mapreduce.lib.db.DataDrivenDBInputFormat; import org.apache.hadoop.mapreduce.lib.db.DBWritable; -import org.apache.hadoop.sqoop.ConnFactory; -import org.apache.hadoop.sqoop.SqoopOptions; -import org.apache.hadoop.sqoop.manager.ConnManager; -import org.apache.hadoop.sqoop.lib.LargeObjectLoader; -import org.apache.hadoop.sqoop.shims.HadoopShim; -import org.apache.hadoop.sqoop.shims.ShimLoader; +import com.cloudera.sqoop.ConnFactory; +import com.cloudera.sqoop.SqoopOptions; +import com.cloudera.sqoop.manager.ConnManager; +import com.cloudera.sqoop.lib.LargeObjectLoader; +import com.cloudera.sqoop.shims.HadoopShim; +import com.cloudera.sqoop.shims.ShimLoader; /** * Actually runs a jdbc import job using the ORM files generated by the @@ -90,7 +90,7 @@ protected Class getOutputFormatClass() throws ClassNotFoundException { if (options.getFileLayout() == SqoopOptions.FileLayout.TextFile) { return (Class) ShimLoader.getShimClass( - "org.apache.hadoop.sqoop.mapreduce.RawKeyTextOutputFormat"); + "com.cloudera.sqoop.mapreduce.RawKeyTextOutputFormat"); } else if (options.getFileLayout() == SqoopOptions.FileLayout.SequenceFile) { return SequenceFileOutputFormat.class; } diff --git a/src/java/org/apache/hadoop/sqoop/mapreduce/ExportJobBase.java b/src/java/com/cloudera/sqoop/mapreduce/ExportJobBase.java similarity index 93% rename from src/java/org/apache/hadoop/sqoop/mapreduce/ExportJobBase.java rename to src/java/com/cloudera/sqoop/mapreduce/ExportJobBase.java index b6d54f10..4a394cab 100644 --- a/src/java/org/apache/hadoop/sqoop/mapreduce/ExportJobBase.java +++ b/src/java/com/cloudera/sqoop/mapreduce/ExportJobBase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.mapreduce; +package com.cloudera.sqoop.mapreduce; import java.io.FileNotFoundException; import java.io.IOException; @@ -36,14 +36,14 @@ import org.apache.hadoop.mapreduce.OutputFormat; import org.apache.hadoop.mapreduce.lib.input.FileInputFormat; -import org.apache.hadoop.sqoop.SqoopOptions; -import org.apache.hadoop.sqoop.lib.SqoopRecord; -import org.apache.hadoop.sqoop.manager.ExportJobContext; -import org.apache.hadoop.sqoop.orm.TableClassName; -import org.apache.hadoop.sqoop.shims.HadoopShim; -import org.apache.hadoop.sqoop.shims.ShimLoader; -import org.apache.hadoop.sqoop.util.ExportException; -import org.apache.hadoop.sqoop.util.PerfCounters; +import com.cloudera.sqoop.SqoopOptions; +import com.cloudera.sqoop.lib.SqoopRecord; +import com.cloudera.sqoop.manager.ExportJobContext; +import com.cloudera.sqoop.orm.TableClassName; +import com.cloudera.sqoop.shims.HadoopShim; +import com.cloudera.sqoop.shims.ShimLoader; +import com.cloudera.sqoop.util.ExportException; +import com.cloudera.sqoop.util.PerfCounters; /** * Base class for running an export MapReduce job. @@ -174,7 +174,7 @@ protected Class getInputFormatClass() Class configuredIF = super.getInputFormatClass(); if (null == configuredIF) { return (Class) ShimLoader.getShimClass( - "org.apache.hadoop.sqoop.mapreduce.ExportInputFormat"); + "com.cloudera.sqoop.mapreduce.ExportInputFormat"); } else { return configuredIF; } @@ -186,7 +186,7 @@ protected Class getOutputFormatClass() Class configuredOF = super.getOutputFormatClass(); if (null == configuredOF) { return (Class) ShimLoader.getShimClass( - "org.apache.hadoop.sqoop.mapreduce.ExportOutputFormat"); + "com.cloudera.sqoop.mapreduce.ExportOutputFormat"); } else { return configuredOF; } diff --git a/src/java/org/apache/hadoop/sqoop/mapreduce/ImportJobBase.java b/src/java/com/cloudera/sqoop/mapreduce/ImportJobBase.java similarity index 94% rename from src/java/org/apache/hadoop/sqoop/mapreduce/ImportJobBase.java rename to src/java/com/cloudera/sqoop/mapreduce/ImportJobBase.java index d9f0c496..601d9637 100644 --- a/src/java/org/apache/hadoop/sqoop/mapreduce/ImportJobBase.java +++ b/src/java/com/cloudera/sqoop/mapreduce/ImportJobBase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.mapreduce; +package com.cloudera.sqoop.mapreduce; import java.io.IOException; @@ -35,11 +35,11 @@ import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; import org.apache.hadoop.mapreduce.lib.output.SequenceFileOutputFormat; -import org.apache.hadoop.sqoop.SqoopOptions; -import org.apache.hadoop.sqoop.orm.TableClassName; -import org.apache.hadoop.sqoop.shims.HadoopShim; -import org.apache.hadoop.sqoop.util.ImportException; -import org.apache.hadoop.sqoop.util.PerfCounters; +import com.cloudera.sqoop.SqoopOptions; +import com.cloudera.sqoop.orm.TableClassName; +import com.cloudera.sqoop.shims.HadoopShim; +import com.cloudera.sqoop.util.ImportException; +import com.cloudera.sqoop.util.PerfCounters; /** * Base class for running an import MapReduce job. diff --git a/src/java/org/apache/hadoop/sqoop/mapreduce/JdbcExportJob.java b/src/java/com/cloudera/sqoop/mapreduce/JdbcExportJob.java similarity index 94% rename from src/java/org/apache/hadoop/sqoop/mapreduce/JdbcExportJob.java rename to src/java/com/cloudera/sqoop/mapreduce/JdbcExportJob.java index 0d5edd6e..c07c3726 100644 --- a/src/java/org/apache/hadoop/sqoop/mapreduce/JdbcExportJob.java +++ b/src/java/com/cloudera/sqoop/mapreduce/JdbcExportJob.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.mapreduce; +package com.cloudera.sqoop.mapreduce; import java.io.IOException; import java.sql.SQLException; @@ -32,9 +32,9 @@ import org.apache.hadoop.mapreduce.lib.db.DBConfiguration; import org.apache.hadoop.mapreduce.lib.db.DBOutputFormat; -import org.apache.hadoop.sqoop.ConnFactory; -import org.apache.hadoop.sqoop.manager.ConnManager; -import org.apache.hadoop.sqoop.manager.ExportJobContext; +import com.cloudera.sqoop.ConnFactory; +import com.cloudera.sqoop.manager.ConnManager; +import com.cloudera.sqoop.manager.ExportJobContext; /** * Run an export using JDBC (JDBC-based ExportOutputFormat). diff --git a/src/java/org/apache/hadoop/sqoop/mapreduce/JobBase.java b/src/java/com/cloudera/sqoop/mapreduce/JobBase.java similarity index 97% rename from src/java/org/apache/hadoop/sqoop/mapreduce/JobBase.java rename to src/java/com/cloudera/sqoop/mapreduce/JobBase.java index fb926623..1646b824 100644 --- a/src/java/org/apache/hadoop/sqoop/mapreduce/JobBase.java +++ b/src/java/com/cloudera/sqoop/mapreduce/JobBase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.mapreduce; +package com.cloudera.sqoop.mapreduce; import java.io.IOException; @@ -29,9 +29,9 @@ import org.apache.hadoop.mapreduce.Mapper; import org.apache.hadoop.mapreduce.OutputFormat; -import org.apache.hadoop.sqoop.SqoopOptions; -import org.apache.hadoop.sqoop.shims.HadoopShim; -import org.apache.hadoop.sqoop.util.ClassLoaderStack; +import com.cloudera.sqoop.SqoopOptions; +import com.cloudera.sqoop.shims.HadoopShim; +import com.cloudera.sqoop.util.ClassLoaderStack; /** * Base class for configuring and running a MapReduce job. diff --git a/src/java/org/apache/hadoop/sqoop/mapreduce/MySQLDumpImportJob.java b/src/java/com/cloudera/sqoop/mapreduce/MySQLDumpImportJob.java similarity index 91% rename from src/java/org/apache/hadoop/sqoop/mapreduce/MySQLDumpImportJob.java rename to src/java/com/cloudera/sqoop/mapreduce/MySQLDumpImportJob.java index 21c44cc2..6c483042 100644 --- a/src/java/org/apache/hadoop/sqoop/mapreduce/MySQLDumpImportJob.java +++ b/src/java/com/cloudera/sqoop/mapreduce/MySQLDumpImportJob.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.mapreduce; +package com.cloudera.sqoop.mapreduce; import java.io.IOException; import java.sql.SQLException; @@ -33,11 +33,11 @@ import org.apache.hadoop.mapreduce.lib.db.DataDrivenDBInputFormat; import org.apache.hadoop.mapreduce.lib.db.DBWritable; -import org.apache.hadoop.sqoop.ConnFactory; -import org.apache.hadoop.sqoop.SqoopOptions; -import org.apache.hadoop.sqoop.manager.ConnManager; -import org.apache.hadoop.sqoop.manager.MySQLUtils; -import org.apache.hadoop.sqoop.shims.ShimLoader; +import com.cloudera.sqoop.ConnFactory; +import com.cloudera.sqoop.SqoopOptions; +import com.cloudera.sqoop.manager.ConnManager; +import com.cloudera.sqoop.manager.MySQLUtils; +import com.cloudera.sqoop.shims.ShimLoader; /** * Class that runs an import job using mysqldump in the mapper. @@ -51,9 +51,9 @@ public MySQLDumpImportJob(final SqoopOptions opts) throws ClassNotFoundException { super(opts, MySQLDumpMapper.class, (Class) ShimLoader.getShimClass( - "org.apache.hadoop.sqoop.mapreduce.MySQLDumpInputFormat"), + "com.cloudera.sqoop.mapreduce.MySQLDumpInputFormat"), (Class) ShimLoader.getShimClass( - "org.apache.hadoop.sqoop.mapreduce.RawKeyTextOutputFormat")); + "com.cloudera.sqoop.mapreduce.RawKeyTextOutputFormat")); } /** diff --git a/src/java/org/apache/hadoop/sqoop/mapreduce/MySQLDumpMapper.java b/src/java/com/cloudera/sqoop/mapreduce/MySQLDumpMapper.java similarity index 97% rename from src/java/org/apache/hadoop/sqoop/mapreduce/MySQLDumpMapper.java rename to src/java/com/cloudera/sqoop/mapreduce/MySQLDumpMapper.java index e85815db..521d85fe 100644 --- a/src/java/org/apache/hadoop/sqoop/mapreduce/MySQLDumpMapper.java +++ b/src/java/com/cloudera/sqoop/mapreduce/MySQLDumpMapper.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.mapreduce; +package com.cloudera.sqoop.mapreduce; import java.io.BufferedReader; import java.io.File; @@ -32,15 +32,15 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.mapreduce.Mapper; -import org.apache.hadoop.sqoop.lib.FieldFormatter; -import org.apache.hadoop.sqoop.lib.RecordParser; -import org.apache.hadoop.sqoop.manager.MySQLUtils; -import org.apache.hadoop.sqoop.util.AsyncSink; -import org.apache.hadoop.sqoop.util.ErrorableAsyncSink; -import org.apache.hadoop.sqoop.util.ErrorableThread; -import org.apache.hadoop.sqoop.util.JdbcUrl; -import org.apache.hadoop.sqoop.util.LoggingAsyncSink; -import org.apache.hadoop.sqoop.util.PerfCounters; +import com.cloudera.sqoop.lib.FieldFormatter; +import com.cloudera.sqoop.lib.RecordParser; +import com.cloudera.sqoop.manager.MySQLUtils; +import com.cloudera.sqoop.util.AsyncSink; +import com.cloudera.sqoop.util.ErrorableAsyncSink; +import com.cloudera.sqoop.util.ErrorableThread; +import com.cloudera.sqoop.util.JdbcUrl; +import com.cloudera.sqoop.util.LoggingAsyncSink; +import com.cloudera.sqoop.util.PerfCounters; /** * Mapper that opens up a pipe to mysqldump and pulls data directly. diff --git a/src/java/org/apache/hadoop/sqoop/mapreduce/MySQLExportJob.java b/src/java/com/cloudera/sqoop/mapreduce/MySQLExportJob.java similarity index 94% rename from src/java/org/apache/hadoop/sqoop/mapreduce/MySQLExportJob.java rename to src/java/com/cloudera/sqoop/mapreduce/MySQLExportJob.java index 0e2b4150..11c7d0f7 100644 --- a/src/java/org/apache/hadoop/sqoop/mapreduce/MySQLExportJob.java +++ b/src/java/com/cloudera/sqoop/mapreduce/MySQLExportJob.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.mapreduce; +package com.cloudera.sqoop.mapreduce; import java.io.IOException; import java.sql.SQLException; @@ -32,10 +32,10 @@ import org.apache.hadoop.mapreduce.lib.db.DataDrivenDBInputFormat; import org.apache.hadoop.mapreduce.lib.db.DBWritable; -import org.apache.hadoop.sqoop.ConnFactory; -import org.apache.hadoop.sqoop.manager.ConnManager; -import org.apache.hadoop.sqoop.manager.ExportJobContext; -import org.apache.hadoop.sqoop.manager.MySQLUtils; +import com.cloudera.sqoop.ConnFactory; +import com.cloudera.sqoop.manager.ConnManager; +import com.cloudera.sqoop.manager.ExportJobContext; +import com.cloudera.sqoop.manager.MySQLUtils; /** * Class that runs an export job using mysqlimport in the mapper. diff --git a/src/java/org/apache/hadoop/sqoop/mapreduce/MySQLExportMapper.java b/src/java/com/cloudera/sqoop/mapreduce/MySQLExportMapper.java similarity index 97% rename from src/java/org/apache/hadoop/sqoop/mapreduce/MySQLExportMapper.java rename to src/java/com/cloudera/sqoop/mapreduce/MySQLExportMapper.java index 96726a8d..008fc172 100644 --- a/src/java/org/apache/hadoop/sqoop/mapreduce/MySQLExportMapper.java +++ b/src/java/com/cloudera/sqoop/mapreduce/MySQLExportMapper.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.mapreduce; +package com.cloudera.sqoop.mapreduce; import java.io.BufferedOutputStream; import java.io.File; @@ -32,13 +32,13 @@ import org.apache.hadoop.util.Shell; import org.apache.hadoop.mapreduce.Mapper; import org.apache.hadoop.mapreduce.lib.db.DBConfiguration; -import org.apache.hadoop.sqoop.lib.TaskId; -import org.apache.hadoop.sqoop.manager.MySQLUtils; -import org.apache.hadoop.sqoop.shims.HadoopShim; -import org.apache.hadoop.sqoop.util.AsyncSink; -import org.apache.hadoop.sqoop.util.JdbcUrl; -import org.apache.hadoop.sqoop.util.LoggingAsyncSink; -import org.apache.hadoop.sqoop.util.NullAsyncSink; +import com.cloudera.sqoop.lib.TaskId; +import com.cloudera.sqoop.manager.MySQLUtils; +import com.cloudera.sqoop.shims.HadoopShim; +import com.cloudera.sqoop.util.AsyncSink; +import com.cloudera.sqoop.util.JdbcUrl; +import com.cloudera.sqoop.util.LoggingAsyncSink; +import com.cloudera.sqoop.util.NullAsyncSink; /** * Mapper that starts a 'mysqlimport' process and uses that to export rows from diff --git a/src/java/org/apache/hadoop/sqoop/mapreduce/MySQLRecordExportMapper.java b/src/java/com/cloudera/sqoop/mapreduce/MySQLRecordExportMapper.java similarity index 94% rename from src/java/org/apache/hadoop/sqoop/mapreduce/MySQLRecordExportMapper.java rename to src/java/com/cloudera/sqoop/mapreduce/MySQLRecordExportMapper.java index 22e21858..49f1c87f 100644 --- a/src/java/org/apache/hadoop/sqoop/mapreduce/MySQLRecordExportMapper.java +++ b/src/java/com/cloudera/sqoop/mapreduce/MySQLRecordExportMapper.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.mapreduce; +package com.cloudera.sqoop.mapreduce; import java.io.IOException; import org.apache.hadoop.io.LongWritable; -import org.apache.hadoop.sqoop.lib.SqoopRecord; +import com.cloudera.sqoop.lib.SqoopRecord; /** * mysqlimport-based exporter which accepts SqoopRecords (e.g., from diff --git a/src/java/org/apache/hadoop/sqoop/mapreduce/MySQLTextExportMapper.java b/src/java/com/cloudera/sqoop/mapreduce/MySQLTextExportMapper.java similarity index 95% rename from src/java/org/apache/hadoop/sqoop/mapreduce/MySQLTextExportMapper.java rename to src/java/com/cloudera/sqoop/mapreduce/MySQLTextExportMapper.java index 57820c58..e244cb2f 100644 --- a/src/java/org/apache/hadoop/sqoop/mapreduce/MySQLTextExportMapper.java +++ b/src/java/com/cloudera/sqoop/mapreduce/MySQLTextExportMapper.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.mapreduce; +package com.cloudera.sqoop.mapreduce; import java.io.IOException; import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.Text; -import org.apache.hadoop.sqoop.manager.MySQLUtils; +import com.cloudera.sqoop.manager.MySQLUtils; /** * mysqlimport-based exporter which accepts lines of text from files diff --git a/src/java/org/apache/hadoop/sqoop/mapreduce/SequenceFileExportMapper.java b/src/java/com/cloudera/sqoop/mapreduce/SequenceFileExportMapper.java similarity index 94% rename from src/java/org/apache/hadoop/sqoop/mapreduce/SequenceFileExportMapper.java rename to src/java/com/cloudera/sqoop/mapreduce/SequenceFileExportMapper.java index 4902e04a..9f95b3ca 100644 --- a/src/java/org/apache/hadoop/sqoop/mapreduce/SequenceFileExportMapper.java +++ b/src/java/com/cloudera/sqoop/mapreduce/SequenceFileExportMapper.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.mapreduce; +package com.cloudera.sqoop.mapreduce; import java.io.IOException; @@ -24,7 +24,7 @@ import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.mapreduce.Mapper.Context; -import org.apache.hadoop.sqoop.lib.SqoopRecord; +import com.cloudera.sqoop.lib.SqoopRecord; /** * Reads a SqoopRecord from the SequenceFile in which it's packed and emits diff --git a/src/java/org/apache/hadoop/sqoop/mapreduce/SequenceFileImportMapper.java b/src/java/com/cloudera/sqoop/mapreduce/SequenceFileImportMapper.java similarity index 93% rename from src/java/org/apache/hadoop/sqoop/mapreduce/SequenceFileImportMapper.java rename to src/java/com/cloudera/sqoop/mapreduce/SequenceFileImportMapper.java index f8db27a1..c7cc2760 100644 --- a/src/java/org/apache/hadoop/sqoop/mapreduce/SequenceFileImportMapper.java +++ b/src/java/com/cloudera/sqoop/mapreduce/SequenceFileImportMapper.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.mapreduce; +package com.cloudera.sqoop.mapreduce; import java.io.IOException; import java.sql.SQLException; @@ -24,8 +24,8 @@ import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.mapreduce.Mapper.Context; import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; -import org.apache.hadoop.sqoop.lib.LargeObjectLoader; -import org.apache.hadoop.sqoop.lib.SqoopRecord; +import com.cloudera.sqoop.lib.LargeObjectLoader; +import com.cloudera.sqoop.lib.SqoopRecord; /** * Imports records by writing them to a SequenceFile. diff --git a/src/java/org/apache/hadoop/sqoop/mapreduce/TextExportMapper.java b/src/java/com/cloudera/sqoop/mapreduce/TextExportMapper.java similarity index 95% rename from src/java/org/apache/hadoop/sqoop/mapreduce/TextExportMapper.java rename to src/java/com/cloudera/sqoop/mapreduce/TextExportMapper.java index 4c31bb7b..9665bb36 100644 --- a/src/java/org/apache/hadoop/sqoop/mapreduce/TextExportMapper.java +++ b/src/java/com/cloudera/sqoop/mapreduce/TextExportMapper.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.mapreduce; +package com.cloudera.sqoop.mapreduce; import java.io.IOException; @@ -27,8 +27,8 @@ import org.apache.hadoop.mapreduce.Mapper.Context; import org.apache.hadoop.util.ReflectionUtils; -import org.apache.hadoop.sqoop.lib.RecordParser; -import org.apache.hadoop.sqoop.lib.SqoopRecord; +import com.cloudera.sqoop.lib.RecordParser; +import com.cloudera.sqoop.lib.SqoopRecord; /** * Converts an input record from a string representation to a parsed Sqoop diff --git a/src/java/org/apache/hadoop/sqoop/mapreduce/TextImportMapper.java b/src/java/com/cloudera/sqoop/mapreduce/TextImportMapper.java similarity index 93% rename from src/java/org/apache/hadoop/sqoop/mapreduce/TextImportMapper.java rename to src/java/com/cloudera/sqoop/mapreduce/TextImportMapper.java index dd973b33..c43a683f 100644 --- a/src/java/org/apache/hadoop/sqoop/mapreduce/TextImportMapper.java +++ b/src/java/com/cloudera/sqoop/mapreduce/TextImportMapper.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.mapreduce; +package com.cloudera.sqoop.mapreduce; import java.io.IOException; import java.sql.SQLException; @@ -26,8 +26,8 @@ import org.apache.hadoop.io.Text; import org.apache.hadoop.mapreduce.Mapper.Context; import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; -import org.apache.hadoop.sqoop.lib.LargeObjectLoader; -import org.apache.hadoop.sqoop.lib.SqoopRecord; +import com.cloudera.sqoop.lib.LargeObjectLoader; +import com.cloudera.sqoop.lib.SqoopRecord; /** * Imports records by transforming them to strings for a plain-text flat file. diff --git a/src/java/org/apache/hadoop/sqoop/orm/ClassWriter.java b/src/java/com/cloudera/sqoop/orm/ClassWriter.java similarity index 98% rename from src/java/org/apache/hadoop/sqoop/orm/ClassWriter.java rename to src/java/com/cloudera/sqoop/orm/ClassWriter.java index 84ba6810..57dc02ed 100644 --- a/src/java/org/apache/hadoop/sqoop/orm/ClassWriter.java +++ b/src/java/com/cloudera/sqoop/orm/ClassWriter.java @@ -16,20 +16,20 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.orm; +package com.cloudera.sqoop.orm; import org.apache.hadoop.io.BytesWritable; -import org.apache.hadoop.sqoop.SqoopOptions; -import org.apache.hadoop.sqoop.manager.ConnManager; -import org.apache.hadoop.sqoop.lib.BigDecimalSerializer; -import org.apache.hadoop.sqoop.lib.FieldFormatter; -import org.apache.hadoop.sqoop.lib.JdbcWritableBridge; -import org.apache.hadoop.sqoop.lib.LargeObjectLoader; -import org.apache.hadoop.sqoop.lib.LobSerializer; -import org.apache.hadoop.sqoop.lib.RecordParser; -import org.apache.hadoop.sqoop.lib.BlobRef; -import org.apache.hadoop.sqoop.lib.ClobRef; -import org.apache.hadoop.sqoop.lib.SqoopRecord; +import com.cloudera.sqoop.SqoopOptions; +import com.cloudera.sqoop.manager.ConnManager; +import com.cloudera.sqoop.lib.BigDecimalSerializer; +import com.cloudera.sqoop.lib.FieldFormatter; +import com.cloudera.sqoop.lib.JdbcWritableBridge; +import com.cloudera.sqoop.lib.LargeObjectLoader; +import com.cloudera.sqoop.lib.LobSerializer; +import com.cloudera.sqoop.lib.RecordParser; +import com.cloudera.sqoop.lib.BlobRef; +import com.cloudera.sqoop.lib.ClobRef; +import com.cloudera.sqoop.lib.SqoopRecord; import java.io.File; import java.io.FileOutputStream; diff --git a/src/java/org/apache/hadoop/sqoop/orm/CompilationManager.java b/src/java/com/cloudera/sqoop/orm/CompilationManager.java similarity index 98% rename from src/java/org/apache/hadoop/sqoop/orm/CompilationManager.java rename to src/java/com/cloudera/sqoop/orm/CompilationManager.java index c7ebd700..d4de7c4e 100644 --- a/src/java/org/apache/hadoop/sqoop/orm/CompilationManager.java +++ b/src/java/com/cloudera/sqoop/orm/CompilationManager.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.orm; +package com.cloudera.sqoop.orm; import java.io.File; import java.io.FileInputStream; @@ -40,9 +40,9 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.mapred.JobConf; -import org.apache.hadoop.sqoop.SqoopOptions; -import org.apache.hadoop.sqoop.util.FileListing; -import org.apache.hadoop.sqoop.shims.HadoopShim; +import com.cloudera.sqoop.SqoopOptions; +import com.cloudera.sqoop.util.FileListing; +import com.cloudera.sqoop.shims.HadoopShim; /** * Manages the compilation of a bunch of .java files into .class files diff --git a/src/java/org/apache/hadoop/sqoop/orm/TableClassName.java b/src/java/com/cloudera/sqoop/orm/TableClassName.java similarity index 97% rename from src/java/org/apache/hadoop/sqoop/orm/TableClassName.java rename to src/java/com/cloudera/sqoop/orm/TableClassName.java index abed91c7..4fc0f543 100644 --- a/src/java/org/apache/hadoop/sqoop/orm/TableClassName.java +++ b/src/java/com/cloudera/sqoop/orm/TableClassName.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.orm; +package com.cloudera.sqoop.orm; -import org.apache.hadoop.sqoop.SqoopOptions; +import com.cloudera.sqoop.SqoopOptions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/src/java/org/apache/hadoop/sqoop/shims/HadoopShim.java b/src/java/com/cloudera/sqoop/shims/HadoopShim.java similarity index 99% rename from src/java/org/apache/hadoop/sqoop/shims/HadoopShim.java rename to src/java/com/cloudera/sqoop/shims/HadoopShim.java index 599eb2a1..fead7b9e 100644 --- a/src/java/org/apache/hadoop/sqoop/shims/HadoopShim.java +++ b/src/java/com/cloudera/sqoop/shims/HadoopShim.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.sqoop.shims; +package com.cloudera.sqoop.shims; import java.io.IOException; diff --git a/src/java/org/apache/hadoop/sqoop/shims/ShimLoader.java b/src/java/com/cloudera/sqoop/shims/ShimLoader.java similarity index 95% rename from src/java/org/apache/hadoop/sqoop/shims/ShimLoader.java rename to src/java/com/cloudera/sqoop/shims/ShimLoader.java index 092e1399..d105546a 100644 --- a/src/java/org/apache/hadoop/sqoop/shims/ShimLoader.java +++ b/src/java/com/cloudera/sqoop/shims/ShimLoader.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.sqoop.shims; +package com.cloudera.sqoop.shims; import java.io.File; import java.io.IOException; @@ -27,7 +27,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.util.VersionInfo; -import org.apache.hadoop.sqoop.util.ClassLoaderStack; +import com.cloudera.sqoop.util.ClassLoaderStack; /** * Provides a service locator for the appropriate shim, dynamically chosen @@ -70,29 +70,29 @@ public abstract class ShimLoader { // CDH3 (based on 0.20.2) HADOOP_SHIM_MATCHES.add("0.20.2-[cC][dD][hH]3.*"); - HADOOP_SHIM_CLASSES.add("org.apache.hadoop.sqoop.shims.CDH3Shim"); + HADOOP_SHIM_CLASSES.add("com.cloudera.sqoop.shims.CDH3Shim"); HADOOP_SHIM_JARS.add("sqoop-.*-cloudera.jar"); // Apache 0.22 trunk. // Version may have the form "0.22-SNAPSHOT" HADOOP_SHIM_MATCHES.add("0.22-.*"); - HADOOP_SHIM_CLASSES.add("org.apache.hadoop.sqoop.shims.Apache22HadoopShim"); + HADOOP_SHIM_CLASSES.add("com.cloudera.sqoop.shims.Apache22HadoopShim"); HADOOP_SHIM_JARS.add("sqoop-.*-apache.jar"); // ... or "0.22.n-SNAPSHOT" HADOOP_SHIM_MATCHES.add("0.22.\\d+-.*"); - HADOOP_SHIM_CLASSES.add("org.apache.hadoop.sqoop.shims.Apache22HadoopShim"); + HADOOP_SHIM_CLASSES.add("com.cloudera.sqoop.shims.Apache22HadoopShim"); HADOOP_SHIM_JARS.add("sqoop-.*-apache.jar"); // Apache 0.22 trunk snapshots often compile with "Unknown" version, // so we default to guessing Apache in this case. HADOOP_SHIM_MATCHES.add("Unknown"); - HADOOP_SHIM_CLASSES.add("org.apache.hadoop.sqoop.shims.Apache22HadoopShim"); + HADOOP_SHIM_CLASSES.add("com.cloudera.sqoop.shims.Apache22HadoopShim"); HADOOP_SHIM_JARS.add("sqoop-.*-apache.jar"); // Apache 0.21 uses the same shim jars as 0.22 HADOOP_SHIM_MATCHES.add("0.21.\\d+(-.*)?"); - HADOOP_SHIM_CLASSES.add("org.apache.hadoop.sqoop.shims.Apache22HadoopShim"); + HADOOP_SHIM_CLASSES.add("com.cloudera.sqoop.shims.Apache22HadoopShim"); HADOOP_SHIM_JARS.add("sqoop-.*-apache.jar"); } diff --git a/src/java/org/apache/hadoop/sqoop/tool/BaseSqoopTool.java b/src/java/com/cloudera/sqoop/tool/BaseSqoopTool.java similarity index 98% rename from src/java/org/apache/hadoop/sqoop/tool/BaseSqoopTool.java rename to src/java/com/cloudera/sqoop/tool/BaseSqoopTool.java index e0a90107..fd0d8ab2 100644 --- a/src/java/org/apache/hadoop/sqoop/tool/BaseSqoopTool.java +++ b/src/java/com/cloudera/sqoop/tool/BaseSqoopTool.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.tool; +package com.cloudera.sqoop.tool; import java.sql.SQLException; import java.util.Arrays; @@ -30,14 +30,14 @@ import org.apache.log4j.Level; import org.apache.log4j.Logger; -import org.apache.hadoop.sqoop.ConnFactory; -import org.apache.hadoop.sqoop.Sqoop; -import org.apache.hadoop.sqoop.SqoopOptions; -import org.apache.hadoop.sqoop.SqoopOptions.InvalidOptionsException; -import org.apache.hadoop.sqoop.cli.RelatedOptions; -import org.apache.hadoop.sqoop.cli.ToolOptions; -import org.apache.hadoop.sqoop.manager.ConnManager; -import org.apache.hadoop.sqoop.shims.ShimLoader; +import com.cloudera.sqoop.ConnFactory; +import com.cloudera.sqoop.Sqoop; +import com.cloudera.sqoop.SqoopOptions; +import com.cloudera.sqoop.SqoopOptions.InvalidOptionsException; +import com.cloudera.sqoop.cli.RelatedOptions; +import com.cloudera.sqoop.cli.ToolOptions; +import com.cloudera.sqoop.manager.ConnManager; +import com.cloudera.sqoop.shims.ShimLoader; /** * Layer on top of SqoopTool that provides some basic common code diff --git a/src/java/org/apache/hadoop/sqoop/tool/CodeGenTool.java b/src/java/com/cloudera/sqoop/tool/CodeGenTool.java similarity index 92% rename from src/java/org/apache/hadoop/sqoop/tool/CodeGenTool.java rename to src/java/com/cloudera/sqoop/tool/CodeGenTool.java index cae91f66..95c4a47a 100644 --- a/src/java/org/apache/hadoop/sqoop/tool/CodeGenTool.java +++ b/src/java/com/cloudera/sqoop/tool/CodeGenTool.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.tool; +package com.cloudera.sqoop.tool; import java.io.IOException; import java.util.ArrayList; @@ -28,14 +28,14 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.util.StringUtils; -import org.apache.hadoop.sqoop.Sqoop; -import org.apache.hadoop.sqoop.SqoopOptions; -import org.apache.hadoop.sqoop.SqoopOptions.InvalidOptionsException; -import org.apache.hadoop.sqoop.cli.RelatedOptions; -import org.apache.hadoop.sqoop.cli.ToolOptions; -import org.apache.hadoop.sqoop.hive.HiveImport; -import org.apache.hadoop.sqoop.orm.ClassWriter; -import org.apache.hadoop.sqoop.orm.CompilationManager; +import com.cloudera.sqoop.Sqoop; +import com.cloudera.sqoop.SqoopOptions; +import com.cloudera.sqoop.SqoopOptions.InvalidOptionsException; +import com.cloudera.sqoop.cli.RelatedOptions; +import com.cloudera.sqoop.cli.ToolOptions; +import com.cloudera.sqoop.hive.HiveImport; +import com.cloudera.sqoop.orm.ClassWriter; +import com.cloudera.sqoop.orm.CompilationManager; /** * Tool that generates code from a database schema. diff --git a/src/java/org/apache/hadoop/sqoop/tool/CreateHiveTableTool.java b/src/java/com/cloudera/sqoop/tool/CreateHiveTableTool.java similarity index 91% rename from src/java/org/apache/hadoop/sqoop/tool/CreateHiveTableTool.java rename to src/java/com/cloudera/sqoop/tool/CreateHiveTableTool.java index 4a17ffe8..2597fcaf 100644 --- a/src/java/org/apache/hadoop/sqoop/tool/CreateHiveTableTool.java +++ b/src/java/com/cloudera/sqoop/tool/CreateHiveTableTool.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.tool; +package com.cloudera.sqoop.tool; import java.io.IOException; @@ -26,12 +26,12 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.util.StringUtils; -import org.apache.hadoop.sqoop.Sqoop; -import org.apache.hadoop.sqoop.SqoopOptions; -import org.apache.hadoop.sqoop.SqoopOptions.InvalidOptionsException; -import org.apache.hadoop.sqoop.cli.RelatedOptions; -import org.apache.hadoop.sqoop.cli.ToolOptions; -import org.apache.hadoop.sqoop.hive.HiveImport; +import com.cloudera.sqoop.Sqoop; +import com.cloudera.sqoop.SqoopOptions; +import com.cloudera.sqoop.SqoopOptions.InvalidOptionsException; +import com.cloudera.sqoop.cli.RelatedOptions; +import com.cloudera.sqoop.cli.ToolOptions; +import com.cloudera.sqoop.hive.HiveImport; /** * Tool that creates a Hive table definition. diff --git a/src/java/org/apache/hadoop/sqoop/tool/EvalSqlTool.java b/src/java/com/cloudera/sqoop/tool/EvalSqlTool.java similarity index 91% rename from src/java/org/apache/hadoop/sqoop/tool/EvalSqlTool.java rename to src/java/com/cloudera/sqoop/tool/EvalSqlTool.java index 56d0a7a1..f6b21cbc 100644 --- a/src/java/org/apache/hadoop/sqoop/tool/EvalSqlTool.java +++ b/src/java/com/cloudera/sqoop/tool/EvalSqlTool.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.tool; +package com.cloudera.sqoop.tool; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.OptionBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.sqoop.SqoopOptions; -import org.apache.hadoop.sqoop.SqoopOptions.InvalidOptionsException; -import org.apache.hadoop.sqoop.cli.RelatedOptions; -import org.apache.hadoop.sqoop.cli.ToolOptions; +import com.cloudera.sqoop.SqoopOptions; +import com.cloudera.sqoop.SqoopOptions.InvalidOptionsException; +import com.cloudera.sqoop.cli.RelatedOptions; +import com.cloudera.sqoop.cli.ToolOptions; /** * Tool that evaluates a SQL statement and displays the results. diff --git a/src/java/org/apache/hadoop/sqoop/tool/ExportTool.java b/src/java/com/cloudera/sqoop/tool/ExportTool.java similarity index 94% rename from src/java/org/apache/hadoop/sqoop/tool/ExportTool.java rename to src/java/com/cloudera/sqoop/tool/ExportTool.java index 72bc4218..a8cb92f3 100644 --- a/src/java/org/apache/hadoop/sqoop/tool/ExportTool.java +++ b/src/java/com/cloudera/sqoop/tool/ExportTool.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.tool; +package com.cloudera.sqoop.tool; import java.io.IOException; import java.util.List; @@ -26,13 +26,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.sqoop.Sqoop; -import org.apache.hadoop.sqoop.SqoopOptions; -import org.apache.hadoop.sqoop.SqoopOptions.InvalidOptionsException; -import org.apache.hadoop.sqoop.cli.RelatedOptions; -import org.apache.hadoop.sqoop.cli.ToolOptions; -import org.apache.hadoop.sqoop.manager.ExportJobContext; -import org.apache.hadoop.sqoop.util.ExportException; +import com.cloudera.sqoop.Sqoop; +import com.cloudera.sqoop.SqoopOptions; +import com.cloudera.sqoop.SqoopOptions.InvalidOptionsException; +import com.cloudera.sqoop.cli.RelatedOptions; +import com.cloudera.sqoop.cli.ToolOptions; +import com.cloudera.sqoop.manager.ExportJobContext; +import com.cloudera.sqoop.util.ExportException; /** * Tool that performs HDFS exports to databases. diff --git a/src/java/org/apache/hadoop/sqoop/tool/HelpTool.java b/src/java/com/cloudera/sqoop/tool/HelpTool.java similarity index 95% rename from src/java/org/apache/hadoop/sqoop/tool/HelpTool.java rename to src/java/com/cloudera/sqoop/tool/HelpTool.java index 1bab3dca..a615676d 100644 --- a/src/java/org/apache/hadoop/sqoop/tool/HelpTool.java +++ b/src/java/com/cloudera/sqoop/tool/HelpTool.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.tool; +package com.cloudera.sqoop.tool; import java.util.Set; -import org.apache.hadoop.sqoop.SqoopOptions; -import org.apache.hadoop.sqoop.cli.ToolOptions; +import com.cloudera.sqoop.SqoopOptions; +import com.cloudera.sqoop.cli.ToolOptions; /** * Tool that explains the usage of Sqoop. diff --git a/src/java/org/apache/hadoop/sqoop/tool/ImportAllTablesTool.java b/src/java/com/cloudera/sqoop/tool/ImportAllTablesTool.java similarity index 91% rename from src/java/org/apache/hadoop/sqoop/tool/ImportAllTablesTool.java rename to src/java/com/cloudera/sqoop/tool/ImportAllTablesTool.java index acad062f..fc1063cc 100644 --- a/src/java/org/apache/hadoop/sqoop/tool/ImportAllTablesTool.java +++ b/src/java/com/cloudera/sqoop/tool/ImportAllTablesTool.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.tool; +package com.cloudera.sqoop.tool; import java.io.IOException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.sqoop.Sqoop; -import org.apache.hadoop.sqoop.SqoopOptions; -import org.apache.hadoop.sqoop.hive.HiveImport; -import org.apache.hadoop.sqoop.util.ImportException; +import com.cloudera.sqoop.Sqoop; +import com.cloudera.sqoop.SqoopOptions; +import com.cloudera.sqoop.hive.HiveImport; +import com.cloudera.sqoop.util.ImportException; /** * Tool that performs database imports of all tables in a database to HDFS. diff --git a/src/java/org/apache/hadoop/sqoop/tool/ImportTool.java b/src/java/com/cloudera/sqoop/tool/ImportTool.java similarity index 96% rename from src/java/org/apache/hadoop/sqoop/tool/ImportTool.java rename to src/java/com/cloudera/sqoop/tool/ImportTool.java index 6aea0090..7a9a9110 100644 --- a/src/java/org/apache/hadoop/sqoop/tool/ImportTool.java +++ b/src/java/com/cloudera/sqoop/tool/ImportTool.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.tool; +package com.cloudera.sqoop.tool; import java.io.IOException; import java.util.List; @@ -26,14 +26,14 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.sqoop.Sqoop; -import org.apache.hadoop.sqoop.SqoopOptions; -import org.apache.hadoop.sqoop.SqoopOptions.InvalidOptionsException; -import org.apache.hadoop.sqoop.cli.RelatedOptions; -import org.apache.hadoop.sqoop.cli.ToolOptions; -import org.apache.hadoop.sqoop.hive.HiveImport; -import org.apache.hadoop.sqoop.manager.ImportJobContext; -import org.apache.hadoop.sqoop.util.ImportException; +import com.cloudera.sqoop.Sqoop; +import com.cloudera.sqoop.SqoopOptions; +import com.cloudera.sqoop.SqoopOptions.InvalidOptionsException; +import com.cloudera.sqoop.cli.RelatedOptions; +import com.cloudera.sqoop.cli.ToolOptions; +import com.cloudera.sqoop.hive.HiveImport; +import com.cloudera.sqoop.manager.ImportJobContext; +import com.cloudera.sqoop.util.ImportException; /** * Tool that performs database imports to HDFS. diff --git a/src/java/org/apache/hadoop/sqoop/tool/ListDatabasesTool.java b/src/java/com/cloudera/sqoop/tool/ListDatabasesTool.java similarity index 92% rename from src/java/org/apache/hadoop/sqoop/tool/ListDatabasesTool.java rename to src/java/com/cloudera/sqoop/tool/ListDatabasesTool.java index a8a6796b..e39c5349 100644 --- a/src/java/org/apache/hadoop/sqoop/tool/ListDatabasesTool.java +++ b/src/java/com/cloudera/sqoop/tool/ListDatabasesTool.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.tool; +package com.cloudera.sqoop.tool; import org.apache.commons.cli.CommandLine; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.sqoop.SqoopOptions; -import org.apache.hadoop.sqoop.SqoopOptions.InvalidOptionsException; -import org.apache.hadoop.sqoop.cli.ToolOptions; +import com.cloudera.sqoop.SqoopOptions; +import com.cloudera.sqoop.SqoopOptions.InvalidOptionsException; +import com.cloudera.sqoop.cli.ToolOptions; /** * Tool that lists available databases on a server. diff --git a/src/java/org/apache/hadoop/sqoop/tool/ListTablesTool.java b/src/java/com/cloudera/sqoop/tool/ListTablesTool.java similarity index 92% rename from src/java/org/apache/hadoop/sqoop/tool/ListTablesTool.java rename to src/java/com/cloudera/sqoop/tool/ListTablesTool.java index e0526808..4cef1623 100644 --- a/src/java/org/apache/hadoop/sqoop/tool/ListTablesTool.java +++ b/src/java/com/cloudera/sqoop/tool/ListTablesTool.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.tool; +package com.cloudera.sqoop.tool; import org.apache.commons.cli.CommandLine; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.sqoop.SqoopOptions; -import org.apache.hadoop.sqoop.SqoopOptions.InvalidOptionsException; -import org.apache.hadoop.sqoop.cli.ToolOptions; +import com.cloudera.sqoop.SqoopOptions; +import com.cloudera.sqoop.SqoopOptions.InvalidOptionsException; +import com.cloudera.sqoop.cli.ToolOptions; /** * Tool that lists available tables in a database. diff --git a/src/java/org/apache/hadoop/sqoop/tool/SqoopTool.java b/src/java/com/cloudera/sqoop/tool/SqoopTool.java similarity index 96% rename from src/java/org/apache/hadoop/sqoop/tool/SqoopTool.java rename to src/java/com/cloudera/sqoop/tool/SqoopTool.java index 0bf57086..b7f68cb4 100644 --- a/src/java/org/apache/hadoop/sqoop/tool/SqoopTool.java +++ b/src/java/com/cloudera/sqoop/tool/SqoopTool.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.tool; +package com.cloudera.sqoop.tool; import java.io.IOException; import java.util.Map; @@ -32,11 +32,11 @@ import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.util.ToolRunner; -import org.apache.hadoop.sqoop.SqoopOptions; -import org.apache.hadoop.sqoop.SqoopOptions.InvalidOptionsException; -import org.apache.hadoop.sqoop.cli.SqoopParser; -import org.apache.hadoop.sqoop.cli.ToolOptions; -import org.apache.hadoop.sqoop.shims.ShimLoader; +import com.cloudera.sqoop.SqoopOptions; +import com.cloudera.sqoop.SqoopOptions.InvalidOptionsException; +import com.cloudera.sqoop.cli.SqoopParser; +import com.cloudera.sqoop.cli.ToolOptions; +import com.cloudera.sqoop.shims.ShimLoader; /** * Base class for Sqoop subprograms (e.g., SqoopImport, SqoopExport, etc.) diff --git a/src/java/org/apache/hadoop/sqoop/tool/VersionTool.java b/src/java/com/cloudera/sqoop/tool/VersionTool.java similarity index 87% rename from src/java/org/apache/hadoop/sqoop/tool/VersionTool.java rename to src/java/com/cloudera/sqoop/tool/VersionTool.java index 0a021221..e8a257c9 100644 --- a/src/java/org/apache/hadoop/sqoop/tool/VersionTool.java +++ b/src/java/com/cloudera/sqoop/tool/VersionTool.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.tool; +package com.cloudera.sqoop.tool; -import org.apache.hadoop.sqoop.SqoopOptions; -import org.apache.hadoop.sqoop.SqoopVersion; -import org.apache.hadoop.sqoop.cli.ToolOptions; +import com.cloudera.sqoop.SqoopOptions; +import com.cloudera.sqoop.SqoopVersion; +import com.cloudera.sqoop.cli.ToolOptions; /** * Tool that prints Sqoop's version. diff --git a/src/java/org/apache/hadoop/sqoop/util/AsyncSink.java b/src/java/com/cloudera/sqoop/util/AsyncSink.java similarity index 97% rename from src/java/org/apache/hadoop/sqoop/util/AsyncSink.java rename to src/java/com/cloudera/sqoop/util/AsyncSink.java index 292a0bdf..9b748d89 100644 --- a/src/java/org/apache/hadoop/sqoop/util/AsyncSink.java +++ b/src/java/com/cloudera/sqoop/util/AsyncSink.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.util; +package com.cloudera.sqoop.util; import java.io.InputStream; diff --git a/src/java/org/apache/hadoop/sqoop/util/ClassLoaderStack.java b/src/java/com/cloudera/sqoop/util/ClassLoaderStack.java similarity index 98% rename from src/java/org/apache/hadoop/sqoop/util/ClassLoaderStack.java rename to src/java/com/cloudera/sqoop/util/ClassLoaderStack.java index fbdff986..7b402c6e 100644 --- a/src/java/org/apache/hadoop/sqoop/util/ClassLoaderStack.java +++ b/src/java/com/cloudera/sqoop/util/ClassLoaderStack.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.util; +package com.cloudera.sqoop.util; import java.io.File; import java.io.IOException; diff --git a/src/java/org/apache/hadoop/sqoop/util/DirectImportUtils.java b/src/java/com/cloudera/sqoop/util/DirectImportUtils.java similarity index 94% rename from src/java/org/apache/hadoop/sqoop/util/DirectImportUtils.java rename to src/java/com/cloudera/sqoop/util/DirectImportUtils.java index 74077e27..538a78e2 100644 --- a/src/java/org/apache/hadoop/sqoop/util/DirectImportUtils.java +++ b/src/java/com/cloudera/sqoop/util/DirectImportUtils.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.util; +package com.cloudera.sqoop.util; import java.io.IOException; import java.io.File; @@ -29,9 +29,9 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.sqoop.SqoopOptions; -import org.apache.hadoop.sqoop.io.SplittingOutputStream; -import org.apache.hadoop.sqoop.io.SplittableBufferedWriter; +import com.cloudera.sqoop.SqoopOptions; +import com.cloudera.sqoop.io.SplittingOutputStream; +import com.cloudera.sqoop.io.SplittableBufferedWriter; import org.apache.hadoop.util.Shell; /** diff --git a/src/java/org/apache/hadoop/sqoop/util/ErrorableAsyncSink.java b/src/java/com/cloudera/sqoop/util/ErrorableAsyncSink.java similarity index 96% rename from src/java/org/apache/hadoop/sqoop/util/ErrorableAsyncSink.java rename to src/java/com/cloudera/sqoop/util/ErrorableAsyncSink.java index ca7e8eb7..b7f83db1 100644 --- a/src/java/org/apache/hadoop/sqoop/util/ErrorableAsyncSink.java +++ b/src/java/com/cloudera/sqoop/util/ErrorableAsyncSink.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.util; +package com.cloudera.sqoop.util; /** * Partial implementation of AsyncSink that relies on ErrorableThread to diff --git a/src/java/org/apache/hadoop/sqoop/util/ErrorableThread.java b/src/java/com/cloudera/sqoop/util/ErrorableThread.java similarity index 96% rename from src/java/org/apache/hadoop/sqoop/util/ErrorableThread.java rename to src/java/com/cloudera/sqoop/util/ErrorableThread.java index 6201fb74..a8621795 100644 --- a/src/java/org/apache/hadoop/sqoop/util/ErrorableThread.java +++ b/src/java/com/cloudera/sqoop/util/ErrorableThread.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.util; +package com.cloudera.sqoop.util; /** * A thread which has an error bit which can be set from within the thread. diff --git a/src/java/org/apache/hadoop/sqoop/util/Executor.java b/src/java/com/cloudera/sqoop/util/Executor.java similarity index 98% rename from src/java/org/apache/hadoop/sqoop/util/Executor.java rename to src/java/com/cloudera/sqoop/util/Executor.java index bcd2e604..46da59af 100644 --- a/src/java/org/apache/hadoop/sqoop/util/Executor.java +++ b/src/java/com/cloudera/sqoop/util/Executor.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.util; +package com.cloudera.sqoop.util; import java.io.IOException; import java.util.ArrayList; diff --git a/src/java/org/apache/hadoop/sqoop/util/ExportException.java b/src/java/com/cloudera/sqoop/util/ExportException.java similarity index 97% rename from src/java/org/apache/hadoop/sqoop/util/ExportException.java rename to src/java/com/cloudera/sqoop/util/ExportException.java index b6f16740..856f7987 100644 --- a/src/java/org/apache/hadoop/sqoop/util/ExportException.java +++ b/src/java/com/cloudera/sqoop/util/ExportException.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.util; +package com.cloudera.sqoop.util; /** * General error during export process. diff --git a/src/java/org/apache/hadoop/sqoop/util/FileListing.java b/src/java/com/cloudera/sqoop/util/FileListing.java similarity index 99% rename from src/java/org/apache/hadoop/sqoop/util/FileListing.java rename to src/java/com/cloudera/sqoop/util/FileListing.java index dbd62b07..fca7dca8 100644 --- a/src/java/org/apache/hadoop/sqoop/util/FileListing.java +++ b/src/java/com/cloudera/sqoop/util/FileListing.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.util; +package com.cloudera.sqoop.util; import java.util.Arrays; import java.util.ArrayList; diff --git a/src/java/org/apache/hadoop/sqoop/util/ImportException.java b/src/java/com/cloudera/sqoop/util/ImportException.java similarity index 97% rename from src/java/org/apache/hadoop/sqoop/util/ImportException.java rename to src/java/com/cloudera/sqoop/util/ImportException.java index 64d74ed9..e60d2379 100644 --- a/src/java/org/apache/hadoop/sqoop/util/ImportException.java +++ b/src/java/com/cloudera/sqoop/util/ImportException.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.util; +package com.cloudera.sqoop.util; /** * General error during the import process. diff --git a/src/java/org/apache/hadoop/sqoop/util/JdbcUrl.java b/src/java/com/cloudera/sqoop/util/JdbcUrl.java similarity index 99% rename from src/java/org/apache/hadoop/sqoop/util/JdbcUrl.java rename to src/java/com/cloudera/sqoop/util/JdbcUrl.java index 802aa182..7140364a 100644 --- a/src/java/org/apache/hadoop/sqoop/util/JdbcUrl.java +++ b/src/java/com/cloudera/sqoop/util/JdbcUrl.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.util; +package com.cloudera.sqoop.util; import java.net.MalformedURLException; import java.net.URL; diff --git a/src/java/org/apache/hadoop/sqoop/util/LoggingAsyncSink.java b/src/java/com/cloudera/sqoop/util/LoggingAsyncSink.java similarity index 98% rename from src/java/org/apache/hadoop/sqoop/util/LoggingAsyncSink.java rename to src/java/com/cloudera/sqoop/util/LoggingAsyncSink.java index bbf10a0e..82a55af4 100644 --- a/src/java/org/apache/hadoop/sqoop/util/LoggingAsyncSink.java +++ b/src/java/com/cloudera/sqoop/util/LoggingAsyncSink.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.util; +package com.cloudera.sqoop.util; import java.io.BufferedReader; import java.io.InputStream; diff --git a/src/java/org/apache/hadoop/sqoop/util/NullAsyncSink.java b/src/java/com/cloudera/sqoop/util/NullAsyncSink.java similarity index 98% rename from src/java/org/apache/hadoop/sqoop/util/NullAsyncSink.java rename to src/java/com/cloudera/sqoop/util/NullAsyncSink.java index 94c7270e..6dda4966 100644 --- a/src/java/org/apache/hadoop/sqoop/util/NullAsyncSink.java +++ b/src/java/com/cloudera/sqoop/util/NullAsyncSink.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.util; +package com.cloudera.sqoop.util; import java.io.BufferedReader; import java.io.InputStream; diff --git a/src/java/org/apache/hadoop/sqoop/util/PerfCounters.java b/src/java/com/cloudera/sqoop/util/PerfCounters.java similarity index 98% rename from src/java/org/apache/hadoop/sqoop/util/PerfCounters.java rename to src/java/com/cloudera/sqoop/util/PerfCounters.java index 671e1974..b4411501 100644 --- a/src/java/org/apache/hadoop/sqoop/util/PerfCounters.java +++ b/src/java/com/cloudera/sqoop/util/PerfCounters.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.util; +package com.cloudera.sqoop.util; import java.text.NumberFormat; diff --git a/src/java/org/apache/hadoop/sqoop/util/ResultSetPrinter.java b/src/java/com/cloudera/sqoop/util/ResultSetPrinter.java similarity index 98% rename from src/java/org/apache/hadoop/sqoop/util/ResultSetPrinter.java rename to src/java/com/cloudera/sqoop/util/ResultSetPrinter.java index d13969bb..840ca45d 100644 --- a/src/java/org/apache/hadoop/sqoop/util/ResultSetPrinter.java +++ b/src/java/com/cloudera/sqoop/util/ResultSetPrinter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.sqoop.util; +package com.cloudera.sqoop.util; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/perftest/ExportStressTest.java b/src/perftest/ExportStressTest.java index a2a18fb3..4d4e29ed 100644 --- a/src/perftest/ExportStressTest.java +++ b/src/perftest/ExportStressTest.java @@ -23,10 +23,10 @@ import org.apache.hadoop.conf.*; import org.apache.hadoop.util.*; -import org.apache.hadoop.sqoop.Sqoop; -import org.apache.hadoop.sqoop.SqoopOptions; -import org.apache.hadoop.sqoop.tool.ExportTool; -import org.apache.hadoop.sqoop.tool.SqoopTool; +import com.cloudera.sqoop.Sqoop; +import com.cloudera.sqoop.SqoopOptions; +import com.cloudera.sqoop.tool.ExportTool; +import com.cloudera.sqoop.tool.SqoopTool; /** * Stress test export procedure by running a large-scale export to MySQL. diff --git a/src/perftest/LobFilePerfTest.java b/src/perftest/LobFilePerfTest.java index 28d16d43..63f387d1 100644 --- a/src/perftest/LobFilePerfTest.java +++ b/src/perftest/LobFilePerfTest.java @@ -19,7 +19,7 @@ import java.io.*; import org.apache.hadoop.fs.*; import org.apache.hadoop.conf.*; -import org.apache.hadoop.sqoop.io.*; +import com.cloudera.sqoop.io.*; /** * A simple benchmark to performance test LobFile reader/writer speed. diff --git a/src/perftest/LobFileStressTest.java b/src/perftest/LobFileStressTest.java index ee197284..b2330198 100644 --- a/src/perftest/LobFileStressTest.java +++ b/src/perftest/LobFileStressTest.java @@ -20,7 +20,7 @@ import java.util.*; import org.apache.hadoop.fs.*; import org.apache.hadoop.conf.*; -import org.apache.hadoop.sqoop.io.*; +import com.cloudera.sqoop.io.*; /** * Stress test LobFiles by writing a bunch of different files and reading diff --git a/src/scripts/write-version-info.sh b/src/scripts/write-version-info.sh index 651b309a..e9ebd937 100755 --- a/src/scripts/write-version-info.sh +++ b/src/scripts/write-version-info.sh @@ -27,7 +27,7 @@ buildroot=$1 version=$2 -outputdir=${buildroot}/src/org/apache/hadoop/sqoop +outputdir=${buildroot}/src/com.cloudera.sqoop outputfile=${outputdir}/SqoopVersion.java signature=`git log -1 --pretty=format:%H` @@ -37,7 +37,7 @@ compiledate=`date` mkdir -p ${outputdir} cat > ${outputfile} < - + - +