diff --git a/pom.xml b/pom.xml
index e3fdbea..9ea48c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,8 +7,8 @@
uoa-admin-tools-library
eu.dnetlib
- dnet45-parent
- 1.0.0
+ uoa-spring-boot-parent
+ 1.0.0-SNAPSHOT
scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet45/modules/uoa-admin-tools-library/trunk
@@ -20,51 +20,11 @@
${maven.build.timestamp}
E MMM dd HH:mm:ss z yyyy
-
-
-
- org.springframework.boot
- spring-boot-dependencies
- 1.5.8.RELEASE
- pom
- import
-
-
-
org.springframework.boot
spring-boot-starter-data-mongodb
-
- org.springframework.boot
- spring-boot-starter-web
-
-
- org.springframework.boot
- spring-boot-starter-logging
-
-
-
-
- org.springframework.boot
- spring-boot-starter-tomcat
- provided
-
-
- org.springframework.boot
- spring-boot-starter-test
- test
-
-
- org.springframework.boot
- spring-boot-starter-security
-
-
- log4j
- log4j
- 1.2.17
-
javax.mail
mail
@@ -73,18 +33,10 @@
eu.dnetlib
uoa-authorization-library
- 2.1.0
+ 2.1.3-SNAPSHOT
-
-
uoa-admin-tools-library
-
-
- src/main/resources
- true
-
-
diff --git a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/AdminPortalRelationsController.java b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/AdminPortalRelationsController.java
index 3ff989e..08501bc 100644
--- a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/AdminPortalRelationsController.java
+++ b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/AdminPortalRelationsController.java
@@ -4,9 +4,9 @@ import eu.dnetlib.uoaadmintoolslibrary.entities.*;
import eu.dnetlib.uoaadmintoolslibrary.entities.fullEntities.*;
import eu.dnetlib.uoaadmintoolslibrary.handlers.ContentNotFoundException;
import eu.dnetlib.uoaadmintoolslibrary.handlers.MismatchingContentException;
-import eu.dnetlib.uoaadmintoolslibrary.responses.SingleValueWrapperResponse;
import eu.dnetlib.uoaadmintoolslibrary.services.*;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -20,7 +20,7 @@ import java.util.Set;
@RequestMapping(value = "{portalType}")
@CrossOrigin(origins = "*")
public class AdminPortalRelationsController {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@Autowired
private PortalService portalService;
diff --git a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/AdminToolsLibraryCheckDeployController.java b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/AdminToolsLibraryCheckDeployController.java
index 7544905..3cbb11a 100644
--- a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/AdminToolsLibraryCheckDeployController.java
+++ b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/AdminToolsLibraryCheckDeployController.java
@@ -3,7 +3,8 @@ package eu.dnetlib.uoaadmintoolslibrary.controllers;
import eu.dnetlib.uoaadmintoolslibrary.configuration.GlobalVars;
import eu.dnetlib.uoaadmintoolslibrary.configuration.properties.GoogleConfig;
import eu.dnetlib.uoaadmintoolslibrary.configuration.properties.MailConfig;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.CrossOrigin;
@@ -27,7 +28,7 @@ public class AdminToolsLibraryCheckDeployController {
@Autowired
private GlobalVars globalVars;
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@RequestMapping(value = {"", "/health_check"}, method = RequestMethod.GET)
public String hello() {
diff --git a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/DivHelpContentController.java b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/DivHelpContentController.java
index f13fd26..b30fe99 100644
--- a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/DivHelpContentController.java
+++ b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/DivHelpContentController.java
@@ -1,13 +1,10 @@
package eu.dnetlib.uoaadmintoolslibrary.controllers;
-import eu.dnetlib.uoaadmintoolslibrary.entities.DivHelpContent;
-import eu.dnetlib.uoaadmintoolslibrary.entities.Portal;
-import eu.dnetlib.uoaadmintoolslibrary.entities.fullEntities.DivHelpContentResponse;
-import eu.dnetlib.uoaadmintoolslibrary.handlers.ContentNotFoundException;
import eu.dnetlib.uoaadmintoolslibrary.services.DivHelpContentService;
import eu.dnetlib.uoaadmintoolslibrary.services.PortalService;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -16,7 +13,7 @@ import java.util.List;
@RestController
@CrossOrigin(origins = "*")
public class DivHelpContentController {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@Autowired
private DivHelpContentService divHelpContentService;
diff --git a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/DivIdController.java b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/DivIdController.java
index 6c18dd4..caffc69 100644
--- a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/DivIdController.java
+++ b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/DivIdController.java
@@ -1,12 +1,12 @@
package eu.dnetlib.uoaadmintoolslibrary.controllers;
-import eu.dnetlib.uoaadmintoolslibrary.entities.DivId;
import eu.dnetlib.uoaadmintoolslibrary.entities.fullEntities.DivIdResponse;
import eu.dnetlib.uoaadmintoolslibrary.services.DivIdService;
import java.util.*;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -14,7 +14,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
@RestController
@CrossOrigin(origins = "*")
public class DivIdController {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@Autowired
private DivIdService divIdService;
diff --git a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/EntityController.java b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/EntityController.java
index 37c5af8..c167743 100644
--- a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/EntityController.java
+++ b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/EntityController.java
@@ -4,7 +4,8 @@ import eu.dnetlib.uoaadmintoolslibrary.entities.Entity;
import eu.dnetlib.uoaadmintoolslibrary.entities.fullEntities.PortalEntity;
import eu.dnetlib.uoaadmintoolslibrary.services.EntityService;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -14,7 +15,7 @@ import java.util.List;
@RestController
@CrossOrigin(origins = "*")
public class EntityController {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@Autowired
private EntityService entityService;
diff --git a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/GenericPortalController.java b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/GenericPortalController.java
index 1355e47..1bdad1d 100644
--- a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/GenericPortalController.java
+++ b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/GenericPortalController.java
@@ -3,7 +3,8 @@ package eu.dnetlib.uoaadmintoolslibrary.controllers;
import eu.dnetlib.uoaadmintoolslibrary.entities.Portal;
import eu.dnetlib.uoaadmintoolslibrary.entities.fullEntities.PortalResponse;
import eu.dnetlib.uoaadmintoolslibrary.services.PortalService;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -14,7 +15,7 @@ import java.util.List;
@RequestMapping("/portal")
@CrossOrigin(origins = "*")
public class GenericPortalController {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@Autowired
private PortalService portalService;
diff --git a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/PageController.java b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/PageController.java
index bf71644..15bee24 100644
--- a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/PageController.java
+++ b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/PageController.java
@@ -1,6 +1,5 @@
package eu.dnetlib.uoaadmintoolslibrary.controllers;
-import com.mongodb.DuplicateKeyException;
import eu.dnetlib.uoaadmintoolslibrary.entities.Page;
import eu.dnetlib.uoaadmintoolslibrary.entities.fullEntities.PortalPage;
import eu.dnetlib.uoaadmintoolslibrary.handlers.ForbiddenException;
@@ -8,18 +7,17 @@ import eu.dnetlib.uoaadmintoolslibrary.handlers.MismatchingContentException;
import eu.dnetlib.uoaadmintoolslibrary.handlers.utils.RolesUtils;
import eu.dnetlib.uoaadmintoolslibrary.services.PageService;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import org.springframework.security.access.prepost.PreAuthorize;
-import javax.validation.constraints.Null;
import java.util.*;
@RestController
@CrossOrigin(origins = "*")
public class PageController {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@Autowired
private PageService pageService;
diff --git a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/PageHelpContentController.java b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/PageHelpContentController.java
index a9861ab..47c83e8 100644
--- a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/PageHelpContentController.java
+++ b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/PageHelpContentController.java
@@ -1,19 +1,16 @@
package eu.dnetlib.uoaadmintoolslibrary.controllers;
-import eu.dnetlib.uoaadmintoolslibrary.entities.PageHelpContent;
-import eu.dnetlib.uoaadmintoolslibrary.entities.fullEntities.PageHelpContentResponse;
import eu.dnetlib.uoaadmintoolslibrary.services.PageHelpContentService;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.List;
-
@RestController
@CrossOrigin(origins = "*")
public class PageHelpContentController {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@Autowired
private PageHelpContentService pageHelpContentService;
diff --git a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/PortalController.java b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/PortalController.java
index 8142054..4213928 100644
--- a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/PortalController.java
+++ b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/PortalController.java
@@ -3,8 +3,9 @@ package eu.dnetlib.uoaadmintoolslibrary.controllers;
import eu.dnetlib.uoaadmintoolslibrary.entities.*;
import eu.dnetlib.uoaadmintoolslibrary.entities.fullEntities.*;
import eu.dnetlib.uoaadmintoolslibrary.services.*;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.web.bind.annotation.*;
-import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
@@ -14,7 +15,7 @@ import java.util.Map;
@RequestMapping(value = "{portalType}")
@CrossOrigin(origins = "*")
public class PortalController {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@Autowired
private PortalService portalService;
diff --git a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/emailSender/EmailSender.java b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/emailSender/EmailSender.java
index 65270ab..66527d5 100644
--- a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/emailSender/EmailSender.java
+++ b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/emailSender/EmailSender.java
@@ -1,6 +1,7 @@
package eu.dnetlib.uoaadmintoolslibrary.emailSender;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Configurable;
import org.springframework.stereotype.Service;
@@ -18,7 +19,7 @@ import eu.dnetlib.uoaadmintoolslibrary.configuration.properties.MailConfig;
@Configurable
public class EmailSender {
- private static final Logger logger = Logger.getLogger(EmailSender.class);
+ private static final Logger logger = LogManager.getLogger(EmailSender.class);
@Autowired
private MailConfig mailConfig;
diff --git a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/handlers/AdminToolsLibraryExceptionsHandler.java b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/handlers/AdminToolsLibraryExceptionsHandler.java
index e39db7d..c5096f4 100644
--- a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/handlers/AdminToolsLibraryExceptionsHandler.java
+++ b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/handlers/AdminToolsLibraryExceptionsHandler.java
@@ -1,7 +1,8 @@
package eu.dnetlib.uoaadmintoolslibrary.handlers;
import eu.dnetlib.uoaadmintoolslibrary.responses.ExceptionResponse;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.data.crossstore.ChangeSetPersister;
import org.springframework.http.HttpStatus;
@@ -12,7 +13,7 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
@ControllerAdvice
public class AdminToolsLibraryExceptionsHandler {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@ExceptionHandler(MissingServletRequestParameterException.class)
public ResponseEntity invalidInput(Exception ex) {
diff --git a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/handlers/utils/RolesUtils.java b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/handlers/utils/RolesUtils.java
index 450b522..6ac6080 100644
--- a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/handlers/utils/RolesUtils.java
+++ b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/handlers/utils/RolesUtils.java
@@ -1,10 +1,11 @@
package eu.dnetlib.uoaadmintoolslibrary.handlers.utils;
import eu.dnetlib.uoaauthorizationlibrary.security.AuthorizationService;
-import org.apache.log4j.Logger;
import java.util.List;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -13,7 +14,7 @@ public class RolesUtils {
@Autowired
private AuthorizationService authorizationService;
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
public List getRoles() {
return authorizationService.getRoles();
diff --git a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/recaptcha/VerifyRecaptcha.java b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/recaptcha/VerifyRecaptcha.java
index 37b867b..6e5a46f 100644
--- a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/recaptcha/VerifyRecaptcha.java
+++ b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/recaptcha/VerifyRecaptcha.java
@@ -1,6 +1,7 @@
package eu.dnetlib.uoaadmintoolslibrary.recaptcha;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Configurable;
import org.springframework.boot.web.client.RestTemplateBuilder;
@@ -19,7 +20,7 @@ import eu.dnetlib.uoaadmintoolslibrary.handlers.InvalidReCaptchaException;
@Service
@Configurable
public class VerifyRecaptcha {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@Autowired
private RestOperations restTemplate;
diff --git a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/services/DivHelpContentService.java b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/services/DivHelpContentService.java
index abaed98..93d3032 100644
--- a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/services/DivHelpContentService.java
+++ b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/services/DivHelpContentService.java
@@ -7,7 +7,8 @@ import eu.dnetlib.uoaadmintoolslibrary.entities.fullEntities.DivIdResponse;
import eu.dnetlib.uoaadmintoolslibrary.handlers.ContentNotFoundException;
import eu.dnetlib.uoaadmintoolslibrary.handlers.MismatchingContentException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -17,7 +18,7 @@ import java.util.List;
@Service
public class DivHelpContentService {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@Autowired
private DivHelpContentDAO divHelpContentDAO;
diff --git a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/services/DivIdService.java b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/services/DivIdService.java
index 4573306..c53515d 100644
--- a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/services/DivIdService.java
+++ b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/services/DivIdService.java
@@ -7,7 +7,8 @@ import eu.dnetlib.uoaadmintoolslibrary.entities.Portal;
import eu.dnetlib.uoaadmintoolslibrary.entities.fullEntities.DivHelpContentResponse;
import eu.dnetlib.uoaadmintoolslibrary.entities.fullEntities.DivIdResponse;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -15,7 +16,7 @@ import java.util.*;
@Service
public class DivIdService {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@Autowired
private DivIdDAO divIdDAO;
diff --git a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/services/EntityService.java b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/services/EntityService.java
index b1e68c9..a604f8f 100644
--- a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/services/EntityService.java
+++ b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/services/EntityService.java
@@ -6,7 +6,8 @@ import eu.dnetlib.uoaadmintoolslibrary.entities.Page;
import eu.dnetlib.uoaadmintoolslibrary.entities.Portal;
import eu.dnetlib.uoaadmintoolslibrary.entities.fullEntities.PortalEntity;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -16,7 +17,7 @@ import java.util.Map;
@Service
public class EntityService {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@Autowired
private EntityDAO entityDAO;
diff --git a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/services/PageHelpContentService.java b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/services/PageHelpContentService.java
index 5e6b5fc..0a110de 100644
--- a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/services/PageHelpContentService.java
+++ b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/services/PageHelpContentService.java
@@ -9,7 +9,8 @@ import eu.dnetlib.uoaadmintoolslibrary.entities.fullEntities.PageHelpContentResp
import eu.dnetlib.uoaadmintoolslibrary.handlers.ContentNotFoundException;
import eu.dnetlib.uoaadmintoolslibrary.handlers.MismatchingContentException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -18,7 +19,7 @@ import java.util.List;
@Service
public class PageHelpContentService {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@Autowired
private PageHelpContentDAO pageHelpContentDAO;
diff --git a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/services/PageService.java b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/services/PageService.java
index d64e741..918e408 100644
--- a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/services/PageService.java
+++ b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/services/PageService.java
@@ -11,9 +11,9 @@ import eu.dnetlib.uoaadmintoolslibrary.entities.fullEntities.PortalPage;
import eu.dnetlib.uoaadmintoolslibrary.handlers.ContentNotFoundException;
import eu.dnetlib.uoaadmintoolslibrary.handlers.ForbiddenException;
-import eu.dnetlib.uoaadmintoolslibrary.handlers.MismatchingContentException;
import eu.dnetlib.uoaadmintoolslibrary.handlers.utils.RolesUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -21,7 +21,7 @@ import java.util.*;
@Service
public class PageService {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@Autowired
private RolesUtils rolesUtils;
diff --git a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/services/PortalService.java b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/services/PortalService.java
index 789e5ee..fba955c 100644
--- a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/services/PortalService.java
+++ b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/services/PortalService.java
@@ -9,7 +9,8 @@ import eu.dnetlib.uoaadmintoolslibrary.entities.fullEntities.*;
import eu.dnetlib.uoaadmintoolslibrary.handlers.ContentNotFoundException;
import eu.dnetlib.uoaadmintoolslibrary.handlers.MismatchingContentException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -17,7 +18,7 @@ import java.util.*;
@Service
public class PortalService {
- private final Logger log = Logger.getLogger(this.getClass());
+ private final Logger log = LogManager.getLogger(this.getClass());
@Autowired
private PortalDAO portalDAO;
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
deleted file mode 100644
index cdeff03..0000000
--- a/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-log4j.rootLogger = DEBUG, R
-
-log4j.logger.eu.dnetlib = DEBUG
-log4j.logger.org.springframework = DEBUG, S
-
-log4j.additivity.org.springframework = false
-
-log4j.appender.R=org.apache.log4j.RollingFileAppender
-log4j.appender.R.File=/var/log/dnet/uoa-admin-tools-library/uoa-admin-tools-library.log
-log4j.appender.R.MaxFileSize=10MB
-log4j.appender.R.MaxBackupIndex=10
-log4j.appender.R.layout=org.apache.log4j.PatternLayout
-log4j.appender.R.layout.ConversionPattern= %d %p %t [%c] - %m%n
-
-log4j.appender.S=org.apache.log4j.RollingFileAppender
-log4j.appender.S.File=/var/log/dnet/uoa-admin-tools-library/uoa-admin-tools-library-spring.log
-log4j.appender.S.MaxFileSize=10MB
-log4j.appender.S.MaxBackupIndex=10
-log4j.appender.S.layout=org.apache.log4j.PatternLayout
-log4j.appender.S.layout.ConversionPattern= %d %p %t [%c] - %m%n
\ No newline at end of file