hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-16 14:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert getLogger() and Log4J imports for Log4J 2

Browse Source
This commit is contained in:
Patrick Trottier
2018-03-09 17:54:01 -05:00
committed by Mark H. Wood
parent a49486310a
commit bb2dde22b1
6 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dspace-api/src/main/java/org/dspace/authenticate/IPAuthentication.java
View File

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

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

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

1
dspace-api/src/main/java/org/dspace/eperson/SubscribeCLITool.java
View File

@@ -27,7 +27,6 @@ import org.apache.commons.cli.Options;
import org.apache.commons.cli.PosixParser; import org.apache.commons.cli.PosixParser;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.Logger; 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.Collection;
import org.dspace.content.DCDate; import org.dspace.content.DCDate;
import org.dspace.content.Item; import org.dspace.content.Item;

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

@@ -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") + "/{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 { public class BitstreamContentRestController {
private static final Logger log = org.apache.logging.log4j.LogManager private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(BitstreamContentRestController.class);
.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. //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; private static final int BUFFER_SIZE = 4096 * 10;

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

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

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

@@ -7,7 +7,7 @@
*/ */
package org.purl.sword.client; 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 * Entry point for the SWORD Demonstration Client. This will parse the list of