More work on NAS-2380

netarchivesuite · May 20, 2015 · 6780fe0 · 6780fe0
1 parent f470b9f
commit 6780fe0
Show file tree

Hide file tree

Showing 20 changed files with 67 additions and 100 deletions.
diff --git a/archive/archive-core/src/main/java/dk/netarkivet/archive/webinterface/BatchExecuter.java b/archive/archive-core/src/main/java/dk/netarkivet/archive/webinterface/BatchExecuter.java
@@ -32,8 +32,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import dk.netarkivet.common.distribute.arcrepository.ArcRepositoryClientFactory;
 import dk.netarkivet.common.distribute.arcrepository.BatchStatus;
@@ -54,7 +54,8 @@ public class BatchExecuter extends Thread {
     private static final boolean APPEND = true;
 
     /** The log. */
-    private Log log = LogFactory.getLog(BatchExecuter.class);
+    //private Log log = LogFactory.getLog(BatchExecuter.class);
+    protected final Logger log = LoggerFactory.getLogger(BatchExecuter.class);
 
     /** The batchjob to execute. */
     private FileBatchJob batchJob;

diff --git a/archive/archive-core/src/main/java/dk/netarkivet/archive/webinterface/BatchGUI.java b/archive/archive-core/src/main/java/dk/netarkivet/archive/webinterface/BatchGUI.java
@@ -42,8 +42,8 @@
 import javax.servlet.jsp.JspWriter;
 import javax.servlet.jsp.PageContext;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import dk.netarkivet.common.CommonSettings;
 import dk.netarkivet.common.distribute.arcrepository.Replica;
@@ -67,7 +67,8 @@
  */
 public final class BatchGUI {
     /** The log. */
-    private static Log log = LogFactory.getLog(BatchGUI.class);
+    //private static Log log = LogFactory.getLog(BatchGUI.class);
+    protected static final Logger log = LoggerFactory.getLogger(BatchGUI.class);
 
     /** The language translator. */
     private static final I18n I18N = new I18n(dk.netarkivet.archive.Constants.TRANSLATIONS_BUNDLE);

diff --git a/...ve-core/src/main/java/dk/netarkivet/archive/webinterface/BitpreservationUpdateThread.java b/...ve-core/src/main/java/dk/netarkivet/archive/webinterface/BitpreservationUpdateThread.java
@@ -22,8 +22,8 @@
  */
 package dk.netarkivet.archive.webinterface;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import dk.netarkivet.archive.arcrepository.bitpreservation.ActiveBitPreservation;
 import dk.netarkivet.archive.arcrepository.bitpreservation.ActiveBitPreservationFactory;
@@ -37,7 +37,8 @@
 public class BitpreservationUpdateThread extends Thread {
 
     /** The log. */
-    private Log log = LogFactory.getLog(BitpreservationUpdateThread.class.getName());
+    //private Log log = LogFactory.getLog(BitpreservationUpdateThread.class.getName());
+    protected static final Logger log = LoggerFactory.getLogger(BitpreservationUpdateThread.class);
 
     /** The ActiveBitPreservation class. */
     private final ActiveBitPreservation preserve;

diff --git a/...e/archive-core/src/main/java/dk/netarkivet/archive/webinterface/BitpreserveFileState.java b/...e/archive-core/src/main/java/dk/netarkivet/archive/webinterface/BitpreserveFileState.java
@@ -36,8 +36,8 @@
 import javax.servlet.jsp.JspWriter;
 import javax.servlet.jsp.PageContext;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import dk.netarkivet.archive.arcrepository.bitpreservation.ActiveBitPreservation;
 import dk.netarkivet.archive.arcrepository.bitpreservation.ActiveBitPreservationFactory;
@@ -57,7 +57,8 @@ public class BitpreserveFileState {
     /** Internationalisation object. */
     private static final I18n I18N = new I18n(dk.netarkivet.archive.Constants.TRANSLATIONS_BUNDLE);
     /** The logger for this class. */
-    private static Log log = LogFactory.getLog(BitpreserveFileState.class);
+    //private static Log log = LogFactory.getLog(BitpreserveFileState.class);
+    protected static final Logger log = LoggerFactory.getLogger(BitpreserveFileState.class);
 
     /**
      * Private constructor to avoid instantiation of this class.

diff --git a/archive/archive-test/src/test/java/dk/netarkivet/archive/arcrepository/ARCLookupTester.java b/archive/archive-test/src/test/java/dk/netarkivet/archive/arcrepository/ARCLookupTester.java
@@ -41,7 +41,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.archive.io.arc.ARCConstants;
+//import org.archive.io.arc.ARCConstants;
+import org.archive.format.arc.ARCConstants;
 import org.archive.io.arc.ARCReader;
 import org.archive.io.arc.ARCReaderFactory;
 import org.archive.io.arc.ARCRecord;

diff --git a/...etarkivet/archive/arcrepository/bitpreservation/FileBasedActiveBitPreservationTester.java b/...etarkivet/archive/arcrepository/bitpreservation/FileBasedActiveBitPreservationTester.java
@@ -48,14 +48,14 @@
 import javax.jms.Message;
 import javax.jms.MessageListener;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.archive.io.arc.ARCReaderFactory;
 import org.archive.io.arc.ARCRecord;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import dk.netarkivet.archive.ArchiveSettings;
 import dk.netarkivet.archive.arcrepositoryadmin.AdminData;
@@ -102,7 +102,8 @@
 @SuppressWarnings({"unused", "deprecation"})
 public class FileBasedActiveBitPreservationTester {
 
-    private Log log = LogFactory.getLog(getClass().getName());
+    //private Log log = LogFactory.getLog(getClass().getName());
+    private final Logger log = LoggerFactory.getLogger(FileBasedActiveBitPreservationTester.class);
 
     private UseTestRemoteFile rf = new UseTestRemoteFile();
     private ReloadSettings rs = new ReloadSettings();

diff --git a/...est/java/dk/netarkivet/archive/arcrepository/distribute/JMSArcRepositoryClientTester.java b/...est/java/dk/netarkivet/archive/arcrepository/distribute/JMSArcRepositoryClientTester.java
@@ -46,7 +46,7 @@
 import javax.jms.MessageListener;
 import javax.jms.ObjectMessage;
 
-import org.archive.io.arc.ARCConstants;
+import org.archive.format.arc.ARCConstants;
 import org.archive.io.arc.ARCRecord;
 import org.archive.io.arc.ARCRecordMetaData;
 import org.junit.After;

diff --git a/archive/archive-test/src/test/java/dk/netarkivet/archive/tools/GetRecordTester.java b/archive/archive-test/src/test/java/dk/netarkivet/archive/tools/GetRecordTester.java
@@ -34,7 +34,7 @@
 import javax.jms.Message;
 
 import org.archive.io.ArchiveRecord;
-import org.archive.io.arc.ARCConstants;
+import org.archive.format.arc.ARCConstants;
 import org.archive.io.arc.ARCRecord;
 import org.archive.io.arc.ARCRecordMetaData;
 import org.junit.After;

diff --git a/common/common-core/src/main/java/dk/netarkivet/common/distribute/Channels.java b/common/common-core/src/main/java/dk/netarkivet/common/distribute/Channels.java
@@ -25,8 +25,8 @@
 
 import java.util.Collection;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import dk.netarkivet.common.CommonSettings;
 import dk.netarkivet.common.distribute.arcrepository.Replica;
@@ -41,7 +41,8 @@
  */
 public class Channels {
 
-    private static final Log log = LogFactory.getLog(Channels.class);
+    //private static final Log log = LogFactory.getLog(Channels.class);
+    private static final Logger log = LoggerFactory.getLogger(Channels.class);
 
     /**
      * Channel type prefixes for the current set of channels.

diff --git a/common/common-core/src/main/java/dk/netarkivet/common/webinterface/GUIWebServer.java b/common/common-core/src/main/java/dk/netarkivet/common/webinterface/GUIWebServer.java
@@ -24,12 +24,12 @@
 
 import java.io.File;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.DefaultHandler;
 import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.webapp.WebAppContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import dk.netarkivet.common.CommonSettings;
 import dk.netarkivet.common.exceptions.ArgumentNotValid;
@@ -55,7 +55,8 @@ public class GUIWebServer implements CleanupIF {
     /**
      * Logger for this class.
      */
-    private Log log = LogFactory.getLog(getClass().getName());
+    //private Log log = LogFactory.getLog(getClass().getName());
+    private static final Logger log = LoggerFactory.getLogger(GUIWebServer.class);
 
     /** The lower limit of acceptable HTTP port-numbers. */
     private static final int HTTP_PORT_NUMBER_LOWER_LIMIT = 1025;

diff --git a/common/common-core/src/main/java/dk/netarkivet/common/webinterface/HTMLUtils.java b/common/common-core/src/main/java/dk/netarkivet/common/webinterface/HTMLUtils.java
@@ -41,8 +41,8 @@
 import javax.servlet.jsp.JspWriter;
 import javax.servlet.jsp.PageContext;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import dk.netarkivet.common.CommonSettings;
 import dk.netarkivet.common.Constants;
@@ -89,7 +89,8 @@ public class HTMLUtils {
             + "</head> <body onload=\"giveFocus()\">\n";
 
     /** Logger for this class. */
-    private static Log log = LogFactory.getLog(HTMLUtils.class.getName());
+    //private static Log log = LogFactory.getLog(HTMLUtils.class.getName());
+    private static final Logger log = LoggerFactory.getLogger(HTMLUtils.class);
     /** Translations for this module. */
     private static final I18n I18N = new I18n(Constants.TRANSLATIONS_BUNDLE);
 

diff --git a/...mon-test/src/main/java/dk/netarkivet/common/arcrepository/TrivialArcRepositoryClient.java b/...mon-test/src/main/java/dk/netarkivet/common/arcrepository/TrivialArcRepositoryClient.java
@@ -30,11 +30,11 @@
 import java.io.OutputStream;
 import java.util.regex.Pattern;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.archive.io.ArchiveReader;
 import org.archive.io.ArchiveReaderFactory;
 import org.archive.io.ArchiveRecord;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import dk.netarkivet.common.distribute.RemoteFileFactory;
 import dk.netarkivet.common.distribute.arcrepository.ArcRepositoryClient;
@@ -59,7 +59,8 @@ public class TrivialArcRepositoryClient implements ArcRepositoryClient {
     /** Store files in this dir -- might later use a separate setting. */
     private final File dir = new File(FileUtils.getTempDir(), ARC_REPOSITORY_DIR_NAME);
     /** The class logger. */
-    private Log log = LogFactory.getLog(getClass());
+    //private Log log = LogFactory.getLog(getClass());
+    private static final Logger log = LoggerFactory.getLogger(TrivialArcRepositoryClient.class);
 
     /**
      * Constructor for this class. Creates a local directory for the arcrepository.

diff --git a/common/common-test/src/main/java/dk/netarkivet/common/distribute/JMSConnectionMockupMQ.java b/common/common-test/src/main/java/dk/netarkivet/common/distribute/JMSConnectionMockupMQ.java
@@ -63,8 +63,8 @@
 import javax.jms.Topic;
 import javax.jms.TopicSubscriber;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import dk.netarkivet.common.CommonSettings;
 import dk.netarkivet.common.exceptions.NotImplementedException;
@@ -76,7 +76,8 @@
  */
 @SuppressWarnings({"rawtypes", "unused", "serial"})
 public class JMSConnectionMockupMQ extends JMSConnection {
-    private static final Log log = LogFactory.getLog(JMSConnectionMockupMQ.class);
+    //private static final Log log = LogFactory.getLog(JMSConnectionMockupMQ.class);
+    private static final Logger log = LoggerFactory.getLogger(JMSConnectionMockupMQ.class);
 
     /**
      * A set of threads where onMessage has been called. This object is notified when all threads have finished

diff --git a/common/common-test/src/test/java/dk/netarkivet/common/utils/warc/WARCUtilsInTest.java b/common/common-test/src/test/java/dk/netarkivet/common/utils/warc/WARCUtilsInTest.java
@@ -24,11 +24,11 @@
 
 import java.io.IOException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.archive.io.ArchiveRecordHeader;
-import org.archive.io.warc.WARCConstants;
+import org.archive.format.warc.WARCConstants;
 import org.archive.io.warc.WARCRecord;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import dk.netarkivet.common.Constants;
 import dk.netarkivet.common.exceptions.ArgumentNotValid;
@@ -42,8 +42,9 @@
 public class WARCUtilsInTest {
 
     /** Logging output place. */
-    protected static final Log log = LogFactory.getLog(WARCUtilsInTest.class);
-
+    //protected static final Log log = LogFactory.getLog(WARCUtilsInTest.class);
+    protected static final Logger log = LoggerFactory.getLogger(WARCUtilsInTest.class);
+
     /**
      * Read the contents (payload) of an WARC record into a byte array.
      *

diff --git a/commons-logging.txt b/commons-logging.txt
diff --git a/...rvester-core/src/main/java/dk/netarkivet/viewerproxy/distribute/HTTPControllerServer.java b/...rvester-core/src/main/java/dk/netarkivet/viewerproxy/distribute/HTTPControllerServer.java
@@ -52,7 +52,7 @@ public class HTTPControllerServer extends CommandResolver {
      */
     private Controller c;
     /** The log. */
-    private static final Logger log = LoggerFactory.getLogger(HTTPControllerServer.class);
+    private final Logger log = LoggerFactory.getLogger(HTTPControllerServer.class);
 
     /** Command for starting url collection. */
     static final String START_COMMAND = "/startRecordingURIs";
@@ -150,8 +150,11 @@ protected boolean executeCommand(Request request, Response response) {
                 return true;
             }
         } else {
-
-        	//log.debug("This request is not a CommandHostRequest. "); //URI: {}. Ignoring request", request.getURI());
+        	if (request != null) {
+        		log.debug("This request is not a CommandHostRequest. Ignoring request for URI {}", request.getURI());
+        	} else {
+        		log.debug("This request is not a CommandHostRequest. Ignoring null request");
+        	}
         }
         return false;
 

diff --git a/...ack/wayback-indexer/src/main/java/dk/netarkivet/wayback/aggregator/AggregationWorker.java b/...ack/wayback-indexer/src/main/java/dk/netarkivet/wayback/aggregator/AggregationWorker.java
@@ -23,16 +23,15 @@
 package dk.netarkivet.wayback.aggregator;
 
 import java.io.File;
-import java.io.FilenameFilter;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.UUID;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import dk.netarkivet.common.exceptions.ArgumentNotValid;
 import dk.netarkivet.common.utils.CleanupIF;
@@ -50,7 +49,8 @@
  */
 public class AggregationWorker implements CleanupIF {
     /** The AggregationWorker logger. */
-    private Log log = LogFactory.getLog(getClass().getName());
+    //private Log log = LogFactory.getLog(getClass().getName());
+    private final Logger log = LoggerFactory.getLogger(AggregationWorker.class);
     /** The singleton instance. */
     private static AggregationWorker instance = null;
     /** The IndexAggregator instance to use for the actual aggregation work. */