hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-12 20:43:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Entities code to use log4j2 and commons-lang v3 (per master merge)

Browse Source
This commit is contained in:
Tim Donohue
2018-12-06 17:43:15 +00:00
parent ceed829800
commit 09faec3f17
5 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dspace-api/src/main/java/org/dspace/app/bulkedit/DSpaceCSV.java
View File

@@ -27,7 +27,7 @@ import java.util.UUID;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.dspace.authority.AuthorityValue; import org.dspace.authority.AuthorityValue;
import org.dspace.authority.factory.AuthorityServiceFactory; import org.dspace.authority.factory.AuthorityServiceFactory;
import org.dspace.authority.service.AuthorityValueService; import org.dspace.authority.service.AuthorityValueService;

7
dspace-api/src/main/java/org/dspace/app/util/InitializeEntities.java
View File

@@ -22,8 +22,9 @@ import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options; import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException; import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser; import org.apache.commons.cli.PosixParser;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.dspace.authorize.AuthorizeException; import org.dspace.authorize.AuthorizeException;
import org.dspace.content.EntityType; import org.dspace.content.EntityType;
import org.dspace.content.RelationshipType; import org.dspace.content.RelationshipType;
@@ -45,7 +46,7 @@ import org.xml.sax.SAXException;
*/ */
public class InitializeEntities { public class InitializeEntities {
private final static Logger log = Logger.getLogger(InitializeEntities.class); private final static Logger log = LogManager.getLogger();
private RelationshipTypeService relationshipTypeService; private RelationshipTypeService relationshipTypeService;
private RelationshipService relationshipService; private RelationshipService relationshipService;

2
dspace-api/src/main/java/org/dspace/content/EntityServiceImpl.java
View File

@@ -12,7 +12,7 @@ import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.dspace.content.service.EntityService; import org.dspace.content.service.EntityService;
import org.dspace.content.service.EntityTypeService; import org.dspace.content.service.EntityTypeService;
import org.dspace.content.service.ItemService; import org.dspace.content.service.ItemService;

9
dspace-api/src/main/java/org/dspace/content/RelationshipServiceImpl.java
View File

@@ -12,9 +12,10 @@ import java.util.Collections;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.dspace.authorize.AuthorizeException; import org.dspace.authorize.AuthorizeException;
import org.dspace.authorize.service.AuthorizeService; import org.dspace.authorize.service.AuthorizeService;
import org.dspace.content.dao.RelationshipDAO; import org.dspace.content.dao.RelationshipDAO;
@@ -26,7 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
public class RelationshipServiceImpl implements RelationshipService { public class RelationshipServiceImpl implements RelationshipService {
private static final Logger log = Logger.getLogger(RelationshipServiceImpl.class); private static final Logger log = LogManager.getLogger();
@Autowired(required = true) @Autowired(required = true)
protected RelationshipDAO relationshipDAO; protected RelationshipDAO relationshipDAO;

5
dspace-spring-rest/src/main/java/org/dspace/app/rest/RootRestResourceController.java
View File

@@ -9,7 +9,8 @@ package org.dspace.app.rest;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.apache.log4j.Logger; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.dspace.app.rest.link.HalLinkService; import org.dspace.app.rest.link.HalLinkService;
import org.dspace.app.rest.model.RootRest; import org.dspace.app.rest.model.RootRest;
import org.dspace.app.rest.model.hateoas.RootResource; import org.dspace.app.rest.model.hateoas.RootResource;
@@ -40,7 +41,7 @@ public class RootRestResourceController {
@Autowired @Autowired
RootRestRepository rootRestRepository; RootRestRepository rootRestRepository;
private static Logger log = Logger.getLogger(RootRestResourceController.class); private static Logger log = LogManager.getLogger();
@RequestMapping(method = RequestMethod.GET) @RequestMapping(method = RequestMethod.GET)
public RootResource listDefinedEndpoint(HttpServletRequest request) { public RootResource listDefinedEndpoint(HttpServletRequest request) {