You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sqoop.apache.org by an...@apache.org on 2018/01/18 14:04:17 UTC
[31/32] sqoop git commit: SQOOP-3273: Removing com.cloudera.sqoop
packages
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/io/LobFile.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/io/LobFile.java b/src/java/com/cloudera/sqoop/io/LobFile.java
deleted file mode 100644
index 905c68f..0000000
--- a/src/java/com/cloudera/sqoop/io/LobFile.java
+++ /dev/null
@@ -1,131 +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.io;
-
-import java.io.IOException;
-
-import org.apache.commons.logging.Log;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-
-/**
- * File format which stores large object records.
- * The format allows large objects to be read through individual InputStreams
- * to allow reading without full materialization of a single record.
- * Each record is assigned an id and can be accessed by id efficiently by
- * consulting an index at the end of the file.
- *
- * @deprecated use org.apache.sqoop.io.LobFile instead.
- * @see org.apache.sqoop.io.LobFile
- */
-public final class LobFile {
-
- private LobFile() {
- }
-
- public static final Log LOG = org.apache.sqoop.io.LobFile.LOG;
-
- public static final int LATEST_LOB_VERSION =
- org.apache.sqoop.io.LobFile.LATEST_LOB_VERSION;
-
- // Must be in sync with org.apache.sqoop.io.LobFile.HEADER_ID_STR
- static final char [] HEADER_ID_STR =
- org.apache.sqoop.io.LobFile.HEADER_ID_STR;
-
- // Value for entryId to write to the beginning of an IndexSegment.
- static final long SEGMENT_HEADER_ID =
- org.apache.sqoop.io.LobFile.SEGMENT_HEADER_ID;
-
- // Value for entryId to write before the finale.
- static final long SEGMENT_OFFSET_ID =
- org.apache.sqoop.io.LobFile.SEGMENT_OFFSET_ID;
-
- // Value for entryID to write before the IndexTable
- static final long INDEX_TABLE_ID = org.apache.sqoop.io.LobFile.INDEX_TABLE_ID;
-
- /**
- * @deprecated use org.apache.sqoop.io.LobFile.Writer
- * @see org.apache.sqoop.io.LobFile.Writer
- */
- public abstract static class Writer
- extends org.apache.sqoop.io.LobFile.Writer {
- }
-
- /**
- * @deprecated use org.apache.sqoop.io.LobFile.Reader instead.
- * @see org.apache.sqoop.io.LobFile.Reader
- */
- public abstract static class Reader
- extends org.apache.sqoop.io.LobFile.Reader {
- }
-
- /**
- * Creates a LobFile Reader configured to read from the specified file.
- */
- public static Reader open(Path p, Configuration conf) throws IOException {
- return org.apache.sqoop.io.LobFile.open(p, conf);
- }
-
- /**
- * Creates a LobFile Writer configured for uncompressed binary data.
- * @param p the path to create.
- * @param conf the configuration to use to interact with the filesystem.
- */
- public static Writer create(Path p, Configuration conf) throws IOException {
- return org.apache.sqoop.io.LobFile.create(p, conf, false);
- }
-
- /**
- * Creates a LobFile Writer configured for uncompressed data.
- * @param p the path to create.
- * @param conf the configuration to use to interact with the filesystem.
- * @param isCharData true if this is for CLOBs, false for BLOBs.
- */
- public static Writer create(Path p, Configuration conf, boolean isCharData)
- throws IOException {
- return org.apache.sqoop.io.LobFile.create(p, conf, isCharData, null);
- }
-
- /**
- * Creates a LobFile Writer.
- * @param p the path to create.
- * @param conf the configuration to use to interact with the filesystem.
- * @param isCharData true if this is for CLOBs, false for BLOBs.
- * @param codec the compression codec to use (or null for none).
- */
- public static Writer create(Path p, Configuration conf, boolean isCharData,
- String codec) throws IOException {
- return org.apache.sqoop.io.LobFile.create(p, conf, isCharData, codec);
- }
-
- /**
- * Creates a LobFile Writer.
- * @param p the path to create.
- * @param conf the configuration to use to interact with the filesystem.
- * @param isCharData true if this is for CLOBs, false for BLOBs.
- * @param codec the compression codec to use (or null for none).
- * @param entriesPerSegment number of entries per index segment.
- */
- public static Writer create(Path p, Configuration conf, boolean isCharData,
- String codec, int entriesPerSegment)
- throws IOException {
- return org.apache.sqoop.io.LobFile.create(
- p, conf, isCharData, codec, entriesPerSegment);
- }
-}
-
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/io/LobReaderCache.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/io/LobReaderCache.java b/src/java/com/cloudera/sqoop/io/LobReaderCache.java
deleted file mode 100644
index 89d31d3..0000000
--- a/src/java/com/cloudera/sqoop/io/LobReaderCache.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.io;
-
-import java.io.IOException;
-
-import org.apache.commons.logging.Log;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-
-/**
- * A cache of open LobFile.Reader objects.
- * This maps from filenames to the open Reader, if any. This uses the
- * Singleton pattern. While nothing prevents multiple LobReaderCache
- * instances, it is most useful to have a single global cache. This cache is
- * internally synchronized; only one thread can insert or retrieve a reader
- * from the cache at a time.
- *
- * @deprecated use org.apache.sqoop.io.LobReaderCache instead.
- * @see org.apache.sqoop.io.LobReaderCache
- */
-public final class LobReaderCache extends org.apache.sqoop.io.LobReaderCache {
-
- public static final Log LOG = org.apache.sqoop.io.LobReaderCache.LOG;
-
- private static final LobReaderCache CACHE;
- static {
- CACHE = new LobReaderCache();
- }
-
- /**
- * @return the singleton LobReaderCache instance.
- */
- public static LobReaderCache getCache() {
- return CACHE;
- }
-
- /**
- * Created a fully-qualified path object.
- * @param path the path to fully-qualify with its fs URI.
- * @param conf the current Hadoop FS configuration.
- * @return a new path representing the same location as the input 'path',
- * but with a fully-qualified URI.
- */
- public static Path qualify(Path path, Configuration conf)
- throws IOException {
- return org.apache.sqoop.util.FileSystemUtil.makeQualified(path, conf);
- }
-}
-
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/io/NamedFifo.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/io/NamedFifo.java b/src/java/com/cloudera/sqoop/io/NamedFifo.java
deleted file mode 100644
index e27d2c4..0000000
--- a/src/java/com/cloudera/sqoop/io/NamedFifo.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.io;
-
-import java.io.File;
-
-/**
- * A named FIFO channel.
- *
- * @deprecated use org.apache.sqoop.io.NamedFifo instead.
- * @see org.apache.sqoop.io.NamedFifo
- */
-public class NamedFifo extends org.apache.sqoop.io.NamedFifo {
-
- public NamedFifo(String pathname) {
- super(pathname);
- }
-
- public NamedFifo(File fifo) {
- super(fifo);
- }
-}
-
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/io/SplittableBufferedWriter.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/io/SplittableBufferedWriter.java b/src/java/com/cloudera/sqoop/io/SplittableBufferedWriter.java
deleted file mode 100644
index ef9285a..0000000
--- a/src/java/com/cloudera/sqoop/io/SplittableBufferedWriter.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.io;
-
-/**
- * A BufferedWriter implementation that wraps around a SplittingOutputStream
- * and allows splitting of the underlying stream.
- * Splits occur at allowSplit() calls, or newLine() calls.
- *
- * @deprecated use org.apache.sqoop.io.SplittableBufferedWriter instead.
- * @see org.apache.sqoop.io.SplittableBufferedWriter
- */
-public class SplittableBufferedWriter
- extends org.apache.sqoop.io.SplittableBufferedWriter {
-
- public SplittableBufferedWriter(
- final SplittingOutputStream splitOutputStream) {
- super(splitOutputStream);
- }
-
- SplittableBufferedWriter(final SplittingOutputStream splitOutputStream,
- final boolean alwaysFlush) {
- super(splitOutputStream, alwaysFlush);
- }
-}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/io/SplittingOutputStream.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/io/SplittingOutputStream.java b/src/java/com/cloudera/sqoop/io/SplittingOutputStream.java
deleted file mode 100644
index ab81042..0000000
--- a/src/java/com/cloudera/sqoop/io/SplittingOutputStream.java
+++ /dev/null
@@ -1,45 +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.io;
-
-import java.io.IOException;
-
-import org.apache.commons.logging.Log;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.compress.CompressionCodec;
-
-/**
- * An output stream that writes to an underlying filesystem, opening
- * a new file after a specified number of bytes have been written to the
- * current one.
- *
- * @deprecated use org.apache.sqoop.io.SplittingOutputStream instead.
- * @see org.apache.sqoop.io.SplittingOutputStream
- */
-public class SplittingOutputStream
- extends org.apache.sqoop.io.SplittingOutputStream {
-
- public static final Log LOG = org.apache.sqoop.io.SplittingOutputStream.LOG;
-
- public SplittingOutputStream(final Configuration conf, final Path destDir,
- final String filePrefix, final long cutoff, final CompressionCodec codec)
- throws IOException {
- super(conf, destDir, filePrefix, cutoff, codec);
- }
-}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/io/UnsupportedCodecException.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/io/UnsupportedCodecException.java b/src/java/com/cloudera/sqoop/io/UnsupportedCodecException.java
deleted file mode 100644
index 4d8225a..0000000
--- a/src/java/com/cloudera/sqoop/io/UnsupportedCodecException.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.io;
-
-
-/**
- * Thrown when a compression codec cannot be recognized.
- *
- * @deprecated use org.apache.sqoop.io.UnsupportedCodecException instead.
- * @see org.apache.sqoop.io.UnsupportedCodecException
- */
-public class UnsupportedCodecException
- extends org.apache.sqoop.io.UnsupportedCodecException {
-
- public UnsupportedCodecException() {
- super("UnsupportedCodecException");
- }
-
- public UnsupportedCodecException(String msg) {
- super(msg);
- }
-
- public UnsupportedCodecException(Throwable cause) {
- super(cause);
- }
-}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/lib/BigDecimalSerializer.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/lib/BigDecimalSerializer.java b/src/java/com/cloudera/sqoop/lib/BigDecimalSerializer.java
deleted file mode 100644
index 2ae89c2..0000000
--- a/src/java/com/cloudera/sqoop/lib/BigDecimalSerializer.java
+++ /dev/null
@@ -1,61 +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.lib;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-/**
- * Serialize BigDecimal classes to/from DataInput and DataOutput objects.
- *
- * BigDecimal is comprised of a BigInteger with an integer 'scale' field.
- * The BigDecimal/BigInteger can also return itself as a 'long' value.
- *
- * We serialize in one of two formats:
- *
- * First, check whether the BigInt can fit in a long:
- * boolean b = BigIntegerPart > LONG_MAX || BigIntegerPart < LONG_MIN
- *
- * [int: scale][boolean: b == false][long: BigInt-part]
- * [int: scale][boolean: b == true][string: BigInt-part.toString()]
- *
- * TODO(aaron): Get this to work with Hadoop's Serializations framework.
- *
- * @deprecated use org.apache.sqoop.lib.BigDecimalSerializer instead.
- * @see org.apache.sqoop.lib.BigDecimalSerializer
- */
-public final class BigDecimalSerializer {
-
- private BigDecimalSerializer() { }
-
- static final BigInteger LONG_MAX_AS_BIGINT =
- org.apache.sqoop.lib.BigDecimalSerializer.LONG_MAX_AS_BIGINT;
- static final BigInteger LONG_MIN_AS_BIGINT =
- org.apache.sqoop.lib.BigDecimalSerializer.LONG_MIN_AS_BIGINT;
-
- public static void write(BigDecimal d, DataOutput out) throws IOException {
- org.apache.sqoop.lib.BigDecimalSerializer.write(d, out);
- }
-
- public static BigDecimal readFields(DataInput in) throws IOException {
- return org.apache.sqoop.lib.BigDecimalSerializer.readFields(in);
- }
-}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/lib/BlobRef.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/lib/BlobRef.java b/src/java/com/cloudera/sqoop/lib/BlobRef.java
deleted file mode 100644
index b3d5341..0000000
--- a/src/java/com/cloudera/sqoop/lib/BlobRef.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.lib;
-
-import org.apache.commons.logging.Log;
-
-/**
- * BlobRef is a wrapper that holds a BLOB either directly, or a
- * reference to a file that holds the BLOB data.
- *
- * @deprecated use org.apache.sqoop.lib.BlobRef instead.
- * @see org.apache.sqoop.lib.BlobRef
- */
-public class BlobRef extends org.apache.sqoop.lib.BlobRef {
-
- public static final Log LOG = org.apache.sqoop.lib.BlobRef.LOG;
-
- public BlobRef() {
- super();
- }
-
- public BlobRef(byte [] bytes) {
- super(bytes);
- }
-
- /**
- * Initialize a BlobRef to an external BLOB.
- * @param file the filename to the BLOB. May be relative to the job dir.
- * @param offset the offset (in bytes) into the LobFile for this record.
- * @param length the length of the record in bytes.
- */
- public BlobRef(String file, long offset, long length) {
- super(file, offset, length);
- }
-
-
- /**
- * Create a BlobRef based on parsed data from a line of text.
- * This only operates correctly on external blobs; inline blobs are simply
- * returned as null. You should store BLOB data in SequenceFile format
- * if reparsing is necessary.
- * @param inputString the text-based input data to parse.
- * @return a new BlobRef containing a reference to an external BLOB, or
- * an empty BlobRef if the data to be parsed is actually inline.
- */
- public static BlobRef parse(String inputString) {
- return org.apache.sqoop.lib.BlobRef.parse(inputString);
- }
-}
-
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/lib/BooleanParser.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/lib/BooleanParser.java b/src/java/com/cloudera/sqoop/lib/BooleanParser.java
deleted file mode 100644
index ab97cf0..0000000
--- a/src/java/com/cloudera/sqoop/lib/BooleanParser.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.lib;
-
-/**
- * Parse string representations of boolean values into boolean
- * scalar types.
- * @deprecated use org.apache.sqoop.lib.BooleanParser instead.
- * @see org.apache.sqoop.lib.BooleanParser
- */
-public final class BooleanParser {
- private BooleanParser() {
- }
-
- /**
- * Return a boolean based on the value contained in the string.
- *
- * <p>The following values are considered true:
- * "true", "t", "yes", "on", "1".</p>
- * <p>All other values, including 'null', are false.</p>
- * <p>All comparisons are case-insensitive.</p>
- */
- public static boolean valueOf(final String s) {
- return org.apache.sqoop.lib.BooleanParser.valueOf(s);
- }
-}
-
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/lib/ClobRef.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/lib/ClobRef.java b/src/java/com/cloudera/sqoop/lib/ClobRef.java
deleted file mode 100644
index a328f23..0000000
--- a/src/java/com/cloudera/sqoop/lib/ClobRef.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.lib;
-
-/**
- * ClobRef is a wrapper that holds a CLOB either directly, or a
- * reference to a file that holds the CLOB data.
- *
- * @deprecated use org.apache.sqoop.lib.ClobRef instead.
- * @see org.apache.sqoop.lib.ClobRef
- */
-public class ClobRef extends org.apache.sqoop.lib.ClobRef {
-
- public ClobRef() {
- super();
- }
-
- public ClobRef(String chars) {
- super(chars);
- }
-
- /**
- * Initialize a clobref to an external CLOB.
- * @param file the filename to the CLOB. May be relative to the job dir.
- * @param offset the offset (in bytes) into the LobFile for this record.
- * @param length the length of the record in characters.
- */
- public ClobRef(String file, long offset, long length) {
- super(file, offset, length);
- }
-
- /**
- * Create a ClobRef based on parsed data from a line of text.
- * @param inputString the text-based input data to parse.
- * @return a ClobRef to the given data.
- */
- public static ClobRef parse(String inputString) {
- return org.apache.sqoop.lib.ClobRef.parse(inputString);
- }
-}
-
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/lib/DelimiterSet.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/lib/DelimiterSet.java b/src/java/com/cloudera/sqoop/lib/DelimiterSet.java
deleted file mode 100644
index 6de90ad..0000000
--- a/src/java/com/cloudera/sqoop/lib/DelimiterSet.java
+++ /dev/null
@@ -1,79 +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.lib;
-
-/**
- * Encapsulates a set of delimiters used to encode a record.
- * @deprecated use org.apache.sqoop.lib.DelimiterSet instead.
- * @see org.apache.sqoop.lib.DelimiterSet
- */
-public class DelimiterSet extends org.apache.sqoop.lib.DelimiterSet {
-
- public static final char NULL_CHAR =
- org.apache.sqoop.lib.DelimiterSet.NULL_CHAR;
-
- /**
- * Create a delimiter set with the default delimiters
- * (comma for fields, newline for records).
- */
- public DelimiterSet() {
- super();
- }
-
- /**
- * Create a delimiter set with the specified delimiters.
- * @param field the fields-terminated-by delimiter
- * @param record the lines-terminated-by delimiter
- * @param enclose the enclosed-by character
- * @param escape the escaped-by character
- * @param isEncloseRequired If true, enclosed-by is applied to all
- * fields. If false, only applied to fields that embed delimiters.
- */
- public DelimiterSet(char field, char record, char enclose, char escape,
- boolean isEncloseRequired) {
- super(field, record, enclose, escape, isEncloseRequired);
- }
-
- /**
- * Identical to clone() but does not throw spurious exceptions.
- * @return a new copy of this same set of delimiters.
- */
- public DelimiterSet copy() {
- try {
- return (DelimiterSet) clone();
- } catch (CloneNotSupportedException cnse) {
- // Should never happen for DelimiterSet.
- return null;
- }
- }
-
- // Static delimiter sets for the commonly-used delimiter arrangements.
-
- public static final DelimiterSet DEFAULT_DELIMITERS;
- public static final DelimiterSet HIVE_DELIMITERS;
- public static final DelimiterSet MYSQL_DELIMITERS;
-
- static {
- DEFAULT_DELIMITERS = new DelimiterSet(',', '\n', NULL_CHAR, NULL_CHAR,
- false);
- MYSQL_DELIMITERS = new DelimiterSet(',', '\n', '\'', '\\', false);
- HIVE_DELIMITERS = new DelimiterSet('\001', '\n',
- NULL_CHAR, NULL_CHAR, false);
- }
-}
-
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/lib/FieldFormatter.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/lib/FieldFormatter.java b/src/java/com/cloudera/sqoop/lib/FieldFormatter.java
deleted file mode 100644
index 45fb81f..0000000
--- a/src/java/com/cloudera/sqoop/lib/FieldFormatter.java
+++ /dev/null
@@ -1,80 +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.lib;
-
-/**
- * Static helper class that will help format data with quotes and escape chars.
- *
- * @deprecated use org.apache.sqoop.lib.FieldFormatter instead.
- * @see org.apache.sqoop.lib.FieldFormatter
- */
-public final class FieldFormatter {
-
- private FieldFormatter() { }
-
- /**
- * only pass fields that are strings when --hive-drop-delims option is on.
- * @param str
- * @param delimiters
- * @return
- */
- public static String hiveStringDropDelims(String str,
- DelimiterSet delimiters) {
- return org.apache.sqoop.lib.FieldFormatter.hiveStringDropDelims(
- str, delimiters);
- }
-
- /**
- * replace hive delimiters with a user-defined string passed to the
- * --hive-delims-replacement option.
- * @param str
- * @param delimiters
- * @return
- */
- public static String hiveStringReplaceDelims(String str, String replacement,
- DelimiterSet delimiters) {
- return org.apache.sqoop.lib.FieldFormatter.hiveStringReplaceDelims(
- str, replacement, delimiters);
- }
-
- /**
- * Takes an input string representing the value of a field, encloses it in
- * enclosing chars, and escapes any occurrences of such characters in the
- * middle. The escape character itself is also escaped if it appears in the
- * text of the field. If there is no enclosing character, then any
- * delimiters present in the field body are escaped instead.
- *
- * The field is enclosed only if:
- * enclose != '\000', and:
- * encloseRequired is true, or
- * one of the fields-terminated-by or lines-terminated-by characters is
- * present in the string.
- *
- * Escaping is not performed if the escape char is '\000'.
- *
- * @param str - The user's string to escape and enclose
- * @param delimiters - The DelimiterSet to use identifying the escape and
- * enclose semantics. If the specified escape or enclose characters are
- * '\000', those operations are not performed.
- * @return the escaped, enclosed version of 'str'.
- */
- public static String escapeAndEnclose(String str, DelimiterSet delimiters) {
- return org.apache.sqoop.lib.FieldFormatter.escapeAndEnclose(
- str, delimiters);
- }
-}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/lib/FieldMapProcessor.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/lib/FieldMapProcessor.java b/src/java/com/cloudera/sqoop/lib/FieldMapProcessor.java
deleted file mode 100644
index 3f21540..0000000
--- a/src/java/com/cloudera/sqoop/lib/FieldMapProcessor.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.lib;
-
-/**
- * Interface implemented by classes that process FieldMappable objects.
- *
- * @deprecated use org.apache.sqoop.lib.FieldMapProcessor instead.
- * @see org.apache.sqoop.lib.FieldMapProcessor
- */
-public interface FieldMapProcessor
- extends org.apache.sqoop.lib.FieldMapProcessor {
-}
-
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/lib/FieldMappable.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/lib/FieldMappable.java b/src/java/com/cloudera/sqoop/lib/FieldMappable.java
deleted file mode 100644
index 2067ecc..0000000
--- a/src/java/com/cloudera/sqoop/lib/FieldMappable.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.lib;
-
-/**
- * Interface describing a class capable of returning a map of the fields
- * of the object to their values.
- *
- * @deprecated use org.apache.sqoop.lib.FieldMappable instead.
- * @see org.apache.sqoop.lib.FieldMappable
- */
-public interface FieldMappable extends org.apache.sqoop.lib.FieldMappable {
-
-}
-
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/lib/JdbcWritableBridge.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/lib/JdbcWritableBridge.java b/src/java/com/cloudera/sqoop/lib/JdbcWritableBridge.java
deleted file mode 100644
index 316547f..0000000
--- a/src/java/com/cloudera/sqoop/lib/JdbcWritableBridge.java
+++ /dev/null
@@ -1,187 +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.lib;
-
-import java.math.BigDecimal;
-import java.sql.Date;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Time;
-import java.sql.Timestamp;
-
-import org.apache.hadoop.io.BytesWritable;
-
-/**
- * Contains a set of methods which can read db columns from a ResultSet into
- * Java types, and do serialization of these types to/from DataInput/DataOutput
- * for use with Hadoop's Writable implementation. This supports null values
- * for all types.
- *
- * @deprecated use org.apache.sqoop.lib.JdbcWritableBridge instead.
- * @see org.apache.sqoop.lib.JdbcWritableBridge
- */
-public final class JdbcWritableBridge {
-
- // Currently, cap BLOB/CLOB objects at 16 MB until we can use external
- // storage.
- public static final long MAX_BLOB_LENGTH =
- org.apache.sqoop.lib.JdbcWritableBridge.MAX_BLOB_LENGTH;
- public static final long MAX_CLOB_LENGTH =
- org.apache.sqoop.lib.JdbcWritableBridge.MAX_CLOB_LENGTH;
-
- private JdbcWritableBridge() {
- }
-
- public static Integer readInteger(int colNum, ResultSet r)
- throws SQLException {
- return org.apache.sqoop.lib.JdbcWritableBridge.readInteger(colNum, r);
- }
-
- public static Long readLong(int colNum, ResultSet r) throws SQLException {
- return org.apache.sqoop.lib.JdbcWritableBridge.readLong(colNum, r);
- }
-
- public static String readString(int colNum, ResultSet r) throws SQLException {
- return org.apache.sqoop.lib.JdbcWritableBridge.readString(colNum, r);
- }
-
- public static Float readFloat(int colNum, ResultSet r) throws SQLException {
- return org.apache.sqoop.lib.JdbcWritableBridge.readFloat(colNum, r);
- }
-
- public static Double readDouble(int colNum, ResultSet r) throws SQLException {
- return org.apache.sqoop.lib.JdbcWritableBridge.readDouble(colNum, r);
- }
-
- public static Boolean readBoolean(int colNum, ResultSet r)
- throws SQLException {
- return org.apache.sqoop.lib.JdbcWritableBridge.readBoolean(colNum, r);
- }
-
- public static Time readTime(int colNum, ResultSet r) throws SQLException {
- return org.apache.sqoop.lib.JdbcWritableBridge.readTime(colNum, r);
- }
-
- public static Timestamp readTimestamp(int colNum, ResultSet r)
- throws SQLException {
- return org.apache.sqoop.lib.JdbcWritableBridge.readTimestamp(colNum, r);
- }
-
- public static Date readDate(int colNum, ResultSet r) throws SQLException {
- return org.apache.sqoop.lib.JdbcWritableBridge.readDate(colNum, r);
- }
-
- public static BytesWritable readBytesWritable(int colNum, ResultSet r)
- throws SQLException {
- return org.apache.sqoop.lib.JdbcWritableBridge.readBytesWritable(colNum, r);
- }
-
- public static BigDecimal readBigDecimal(int colNum, ResultSet r)
- throws SQLException {
- return org.apache.sqoop.lib.JdbcWritableBridge.readBigDecimal(colNum, r);
- }
-
- public static BlobRef readBlobRef(int colNum, ResultSet r)
- throws SQLException {
- return org.apache.sqoop.lib.JdbcWritableBridge.readBlobRef(colNum, r);
- }
-
- public static ClobRef readClobRef(int colNum, ResultSet r)
- throws SQLException {
- return org.apache.sqoop.lib.JdbcWritableBridge.readClobRef(colNum, r);
- }
-
- public static void writeInteger(Integer val, int paramIdx, int sqlType,
- PreparedStatement s) throws SQLException {
- org.apache.sqoop.lib.JdbcWritableBridge.writeInteger(
- val, paramIdx, sqlType, s);
- }
-
- public static void writeLong(Long val, int paramIdx, int sqlType,
- PreparedStatement s) throws SQLException {
- org.apache.sqoop.lib.JdbcWritableBridge.writeLong(
- val, paramIdx, sqlType, s);
- }
-
- public static void writeDouble(Double val, int paramIdx, int sqlType,
- PreparedStatement s) throws SQLException {
- org.apache.sqoop.lib.JdbcWritableBridge.writeDouble(
- val, paramIdx, sqlType, s);
- }
-
- public static void writeBoolean(Boolean val, int paramIdx, int sqlType,
- PreparedStatement s) throws SQLException {
- org.apache.sqoop.lib.JdbcWritableBridge.writeBoolean(
- val, paramIdx, sqlType, s);
- }
-
- public static void writeFloat(Float val, int paramIdx, int sqlType,
- PreparedStatement s) throws SQLException {
- org.apache.sqoop.lib.JdbcWritableBridge.writeFloat(
- val, paramIdx, sqlType, s);
- }
-
- public static void writeString(String val, int paramIdx, int sqlType,
- PreparedStatement s) throws SQLException {
- org.apache.sqoop.lib.JdbcWritableBridge.writeString(
- val, paramIdx, sqlType, s);
- }
-
- public static void writeTimestamp(Timestamp val, int paramIdx, int sqlType,
- PreparedStatement s) throws SQLException {
- org.apache.sqoop.lib.JdbcWritableBridge.writeTimestamp(
- val, paramIdx, sqlType, s);
- }
-
- public static void writeTime(Time val, int paramIdx, int sqlType,
- PreparedStatement s) throws SQLException {
- org.apache.sqoop.lib.JdbcWritableBridge.writeTime(
- val, paramIdx, sqlType, s);
- }
-
- public static void writeDate(Date val, int paramIdx, int sqlType,
- PreparedStatement s) throws SQLException {
- org.apache.sqoop.lib.JdbcWritableBridge.writeDate(
- val, paramIdx, sqlType, s);
- }
-
- public static void writeBytesWritable(BytesWritable val, int paramIdx,
- int sqlType, PreparedStatement s) throws SQLException {
- org.apache.sqoop.lib.JdbcWritableBridge.writeBytesWritable(
- val, paramIdx, sqlType, s);
- }
-
- public static void writeBigDecimal(BigDecimal val, int paramIdx,
- int sqlType, PreparedStatement s) throws SQLException {
- org.apache.sqoop.lib.JdbcWritableBridge.writeBigDecimal(
- val, paramIdx, sqlType, s);
- }
-
- public static void writeBlobRef(BlobRef val, int paramIdx,
- int sqlType, PreparedStatement s) throws SQLException {
- org.apache.sqoop.lib.JdbcWritableBridge.writeBlobRef(
- val, paramIdx, sqlType, s);
- }
-
- public static void writeClobRef(ClobRef val, int paramIdx,
- int sqlType, PreparedStatement s) throws SQLException {
- org.apache.sqoop.lib.JdbcWritableBridge.writeClobRef(
- val, paramIdx, sqlType, s);
- }
-}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/lib/LargeObjectLoader.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/lib/LargeObjectLoader.java b/src/java/com/cloudera/sqoop/lib/LargeObjectLoader.java
deleted file mode 100644
index b51cf0c..0000000
--- a/src/java/com/cloudera/sqoop/lib/LargeObjectLoader.java
+++ /dev/null
@@ -1,55 +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.lib;
-
-import java.io.IOException;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-
-/**
- * Contains a set of methods which can read db columns from a ResultSet into
- * Java types, and do serialization of these types to/from DataInput/DataOutput
- * for use with Hadoop's Writable implementation. This supports null values
- * for all types.
- *
- * This is a singleton instance class; only one may exist at a time.
- * However, its lifetime is limited to the current TaskInputOutputContext's
- * life.
- *
- * @deprecated use org.apache.sqoop.lib.LargeObjectLoader instead.
- * @see org.apache.sqoop.lib.LargeObjectLoader
- */
-public class LargeObjectLoader extends org.apache.sqoop.lib.LargeObjectLoader {
-
- // Spill to external storage for BLOB/CLOB objects > 16 MB.
- public static final long DEFAULT_MAX_LOB_LENGTH =
- org.apache.sqoop.lib.LargeObjectLoader.DEFAULT_MAX_LOB_LENGTH;
-
- public static final String MAX_INLINE_LOB_LEN_KEY =
- org.apache.sqoop.lib.LargeObjectLoader.MAX_INLINE_LOB_LEN_KEY;
-
- /**
- * Create a new LargeObjectLoader.
- * @param conf the Configuration to use
- */
- public LargeObjectLoader(Configuration conf, Path workPath)
- throws IOException {
- super(conf, workPath);
- }
-}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/lib/LobRef.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/lib/LobRef.java b/src/java/com/cloudera/sqoop/lib/LobRef.java
deleted file mode 100644
index 518b622..0000000
--- a/src/java/com/cloudera/sqoop/lib/LobRef.java
+++ /dev/null
@@ -1,54 +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.lib;
-
-import java.util.regex.Matcher;
-
-import org.apache.commons.logging.Log;
-
-/**
- * Abstract base class that holds a reference to a Blob or a Clob.
- * DATATYPE is the type being held (e.g., a byte array).
- * CONTAINERTYPE is the type used to hold this data (e.g., BytesWritable).
- * ACCESSORTYPE is the type used to access this data in a streaming fashion
- * (either an InputStream or a Reader).
- *
- * @deprecated use org.apache.sqoop.lib.LobRef instead.
- * @see org.apache.sqoop.lib.LobRef
- */
-public abstract class LobRef<DATATYPE, CONTAINERTYPE, ACCESSORTYPE>
- extends org.apache.sqoop.lib.LobRef<DATATYPE, CONTAINERTYPE, ACCESSORTYPE> {
-
- public static final Log LOG = org.apache.sqoop.lib.LobRef.LOG;
-
- protected LobRef() {
- super();
- }
-
- protected LobRef(CONTAINERTYPE container) {
- super(container);
- }
-
- protected LobRef(String file, long offset, long length) {
- super(file, offset, length);
- }
-
- protected static final ThreadLocal<Matcher> EXTERNAL_MATCHER =
- org.apache.sqoop.lib.LobRef.EXTERNAL_MATCHER;
-}
-
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/lib/LobSerializer.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/lib/LobSerializer.java b/src/java/com/cloudera/sqoop/lib/LobSerializer.java
deleted file mode 100644
index b8324fe..0000000
--- a/src/java/com/cloudera/sqoop/lib/LobSerializer.java
+++ /dev/null
@@ -1,51 +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.lib;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-/**
- * Serialize LOB classes to/from DataInput and DataOutput objects.
- *
- * @deprecated use org.apache.sqoop.lib.LobSerializer instead.
- * @see org.apache.sqoop.lib.LobSerializer
- */
-public final class LobSerializer {
-
- private LobSerializer() { }
-
- public static void writeClob(ClobRef clob, DataOutput out)
- throws IOException {
- org.apache.sqoop.lib.LobSerializer.writeClob(clob, out);
- }
-
- public static void writeBlob(BlobRef blob, DataOutput out)
- throws IOException {
- org.apache.sqoop.lib.LobSerializer.writeBlob(blob, out);
- }
-
- public static ClobRef readClobFields(DataInput in) throws IOException {
- return org.apache.sqoop.lib.LobSerializer.readClobFields(in);
- }
-
- public static BlobRef readBlobFields(DataInput in) throws IOException {
- return org.apache.sqoop.lib.LobSerializer.readBlobFields(in);
- }
-}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/lib/ProcessingException.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/lib/ProcessingException.java b/src/java/com/cloudera/sqoop/lib/ProcessingException.java
deleted file mode 100644
index c4216b1..0000000
--- a/src/java/com/cloudera/sqoop/lib/ProcessingException.java
+++ /dev/null
@@ -1,45 +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.lib;
-
-/**
- * General error during processing of a SqoopRecord.
- *
- * @deprecated use org.apache.sqoop.lib.ProcessingException instead.
- * @see org.apache.sqoop.lib.ProcessingException
- */
-@SuppressWarnings("serial")
-public class ProcessingException
- extends org.apache.sqoop.lib.ProcessingException {
-
- public ProcessingException() {
- super("ProcessingException");
- }
-
- public ProcessingException(final String message) {
- super(message);
- }
-
- public ProcessingException(final Throwable cause) {
- super(cause);
- }
-
- public ProcessingException(final String message, final Throwable cause) {
- super(message, cause);
- }
-}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/lib/RecordParser.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/lib/RecordParser.java b/src/java/com/cloudera/sqoop/lib/RecordParser.java
deleted file mode 100644
index a3238e8..0000000
--- a/src/java/com/cloudera/sqoop/lib/RecordParser.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.lib;
-
-import org.apache.commons.logging.Log;
-
-/**
- * Parses a record containing one or more fields. Fields are separated
- * by some FIELD_DELIMITER character, e.g. a comma or a ^A character.
- * Records are terminated by a RECORD_DELIMITER character, e.g., a newline.
- *
- * Fields may be (optionally or mandatorily) enclosed by a quoting char
- * e.g., '\"'
- *
- * Fields may contain escaped characters. An escape character may be, e.g.,
- * the '\\' character. Any character following an escape character
- * is treated literally. e.g., '\n' is recorded as an 'n' character, not a
- * newline.
- *
- * Unexpected results may occur if the enclosing character escapes itself.
- * e.g., this cannot parse SQL SELECT statements where the single character
- * ['] escapes to [''].
- *
- * This class is not synchronized. Multiple threads must use separate
- * instances of RecordParser.
- *
- * The fields parsed by RecordParser are backed by an internal buffer
- * which is cleared when the next call to parseRecord() is made. If
- * the buffer is required to be preserved, you must copy it yourself.
- *
- * @deprecated use org.apache.sqoop.lib.RecordParser instead.
- * @see org.apache.sqoop.lib.RecordParser
- */
-public final class RecordParser extends org.apache.sqoop.lib.RecordParser {
-
- public static final Log LOG = org.apache.sqoop.lib.RecordParser.LOG;
-
- /**
- * An error thrown when parsing fails.
- *
- * @deprecated use org.apache.sqoop.lib.RecordParser.ParseError instead.
- * @see org.apache.sqoop.lib.RecordParser.ParseError
- */
- public static class ParseError
- extends org.apache.sqoop.lib.RecordParser.ParseError {
-
- public ParseError() {
- super();
- }
-
- public ParseError(final String msg) {
- super(msg);
- }
-
- public ParseError(final String msg, final Throwable cause) {
- super(msg, cause);
- }
-
- public ParseError(final Throwable cause) {
- super(cause);
- }
- }
-
- public RecordParser(final DelimiterSet delimitersIn) {
- super(delimitersIn);
- }
-}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/lib/SqoopRecord.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/lib/SqoopRecord.java b/src/java/com/cloudera/sqoop/lib/SqoopRecord.java
deleted file mode 100644
index 7cfcbb3..0000000
--- a/src/java/com/cloudera/sqoop/lib/SqoopRecord.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.lib;
-
-
-/**
- * Interface implemented by the classes generated by sqoop's orm.ClassWriter.
- *
- * @deprecated use org.apache.sqoop.lib.SqoopRecord instead.
- * @see org.apache.sqoop.lib.SqoopRecord
- */
-public abstract class SqoopRecord extends org.apache.sqoop.lib.SqoopRecord {
-
- public SqoopRecord() {
- }
-}
-
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/manager/CatalogQueryManager.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/manager/CatalogQueryManager.java b/src/java/com/cloudera/sqoop/manager/CatalogQueryManager.java
deleted file mode 100644
index 5e6a725..0000000
--- a/src/java/com/cloudera/sqoop/manager/CatalogQueryManager.java
+++ /dev/null
@@ -1,34 +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.manager;
-
-import com.cloudera.sqoop.SqoopOptions;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public abstract class CatalogQueryManager
- extends org.apache.sqoop.manager.CatalogQueryManager {
-
- public CatalogQueryManager(final String driverClass,
- final SqoopOptions opts) {
- super(driverClass, opts);
- }
-}
-
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/manager/ConnManager.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/manager/ConnManager.java b/src/java/com/cloudera/sqoop/manager/ConnManager.java
deleted file mode 100644
index a4b4457..0000000
--- a/src/java/com/cloudera/sqoop/manager/ConnManager.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.manager;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public abstract class ConnManager
- extends org.apache.sqoop.manager.ConnManager {
-}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/manager/Db2Manager.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/manager/Db2Manager.java b/src/java/com/cloudera/sqoop/manager/Db2Manager.java
deleted file mode 100644
index dd4c743..0000000
--- a/src/java/com/cloudera/sqoop/manager/Db2Manager.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.manager;
-
-import com.cloudera.sqoop.SqoopOptions;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class Db2Manager
- extends org.apache.sqoop.manager.Db2Manager {
-
- public Db2Manager(final SqoopOptions opts) {
- super(opts);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/manager/DefaultManagerFactory.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/manager/DefaultManagerFactory.java b/src/java/com/cloudera/sqoop/manager/DefaultManagerFactory.java
deleted file mode 100644
index c1ca763..0000000
--- a/src/java/com/cloudera/sqoop/manager/DefaultManagerFactory.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.manager;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public final class DefaultManagerFactory
- extends org.apache.sqoop.manager.DefaultManagerFactory {
-}
-
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/manager/DirectMySQLManager.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/manager/DirectMySQLManager.java b/src/java/com/cloudera/sqoop/manager/DirectMySQLManager.java
deleted file mode 100644
index e13823d..0000000
--- a/src/java/com/cloudera/sqoop/manager/DirectMySQLManager.java
+++ /dev/null
@@ -1,34 +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.manager;
-
-import com.cloudera.sqoop.SqoopOptions;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class DirectMySQLManager
- extends org.apache.sqoop.manager.DirectMySQLManager {
-
- public DirectMySQLManager(final SqoopOptions options) {
- super(options);
- }
-
-}
-
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/manager/DirectPostgresqlManager.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/manager/DirectPostgresqlManager.java b/src/java/com/cloudera/sqoop/manager/DirectPostgresqlManager.java
deleted file mode 100644
index 18cbe74..0000000
--- a/src/java/com/cloudera/sqoop/manager/DirectPostgresqlManager.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.manager;
-
-import com.cloudera.sqoop.SqoopOptions;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class DirectPostgresqlManager
- extends org.apache.sqoop.manager.DirectPostgresqlManager {
-
- public DirectPostgresqlManager(final SqoopOptions opts) {
- super(opts);
- }
-}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/manager/ExportJobContext.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/manager/ExportJobContext.java b/src/java/com/cloudera/sqoop/manager/ExportJobContext.java
deleted file mode 100644
index cad63a1..0000000
--- a/src/java/com/cloudera/sqoop/manager/ExportJobContext.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.manager;
-
-import com.cloudera.sqoop.SqoopOptions;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class ExportJobContext
- extends org.apache.sqoop.manager.ExportJobContext {
-
- public ExportJobContext(final String table, final String jar,
- final SqoopOptions opts) {
- super(table, jar, opts);
- }
-
- public void setConnManager(ConnManager mgr) {
- super.setConnManager(mgr);
- }
-
- public ConnManager getConnManager() {
- return (ConnManager)super.getConnManager();
- }
-}
-
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/manager/GenericJdbcManager.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/manager/GenericJdbcManager.java b/src/java/com/cloudera/sqoop/manager/GenericJdbcManager.java
deleted file mode 100644
index 14d4554..0000000
--- a/src/java/com/cloudera/sqoop/manager/GenericJdbcManager.java
+++ /dev/null
@@ -1,34 +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.manager;
-
-import com.cloudera.sqoop.SqoopOptions;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class GenericJdbcManager
- extends org.apache.sqoop.manager.GenericJdbcManager {
-
- public GenericJdbcManager(final String driverClass, final SqoopOptions opts) {
- super(driverClass, opts);
- }
-
-}
-
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/manager/HsqldbManager.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/manager/HsqldbManager.java b/src/java/com/cloudera/sqoop/manager/HsqldbManager.java
deleted file mode 100644
index e0a2cf9..0000000
--- a/src/java/com/cloudera/sqoop/manager/HsqldbManager.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.manager;
-
-import com.cloudera.sqoop.SqoopOptions;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class HsqldbManager
- extends org.apache.sqoop.manager.HsqldbManager {
-
- public HsqldbManager(final SqoopOptions opts) {
- super(opts);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/manager/ImportJobContext.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/manager/ImportJobContext.java b/src/java/com/cloudera/sqoop/manager/ImportJobContext.java
deleted file mode 100644
index 8eec2eb..0000000
--- a/src/java/com/cloudera/sqoop/manager/ImportJobContext.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.manager;
-
-import org.apache.hadoop.fs.Path;
-
-import com.cloudera.sqoop.SqoopOptions;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class ImportJobContext
- extends org.apache.sqoop.manager.ImportJobContext {
-
- public ImportJobContext(final String table, final String jar,
- final SqoopOptions opts, final Path destination) {
- super(table, jar, opts, destination);
- }
-
- public void setConnManager(ConnManager mgr) {
- super.setConnManager(mgr);
- }
-
- public ConnManager getConnManager() {
- return (ConnManager)super.getConnManager();
- }
-}
-
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/manager/InformationSchemaManager.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/manager/InformationSchemaManager.java b/src/java/com/cloudera/sqoop/manager/InformationSchemaManager.java
deleted file mode 100644
index 056ddea..0000000
--- a/src/java/com/cloudera/sqoop/manager/InformationSchemaManager.java
+++ /dev/null
@@ -1,34 +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.manager;
-
-import com.cloudera.sqoop.SqoopOptions;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public abstract class InformationSchemaManager
- extends org.apache.sqoop.manager.InformationSchemaManager {
-
- public InformationSchemaManager(final String driverClass,
- final SqoopOptions opts) {
- super(driverClass, opts);
- }
-}
-
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/manager/ManagerFactory.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/manager/ManagerFactory.java b/src/java/com/cloudera/sqoop/manager/ManagerFactory.java
deleted file mode 100644
index 3ffa722..0000000
--- a/src/java/com/cloudera/sqoop/manager/ManagerFactory.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.manager;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public abstract class ManagerFactory
- extends org.apache.sqoop.manager.ManagerFactory {
-}
-
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/manager/MySQLManager.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/manager/MySQLManager.java b/src/java/com/cloudera/sqoop/manager/MySQLManager.java
deleted file mode 100644
index 4c29a4c..0000000
--- a/src/java/com/cloudera/sqoop/manager/MySQLManager.java
+++ /dev/null
@@ -1,34 +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.manager;
-
-import com.cloudera.sqoop.SqoopOptions;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class MySQLManager
- extends org.apache.sqoop.manager.MySQLManager {
-
- public MySQLManager(final SqoopOptions opts) {
- super(opts);
- }
-
-}
-
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/manager/MySQLUtils.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/manager/MySQLUtils.java b/src/java/com/cloudera/sqoop/manager/MySQLUtils.java
deleted file mode 100644
index 3410324..0000000
--- a/src/java/com/cloudera/sqoop/manager/MySQLUtils.java
+++ /dev/null
@@ -1,69 +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.manager;
-
-import java.io.IOException;
-import org.apache.hadoop.conf.Configuration;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public final class MySQLUtils {
-
- private MySQLUtils() {
- }
-
- public static final String MYSQL_DUMP_CMD =
- org.apache.sqoop.manager.MySQLUtils.MYSQL_DUMP_CMD;
- public static final String MYSQL_IMPORT_CMD =
- org.apache.sqoop.manager.MySQLUtils.MYSQL_IMPORT_CMD;
- public static final String OUTPUT_FIELD_DELIM_KEY =
- org.apache.sqoop.manager.MySQLUtils.OUTPUT_FIELD_DELIM_KEY;
- public static final String OUTPUT_RECORD_DELIM_KEY =
- org.apache.sqoop.manager.MySQLUtils.OUTPUT_RECORD_DELIM_KEY;
- public static final String OUTPUT_ENCLOSED_BY_KEY =
- org.apache.sqoop.manager.MySQLUtils.OUTPUT_ENCLOSED_BY_KEY;
- public static final String OUTPUT_ESCAPED_BY_KEY =
- org.apache.sqoop.manager.MySQLUtils.OUTPUT_ESCAPED_BY_KEY;
- public static final String OUTPUT_ENCLOSE_REQUIRED_KEY =
- org.apache.sqoop.manager.MySQLUtils.OUTPUT_ENCLOSE_REQUIRED_KEY;
- public static final String TABLE_NAME_KEY =
- org.apache.sqoop.manager.MySQLUtils.TABLE_NAME_KEY;
- public static final String CONNECT_STRING_KEY =
- org.apache.sqoop.manager.MySQLUtils.CONNECT_STRING_KEY;
- public static final String USERNAME_KEY =
- org.apache.sqoop.manager.MySQLUtils.USERNAME_KEY;
- public static final String WHERE_CLAUSE_KEY =
- org.apache.sqoop.manager.MySQLUtils.WHERE_CLAUSE_KEY;
- public static final String EXTRA_ARGS_KEY =
- org.apache.sqoop.manager.MySQLUtils.EXTRA_ARGS_KEY;
- public static final String MYSQL_DEFAULT_CHARSET =
- org.apache.sqoop.manager.MySQLUtils.MYSQL_DEFAULT_CHARSET;
-
- public static boolean outputDelimsAreMySQL(Configuration conf) {
- return org.apache.sqoop.manager.MySQLUtils.outputDelimsAreMySQL(conf);
- }
-
- public static String writePasswordFile(Configuration conf)
- throws IOException {
- return org.apache.sqoop.manager.MySQLUtils.writePasswordFile(conf);
- }
-
-}
-
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/manager/OracleManager.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/manager/OracleManager.java b/src/java/com/cloudera/sqoop/manager/OracleManager.java
deleted file mode 100644
index 7beb521..0000000
--- a/src/java/com/cloudera/sqoop/manager/OracleManager.java
+++ /dev/null
@@ -1,47 +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.manager;
-
-import com.cloudera.sqoop.SqoopOptions;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class OracleManager
- extends org.apache.sqoop.manager.OracleManager {
-
- public static final int ERROR_TABLE_OR_VIEW_DOES_NOT_EXIST =
- org.apache.sqoop.manager.OracleManager.ERROR_TABLE_OR_VIEW_DOES_NOT_EXIST;
- public static final String QUERY_LIST_DATABASES =
- org.apache.sqoop.manager.OracleManager.QUERY_LIST_DATABASES;
- public static final String QUERY_LIST_TABLES =
- org.apache.sqoop.manager.OracleManager.QUERY_LIST_TABLES;
- public static final String QUERY_COLUMNS_FOR_TABLE =
- org.apache.sqoop.manager.OracleManager.QUERY_COLUMNS_FOR_TABLE;
- public static final String QUERY_PRIMARY_KEY_FOR_TABLE =
- org.apache.sqoop.manager.OracleManager.QUERY_PRIMARY_KEY_FOR_TABLE;
- public static final String ORACLE_TIMEZONE_KEY =
- org.apache.sqoop.manager.OracleManager.ORACLE_TIMEZONE_KEY;
-
- public OracleManager(final SqoopOptions opts) {
- super(opts);
- }
-
-}
-
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/manager/PostgresqlManager.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/manager/PostgresqlManager.java b/src/java/com/cloudera/sqoop/manager/PostgresqlManager.java
deleted file mode 100644
index 354d260..0000000
--- a/src/java/com/cloudera/sqoop/manager/PostgresqlManager.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.manager;
-
-import com.cloudera.sqoop.SqoopOptions;
-
-/**
- * Manages connections to Postgresql databases.
- */
-public class PostgresqlManager
- extends org.apache.sqoop.manager.PostgresqlManager {
-
- public PostgresqlManager(final SqoopOptions opts) {
- super(opts);
- }
-}
-
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/manager/SQLServerManager.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/manager/SQLServerManager.java b/src/java/com/cloudera/sqoop/manager/SQLServerManager.java
deleted file mode 100644
index 2cc0458..0000000
--- a/src/java/com/cloudera/sqoop/manager/SQLServerManager.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.manager;
-
-import com.cloudera.sqoop.SqoopOptions;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public class SQLServerManager
- extends org.apache.sqoop.manager.SQLServerManager {
-
- public SQLServerManager(final SqoopOptions opts) {
- super(opts);
- }
-}
-
http://git-wip-us.apache.org/repos/asf/sqoop/blob/6984a36c/src/java/com/cloudera/sqoop/manager/SqlManager.java
----------------------------------------------------------------------
diff --git a/src/java/com/cloudera/sqoop/manager/SqlManager.java b/src/java/com/cloudera/sqoop/manager/SqlManager.java
deleted file mode 100644
index 398e01b..0000000
--- a/src/java/com/cloudera/sqoop/manager/SqlManager.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.manager;
-
-import com.cloudera.sqoop.SqoopOptions;
-
-/**
- * @deprecated Moving to use org.apache.sqoop namespace.
- */
-public abstract class SqlManager
- extends org.apache.sqoop.manager.SqlManager {
-
- public static final String SUBSTITUTE_TOKEN =
- org.apache.sqoop.manager.SqlManager.SUBSTITUTE_TOKEN;
-
- public SqlManager(final SqoopOptions opts) {
- super(opts);
- }
-
-}