Convert getLogger() and Log4J imports for Log4J 2

dspace-api/src/main/java/org/dspace/authenticate/IPAuthentication.java

@@ -17,6 +17,7 @@ import java.util.UUID;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.collections.ListUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;

dspace-api/src/main/java/org/dspace/content/packager/AbstractMETSDisseminator.java

@@ -126,7 +126,6 @@ public abstract class AbstractMETSDisseminator
     /**
      * log4j category
      */
-
     private static Logger log = org.apache.logging.log4j.LogManager.getLogger(AbstractMETSDisseminator.class);
 
     // JDOM xml output writer - indented format for readability.

dspace-api/src/main/java/org/dspace/eperson/SubscribeCLITool.java

@@ -27,7 +27,6 @@ import org.apache.commons.cli.Options;
 import org.apache.commons.cli.PosixParser;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
-// Replace with new log4j 2: import org.apache.logging.log4j.Level;
 import org.dspace.content.Collection;
 import org.dspace.content.DCDate;
 import org.dspace.content.Item;

dspace-spring-rest/src/main/java/org/dspace/app/rest/BitstreamContentRestController.java

@@ -57,8 +57,7 @@ import org.springframework.web.bind.annotation.RestController;
     + "/{uuid:[0-9a-fxA-FX]{8}-[0-9a-fxA-FX]{4}-[0-9a-fxA-FX]{4}-[0-9a-fxA-FX]{4}-[0-9a-fxA-FX]{12}}/content")
 public class BitstreamContentRestController {
 
-    private static final Logger log = org.apache.logging.log4j.LogManager
-            .getLogger(BitstreamContentRestController.class);
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(BitstreamContentRestController.class);
 
     //Most file systems are configured to use block sizes of 4096 or 8192 and our buffer should be a multiple of that.
     private static final int BUFFER_SIZE = 4096 * 10;

dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/SubmissionUploadRestRepository.java

@@ -43,8 +43,7 @@ import org.springframework.stereotype.Component;
 public class SubmissionUploadRestRepository extends DSpaceRestRepository<SubmissionUploadRest, String>
     implements LinkRestRepository<SubmissionUploadRest> {
 
-    private static final Logger log = org.apache.logging.log4j.LogManager
-            .getLogger(SubmissionUploadRestRepository.class);
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(SubmissionUploadRestRepository.class);
 
     private SubmissionConfigReader submissionConfigReader;
 

dspace-sword/src/main/java/org/purl/sword/client/ClientFactory.java

@@ -7,7 +7,7 @@
  */
 package org.purl.sword.client;
 
-// Replace with log4j 2: import org.apache.logging.log4j.PropertyConfigurator;
+import org.apache.logging.log4j.PropertyConfigurator;
 
 /**
  * Entry point for the SWORD Demonstration Client. This will parse the list of