svn commit: r1177290 - in /nutch/trunk: CHANGES.txt src/java/org/apache/nutch/util/LogUtil.java

[le...@apache.org]

Author: lewismc
Date: Thu Sep 29 12:47:39 2011
New Revision: 1177290

URL: http://svn.apache.org/viewvc?rev=1177290&view=rev
Log:
commit to address NUTCH-1078 and update to changes.txt

Modified:
    nutch/trunk/CHANGES.txt
    nutch/trunk/src/java/org/apache/nutch/util/LogUtil.java

Modified: nutch/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/nutch/trunk/CHANGES.txt?rev=1177290&r1=1177289&r2=1177290&view=diff
==============================================================================
--- nutch/trunk/CHANGES.txt (original)
+++ nutch/trunk/CHANGES.txt Thu Sep 29 12:47:39 2011
@@ -6,7 +6,7 @@ Release 1.4 - Current development
 
 * NUTCH-937 Put plugins in classes/plugins in job file (Claudio Martella, Ferdy Galema, jnioche)
 
-* NUTCH-623 Change plugin source directory "languageidentifier" to "language-identifier"
+* NUTCH-623 Change plugin source directory "languageidentifier" to "language-identifier" (lewismc)
 
 * NUTCH-1074 topN is ignored with maxNumSegments and generate.max.count (Robert Thomson via markus)
 

Modified: nutch/trunk/src/java/org/apache/nutch/util/LogUtil.java
URL: http://svn.apache.org/viewvc/nutch/trunk/src/java/org/apache/nutch/util/LogUtil.java?rev=1177290&r1=1177289&r2=1177290&view=diff
==============================================================================
--- nutch/trunk/src/java/org/apache/nutch/util/LogUtil.java (original)
+++ nutch/trunk/src/java/org/apache/nutch/util/LogUtil.java Thu Sep 29 12:47:39 2011
@@ -22,7 +22,7 @@ import java.io.IOException;
 import java.io.PrintStream;
 import java.lang.reflect.Method;
 
-// Commons Logging imports
+// slf4j Logging imports
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,12 +45,12 @@ public class LogUtil {
 
   static {
     try {
-      TRACE = Logger.class.getMethod("trace", new Class[] { Object.class });
-      DEBUG = Logger.class.getMethod("debug", new Class[] { Object.class });
-      INFO  = Logger.class.getMethod("info",  new Class[] { Object.class });
-      WARN  = Logger.class.getMethod("warn",  new Class[] { Object.class });
-      ERROR = Logger.class.getMethod("error", new Class[] { Object.class });
-      FATAL = Logger.class.getMethod("error", new Class[] { Object.class });
+      TRACE = Logger.class.getMethod("trace", new Class[] { String.class });
+      DEBUG = Logger.class.getMethod("debug", new Class[] { String.class });
+      INFO  = Logger.class.getMethod("info",  new Class[] { String.class });
+      WARN  = Logger.class.getMethod("warn",  new Class[] { String.class });
+      ERROR = Logger.class.getMethod("error", new Class[] { String.class });
+      FATAL = Logger.class.getMethod("error", new Class[] { String.class });
     } catch(Exception e) {
       if (LOG.isErrorEnabled()) {
         LOG.error("Cannot init log methods", e);
@@ -100,7 +100,7 @@ public class LogUtil {
           if (!hasNewline())
             return;
           try {
-            method.invoke(logger, new Object[] { toString().trim() });
+            method.invoke(logger, new String[] { toString().trim() });
           } catch (Exception e) {
             if (LOG.isErrorEnabled()) {
               LOG.error("Cannot log with method [" + method + "]", e);