HADOOP-6548. Replace mortbay imports with commons logging.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@909802 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
e0a0e6b9f5
commit
fc83909c3f
@ -189,6 +189,8 @@ Trunk (unreleased changes)
|
||||
HADOOP-6505. Use tr rather than sed to effect literal substitution in the
|
||||
build script. (Allen Wittenauer via cdouglas)
|
||||
|
||||
HADOOP-6548. Replace mortbay imports with commons logging. (cdouglas)
|
||||
|
||||
Release 0.21.0 - Unreleased
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
@ -27,12 +27,17 @@
|
||||
import org.apache.hadoop.util.StringUtils;
|
||||
import org.apache.hadoop.util.Shell;
|
||||
import org.apache.hadoop.util.Shell.ShellCommandExecutor;
|
||||
import org.mortbay.log.Log;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
||||
/**
|
||||
* A collection of file-processing util methods
|
||||
*/
|
||||
public class FileUtil {
|
||||
|
||||
private static final Log LOG = LogFactory.getLog(FileUtil.class);
|
||||
|
||||
/**
|
||||
* convert an array of FileStatus to an array of Path
|
||||
*
|
||||
@ -752,8 +757,8 @@ public static int chmod(String filename, String perm, boolean recursive)
|
||||
try {
|
||||
shExec.execute();
|
||||
}catch(Exception e) {
|
||||
if(Log.isDebugEnabled()) {
|
||||
Log.debug("Error while changing permission : " + filename
|
||||
if(LOG.isDebugEnabled()) {
|
||||
LOG.debug("Error while changing permission : " + filename
|
||||
+" Exception: " + StringUtils.stringifyException(e));
|
||||
}
|
||||
}
|
||||
|
@ -23,7 +23,9 @@
|
||||
|
||||
import org.apache.hadoop.conf.Configuration;
|
||||
import org.apache.hadoop.io.compress.Compressor;
|
||||
import org.mortbay.log.Log;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
||||
/**
|
||||
* A wrapper around java.util.zip.Deflater to make it conform
|
||||
@ -32,6 +34,8 @@
|
||||
*/
|
||||
public class BuiltInZlibDeflater extends Deflater implements Compressor {
|
||||
|
||||
private static final Log LOG = LogFactory.getLog(BuiltInZlibDeflater.class);
|
||||
|
||||
public BuiltInZlibDeflater(int level, boolean nowrap) {
|
||||
super(level, nowrap);
|
||||
}
|
||||
@ -69,9 +73,9 @@ public void reinit(Configuration conf) {
|
||||
try {
|
||||
setStrategy(strategy.compressionStrategy());
|
||||
} catch (IllegalArgumentException ill) {
|
||||
Log.warn(strategy + " not supported by BuiltInZlibDeflater.");
|
||||
LOG.warn(strategy + " not supported by BuiltInZlibDeflater.");
|
||||
setStrategy(DEFAULT_STRATEGY);
|
||||
}
|
||||
Log.debug("Reinit compressor with new compression configuration");
|
||||
LOG.debug("Reinit compressor with new compression configuration");
|
||||
}
|
||||
}
|
||||
|
@ -25,7 +25,9 @@
|
||||
import org.apache.hadoop.conf.Configuration;
|
||||
import org.apache.hadoop.io.compress.Compressor;
|
||||
import org.apache.hadoop.util.NativeCodeLoader;
|
||||
import org.mortbay.log.Log;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
||||
/**
|
||||
* A {@link Compressor} based on the popular
|
||||
@ -34,6 +36,9 @@
|
||||
*
|
||||
*/
|
||||
public class ZlibCompressor implements Compressor {
|
||||
|
||||
private static final Log LOG = LogFactory.getLog(ZlibCompressor.class);
|
||||
|
||||
private static final int DEFAULT_DIRECT_BUFFER_SIZE = 64*1024;
|
||||
|
||||
// HACK - Use this as a global lock in the JNI layer
|
||||
@ -248,7 +253,7 @@ public synchronized void reinit(Configuration conf) {
|
||||
stream = init(level.compressionLevel(),
|
||||
strategy.compressionStrategy(),
|
||||
windowBits.windowBits());
|
||||
Log.debug("Reinit compressor with new compression configuration");
|
||||
LOG.debug("Reinit compressor with new compression configuration");
|
||||
}
|
||||
|
||||
public synchronized void setInput(byte[] b, int off, int len) {
|
||||
|
Loading…
Reference in New Issue
Block a user