http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/AsyncSqlOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/AsyncSqlOutputFormat.java 
b/src/java/com/cloudera/sqoop/mapreduce/AsyncSqlOutputFormat.java
deleted file mode 100644
index ccd2be5..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/AsyncSqlOutputFormat.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import com.cloudera.sqoop.lib.SqoopRecord;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public abstract class AsyncSqlOutputFormat<K extends SqoopRecord, V>
-    extends org.apache.sqoop.mapreduce.AsyncSqlOutputFormat<K, V> {
-
-  public static final String RECORDS_PER_STATEMENT_KEY =
-      org.apache.sqoop.mapreduce.AsyncSqlOutputFormat.
-      RECORDS_PER_STATEMENT_KEY;
-
-  public static final String STATEMENTS_PER_TRANSACTION_KEY =
-      org.apache.sqoop.mapreduce.AsyncSqlOutputFormat.
-      STATEMENTS_PER_TRANSACTION_KEY;
-
-  public static final int DEFAULT_RECORDS_PER_STATEMENT =
-      org.apache.sqoop.mapreduce.AsyncSqlOutputFormat.
-      DEFAULT_RECORDS_PER_STATEMENT;
-
-  public static final int DEFAULT_STATEMENTS_PER_TRANSACTION =
-      org.apache.sqoop.mapreduce.AsyncSqlOutputFormat.
-      DEFAULT_STATEMENTS_PER_TRANSACTION;
-
-  public static final int UNLIMITED_STATEMENTS_PER_TRANSACTION =
-      org.apache.sqoop.mapreduce.AsyncSqlOutputFormat.
-      UNLIMITED_STATEMENTS_PER_TRANSACTION;
-
-  /**
-   * @deprecated Moving to use org.apache.sqoop namespace.
-   */
-  public static class AsyncDBOperation
-      extends org.apache.sqoop.mapreduce.AsyncSqlOutputFormat.
-      AsyncDBOperation {
-
-    public AsyncDBOperation(PreparedStatement s, boolean commitAndClose,
-        boolean batch) {
-        super(s, commitAndClose, batch);
-    }
-
-    public AsyncDBOperation(PreparedStatement s, boolean batch,
-        boolean commit, boolean stopThread) {
-      super(s, batch, commit, stopThread);
-    }
-
-  }
-
-  /**
-   * @deprecated Moving to use org.apache.sqoop namespace.
-   */
-  public static class AsyncSqlExecThread
-      extends org.apache.sqoop.mapreduce.AsyncSqlOutputFormat.
-      AsyncSqlExecThread{
-
-    public AsyncSqlExecThread(Connection conn, int stmtsPerTx) {
-      super(conn, stmtsPerTx);
-    }
-
-  }
-}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/AsyncSqlRecordWriter.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/AsyncSqlRecordWriter.java 
b/src/java/com/cloudera/sqoop/mapreduce/AsyncSqlRecordWriter.java
deleted file mode 100644
index 265dc27..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/AsyncSqlRecordWriter.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-import java.sql.SQLException;
-import org.apache.hadoop.mapreduce.TaskAttemptContext;
-import com.cloudera.sqoop.lib.SqoopRecord;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public abstract class AsyncSqlRecordWriter<K extends SqoopRecord, V>
-    extends org.apache.sqoop.mapreduce.AsyncSqlRecordWriter<K, V> {
-
-  public AsyncSqlRecordWriter(TaskAttemptContext context)
-      throws ClassNotFoundException, SQLException {
-    super(context);
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/AutoProgressMapper.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/AutoProgressMapper.java 
b/src/java/com/cloudera/sqoop/mapreduce/AutoProgressMapper.java
deleted file mode 100644
index ee8ab6d..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/AutoProgressMapper.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class AutoProgressMapper<KEYIN, VALIN, KEYOUT, VALOUT>
-    extends org.apache.sqoop.mapreduce.AutoProgressMapper
-    <KEYIN, VALIN, KEYOUT, VALOUT> {
-
-  public static final String MAX_PROGRESS_PERIOD_KEY =
-      org.apache.sqoop.mapreduce.AutoProgressMapper.MAX_PROGRESS_PERIOD_KEY;
-  public static final String SLEEP_INTERVAL_KEY =
-      org.apache.sqoop.mapreduce.AutoProgressMapper.SLEEP_INTERVAL_KEY;
-  public static final String REPORT_INTERVAL_KEY =
-      org.apache.sqoop.mapreduce.AutoProgressMapper.REPORT_INTERVAL_KEY;
-
-  public static final int DEFAULT_SLEEP_INTERVAL =
-      org.apache.sqoop.mapreduce.AutoProgressMapper.DEFAULT_SLEEP_INTERVAL;
-  public static final int DEFAULT_REPORT_INTERVAL =
-      org.apache.sqoop.mapreduce.AutoProgressMapper.DEFAULT_REPORT_INTERVAL;
-  public static final int DEFAULT_MAX_PROGRESS =
-      org.apache.sqoop.mapreduce.AutoProgressMapper.DEFAULT_MAX_PROGRESS;
-
-}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/AvroExportMapper.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/AvroExportMapper.java 
b/src/java/com/cloudera/sqoop/mapreduce/AvroExportMapper.java
deleted file mode 100644
index 725b9d0..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/AvroExportMapper.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class AvroExportMapper
-    extends org.apache.sqoop.mapreduce.AvroExportMapper {
-
-  public static final String AVRO_COLUMN_TYPES_MAP =
-      org.apache.sqoop.mapreduce.AvroExportMapper.AVRO_COLUMN_TYPES_MAP;
-
-}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/AvroImportMapper.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/AvroImportMapper.java 
b/src/java/com/cloudera/sqoop/mapreduce/AvroImportMapper.java
deleted file mode 100644
index 08b5788..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/AvroImportMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class AvroImportMapper
-    extends org.apache.sqoop.mapreduce.AvroImportMapper {
-}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/AvroInputFormat.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/AvroInputFormat.java 
b/src/java/com/cloudera/sqoop/mapreduce/AvroInputFormat.java
deleted file mode 100644
index 2491012..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/AvroInputFormat.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class AvroInputFormat<T>
-    extends org.apache.sqoop.mapreduce.AvroInputFormat<T> {
-}
-

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/AvroJob.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/AvroJob.java 
b/src/java/com/cloudera/sqoop/mapreduce/AvroJob.java
deleted file mode 100644
index 1ba22a5..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/AvroJob.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-import org.apache.avro.Schema;
-import org.apache.hadoop.conf.Configuration;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public final class AvroJob {
-
-  public static final String MAP_OUTPUT_SCHEMA =
-      org.apache.sqoop.mapreduce.AvroJob.MAP_OUTPUT_SCHEMA;
-
-  private AvroJob() { }
-
-  public static void setMapOutputSchema(Configuration job, Schema s) {
-    org.apache.sqoop.mapreduce.AvroJob.setMapOutputSchema(job, s);
-  }
-
-  public static Schema getMapOutputSchema(Configuration job) {
-    return org.apache.sqoop.mapreduce.AvroJob.getMapOutputSchema(job);
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/AvroOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/AvroOutputFormat.java 
b/src/java/com/cloudera/sqoop/mapreduce/AvroOutputFormat.java
deleted file mode 100644
index 40b4368..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/AvroOutputFormat.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class AvroOutputFormat<T>
-    extends org.apache.sqoop.mapreduce.AvroOutputFormat<T> {
-}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/AvroRecordReader.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/AvroRecordReader.java 
b/src/java/com/cloudera/sqoop/mapreduce/AvroRecordReader.java
deleted file mode 100644
index 8f34128..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/AvroRecordReader.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class AvroRecordReader<T>
-    extends org.apache.sqoop.mapreduce.AvroRecordReader<T> {
-}
-

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/CombineShimRecordReader.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/CombineShimRecordReader.java 
b/src/java/com/cloudera/sqoop/mapreduce/CombineShimRecordReader.java
deleted file mode 100644
index 7fb7c22..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/CombineShimRecordReader.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-import java.io.IOException;
-import org.apache.hadoop.mapreduce.TaskAttemptContext;
-import org.apache.sqoop.mapreduce.CombineFileSplit;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class CombineShimRecordReader
-    extends org.apache.sqoop.mapreduce.CombineShimRecordReader {
-
-  public CombineShimRecordReader(CombineFileSplit split,
-      TaskAttemptContext context, Integer index)
-      throws IOException, InterruptedException {
-    super(split, context, index);
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/DataDrivenImportJob.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/DataDrivenImportJob.java 
b/src/java/com/cloudera/sqoop/mapreduce/DataDrivenImportJob.java
deleted file mode 100644
index 2a648a0..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/DataDrivenImportJob.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-import com.cloudera.sqoop.SqoopOptions;
-import com.cloudera.sqoop.manager.ImportJobContext;
-import org.apache.hadoop.mapreduce.InputFormat;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class DataDrivenImportJob
-    extends org.apache.sqoop.mapreduce.DataDrivenImportJob {
-
-  public DataDrivenImportJob(final SqoopOptions opts) {
-    super(opts);
-  }
-
-  public DataDrivenImportJob(final SqoopOptions opts,
-      final Class<? extends InputFormat> inputFormatClass,
-      ImportJobContext context) {
-    super(opts, inputFormatClass, context);
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/DelegatingOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/DelegatingOutputFormat.java 
b/src/java/com/cloudera/sqoop/mapreduce/DelegatingOutputFormat.java
deleted file mode 100644
index 2994d21..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/DelegatingOutputFormat.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-import com.cloudera.sqoop.lib.FieldMappable;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class DelegatingOutputFormat<K extends FieldMappable, V>
-    extends org.apache.sqoop.mapreduce.DelegatingOutputFormat<K, V> {
-
-  public static final String DELEGATE_CLASS_KEY =
-      org.apache.sqoop.mapreduce.DelegatingOutputFormat.DELEGATE_CLASS_KEY;
-
-}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/ExportBatchOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/ExportBatchOutputFormat.java 
b/src/java/com/cloudera/sqoop/mapreduce/ExportBatchOutputFormat.java
deleted file mode 100644
index 030bcbe..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/ExportBatchOutputFormat.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-import com.cloudera.sqoop.lib.SqoopRecord;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class ExportBatchOutputFormat<K extends SqoopRecord, V>
-    extends org.apache.sqoop.mapreduce.ExportBatchOutputFormat
-    <SqoopRecord, V> {
-}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/ExportInputFormat.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/ExportInputFormat.java 
b/src/java/com/cloudera/sqoop/mapreduce/ExportInputFormat.java
deleted file mode 100644
index e0ad15b..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/ExportInputFormat.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-import org.apache.hadoop.mapreduce.JobContext;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class ExportInputFormat
-   extends org.apache.sqoop.mapreduce.ExportInputFormat {
-
-  public static final int DEFAULT_NUM_MAP_TASKS =
-      org.apache.sqoop.mapreduce.ExportInputFormat.DEFAULT_NUM_MAP_TASKS;
-
-  public static void setNumMapTasks(JobContext job, int numTasks) {
-    org.apache.sqoop.mapreduce.ExportInputFormat.setNumMapTasks(job, numTasks);
-  }
-
-  public static int getNumMapTasks(JobContext job) {
-    return org.apache.sqoop.mapreduce.ExportInputFormat.getNumMapTasks(job);
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/ExportJobBase.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/ExportJobBase.java 
b/src/java/com/cloudera/sqoop/mapreduce/ExportJobBase.java
deleted file mode 100644
index 026b5e4..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/ExportJobBase.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-import java.io.IOException;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.mapreduce.InputFormat;
-import org.apache.hadoop.mapreduce.Mapper;
-import org.apache.hadoop.mapreduce.OutputFormat;
-import com.cloudera.sqoop.manager.ExportJobContext;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class ExportJobBase
-    extends org.apache.sqoop.mapreduce.ExportJobBase {
-
-  public static final String SQOOP_EXPORT_TABLE_CLASS_KEY =
-      org.apache.sqoop.mapreduce.ExportJobBase.SQOOP_EXPORT_TABLE_CLASS_KEY;
-
-  public static final String SQOOP_EXPORT_UPDATE_COL_KEY =
-      org.apache.sqoop.mapreduce.ExportJobBase.SQOOP_EXPORT_UPDATE_COL_KEY;
-
-  public static final String EXPORT_MAP_TASKS_KEY =
-      org.apache.sqoop.mapreduce.ExportJobBase.EXPORT_MAP_TASKS_KEY;
-
-  public ExportJobBase(final ExportJobContext ctxt) {
-    super(ctxt);
-  }
-
-  public ExportJobBase(final ExportJobContext ctxt,
-      final Class<? extends Mapper> mapperClass,
-      final Class<? extends InputFormat> inputFormatClass,
-      final Class<? extends OutputFormat> outputFormatClass) {
-    super(ctxt, mapperClass, inputFormatClass, outputFormatClass);
-  }
-
-  public static boolean isSequenceFiles(Configuration conf, Path p)
-      throws IOException {
-    return org.apache.sqoop.mapreduce.ExportJobBase.isSequenceFiles(conf, p);
-  }
-
-  public static FileType getFileType(Configuration conf, Path p)
-      throws IOException {
-    return org.apache.sqoop.mapreduce.ExportJobBase.getFileType(conf, p);
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/ExportOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/ExportOutputFormat.java 
b/src/java/com/cloudera/sqoop/mapreduce/ExportOutputFormat.java
deleted file mode 100644
index 2b99552..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/ExportOutputFormat.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-import com.cloudera.sqoop.lib.SqoopRecord;
-import org.apache.hadoop.mapreduce.TaskAttemptContext;
-
-import java.sql.SQLException;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class ExportOutputFormat<K extends SqoopRecord, V>
-    extends org.apache.sqoop.mapreduce.ExportOutputFormat<K, V> {
-
-  /** {@inheritDoc}. **/
-  public class ExportRecordWriter<K extends SqoopRecord, V> extends
-    org.apache.sqoop.mapreduce.ExportOutputFormat<K, V>.ExportRecordWriter {
-
-    public ExportRecordWriter(TaskAttemptContext context)
-      throws ClassNotFoundException, SQLException {
-      super(context);
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/HBaseImportJob.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/HBaseImportJob.java 
b/src/java/com/cloudera/sqoop/mapreduce/HBaseImportJob.java
deleted file mode 100644
index b3d8ec6..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/HBaseImportJob.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import com.cloudera.sqoop.SqoopOptions;
-import com.cloudera.sqoop.manager.ImportJobContext;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class HBaseImportJob
-    extends org.apache.sqoop.mapreduce.HBaseImportJob {
-
-  public static final Log LOG = LogFactory.getLog(
-      HBaseImportJob.class.getName());
-
-  public HBaseImportJob(final SqoopOptions opts,
-      final ImportJobContext importContext) {
-    super(opts, importContext);
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/HBaseImportMapper.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/HBaseImportMapper.java 
b/src/java/com/cloudera/sqoop/mapreduce/HBaseImportMapper.java
deleted file mode 100644
index 1fbc333..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/HBaseImportMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class HBaseImportMapper
-    extends org.apache.sqoop.mapreduce.HBaseImportMapper {
-}
-

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/ImportJobBase.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/ImportJobBase.java 
b/src/java/com/cloudera/sqoop/mapreduce/ImportJobBase.java
deleted file mode 100644
index c9fe8e5..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/ImportJobBase.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-import org.apache.hadoop.mapreduce.InputFormat;
-import org.apache.hadoop.mapreduce.Mapper;
-import org.apache.hadoop.mapreduce.OutputFormat;
-import com.cloudera.sqoop.SqoopOptions;
-import com.cloudera.sqoop.manager.ImportJobContext;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class ImportJobBase
-    extends org.apache.sqoop.mapreduce.ImportJobBase {
-
-  public ImportJobBase() {
-    super();
-  }
-
-  public ImportJobBase(final SqoopOptions opts) {
-    super(opts);
-  }
-
-  public ImportJobBase(final SqoopOptions opts,
-      final Class<? extends Mapper> mapperClass,
-      final Class<? extends InputFormat> inputFormatClass,
-      final Class<? extends OutputFormat> outputFormatClass,
-      final ImportJobContext context) {
-    super(opts, mapperClass, inputFormatClass, outputFormatClass, context);
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/JdbcExportJob.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/JdbcExportJob.java 
b/src/java/com/cloudera/sqoop/mapreduce/JdbcExportJob.java
deleted file mode 100644
index d0baeaf..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/JdbcExportJob.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-import org.apache.hadoop.mapreduce.InputFormat;
-import org.apache.hadoop.mapreduce.Mapper;
-import org.apache.hadoop.mapreduce.OutputFormat;
-import com.cloudera.sqoop.manager.ExportJobContext;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class JdbcExportJob
-    extends org.apache.sqoop.mapreduce.JdbcExportJob {
-
-  public JdbcExportJob(final ExportJobContext context) {
-    super(context);
-  }
-
-  public JdbcExportJob(final ExportJobContext ctxt,
-      final Class<? extends Mapper> mapperClass,
-      final Class<? extends InputFormat> inputFormatClass,
-      final Class<? extends OutputFormat> outputFormatClass) {
-    super(ctxt, mapperClass, inputFormatClass, outputFormatClass);
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/JdbcUpdateExportJob.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/JdbcUpdateExportJob.java 
b/src/java/com/cloudera/sqoop/mapreduce/JdbcUpdateExportJob.java
deleted file mode 100644
index 5d282ba..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/JdbcUpdateExportJob.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-import java.io.IOException;
-import org.apache.hadoop.mapreduce.InputFormat;
-import org.apache.hadoop.mapreduce.Mapper;
-import org.apache.hadoop.mapreduce.OutputFormat;
-import com.cloudera.sqoop.manager.ExportJobContext;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class JdbcUpdateExportJob
-    extends org.apache.sqoop.mapreduce.JdbcUpdateExportJob {
-
-  public JdbcUpdateExportJob(final ExportJobContext context)
-      throws IOException {
-    super(context);
-  }
-
-  public JdbcUpdateExportJob(final ExportJobContext ctxt,
-      final Class<? extends Mapper> mapperClass,
-      final Class<? extends InputFormat> inputFormatClass,
-      final Class<? extends OutputFormat> outputFormatClass) {
-    super(ctxt, mapperClass, inputFormatClass, outputFormatClass);
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/JdbcUpsertExportJob.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/JdbcUpsertExportJob.java 
b/src/java/com/cloudera/sqoop/mapreduce/JdbcUpsertExportJob.java
deleted file mode 100644
index c23f234..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/JdbcUpsertExportJob.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-import java.io.IOException;
-import org.apache.hadoop.mapreduce.OutputFormat;
-import com.cloudera.sqoop.manager.ExportJobContext;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class JdbcUpsertExportJob
-    extends org.apache.sqoop.mapreduce.JdbcUpsertExportJob {
-
-  public JdbcUpsertExportJob(final ExportJobContext context,
-      final Class<? extends OutputFormat> outputFormatClass)
-      throws IOException {
-    super(context, outputFormatClass);
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/JobBase.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/JobBase.java 
b/src/java/com/cloudera/sqoop/mapreduce/JobBase.java
deleted file mode 100644
index 974422a..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/JobBase.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-import java.io.IOException;
-import java.sql.SQLException;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.mapreduce.InputFormat;
-import org.apache.hadoop.mapreduce.Job;
-import org.apache.hadoop.mapreduce.Mapper;
-import org.apache.hadoop.mapreduce.OutputFormat;
-import org.apache.hadoop.util.ReflectionUtils;
-import org.apache.sqoop.config.ConfigurationHelper;
-import org.apache.sqoop.manager.ConnManager;
-import org.apache.sqoop.validation.ValidationContext;
-import org.apache.sqoop.validation.ValidationException;
-import org.apache.sqoop.validation.ValidationFailureHandler;
-import org.apache.sqoop.validation.ValidationThreshold;
-import org.apache.sqoop.validation.Validator;
-
-import com.cloudera.sqoop.SqoopOptions;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-@Deprecated
-public class JobBase
-    extends org.apache.sqoop.mapreduce.JobBase {
-
-  public JobBase() {
-    super();
-  }
-
-  public JobBase(final SqoopOptions opts) {
-    super(opts);
-  }
-
-  public JobBase(final SqoopOptions opts,
-      final Class<? extends Mapper> mapperClass,
-      final Class<? extends InputFormat> inputFormatClass,
-      final Class<? extends OutputFormat> outputFormatClass) {
-    super(opts, mapperClass, inputFormatClass, outputFormatClass);
-  }
-
-  protected long getRowCountFromDB(ConnManager connManager, String tableName)
-    throws SQLException {
-    return connManager.getTableRowCount(tableName);
-  }
-
-  protected long getRowCountFromHadoop(Job job)
-    throws IOException, InterruptedException {
-    return ConfigurationHelper.getNumMapOutputRecords(job);
-  }
-
-  protected void doValidate(SqoopOptions options, Configuration conf,
-                            ValidationContext validationContext)
-    throws ValidationException {
-    Validator validator = (Validator) ReflectionUtils.newInstance(
-        options.getValidatorClass(), conf);
-    ValidationThreshold threshold = (ValidationThreshold)
-        ReflectionUtils.newInstance(options.getValidationThresholdClass(),
-          conf);
-    ValidationFailureHandler failureHandler = (ValidationFailureHandler)
-        ReflectionUtils.newInstance(options.getValidationFailureHandlerClass(),
-          conf);
-
-    StringBuilder sb = new StringBuilder();
-    sb.append("Validating the integrity of the import using the "
-      + "following configuration\n");
-    sb.append("\tValidator : ").append(validator.getClass().getName())
-      .append('\n');
-    sb.append("\tThreshold Specifier : ")
-      .append(threshold.getClass().getName()).append('\n');
-    sb.append("\tFailure Handler : ")
-      .append(failureHandler.getClass().getName()).append('\n');
-    LOG.info(sb.toString());
-    validator.validate(validationContext, threshold, failureHandler);
-  }
-}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/MergeJob.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/MergeJob.java 
b/src/java/com/cloudera/sqoop/mapreduce/MergeJob.java
deleted file mode 100644
index 5b21343..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/MergeJob.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-import com.cloudera.sqoop.SqoopOptions;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class MergeJob
-    extends org.apache.sqoop.mapreduce.MergeJob {
-
-  public static final String MERGE_OLD_PATH_KEY =
-      org.apache.sqoop.mapreduce.MergeJob.MERGE_OLD_PATH_KEY;
-  public static final String MERGE_NEW_PATH_KEY =
-      org.apache.sqoop.mapreduce.MergeJob.MERGE_NEW_PATH_KEY;
-  public static final String MERGE_KEY_COL_KEY =
-      org.apache.sqoop.mapreduce.MergeJob.MERGE_KEY_COL_KEY;
-  public static final String MERGE_SQOOP_RECORD_KEY =
-      org.apache.sqoop.mapreduce.MergeJob.MERGE_SQOOP_RECORD_KEY;
-
-  public MergeJob(final SqoopOptions opts) {
-    super(opts);
-  }
-
-}
-
-

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/MergeMapperBase.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/MergeMapperBase.java 
b/src/java/com/cloudera/sqoop/mapreduce/MergeMapperBase.java
deleted file mode 100644
index 083c8dc..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/MergeMapperBase.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class MergeMapperBase<INKEY, INVAL>
-    extends org.apache.sqoop.mapreduce.MergeMapperBase<INKEY, INVAL> {
-}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/MergeRecord.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/MergeRecord.java 
b/src/java/com/cloudera/sqoop/mapreduce/MergeRecord.java
deleted file mode 100644
index 0494c05..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/MergeRecord.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-import com.cloudera.sqoop.lib.SqoopRecord;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class MergeRecord
-    extends org.apache.sqoop.mapreduce.MergeRecord {
-
-  public MergeRecord() {
-    super();
-  }
-
-  public MergeRecord(SqoopRecord sr, boolean recordIsNew) {
-    super(sr, recordIsNew);
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/MergeRecordMapper.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/MergeRecordMapper.java 
b/src/java/com/cloudera/sqoop/mapreduce/MergeRecordMapper.java
deleted file mode 100644
index a9acf9e..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/MergeRecordMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class MergeRecordMapper
-    extends org.apache.sqoop.mapreduce.MergeRecordMapper {
-}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/MergeReducer.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/MergeReducer.java 
b/src/java/com/cloudera/sqoop/mapreduce/MergeReducer.java
deleted file mode 100644
index e3ecde3..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/MergeReducer.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class MergeReducer
-    extends org.apache.sqoop.mapreduce.MergeReducer {
-}
-

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/MergeTextMapper.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/MergeTextMapper.java 
b/src/java/com/cloudera/sqoop/mapreduce/MergeTextMapper.java
deleted file mode 100644
index d4d7d02..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/MergeTextMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class MergeTextMapper
-    extends org.apache.sqoop.mapreduce.MergeTextMapper {
-}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/MySQLDumpImportJob.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/MySQLDumpImportJob.java 
b/src/java/com/cloudera/sqoop/mapreduce/MySQLDumpImportJob.java
deleted file mode 100644
index a6d0de6..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/MySQLDumpImportJob.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-import com.cloudera.sqoop.SqoopOptions;
-import com.cloudera.sqoop.manager.ImportJobContext;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class MySQLDumpImportJob
-    extends org.apache.sqoop.mapreduce.MySQLDumpImportJob {
-
-  public MySQLDumpImportJob(final SqoopOptions opts, ImportJobContext context)
-      throws ClassNotFoundException {
-    super(opts, context);
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/MySQLDumpInputFormat.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/MySQLDumpInputFormat.java 
b/src/java/com/cloudera/sqoop/mapreduce/MySQLDumpInputFormat.java
deleted file mode 100644
index 066e4e0..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/MySQLDumpInputFormat.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class MySQLDumpInputFormat
-    extends org.apache.sqoop.mapreduce.MySQLDumpInputFormat {
-}
-

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/MySQLDumpMapper.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/MySQLDumpMapper.java 
b/src/java/com/cloudera/sqoop/mapreduce/MySQLDumpMapper.java
deleted file mode 100644
index b6fe39f..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/MySQLDumpMapper.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-import org.apache.hadoop.conf.Configuration;
-import com.cloudera.sqoop.util.PerfCounters;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class MySQLDumpMapper
-    extends org.apache.sqoop.mapreduce.MySQLDumpMapper {
-
-  /**
-   * @deprecated Moving to use org.apache.sqoop namespace.
-   */
-  public static class CopyingAsyncSink
-      extends org.apache.sqoop.mapreduce.MySQLDumpMapper.CopyingAsyncSink {
-
-    protected CopyingAsyncSink(final MySQLDumpMapper.Context context,
-        final PerfCounters ctrs) {
-      super(context, ctrs);
-    }
-
-  }
-
-  /**
-   * @deprecated Moving to use org.apache.sqoop namespace.
-   */
-  public static class ReparsingAsyncSink
-      extends org.apache.sqoop.mapreduce.MySQLDumpMapper.ReparsingAsyncSink {
-
-    protected ReparsingAsyncSink(final MySQLDumpMapper.Context c,
-        final Configuration conf, final PerfCounters ctrs) {
-      super(c, conf, ctrs);
-    }
-
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/MySQLExportJob.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/MySQLExportJob.java 
b/src/java/com/cloudera/sqoop/mapreduce/MySQLExportJob.java
deleted file mode 100644
index 2eb8442..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/MySQLExportJob.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-import com.cloudera.sqoop.manager.ExportJobContext;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class MySQLExportJob
-    extends org.apache.sqoop.mapreduce.MySQLExportJob {
-
-  public MySQLExportJob(final ExportJobContext context) {
-    super(context);
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/MySQLExportMapper.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/MySQLExportMapper.java 
b/src/java/com/cloudera/sqoop/mapreduce/MySQLExportMapper.java
deleted file mode 100644
index 30046dd..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/MySQLExportMapper.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class MySQLExportMapper<KEYIN, VALIN>
-    extends org.apache.sqoop.mapreduce.MySQLExportMapper<KEYIN, VALIN> {
-
-  public static final String MYSQL_CHECKPOINT_BYTES_KEY =
-      org.apache.sqoop.mapreduce.MySQLExportMapper.MYSQL_CHECKPOINT_BYTES_KEY;
-
-  public static final long DEFAULT_CHECKPOINT_BYTES =
-      org.apache.sqoop.mapreduce.MySQLExportMapper.DEFAULT_CHECKPOINT_BYTES;
-
-}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/MySQLRecordExportMapper.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/MySQLRecordExportMapper.java 
b/src/java/com/cloudera/sqoop/mapreduce/MySQLRecordExportMapper.java
deleted file mode 100644
index 08751d2..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/MySQLRecordExportMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class MySQLRecordExportMapper
-    extends org.apache.sqoop.mapreduce.MySQLRecordExportMapper {
-}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/MySQLTextExportMapper.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/MySQLTextExportMapper.java 
b/src/java/com/cloudera/sqoop/mapreduce/MySQLTextExportMapper.java
deleted file mode 100644
index 95517e2..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/MySQLTextExportMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class MySQLTextExportMapper
-    extends org.apache.sqoop.mapreduce.MySQLTextExportMapper {
-}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/NullOutputCommitter.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/NullOutputCommitter.java 
b/src/java/com/cloudera/sqoop/mapreduce/NullOutputCommitter.java
deleted file mode 100644
index c3c9b39..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/NullOutputCommitter.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class NullOutputCommitter
-    extends org.apache.sqoop.mapreduce.NullOutputCommitter {
-}
-

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/OracleExportOutputFormat.java
----------------------------------------------------------------------
diff --git 
a/src/java/com/cloudera/sqoop/mapreduce/OracleExportOutputFormat.java 
b/src/java/com/cloudera/sqoop/mapreduce/OracleExportOutputFormat.java
deleted file mode 100644
index 8ae10d7..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/OracleExportOutputFormat.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-import com.cloudera.sqoop.lib.SqoopRecord;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class OracleExportOutputFormat<K extends SqoopRecord, V>
-    extends org.apache.sqoop.mapreduce.OracleExportOutputFormat<K, V> {
-}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/OracleUpsertOutputFormat.java
----------------------------------------------------------------------
diff --git 
a/src/java/com/cloudera/sqoop/mapreduce/OracleUpsertOutputFormat.java 
b/src/java/com/cloudera/sqoop/mapreduce/OracleUpsertOutputFormat.java
deleted file mode 100644
index aa20e7f..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/OracleUpsertOutputFormat.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-import com.cloudera.sqoop.lib.SqoopRecord;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class OracleUpsertOutputFormat<K extends SqoopRecord, V>
-    extends org.apache.sqoop.mapreduce.OracleUpsertOutputFormat<K, V> {
-}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/RawKeyTextOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/RawKeyTextOutputFormat.java 
b/src/java/com/cloudera/sqoop/mapreduce/RawKeyTextOutputFormat.java
deleted file mode 100644
index 2e9518a..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/RawKeyTextOutputFormat.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-import java.io.DataOutputStream;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class RawKeyTextOutputFormat<K, V>
-    extends org.apache.sqoop.mapreduce.RawKeyTextOutputFormat<K, V> {
-
-  /**
-   * @deprecated Moving to use org.apache.sqoop namespace.
-   */
-  public static class RawKeyRecordWriter<K, V>
-      extends org.apache.sqoop.mapreduce.RawKeyTextOutputFormat.
-      RawKeyRecordWriter<K, V> {
-
-    public RawKeyRecordWriter(DataOutputStream out) {
-      super(out);
-    }
-
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/SQLServerExportOutputFormat.java
----------------------------------------------------------------------
diff --git 
a/src/java/com/cloudera/sqoop/mapreduce/SQLServerExportOutputFormat.java 
b/src/java/com/cloudera/sqoop/mapreduce/SQLServerExportOutputFormat.java
deleted file mode 100644
index f7841ca..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/SQLServerExportOutputFormat.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-import com.cloudera.sqoop.lib.SqoopRecord;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class SQLServerExportOutputFormat<K extends SqoopRecord, V>
-    extends org.apache.sqoop.mapreduce.SQLServerExportOutputFormat<K, V> {
-}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/SequenceFileExportMapper.java
----------------------------------------------------------------------
diff --git 
a/src/java/com/cloudera/sqoop/mapreduce/SequenceFileExportMapper.java 
b/src/java/com/cloudera/sqoop/mapreduce/SequenceFileExportMapper.java
deleted file mode 100644
index 3b5b8b7..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/SequenceFileExportMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class SequenceFileExportMapper
-    extends org.apache.sqoop.mapreduce.SequenceFileExportMapper {
-}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/SequenceFileImportMapper.java
----------------------------------------------------------------------
diff --git 
a/src/java/com/cloudera/sqoop/mapreduce/SequenceFileImportMapper.java 
b/src/java/com/cloudera/sqoop/mapreduce/SequenceFileImportMapper.java
deleted file mode 100644
index 152a942..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/SequenceFileImportMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class SequenceFileImportMapper
-    extends org.apache.sqoop.mapreduce.SequenceFileImportMapper {
-}
-

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/TextExportMapper.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/TextExportMapper.java 
b/src/java/com/cloudera/sqoop/mapreduce/TextExportMapper.java
deleted file mode 100644
index 742feb6..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/TextExportMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class TextExportMapper
-    extends org.apache.sqoop.mapreduce.TextExportMapper {
-}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/TextImportMapper.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/TextImportMapper.java 
b/src/java/com/cloudera/sqoop/mapreduce/TextImportMapper.java
deleted file mode 100644
index 0479297..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/TextImportMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class TextImportMapper
-    extends org.apache.sqoop.mapreduce.TextImportMapper {
-}
-

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/UpdateOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/UpdateOutputFormat.java 
b/src/java/com/cloudera/sqoop/mapreduce/UpdateOutputFormat.java
deleted file mode 100644
index fb47f9d..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/UpdateOutputFormat.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cloudera.sqoop.mapreduce;
-
-import com.cloudera.sqoop.lib.SqoopRecord;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class UpdateOutputFormat<K extends SqoopRecord, V>
-    extends org.apache.sqoop.mapreduce.UpdateOutputFormat<K, V> {
-}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/db/BigDecimalSplitter.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/db/BigDecimalSplitter.java 
b/src/java/com/cloudera/sqoop/mapreduce/db/BigDecimalSplitter.java
deleted file mode 100644
index 8d3505a..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/db/BigDecimalSplitter.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.cloudera.sqoop.mapreduce.db;
-
-
-/**
- * Implement DBSplitter over BigDecimal values.
- *
- * @deprecated use org.apache.sqoop.mapreduce.db.BigDecimalSplitter instead.
- * @see org.apache.sqoop.mapreduce.db.BigDecimalSplitter
- */
-public class BigDecimalSplitter
-  extends org.apache.sqoop.mapreduce.db.BigDecimalSplitter {
-
-}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/mapreduce/db/BooleanSplitter.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/mapreduce/db/BooleanSplitter.java 
b/src/java/com/cloudera/sqoop/mapreduce/db/BooleanSplitter.java
deleted file mode 100644
index da5ef85..0000000
--- a/src/java/com/cloudera/sqoop/mapreduce/db/BooleanSplitter.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.cloudera.sqoop.mapreduce.db;
-
-
-/**
- * Implement DBSplitter over boolean values.
- *
- * @deprecated use org.apache.sqoop.mapreduce.db.BooleanSplitter instead.
- * @see org.apache.sqoop.mapreduce.db.BooleanSplitter
- */
-public class BooleanSplitter
-  extends org.apache.sqoop.mapreduce.db.BooleanSplitter {
-
-}

Reply via email to