You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nutch.apache.org by si...@apache.org on 2006/06/14 18:08:29 UTC
svn commit: r414306 - in /lucene/nutch/trunk/contrib/web2: ./
plugins/web-keymatch/src/java/org/apache/nutch/keymatch/
plugins/web-query-propose-spellcheck/src/java/org/apache/nutch/spell/
src/main/java/org/apache/nutch/webapp/common/ src/main/java/org...
Author: siren
Date: Wed Jun 14 09:08:28 2006
New Revision: 414306
URL: http://svn.apache.org/viewvc?rev=414306&view=rev
Log:
logging changes
Modified:
lucene/nutch/trunk/contrib/web2/build.xml
lucene/nutch/trunk/contrib/web2/plugins/web-keymatch/src/java/org/apache/nutch/keymatch/SimpleKeyMatcher.java
lucene/nutch/trunk/contrib/web2/plugins/web-query-propose-spellcheck/src/java/org/apache/nutch/spell/SpellCheckerBean.java
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/BaseSearch.java
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/PluginResourceLoader.java
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/Search.java
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/ServletContextServiceLocator.java
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/WebappInstanceServiceLocator.java
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/controller/NutchController.java
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/servlet/OpenSearchServlet.java
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/tiles/ExtendableDefinitionsFactory.java
Modified: lucene/nutch/trunk/contrib/web2/build.xml
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/contrib/web2/build.xml?rev=414306&r1=414305&r2=414306&view=diff
==============================================================================
--- lucene/nutch/trunk/contrib/web2/build.xml (original)
+++ lucene/nutch/trunk/contrib/web2/build.xml Wed Jun 14 09:08:28 2006
@@ -119,6 +119,7 @@
<include name="hadoop-*.jar" />
<include name="commons-lang-*.jar" />
<include name="commons-logging-*.jar" />
+ <include name="log4j-*.jar" />
<include name="xerces-*.jar" />
</lib>
<lib dir="${nutch.root}/lib/jetty-ext">
@@ -139,6 +140,9 @@
<include name="*.jar" />
</lib>
<classes dir="${conf.dir}" excludes="**/*.template" />
+
+ <classes file="${nutch.root}/src/web/log4j.properties"/>
+
<!--
<zipfileset prefix="WEB-INF/classes/plugins" dir="${build.plugins}" >
<exclude name="parse-*/**"/>
Modified: lucene/nutch/trunk/contrib/web2/plugins/web-keymatch/src/java/org/apache/nutch/keymatch/SimpleKeyMatcher.java
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/contrib/web2/plugins/web-keymatch/src/java/org/apache/nutch/keymatch/SimpleKeyMatcher.java?rev=414306&r1=414305&r2=414306&view=diff
==============================================================================
--- lucene/nutch/trunk/contrib/web2/plugins/web-keymatch/src/java/org/apache/nutch/keymatch/SimpleKeyMatcher.java (original)
+++ lucene/nutch/trunk/contrib/web2/plugins/web-keymatch/src/java/org/apache/nutch/keymatch/SimpleKeyMatcher.java Wed Jun 14 09:08:28 2006
@@ -26,11 +26,11 @@
import java.util.HashMap;
import java.util.Map;
import java.util.Iterator;
-import java.util.logging.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.Configured;
-import org.apache.hadoop.util.LogFormatter;
import org.apache.nutch.searcher.Query;
import org.apache.nutch.util.DomUtil;
import org.apache.xerces.dom.DocumentImpl;
@@ -93,8 +93,7 @@
}
}
- static final Logger LOG = LogFormatter.getLogger(SimpleKeyMatcher.class
- .getName());
+ public static final Log LOG = LogFactory.getLog(SimpleKeyMatcher.class);
public static final String TAG_KEYMATCH = "keymatch";
@@ -154,7 +153,7 @@
final NodeList nodeList = root.getElementsByTagName(TAG_KEYMATCH);
- LOG.fine("Configuration file has " + nodeList.getLength()
+ LOG.debug("Configuration file has " + nodeList.getLength()
+ " KeyMatch entries.");
for (int i = 0; i < nodeList.getLength(); i++) {
final Element element = (Element) nodeList.item(i);
@@ -181,7 +180,9 @@
//"keyword"
for(int i=0;i<terms.length;i++){
- LOG.fine("keyword: '" + terms[i] + "'");
+ if(LOG.isDebugEnabled()){
+ LOG.debug("keyword: '" + terms[i] + "'");
+ }
addMatches(currentMatches, matches.get(PREFIX_KEYWORD + terms[i]));
}
@@ -195,8 +196,9 @@
key+=terms[i];
if(i!=p+l-1) key+=" ";
}
-
- LOG.fine("phrase key: '" + key + "'");
+ if(LOG.isDebugEnabled()){
+ LOG.debug("phrase key: '" + key + "'");
+ }
addMatches(currentMatches, matches.get(PREFIX_PHRASE + key));
}
}
@@ -204,7 +206,9 @@
//"exact"
String key=query.toString();
- LOG.fine("exact key: '" + key + "'");
+ if(LOG.isDebugEnabled()){
+ LOG.debug("exact key: '" + key + "'");
+ }
addMatches(currentMatches, matches.get(PREFIX_EXACT + key));
Modified: lucene/nutch/trunk/contrib/web2/plugins/web-query-propose-spellcheck/src/java/org/apache/nutch/spell/SpellCheckerBean.java
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/contrib/web2/plugins/web-query-propose-spellcheck/src/java/org/apache/nutch/spell/SpellCheckerBean.java?rev=414306&r1=414305&r2=414306&view=diff
==============================================================================
--- lucene/nutch/trunk/contrib/web2/plugins/web-query-propose-spellcheck/src/java/org/apache/nutch/spell/SpellCheckerBean.java (original)
+++ lucene/nutch/trunk/contrib/web2/plugins/web-query-propose-spellcheck/src/java/org/apache/nutch/spell/SpellCheckerBean.java Wed Jun 14 09:08:28 2006
@@ -21,13 +21,14 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.logging.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.util.LogFormatter;
import org.apache.lucene.search.IndexSearcher;
import org.apache.nutch.searcher.Query;
+import org.apache.nutch.util.LogUtil;
import org.apache.nutch.util.NutchConfiguration;
/**
@@ -36,8 +37,7 @@
* @author Andy Liu <andyliu1227@gmail.com>
*/
public class SpellCheckerBean {
- public static final Logger LOG = LogFormatter
- .getLogger(SpellCheckerBean.class.toString());
+ public static final Log LOG = LogFactory.getLog(SpellCheckerBean.class);
IndexSearcher spellingSearcher;
@@ -84,7 +84,7 @@
spellingSearcher = new IndexSearcher(indexLocation);
} catch (IOException ioe) {
LOG.info("error opening spell checking index");
- ioe.printStackTrace(System.out);
+ ioe.printStackTrace(LogUtil.getInfoStream(LOG));
}
}
@@ -152,7 +152,9 @@
Iterator it = lis.iterator();
while (it.hasNext()) {
- LOG.fine(it.next().toString());
+ if(LOG.isDebugEnabled()){
+ LOG.debug(it.next().toString());
+ }
}
if (suggestions.length > 0) {
Modified: lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/BaseSearch.java
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/BaseSearch.java?rev=414306&r1=414305&r2=414306&view=diff
==============================================================================
--- lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/BaseSearch.java (original)
+++ lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/BaseSearch.java Wed Jun 14 09:08:28 2006
@@ -18,10 +18,10 @@
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.logging.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.util.LogFormatter;
import org.apache.nutch.plugin.Extension;
import org.apache.nutch.plugin.ExtensionPoint;
import org.apache.nutch.webapp.extension.PostSearchExtensionPoint;
@@ -30,7 +30,7 @@
public class BaseSearch {
- public static Logger LOG = LogFormatter.getLogger(BaseSearch.class.getName());
+ public static final Log LOG = LogFactory.getLog(BaseSearch.class);
protected PreSearchExtensionPoint[] presearch;
Modified: lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/PluginResourceLoader.java
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/PluginResourceLoader.java?rev=414306&r1=414305&r2=414306&view=diff
==============================================================================
--- lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/PluginResourceLoader.java (original)
+++ lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/PluginResourceLoader.java Wed Jun 14 09:08:28 2006
@@ -22,12 +22,13 @@
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.Iterator;
-import java.util.logging.Logger;
-import org.apache.hadoop.util.LogFormatter;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.nutch.plugin.Extension;
import org.apache.nutch.plugin.ExtensionPoint;
import org.apache.nutch.plugin.PluginClassLoader;
+import org.apache.nutch.util.LogUtil;
import org.apache.nutch.webapp.extension.UIExtensionPoint;
/**
@@ -88,17 +89,23 @@
* @see java.lang.ClassLoader#loadClass(java.lang.String)
*/
public Class loadClass(String name) throws ClassNotFoundException {
- LOG.info("loading class " + name + " from " + one);
+ if(LOG.isDebugEnabled()){
+ LOG.debug("loading class " + name + " from " + one);
+ }
try {
return one.loadClass(name);
} catch (ClassNotFoundException e) {
}
- LOG.info("loading class " + name + " from " + two);
+ if(LOG.isDebugEnabled()){
+ LOG.debug("loading class " + name + " from " + two);
+ }
try {
return two.loadClass(name);
} catch (ClassNotFoundException e) {
}
- LOG.info("could not find class, must throw Exception");
+ if(LOG.isDebugEnabled()){
+ LOG.info("could not find class, must throw Exception");
+ }
throw new ClassNotFoundException(name);
}
}
@@ -107,8 +114,7 @@
ArrayList classloaders = new ArrayList();
- public static Logger LOG = LogFormatter.getLogger(PluginResourceLoader.class
- .getName());
+ public static Log LOG = LogFactory.getLog(PluginResourceLoader.class);
public static PluginResourceLoader getInstance(ServiceLocator locator,
ClassLoader parent) {
@@ -116,7 +122,7 @@
.getConfiguration().getObject(PluginResourceLoader.class.getName());
if (loader == null) {
- LOG.info("created new nutch loader with parent loader:" + parent);
+ LOG.info("Created new nutch loader with parent loader:" + parent);
loader = new PluginResourceLoader(locator, parent);
locator.getConfiguration().setObject(
PluginResourceLoader.class.getName(), loader);
@@ -134,8 +140,9 @@
ArrayList paths = new ArrayList();
- LOG
- .info("PluginResourceLoader : dynamically setting jars based on plugins implementing UIExtensionPoint.");
+ if(LOG.isDebugEnabled()){
+ LOG.debug("PluginResourceLoader : dynamically setting jars based on plugins implementing UIExtensionPoint.");
+ }
ExtensionPoint point = locator.getPluginRepository().getExtensionPoint(
UIExtensionPoint.X_POINT_ID);
@@ -162,7 +169,9 @@
URL url = urls[k];
if (!seen.contains(url)) {
paths.add(url);
- LOG.info("Adding to classpath:" + url);
+ if(LOG.isDebugEnabled()){
+ LOG.debug("Adding to classpath:" + url);
+ }
}
seen.add(url);
}
@@ -255,7 +264,7 @@
// LOG.info("CUSTOM_LOADER_not found");
} catch (Exception e) {
LOG.info("Exception in loader " + e);
- e.printStackTrace(System.out);
+ e.printStackTrace(LogUtil.getInfoStream(LOG));
}
throw new ClassNotFoundException(name);
}
Modified: lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/Search.java
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/Search.java?rev=414306&r1=414305&r2=414306&view=diff
==============================================================================
--- lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/Search.java (original)
+++ lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/Search.java Wed Jun 14 09:08:28 2006
@@ -18,9 +18,9 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import java.util.logging.Logger;
-import org.apache.hadoop.util.LogFormatter;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.nutch.html.Entities;
import org.apache.nutch.searcher.Hit;
import org.apache.nutch.searcher.HitDetails;
@@ -37,7 +37,7 @@
*/
public class Search {
public static final String REQ_ATTR_SEARCH="nutchSearch";
- public static Logger LOG = LogFormatter.getLogger(Search.class.getName());
+ public static final Log LOG = LogFactory.getLog(Search.class);
String queryString;
Modified: lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/ServletContextServiceLocator.java
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/ServletContextServiceLocator.java?rev=414306&r1=414305&r2=414306&view=diff
==============================================================================
--- lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/ServletContextServiceLocator.java (original)
+++ lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/ServletContextServiceLocator.java Wed Jun 14 09:08:28 2006
@@ -2,12 +2,12 @@
import java.io.IOException;
import java.util.Locale;
-import java.util.logging.Logger;
import javax.servlet.ServletContext;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.util.LogFormatter;
import org.apache.nutch.plugin.PluginRepository;
import org.apache.nutch.searcher.NutchBean;
import org.apache.nutch.util.NutchConfiguration;
@@ -23,8 +23,7 @@
/**
* Logger
*/
- public static Logger LOG = LogFormatter
- .getLogger(ServletContextServiceLocator.class.getName());
+ public static final Log LOG = LogFactory.getLog(ServletContextServiceLocator.class);
/**
* ServletContext this ServiceLocator is bound to
Modified: lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/WebappInstanceServiceLocator.java
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/WebappInstanceServiceLocator.java?rev=414306&r1=414305&r2=414306&view=diff
==============================================================================
--- lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/WebappInstanceServiceLocator.java (original)
+++ lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/WebappInstanceServiceLocator.java Wed Jun 14 09:08:28 2006
@@ -16,20 +16,19 @@
package org.apache.nutch.webapp.common;
import java.util.Locale;
-import java.util.logging.Logger;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.util.LogFormatter;
import org.apache.nutch.plugin.PluginRepository;
import org.apache.nutch.searcher.NutchBean;
public class WebappInstanceServiceLocator implements ServiceLocator {
- public static Logger LOG = LogFormatter
- .getLogger(WebappInstanceServiceLocator.class.getName());
+ public static final Log LOG = LogFactory.getLog(WebappInstanceServiceLocator.class);
HttpServletRequest request;
Modified: lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/controller/NutchController.java
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/controller/NutchController.java?rev=414306&r1=414305&r2=414306&view=diff
==============================================================================
--- lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/controller/NutchController.java (original)
+++ lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/controller/NutchController.java Wed Jun 14 09:08:28 2006
@@ -18,14 +18,15 @@
import java.io.IOException;
import java.util.Enumeration;
import java.util.Iterator;
-import java.util.logging.Logger;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.hadoop.util.LogFormatter;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.nutch.util.LogUtil;
import org.apache.nutch.webapp.common.ServiceLocator;
import org.apache.nutch.webapp.common.ServletContextServiceLocator;
import org.apache.nutch.webapp.common.WebappInstanceServiceLocator;
@@ -37,8 +38,7 @@
*/
public abstract class NutchController implements Controller {
- public static Logger LOG = LogFormatter.getLogger(NutchController.class
- .getName());
+ public static final Log LOG = LogFactory.getLog(NutchController.class);
public final void execute(ComponentContext tileContext,
HttpServletRequest request, HttpServletResponse response,
@@ -50,7 +50,7 @@
nutchPerform(tileContext, request, response, servletContext);
} catch (Exception e) {
LOG.info("Exception occured while executing nutch controller:");
- e.printStackTrace(System.err);
+ e.printStackTrace(LogUtil.getInfoStream(LOG));
}
}
Modified: lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/servlet/OpenSearchServlet.java
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/servlet/OpenSearchServlet.java?rev=414306&r1=414305&r2=414306&view=diff
==============================================================================
--- lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/servlet/OpenSearchServlet.java (original)
+++ lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/servlet/OpenSearchServlet.java Wed Jun 14 09:08:28 2006
@@ -18,7 +18,6 @@
import java.io.IOException;
import java.net.URLEncoder;
-import java.util.logging.Level;
import java.util.Map;
import java.util.HashMap;
import java.util.Set;
@@ -128,7 +127,7 @@
hits = getServiceLocator().getNutchBean().search(query, start + hitsPerPage, hitsPerDup, dedupField,
sort, reverse);
} catch (IOException e) {
- NutchBean.LOG.log(Level.WARNING, "Search Error", e);
+ NutchBean.LOG.warn("Search Error", e);
hits = new Hits(0, new Hit[0]);
}
Modified: lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/tiles/ExtendableDefinitionsFactory.java
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/tiles/ExtendableDefinitionsFactory.java?rev=414306&r1=414305&r2=414306&view=diff
==============================================================================
--- lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/tiles/ExtendableDefinitionsFactory.java (original)
+++ lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/tiles/ExtendableDefinitionsFactory.java Wed Jun 14 09:08:28 2006
@@ -20,12 +20,12 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import java.util.logging.Logger;
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
-import org.apache.hadoop.util.LogFormatter;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.nutch.plugin.Extension;
import org.apache.nutch.plugin.ExtensionPoint;
@@ -52,8 +52,7 @@
private static final long serialVersionUID = 1L;
- public static Logger LOG = LogFormatter
- .getLogger(ExtendableDefinitionsFactory.class.getName());
+ public static final Log LOG = LogFactory.getLog(ExtendableDefinitionsFactory.class);
DefinitionsFactoryConfig config;
@@ -172,7 +171,6 @@
try {
xmlParser.parse(input, newSet);
- preprocessDefinitions(newSet);
} catch (IOException e) {
LOG.info("IOException (" + e.getMessage() + ") parsing definitions "
+ info);
@@ -183,8 +181,8 @@
e.printStackTrace();
}
- LOG.info("Definitions:" + definitions.getDefinitions().size() + " : "
- + definitions.toString());
+// LOG.info("Definitions:" + definitions.getDefinitions().size() + " : "
+// + definitions.toString());
copySet(definitions,newSet);
@@ -228,25 +226,14 @@
this.definitions = definitions.getDefinitions();
}
- private void preprocessDefinitions(XmlDefinitionsSet set){
- Map definitions=set.getDefinitions();
- Iterator i=definitions.keySet().iterator();
-
- while(i.hasNext()){
- String key=(String)i.next();
- XmlDefinition definition=(XmlDefinition)definitions.get(key);
- if(definition.getPath()!=null && definition.getPath().startsWith("@plugin@")){
- definition.setPath("goooo" + definition.getPath());
- }
- }
- }
-
private void initDefinitions(XmlDefinitionsSet definitions) {
Iterator i = definitions.getDefinitions().keySet().iterator();
while (i.hasNext()) {
String key = (String) i.next();
- LOG.fine("Initializing controller: " + key);
+ if(LOG.isDebugEnabled()){
+ LOG.debug("Initializing controller: " + key);
+ }
XmlDefinition d = definitions.getDefinition(key);
try {
Controller controller=d.getOrCreateController();