Revision 62531
Added by Katerina Iatropoulou over 1 year ago
modules/uoa-claims-api/trunk/pom.xml | ||
---|---|---|
1 | 1 |
<?xml version="1.0"?> |
2 | 2 |
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
3 |
<parent>
|
|
4 |
<groupId>eu.dnetlib</groupId>
|
|
5 |
<artifactId>dnet45-parent</artifactId>
|
|
6 |
<version>1.0.0-SNAPSHOT</version>
|
|
7 |
</parent>
|
|
3 |
<parent>
|
|
4 |
<groupId>eu.dnetlib</groupId>
|
|
5 |
<artifactId>uoa-global-parent</artifactId>
|
|
6 |
<version>1.0.1</version>
|
|
7 |
</parent>
|
|
8 | 8 |
<modelVersion>4.0.0</modelVersion> |
9 | 9 |
<groupId>eu.dnetlib</groupId> |
10 | 10 |
<artifactId>uoa-claims-api</artifactId> |
... | ... | |
68 | 68 |
<dependency> |
69 | 69 |
<groupId>org.springframework</groupId> |
70 | 70 |
<artifactId>spring-tx</artifactId> |
71 |
<version>${spring.version}</version>
|
|
71 |
<version>4.2.5.RELEASE</version>
|
|
72 | 72 |
</dependency> |
73 | 73 |
<dependency> |
74 | 74 |
<groupId>org.springframework</groupId> |
75 | 75 |
<artifactId>spring-jdbc</artifactId> |
76 |
<version>${spring.version}</version>
|
|
76 |
<version>4.2.5.RELEASE</version>
|
|
77 | 77 |
</dependency> |
78 | 78 |
<dependency> |
79 | 79 |
<groupId>oro</groupId> |
modules/uoa-claims-api/trunk/src/main/java/eu/dnetlib/openaire/rest/Authorization.java | ||
---|---|---|
1 | 1 |
package eu.dnetlib.openaire.rest; |
2 | 2 |
|
3 | 3 |
import eu.dnetlib.openaire.rest.inputHandler.UserHandler; |
4 |
import org.apache.log4j.Logger; |
|
4 |
import org.apache.logging.log4j.LogManager; |
|
5 |
import org.apache.logging.log4j.Logger; |
|
5 | 6 |
|
6 | 7 |
import java.util.ArrayList; |
7 | 8 |
import java.util.Arrays; |
... | ... | |
12 | 13 |
*/ |
13 | 14 |
public class Authorization { |
14 | 15 |
|
15 |
private static Logger logger = Logger.getLogger(Authorization.class); |
|
16 |
private static Logger logger = LogManager.getLogger(Authorization.class);
|
|
16 | 17 |
List<String> registeredRoles = new ArrayList<String>(Arrays.asList("Super Administrator", "Portal Administrator", "Expert - Community", |
17 | 18 |
"Expert - Funder", "Curator - Claim", "Curator - Project", "Curator - Community", "Curator - Institution", "Cuthor", "Registered", "User Manager")); |
18 | 19 |
List<String> claimCuratorRoles = new ArrayList<String>(Arrays.asList("Super Administrator", "Curator - Claim", "Portal Administrator")); |
modules/uoa-claims-api/trunk/src/main/java/eu/dnetlib/openaire/rest/ClaimsService.java | ||
---|---|---|
6 | 6 |
import eu.dnetlib.data.claims.handler.*; |
7 | 7 |
import eu.dnetlib.data.claims.sql.SQLStoreException; |
8 | 8 |
import eu.dnetlib.data.claims.utils.ClaimValidationException; |
9 |
import eu.dnetlib.data.claims.utils.CommunityUtils; |
|
10 | 9 |
import eu.dnetlib.data.emailSender.EmailSender; |
11 | 10 |
import org.apache.commons.validator.EmailValidator; |
12 |
import org.apache.log4j.Logger;
|
|
13 |
import org.json.JSONObject;
|
|
11 |
import org.apache.logging.log4j.LogManager;
|
|
12 |
import org.apache.logging.log4j.Logger;
|
|
14 | 13 |
import org.json.XML; |
15 | 14 |
import org.springframework.beans.factory.annotation.Autowired; |
16 | 15 |
import org.springframework.stereotype.Component; |
... | ... | |
34 | 33 |
@Path("/claimsService") |
35 | 34 |
public class ClaimsService { |
36 | 35 |
|
37 |
private static final Logger logger = Logger.getLogger(ClaimsService.class); |
|
36 |
private static final Logger logger = LogManager.getLogger(ClaimsService.class);
|
|
38 | 37 |
|
39 | 38 |
@Autowired |
40 | 39 |
private FetchClaimHandler fetchClaimHandler = null; |
modules/uoa-claims-api/trunk/src/main/java/eu/dnetlib/openaire/rest/MetricsService.java | ||
---|---|---|
2 | 2 |
|
3 | 3 |
|
4 | 4 |
import com.google.gson.JsonObject; |
5 |
import eu.dnetlib.data.claims.entity.Metrics; |
|
6 |
import eu.dnetlib.data.claims.handler.MetricsHandler; |
|
5 | 7 |
import eu.dnetlib.data.claims.sql.SQLStoreException; |
6 |
import org.apache.log4j.Logger; |
|
8 |
import org.apache.logging.log4j.LogManager; |
|
9 |
import org.apache.logging.log4j.Logger; |
|
7 | 10 |
import org.springframework.beans.factory.annotation.Autowired; |
8 | 11 |
import org.springframework.stereotype.Component; |
9 | 12 |
import org.springframework.web.bind.annotation.CrossOrigin; |
10 | 13 |
|
11 |
import javax.ws.rs.*; |
|
14 |
import javax.ws.rs.CookieParam; |
|
15 |
import javax.ws.rs.GET; |
|
16 |
import javax.ws.rs.Path; |
|
17 |
import javax.ws.rs.Produces; |
|
12 | 18 |
import javax.ws.rs.core.MediaType; |
13 |
import javax.ws.rs.core.Response; |
|
14 |
|
|
15 |
import eu.dnetlib.data.claims.handler.MetricsHandler; |
|
16 |
import eu.dnetlib.data.claims.entity.Metrics; |
|
17 |
|
|
18 | 19 |
import java.sql.SQLException; |
19 | 20 |
import java.util.HashMap; |
20 | 21 |
import java.util.Map; |
... | ... | |
24 | 25 |
@CrossOrigin(origins = "*") |
25 | 26 |
@Path("/report") |
26 | 27 |
public class MetricsService { |
27 |
private static final Logger logger = Logger.getLogger(MetricsService.class); |
|
28 |
private static final Logger logger = LogManager.getLogger(MetricsService.class);
|
|
28 | 29 |
|
29 | 30 |
@Autowired |
30 | 31 |
public Authorization authorization = null; |
modules/uoa-claims-api/trunk/src/main/java/eu/dnetlib/openaire/rest/authorization/Authorization.java | ||
---|---|---|
2 | 2 |
|
3 | 3 |
import io.jsonwebtoken.Claims; |
4 | 4 |
import io.jsonwebtoken.Jwts; |
5 |
import org.apache.log4j.Logger; |
|
5 |
import org.apache.logging.log4j.LogManager; |
|
6 |
import org.apache.logging.log4j.Logger; |
|
6 | 7 |
|
7 | 8 |
import javax.xml.bind.DatatypeConverter; |
8 | 9 |
|
... | ... | |
11 | 12 |
*/ |
12 | 13 |
public class Authorization { |
13 | 14 |
|
14 |
private static Logger logger = Logger.getLogger(Authorization.class); |
|
15 |
private static Logger logger = LogManager.getLogger(Authorization.class);
|
|
15 | 16 |
|
16 | 17 |
public static boolean isRegistered(String token) { |
17 | 18 |
|
modules/uoa-claims-api/trunk/src/main/java/eu/dnetlib/openaire/rest/inputHandler/UserHandler.java | ||
---|---|---|
1 | 1 |
package eu.dnetlib.openaire.rest.inputHandler; |
2 | 2 |
|
3 | 3 |
import com.google.gson.Gson; |
4 |
import eu.dnetlib.openaire.rest.Authorization; |
|
5 | 4 |
import eu.dnetlib.openaire.rest.UserInfo; |
6 |
import io.jsonwebtoken.Claims; |
|
7 |
import io.jsonwebtoken.Jwts; |
|
8 |
import org.apache.log4j.BasicConfigurator; |
|
9 |
import org.apache.log4j.Logger; |
|
10 |
import org.springframework.context.ApplicationContext; |
|
11 |
import org.springframework.context.support.ClassPathXmlApplicationContext; |
|
5 |
import org.apache.logging.log4j.LogManager; |
|
6 |
import org.apache.logging.log4j.Logger; |
|
12 | 7 |
|
13 |
import javax.xml.bind.DatatypeConverter; |
|
14 | 8 |
import java.io.BufferedReader; |
15 | 9 |
import java.io.IOException; |
16 | 10 |
import java.io.InputStreamReader; |
... | ... | |
22 | 16 |
* Created by sofia on 20/4/2017. |
23 | 17 |
*/ |
24 | 18 |
public class UserHandler{ |
25 |
private static Logger logger = Logger.getLogger(UserHandler.class); |
|
19 |
private static Logger logger = LogManager.getLogger(UserHandler.class);
|
|
26 | 20 |
|
27 | 21 |
String userInfoUrl = null; |
28 | 22 |
// public String getMail(String token) { |
modules/uoa-claims-api/trunk/src/main/java/eu/dnetlib/openaire/rest/security/JWTValidator.java | ||
---|---|---|
1 | 1 |
package eu.dnetlib.openaire.rest.security; |
2 | 2 |
|
3 | 3 |
import io.jsonwebtoken.*; |
4 |
import org.apache.log4j.Logger; |
|
4 |
import org.apache.logging.log4j.LogManager; |
|
5 |
import org.apache.logging.log4j.Logger; |
|
5 | 6 |
|
6 | 7 |
import javax.xml.bind.DatatypeConverter; |
7 | 8 |
|
... | ... | |
10 | 11 |
*/ |
11 | 12 |
public class JWTValidator { |
12 | 13 |
|
13 |
private static final Logger logger = Logger.getLogger(JWTValidator.class); |
|
14 |
private static final Logger logger = LogManager.getLogger(JWTValidator.class);
|
|
14 | 15 |
|
15 | 16 |
public static boolean isValid(String token) { |
16 | 17 |
|
Also available in: Unified diff
integrated log4j2 + uoa-global-parent