Author: rfrovarp
Date: Mon Apr 30 01:57:02 2012
New Revision: 1332040
URL: http://svn.apache.org/viewvc?rev=1332040&view=rev
Log:
Loggers should be static and final.
They should also be upper case.
Modified:
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/SequentialTaskMaster.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/net/RegexURLFilter.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/parse/html/HtmlParser.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/HttpProtocol.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/crawler/CrawlingWorker.java
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/examples/FileRenameDroid.java
incubator/droids/trunk/droids-spring/src/main/java/org/apache/droids/dynamic/Cli.java
Modified:
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/SequentialTaskMaster.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/SequentialTaskMaster.java?rev=1332040&r1=1332039&r2=1332040&view=diff
==============================================================================
---
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/SequentialTaskMaster.java
(original)
+++
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/SequentialTaskMaster.java
Mon Apr 30 01:57:02 2012
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
public class SequentialTaskMaster<T extends Task> implements TaskMaster<T>
{
- private final Logger log =
LoggerFactory.getLogger(SequentialTaskMaster.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(SequentialTaskMaster.class);
private final Object mutex;
private volatile boolean completed;
private volatile Date startedWorking = null;
@@ -89,10 +89,10 @@ public class SequentialTaskMaster<T exte
}
switch (result) {
case WARN:
- log.warn(ex.toString(), ex);
+ LOG.warn(ex.toString(), ex);
break;
case FATAL:
- log.warn(ex.getMessage(), ex);
+ LOG.warn(ex.getMessage(), ex);
terminated = true;
break;
}
Modified:
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/net/RegexURLFilter.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/net/RegexURLFilter.java?rev=1332040&r1=1332039&r2=1332040&view=diff
==============================================================================
---
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/net/RegexURLFilter.java
(original)
+++
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/net/RegexURLFilter.java
Mon Apr 30 01:57:02 2012
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
*/
public class RegexURLFilter implements URLFilter {
- private final Logger log = LoggerFactory.getLogger(RegexURLFilter.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(RegexURLFilter.class);
/** An array of applicable rules */
private final List<RegexRule> rules;
@@ -89,7 +89,7 @@ public class RegexURLFilter implements U
} else {
url = (file.contains(":/") ? new URL(file) : new URL("file://" + file));
}
- log.debug("url " + url);
+ LOG.debug("url " + url);
Reader reader = new InputStreamReader(url.openStream());
try {
rules.addAll( readRulesFile(reader) );
@@ -125,8 +125,8 @@ public class RegexURLFilter implements U
}
String regex = line.substring(1);
- if (log.isTraceEnabled()) {
- log.trace("Adding rule [" + regex + "]");
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Adding rule [" + regex + "]");
}
final RegexRule rule = createRule(sign, regex);
localRules.add(rule);
Modified:
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/parse/html/HtmlParser.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/parse/html/HtmlParser.java?rev=1332040&r1=1332039&r2=1332040&view=diff
==============================================================================
---
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/parse/html/HtmlParser.java
(original)
+++
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/parse/html/HtmlParser.java
Mon Apr 30 01:57:02 2012
@@ -50,7 +50,7 @@ import org.xml.sax.SAXNotSupportedExcept
@Deprecated
public class HtmlParser implements Parser {
- private final Logger log = LoggerFactory.getLogger(HtmlParser.class);
+ private static final Logger LOG = LoggerFactory.getLogger(HtmlParser.class);
private Map<String, String> elements= null;
Modified:
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/HttpProtocol.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/HttpProtocol.java?rev=1332040&r1=1332039&r2=1332040&view=diff
==============================================================================
---
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/HttpProtocol.java
(original)
+++
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/HttpProtocol.java
Mon Apr 30 01:57:02 2012
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
*/
public class HttpProtocol implements Protocol {
- private final Logger log = LoggerFactory.getLogger(HttpProtocol.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(HttpProtocol.class);
private final HttpClient httpclient;
private final ContentLoader contentLoader;
@@ -92,7 +92,7 @@ public class HttpProtocol implements Pro
uri.getScheme(), uri.getUserInfo(), uri.getHost(), uri.getPort(),
"/", null, null);
} catch (URISyntaxException ex) {
- log.error("Unable to determine base URI for " + uri);
+ LOG.error("Unable to determine base URI for " + uri);
return false;
}
@@ -100,12 +100,12 @@ public class HttpProtocol implements Pro
try {
nrc.parse(baseURI);
} catch (NoRobotException ex) {
- log.error("Failure parsing robots.txt: " + ex.getMessage());
+ LOG.error("Failure parsing robots.txt: " + ex.getMessage());
return false;
}
boolean test = nrc.isUrlAllowed(uri);
- if (log.isInfoEnabled()) {
- log.info(uri + " is " + (test ? "allowed" : "denied"));
+ if (LOG.isInfoEnabled()) {
+ LOG.info(uri + " is " + (test ? "allowed" : "denied"));
}
return test;
}
Modified:
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/crawler/CrawlingWorker.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/crawler/CrawlingWorker.java?rev=1332040&r1=1332039&r2=1332040&view=diff
==============================================================================
---
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/crawler/CrawlingWorker.java
(original)
+++
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/crawler/CrawlingWorker.java
Mon Apr 30 01:57:02 2012
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
public class CrawlingWorker implements Worker<Link>
{
- private final Logger log = LoggerFactory.getLogger(CrawlingWorker.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(CrawlingWorker.class);
private final CrawlingDroid droid;
HandlerFactory handlerFactory;
@@ -54,42 +54,42 @@ public class CrawlingWorker implements W
public void execute(Link link) throws DroidsException, IOException
{
final String userAgent = this.getClass().getCanonicalName();
- if (log.isDebugEnabled()) {
- log.debug("Starting " + userAgent);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Starting " + userAgent);
}
URI uri = link.getURI();
final Protocol protocol = droid.getProtocolFactory().getProtocol(uri);
if (protocol == null) {
- if (log.isWarnEnabled()) {
- log.warn("Unsupported protocol scheme '" + uri.getScheme() + "'");
+ if (LOG.isWarnEnabled()) {
+ LOG.warn("Unsupported protocol scheme '" + uri.getScheme() + "'");
}
return;
}
if (protocol.isAllowed(uri)) {
- if (log.isInfoEnabled()) {
- log.info("Loading " + uri);
+ if (LOG.isInfoEnabled()) {
+ LOG.info("Loading " + uri);
}
ManagedContentEntity entity = null;
try {
entity = protocol.load(uri);
} catch(OutOfMemoryError e) {
- log.error("Out of memory processing: " + uri + " skipping", e);
+ LOG.error("Out of memory processing: " + uri + " skipping", e);
throw new DroidsException(e);
}
try {
String contentType = entity.getMimeType();
- if (log.isDebugEnabled()) {
- log.debug("Content type " + contentType);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Content type " + contentType);
}
if (contentType == null){
- log.info("Missing content type... can't parse...");
+ LOG.info("Missing content type... can't parse...");
}
else {
Parser parser = droid.getParserFactory().getParser(contentType);
if( parser == null ) {
- if (log.isDebugEnabled()) {
- log.debug("Could not find parser for " + contentType);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Could not find parser for " + contentType);
}
}
else {
@@ -107,8 +107,8 @@ public class CrawlingWorker implements W
}
}
else {
- if (log.isInfoEnabled()) {
- log.info("Stopping processing since"
+ if (LOG.isInfoEnabled()) {
+ LOG.info("Stopping processing since"
+ " bots are not allowed for " + uri );
}
}
Modified:
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/examples/FileRenameDroid.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/examples/FileRenameDroid.java?rev=1332040&r1=1332039&r2=1332040&view=diff
==============================================================================
---
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/examples/FileRenameDroid.java
(original)
+++
incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/examples/FileRenameDroid.java
Mon Apr 30 01:57:02 2012
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
public class FileRenameDroid extends AbstractDroid<FileTask>
{
- private static final Logger log =
LoggerFactory.getLogger(FileRenameDroid.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(FileRenameDroid.class);
private Collection<File> initialFiles;
public FileRenameDroid(Queue<FileTask> queue, TaskMaster<FileTask>
taskMaster)
@@ -106,19 +106,19 @@ public class FileRenameDroid extends Abs
private void cleanFileName(File file, String pattern, String replace)
{
- log.debug("Processing: " + file.getName());
- log.debug("finding pattern: " + pattern);
- log.debug("replacing it with: " + replace);
+ LOG.debug("Processing: " + file.getName());
+ LOG.debug("finding pattern: " + pattern);
+ LOG.debug("replacing it with: " + replace);
String fileName = file.getName();
if (fileName.contains(pattern) ||
!fileName.toLowerCase().equals(fileName)) {
- log.debug("need to process this file: " + fileName + " in "
+ LOG.debug("need to process this file: " + fileName + " in "
+ file.getAbsolutePath());
File replacement = new File(fileName.substring(0,
file.getAbsolutePath().indexOf(fileName))
+ fileName.replaceAll(pattern, replace).toLowerCase());
- log.debug("Renaming to: " + replacement.getName() + " in "
+ LOG.debug("Renaming to: " + replacement.getName() + " in "
+ replacement.getAbsolutePath());
- log.info("TODO! actually do the rename!");
+ LOG.info("TODO! actually do the rename!");
// TODO -- actually do the rename...file.renameTo(replacement);
}
}
Modified:
incubator/droids/trunk/droids-spring/src/main/java/org/apache/droids/dynamic/Cli.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-spring/src/main/java/org/apache/droids/dynamic/Cli.java?rev=1332040&r1=1332039&r2=1332040&view=diff
==============================================================================
---
incubator/droids/trunk/droids-spring/src/main/java/org/apache/droids/dynamic/Cli.java
(original)
+++
incubator/droids/trunk/droids-spring/src/main/java/org/apache/droids/dynamic/Cli.java
Mon Apr 30 01:57:02 2012
@@ -20,10 +20,11 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.droids.api.Droid;
+import org.apache.droids.examples.FileRenameDroid;
import org.apache.droids.robot.crawler.CrawlingDroid;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -37,7 +38,7 @@ import org.springframework.context.suppo
public class Cli {
private Cli(){
}
- private static final Log log = LogFactory.getLog(Cli.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(FileRenameDroid.class);
/**
* Invoke the processing with droids.
@@ -46,7 +47,7 @@ public class Cli {
*/
public static void main(String[] args) throws Exception {
if (args.length < 1) {
- log.error("To invoke a droid:\n"
+ LOG.error("To invoke a droid:\n"
+ "You need to provide a droid name (e.g. crawler-x-m02y07)" +
" and optionally an initial location to crawl");
return;
@@ -63,17 +64,17 @@ public class Cli {
Droid droid = config.getDroid(name);
if (droid == null) {
- log.error("Droid " + name + " is not defined");
- log.error(getUsage());
+ LOG.error("Droid " + name + " is not defined");
+ LOG.error(getUsage());
return;
}
- log.info("A p a c h e D r o i d s - an intelligent robot framework");
+ LOG.info("A p a c h e D r o i d s - an intelligent robot framework");
if (droid instanceof CrawlingDroid) {
List<String> locations = new ArrayList<String>();
if (location == null) {
- log.error("Droid " + name + " is a crawler, however you have not
defined a starting location.");
- log.error(getUsage());
+ LOG.error("Droid " + name + " is a crawler, however you have not
defined a starting location.");
+ LOG.error(getUsage());
return;
}
locations.add(location);
