Merge branch 'master' into fetchhttp-hc

Conflicts:
	modules/src/main/java/org/archive/modules/fetcher/FetchHTTP.java

(conflicts are resolved)

engine/src/main/java/org/archive/crawler/framework/Engine.java

@@ -43,6 +43,7 @@ import org.archive.util.ArchiveUtils;
  * @contributor gojomo
  */
 public class Engine {
+    @SuppressWarnings("unused")
     private static final long serialVersionUID = 4L;
 
     final public static String LOGS_DIR_NAME = "logs subdirectory";

engine/src/main/java/org/archive/crawler/frontier/AbstractFrontier.java

@@ -89,6 +89,7 @@ public abstract class AbstractFrontier
                ExtractorParameters,
                CrawlUriReceiver,
                ApplicationListener<ApplicationEvent> {
+    @SuppressWarnings("unused")
     private static final long serialVersionUID = 555881755284996860L;
     private static final Logger logger = Logger
             .getLogger(AbstractFrontier.class.getName());

engine/src/main/java/org/archive/crawler/frontier/BdbFrontier.java

@@ -60,6 +60,7 @@ import com.sleepycat.je.DatabaseException;
  */
 public class BdbFrontier extends WorkQueueFrontier 
 implements Checkpointable, BeanNameAware {
+    @SuppressWarnings("unused")
     private static final long serialVersionUID = 1L;
 
     private static final Logger logger =

engine/src/main/java/org/archive/crawler/frontier/BdbMultipleWorkQueues.java

@@ -59,7 +59,8 @@ import com.sleepycat.util.RuntimeExceptionWrapper;
  * @author gojomo
  */
 public class BdbMultipleWorkQueues {
-	private static final long serialVersionUID = 1L;
+	@SuppressWarnings("unused")
+    private static final long serialVersionUID = 1L;
 	
     private static final Logger LOGGER =
         Logger.getLogger(BdbMultipleWorkQueues.class.getName());
@@ -152,7 +153,6 @@ public class BdbMultipleWorkQueues {
             boolean verbose) 
     throws DatabaseException {
         int matches = 0;
-        int tries = 0;
         ArrayList<String> results = new ArrayList<String>(maxMatches);
         
         DatabaseEntry key;
@@ -183,7 +183,6 @@ public class BdbMultipleWorkQueues {
                         }
                         matches++;
                     }
-                    tries++;
                 }
                 result = cursor.getNext(key,value,null);
             }

engine/src/main/java/org/archive/crawler/frontier/WorkQueueFrontier.java

@@ -83,6 +83,7 @@ import com.sleepycat.je.DatabaseException;
 public abstract class WorkQueueFrontier extends AbstractFrontier
 implements Closeable, 
            ApplicationContextAware {
+    @SuppressWarnings("unused")
     private static final long serialVersionUID = 570384305871965843L;
 
     /**

engine/src/main/java/org/archive/crawler/postprocessor/CandidatesProcessor.java

@@ -47,6 +47,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  */
 public class CandidatesProcessor extends Processor {
 
+    @SuppressWarnings("unused")
     private static final long serialVersionUID = -3L;
     
     /**

engine/src/main/java/org/archive/crawler/postprocessor/DispositionProcessor.java

@@ -54,6 +54,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * @version $Date$, $Revision$
  */
 public class DispositionProcessor extends Processor {
+    @SuppressWarnings("unused")
     private static final long serialVersionUID = -1072728147960180091L;
     private static final Logger logger =
         Logger.getLogger(DispositionProcessor.class.getName());

engine/src/main/java/org/archive/crawler/postprocessor/LinksScoper.java

@@ -54,6 +54,7 @@ import org.archive.modules.extractor.Link;
  */
 public class LinksScoper extends Scoper {
 
+    @SuppressWarnings("unused")
     private static final long serialVersionUID = -3L;
 
     private static Logger LOGGER =

engine/src/main/java/org/archive/crawler/postprocessor/LowDiskPauseProcessor.java

@@ -45,6 +45,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 @Deprecated
 public class LowDiskPauseProcessor extends Processor {
 
+    @SuppressWarnings("unused")
     private static final long serialVersionUID = 3L;
 
     /**

engine/src/main/java/org/archive/crawler/postprocessor/SupplementaryLinksScoper.java

@@ -43,6 +43,7 @@ import org.archive.modules.deciderules.DecideRule;
  */
 public class SupplementaryLinksScoper extends Scoper {
 
+    @SuppressWarnings("unused")
     private static final long serialVersionUID = -3L;
 
     private static Logger LOGGER =

engine/src/main/java/org/archive/crawler/prefetch/CandidateScoper.java

@@ -32,6 +32,7 @@ import org.archive.modules.ProcessResult;
  * @contributor gojomo
  */
 public class CandidateScoper extends Scoper {
+    @SuppressWarnings("unused")
     private static final long serialVersionUID = 1L;
 
     @Override

engine/src/main/java/org/archive/crawler/prefetch/FrontierPreparer.java

@@ -48,6 +48,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * @contributor gojomo
  */
 public class FrontierPreparer extends Scoper {
+    @SuppressWarnings("unused")
     private static final long serialVersionUID = 1L;
 
     /**

engine/src/main/java/org/archive/crawler/prefetch/PreconditionEnforcer.java

@@ -51,6 +51,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * @author gojomo
  */
 public class PreconditionEnforcer extends Processor  {
+    @SuppressWarnings("unused")
     private static final long serialVersionUID = 3L;
     private static final Logger logger =
         Logger.getLogger(PreconditionEnforcer.class.getName());

engine/src/main/java/org/archive/crawler/prefetch/Preselector.java

@@ -40,6 +40,7 @@ import org.archive.util.TextUtils;
  *
  */
 public class Preselector extends Scoper {
+    @SuppressWarnings("unused")
     private static final long serialVersionUID = 3L;
 
     /**

engine/src/main/java/org/archive/crawler/prefetch/QuotaEnforcer.java

@@ -42,6 +42,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * @version $Date$, $Revision$
  */
 public class QuotaEnforcer extends Processor {
+    @SuppressWarnings("unused")
     private static final long serialVersionUID = 3L;
 
     private static final Logger LOGGER =

engine/src/main/java/org/archive/crawler/prefetch/RuntimeLimitEnforcer.java

@@ -62,6 +62,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  */
 public class RuntimeLimitEnforcer extends Processor {
 
+    @SuppressWarnings("unused")
     private static final long serialVersionUID = 3L;
     
     protected static Logger logger = Logger.getLogger(

engine/src/main/java/org/archive/crawler/processor/HashCrawlMapper.java

@@ -37,6 +37,7 @@ import st.ata.util.FPGenerator;
  */
 public class HashCrawlMapper extends CrawlMapper {
 
+    @SuppressWarnings("unused")
     private static final long serialVersionUID = 2L;
     
     protected Frontier frontier;

engine/src/main/java/org/archive/crawler/processor/LexicalCrawlMapper.java

@@ -78,6 +78,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * @version $Date$, $Revision$
  */
 public class LexicalCrawlMapper extends CrawlMapper {
+    @SuppressWarnings("unused")
     private static final long serialVersionUID = 2L;
 
     /**

engine/src/main/java/org/archive/crawler/reporting/CrawlerLoggerModule.java

@@ -62,6 +62,7 @@ public class CrawlerLoggerModule
     implements 
         UriErrorLoggerModule, Lifecycle, InitializingBean,
         Checkpointable, SimpleFileLoggerProvider, DisposableBean {
+    @SuppressWarnings("unused")
     private static final long serialVersionUID = 1L;
 
     protected ConfigPath path = new ConfigPath(Engine.LOGS_DIR_NAME,"${launchId}/logs"); 

engine/src/main/java/org/archive/crawler/reporting/StatisticsTracker.java

@@ -138,6 +138,7 @@ public class StatisticsTracker
         Runnable, 
         Checkpointable,
         BeanNameAware {
+    @SuppressWarnings("unused")
     private static final long serialVersionUID = 5L;
 
     protected SeedModule seeds;

engine/src/test/java/org/archive/crawler/selftest/KeyWordProcessor.java

@@ -57,6 +57,7 @@ import org.archive.modules.Processor;
  * @author pjack
  */
 public class KeyWordProcessor extends Processor {
+    @SuppressWarnings("unused")
     private static final long serialVersionUID = 1L;
     /**
      * Regular expression used to detect the presence of a keyword.