Revision 54702
Added by Panagiotis Kanakakis almost 6 years ago
modules/uoa-repository-manager-service/branches/dev-api/src/test/java/unitest/ValidatorTest.java | ||
---|---|---|
1 |
package unitest; |
|
2 |
|
|
3 |
import eu.dnetlib.repo.manager.config.RepoManagerContextLoaderListener; |
|
4 |
import eu.dnetlib.repo.manager.utils.OaiTools; |
|
5 |
import org.junit.Test; |
|
6 |
import org.junit.runner.RunWith; |
|
7 |
import org.springframework.test.context.ContextConfiguration; |
|
8 |
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; |
|
9 |
|
|
10 |
@RunWith(SpringJUnit4ClassRunner.class) |
|
11 |
@ContextConfiguration(classes = RepoManagerContextLoaderListener.class) |
|
12 |
//@WebAppConfiguration |
|
13 |
public class ValidatorTest { |
|
14 |
|
|
15 |
|
|
16 |
@Test |
|
17 |
public void identiFy(){ |
|
18 |
|
|
19 |
String url = "https://repozitorij.srce.unizg.hr/oai"; |
|
20 |
|
|
21 |
|
|
22 |
System.out.println("Identify repository with url : " + url); |
|
23 |
try { |
|
24 |
System.out.println(OaiTools.identifyRepository(url)); |
|
25 |
} catch (Exception e) { |
|
26 |
System.out.println(e); |
|
27 |
} |
|
28 |
} |
|
29 |
|
|
30 |
|
|
31 |
} |
|
1 |
//package unitest; |
|
2 |
// |
|
3 |
//import eu.dnetlib.repo.manager.config.RepoManagerContextLoaderListener; |
|
4 |
//import eu.dnetlib.repo.manager.utils.OaiTools; |
|
5 |
//import org.junit.Test; |
|
6 |
//import org.junit.runner.RunWith; |
|
7 |
//import org.springframework.test.context.ContextConfiguration; |
|
8 |
//import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; |
|
9 |
// |
|
10 |
//@RunWith(SpringJUnit4ClassRunner.class) |
|
11 |
//@ContextConfiguration(classes = RepoManagerContextLoaderListener.class) |
|
12 |
////@WebAppConfiguration |
|
13 |
//public class ValidatorTest { |
|
14 |
// |
|
15 |
// |
|
16 |
// @Test |
|
17 |
// public void identiFy(){ |
|
18 |
// |
|
19 |
// String url = "https://repozitorij.srce.unizg.hr/oai"; |
|
20 |
// |
|
21 |
// |
|
22 |
// System.out.println("Identify repository with url : " + url); |
|
23 |
// try { |
|
24 |
// System.out.println(OaiTools.identifyRepository(url)); |
|
25 |
// } catch (Exception e) { |
|
26 |
// System.out.println(e); |
|
27 |
// } |
|
28 |
// } |
|
29 |
// |
|
30 |
// |
|
31 |
//} |
modules/uoa-repository-manager-service/branches/dev-api/src/main/java/eu/dnetlib/repo/manager/service/GenericControllerAdvice.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service; |
|
2 |
|
|
3 |
|
|
4 |
import eu.dnetlib.api.functionality.ValidatorServiceException; |
|
5 |
import eu.dnetlib.repo.manager.exception.ResourceNotFoundException; |
|
6 |
import eu.dnetlib.repo.manager.exception.ServerError; |
|
7 |
import eu.dnetlib.repo.manager.shared.BrokerException; |
|
8 |
import org.apache.log4j.LogManager; |
|
9 |
import org.apache.log4j.Logger; |
|
10 |
import org.json.JSONException; |
|
11 |
import org.springframework.core.Ordered; |
|
12 |
import org.springframework.core.annotation.Order; |
|
13 |
import org.springframework.http.HttpStatus; |
|
14 |
import org.springframework.security.access.AccessDeniedException; |
|
15 |
import org.springframework.web.bind.annotation.ControllerAdvice; |
|
16 |
import org.springframework.web.bind.annotation.ExceptionHandler; |
|
17 |
import org.springframework.web.bind.annotation.ResponseBody; |
|
18 |
import org.springframework.web.bind.annotation.ResponseStatus; |
|
19 |
|
|
20 |
import javax.servlet.http.HttpServletRequest; |
|
21 |
import java.net.UnknownHostException; |
|
22 |
|
|
23 |
|
|
24 |
@ControllerAdvice |
|
25 |
@Order(Ordered.HIGHEST_PRECEDENCE) |
|
26 |
public class GenericControllerAdvice { |
|
27 |
|
|
28 |
private Logger logger = LogManager.getLogger(GenericControllerAdvice.class); |
|
29 |
|
|
30 |
|
|
31 |
@ResponseStatus(HttpStatus.NOT_FOUND) |
|
32 |
@ExceptionHandler(ResourceNotFoundException.class) |
|
33 |
@ResponseBody |
|
34 |
ServerError securityException(HttpServletRequest req, Exception ex) { |
|
35 |
return new ServerError(req.getRequestURL().toString(),ex); |
|
36 |
} |
|
37 |
|
|
38 |
@ResponseStatus(HttpStatus.FORBIDDEN) |
|
39 |
@ExceptionHandler(AccessDeniedException.class) |
|
40 |
@ResponseBody |
|
41 |
ServerError accessDeniedException(HttpServletRequest req, Exception ex) { |
|
42 |
return new ServerError(req.getRequestURL().toString(),ex); |
|
43 |
} |
|
44 |
|
|
45 |
@ResponseStatus(HttpStatus.NOT_FOUND) |
|
46 |
@ExceptionHandler(UnknownHostException.class) |
|
47 |
@ResponseBody |
|
48 |
ServerError unknownHostException(HttpServletRequest req, Exception ex) { |
|
49 |
return new ServerError(req.getRequestURL().toString(),ex); |
|
50 |
} |
|
51 |
|
|
52 |
@ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) |
|
53 |
@ExceptionHandler({JSONException.class,BrokerException.class,ValidatorServiceException.class}) |
|
54 |
@ResponseBody |
|
55 |
ServerError internalException(HttpServletRequest req, Exception ex) { |
|
56 |
return new ServerError(req.getRequestURL().toString(),ex); |
|
57 |
} |
|
58 |
|
|
59 |
|
|
60 |
} |
modules/uoa-repository-manager-service/branches/dev-api/src/main/java/eu/dnetlib/repo/manager/service/RepositoryService.java | ||
---|---|---|
67 | 67 |
|
68 | 68 |
Map<String, String> getListLatestUpdate(String mode) throws RepositoryServiceException, JSONException; |
69 | 69 |
|
70 |
RepositoryInterface updateRepositoryInterface(String repositoryId, String registeredBy, RepositoryInterface repositoryInterface) throws JSONException;
|
|
70 |
RepositoryInterface updateRepositoryInterface(String repositoryId, String registeredBy, RepositoryInterface repositoryInterface) throws Exception; |
|
71 | 71 |
|
72 | 72 |
} |
modules/uoa-repository-manager-service/branches/dev-api/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java | ||
---|---|---|
9 | 9 |
import eu.dnetlib.repo.manager.domain.RepositorySnippet; |
10 | 10 |
import eu.dnetlib.repo.manager.domain.RequestFilter; |
11 | 11 |
import eu.dnetlib.repo.manager.exception.ResourceNotFoundException; |
12 |
import eu.dnetlib.repo.manager.shared.*; |
|
12 | 13 |
import eu.dnetlib.repo.manager.utils.Converter; |
13 |
import eu.dnetlib.repo.manager.shared.*; |
|
14 | 14 |
import gr.uoa.di.driver.enabling.vocabulary.VocabularyLoader; |
15 | 15 |
import org.apache.commons.codec.digest.DigestUtils; |
16 | 16 |
import org.apache.log4j.Logger; |
... | ... | |
22 | 22 |
import org.springframework.core.ParameterizedTypeReference; |
23 | 23 |
import org.springframework.http.*; |
24 | 24 |
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; |
25 |
import org.springframework.security.access.prepost.PreAuthorize; |
|
26 | 25 |
import org.springframework.security.core.Authentication; |
27 | 26 |
import org.springframework.security.core.context.SecurityContextHolder; |
28 | 27 |
import org.springframework.stereotype.Service; |
... | ... | |
70 | 69 |
@Autowired |
71 | 70 |
private EmailUtils emailUtils; |
72 | 71 |
|
72 |
|
|
73 | 73 |
private Map<String, Vocabulary> vocabularyMap = new ConcurrentHashMap<String, Vocabulary>(); |
74 | 74 |
|
75 | 75 |
private Map<String, String> countriesMap = new HashMap<>(); |
... | ... | |
489 | 489 |
.fromHttpUrl(baseAddress + "/ds/add/") |
490 | 490 |
.build() |
491 | 491 |
.encode(); |
492 |
|
|
493 |
|
|
494 | 492 |
String json_repository = Converter.repositoryObjectToJson(repository); |
495 |
|
|
496 |
ObjectMapper mapper = new ObjectMapper(); |
|
497 |
mapper.enable(SerializationFeature.INDENT_OUTPUT); |
|
498 |
try { |
|
499 |
LOGGER.debug(mapper.writeValueAsString(json_repository)); |
|
500 |
} catch (JsonProcessingException e) { |
|
501 |
e.printStackTrace(); |
|
502 |
} |
|
503 |
|
|
504 | 493 |
HttpEntity<String> httpEntity = new HttpEntity <String> (json_repository,httpHeaders); |
505 | 494 |
ResponseEntity responseEntity = restTemplate.exchange(uriComponents.toUri(),HttpMethod.POST, httpEntity, ResponseEntity.class); |
506 | 495 |
|
... | ... | |
751 | 740 |
@Override |
752 | 741 |
public RepositoryInterface updateRepositoryInterface(@RequestParam("repoId") String repoId, |
753 | 742 |
@RequestParam("registeredBy") String registeredBy, |
754 |
@RequestBody RepositoryInterface repositoryInterface) throws JSONException {
|
|
743 |
@RequestBody RepositoryInterface repositoryInterface) throws Exception { |
|
755 | 744 |
|
756 | 745 |
this.updateBaseUrl(repoId,repositoryInterface.getId(),repositoryInterface.getBaseUrl()); |
757 | 746 |
this.updateCompliance(repoId,repositoryInterface.getId(),repositoryInterface.getCompliance()); |
... | ... | |
759 | 748 |
return repositoryInterface; |
760 | 749 |
} |
761 | 750 |
|
762 |
private void updateValidationSet(String repositoryId, String repositoryInterfaceId, String validationSet) { |
|
751 |
private void updateValidationSet(String repositoryId, String repositoryInterfaceId, String validationSet) throws Exception {
|
|
763 | 752 |
UriComponents uriComponents = UriComponentsBuilder |
764 | 753 |
.fromHttpUrl(baseAddress + "/ds/api/oaiset") |
765 | 754 |
.queryParam("dsId",repositoryId) |
766 | 755 |
.queryParam("apiId",repositoryInterfaceId) |
767 | 756 |
.queryParam("oaiSet",validationSet) |
768 | 757 |
.build().encode(); |
769 |
restTemplate.postForObject(uriComponents.toUri(),null,String.class); |
|
758 |
restTemplate.exchange(uriComponents.toUri(),HttpMethod.POST, null, ResponseEntity.class); |
|
759 |
|
|
770 | 760 |
} |
771 | 761 |
|
772 | 762 |
|
modules/uoa-repository-manager-service/branches/dev-api/src/main/java/eu/dnetlib/repo/manager/utils/Converter.java | ||
---|---|---|
2 | 2 |
|
3 | 3 |
import com.fasterxml.jackson.core.JsonProcessingException; |
4 | 4 |
import com.fasterxml.jackson.databind.ObjectMapper; |
5 |
import com.fasterxml.jackson.databind.SerializationFeature; |
|
5 | 6 |
import eu.dnetlib.domain.data.Repository; |
6 | 7 |
import eu.dnetlib.domain.data.RepositoryInterface; |
7 | 8 |
import eu.dnetlib.repo.manager.domain.RepositorySnippet; |
... | ... | |
225 | 226 |
|
226 | 227 |
public static String repositoryObjectToJson(Repository repository) throws JSONException, JsonProcessingException { |
227 | 228 |
|
228 |
JSONObject jsonObject = new JSONObject(); |
|
229 |
HashMap<String,Object> repositoryMap = new HashMap<>(); |
|
230 |
ObjectMapper mapper = new ObjectMapper(); |
|
229 | 231 |
|
230 |
jsonObject.put("id",repository.getId());
|
|
231 |
jsonObject.put("openaireId",getOpenaireId(repository.getId()));
|
|
232 |
jsonObject.put("officialname",repository.getOfficialName());
|
|
233 |
jsonObject.put("englishname",repository.getEnglishName());
|
|
234 |
jsonObject.put("websiteurl",repository.getWebsiteUrl());
|
|
235 |
jsonObject.put("logourl",repository.getLogoUrl());
|
|
236 |
jsonObject.put("contactemail",repository.getContactEmail());
|
|
237 |
jsonObject.put("longitude",repository.getLongitude().toString());
|
|
238 |
jsonObject.put("latitude",repository.getLatitude().toString());
|
|
239 |
jsonObject.put("timezone",repository.getTimezone());
|
|
232 |
repositoryMap.put("id",repository.getId());
|
|
233 |
repositoryMap.put("openaireId",getOpenaireId(repository.getId()));
|
|
234 |
repositoryMap.put("officialname",repository.getOfficialName());
|
|
235 |
repositoryMap.put("englishname",repository.getEnglishName());
|
|
236 |
repositoryMap.put("websiteurl",repository.getWebsiteUrl());
|
|
237 |
repositoryMap.put("logourl",repository.getLogoUrl());
|
|
238 |
repositoryMap.put("contactemail",repository.getContactEmail());
|
|
239 |
repositoryMap.put("longitude",repository.getLongitude().toString());
|
|
240 |
repositoryMap.put("latitude",repository.getLatitude().toString());
|
|
241 |
repositoryMap.put("timezone",repository.getTimezone());
|
|
240 | 242 |
|
241 |
jsonObject.put("namespaceprefix",repository.getNamespacePrefix()!=null?repository.getNamespacePrefix():"");
|
|
242 |
jsonObject.put("languages",repository.getOdLanguages()!=null?repository.getOdLanguages():"");
|
|
243 |
repositoryMap.put("namespaceprefix",repository.getNamespacePrefix()!=null?repository.getNamespacePrefix():"");
|
|
244 |
repositoryMap.put("languages",repository.getOdLanguages()!=null?repository.getOdLanguages():"");
|
|
243 | 245 |
|
244 |
jsonObject.put("dateofcollection",repository.getDateOfCollection()!=null?convertDateToString(repository.getDateOfCollection()):"");
|
|
246 |
repositoryMap.put("dateofcollection",repository.getDateOfCollection()!=null?convertDateToString(repository.getDateOfCollection()):"");
|
|
245 | 247 |
|
246 | 248 |
/* |
247 | 249 |
* typology -> platform |
248 | 250 |
* datasource class -> typology |
249 | 251 |
* */ |
250 |
jsonObject.put("typology",repository.getDatasourceClass());
|
|
251 |
jsonObject.put("platform",repository.getTypology());
|
|
252 |
repositoryMap.put("typology",repository.getDatasourceClass());
|
|
253 |
repositoryMap.put("platform",repository.getTypology());
|
|
252 | 254 |
|
253 |
jsonObject.put("dateofvalidation",repository.getDateOfCollection()!=null?convertDateToString(repository.getDateOfCollection()):"");
|
|
254 |
jsonObject.put("activationId",repository.getActivationId()!=null?repository.getActivationId():"");
|
|
255 |
repositoryMap.put("dateofvalidation",repository.getDateOfCollection()!=null?convertDateToString(repository.getDateOfCollection()):"");
|
|
256 |
repositoryMap.put("activationId",repository.getActivationId()!=null?repository.getActivationId():"");
|
|
255 | 257 |
|
256 |
jsonObject.put("description",repository.getDescription());
|
|
258 |
repositoryMap.put("description",repository.getDescription());
|
|
257 | 259 |
|
258 |
jsonObject.put("eissn",repository.getEissn()!=null?repository.getEissn():"");
|
|
259 |
jsonObject.put("issn",repository.getIssn()!=null?repository.getIssn():"");
|
|
260 |
jsonObject.put("lissn",repository.getLissn()!=null?repository.getLissn():"");
|
|
260 |
repositoryMap.put("eissn",repository.getEissn()!=null?repository.getEissn():"");
|
|
261 |
repositoryMap.put("issn",repository.getIssn()!=null?repository.getIssn():"");
|
|
262 |
repositoryMap.put("lissn",repository.getLissn()!=null?repository.getLissn():"");
|
|
261 | 263 |
|
262 |
jsonObject.put("registeredby",repository.getRegisteredBy());
|
|
264 |
repositoryMap.put("registeredby",repository.getRegisteredBy());
|
|
263 | 265 |
|
264 |
jsonObject.put("aggregator",repository.getAggregator()!=null?repository.getAggregator():"");
|
|
265 |
jsonObject.put("collectedfrom",repository.getCollectedFrom()!=null?repository.getCollectedFrom():"");
|
|
266 |
repositoryMap.put("aggregator",repository.getAggregator()!=null?repository.getAggregator():"");
|
|
267 |
repositoryMap.put("collectedfrom",repository.getCollectedFrom()!=null?repository.getCollectedFrom():"");
|
|
266 | 268 |
|
267 |
jsonObject.put("managed",repository.isRegistered());
|
|
269 |
repositoryMap.put("managed",repository.isRegistered());
|
|
268 | 270 |
|
269 |
JSONObject organization = new JSONObject();
|
|
271 |
Map<String,String> organization = new HashMap<>();
|
|
270 | 272 |
organization.put("legalname",repository.getOrganization()); |
271 | 273 |
organization.put("country",repository.getCountryCode()); |
272 | 274 |
organization.put("legalshortname",""); |
273 | 275 |
organization.put("websiteurl",""); |
274 | 276 |
organization.put("logourl",""); |
275 | 277 |
|
276 |
JSONArray organizations = new JSONArray();
|
|
277 |
organizations.put(organization);
|
|
278 |
jsonObject.put("organizations",organizations);
|
|
278 |
List organizations = new ArrayList();
|
|
279 |
organizations.add(organization);
|
|
280 |
repositoryMap.put("organizations",organizations);
|
|
279 | 281 |
|
280 | 282 |
//TODO check identitites |
281 |
JSONArray identities = new JSONArray(); |
|
282 |
identities.put(identities); |
|
283 |
jsonObject.put("identities",identities); |
|
283 |
//Map<String,String> identity = new HashMap<>(); |
|
284 |
List identities = new ArrayList(); |
|
285 |
// identities.add(identities); |
|
286 |
repositoryMap.put("identities",identities); |
|
287 |
repositoryMap.put("subjects",""); |
|
284 | 288 |
|
285 |
|
|
286 |
jsonObject.put("subjects",""); |
|
287 |
|
|
288 | 289 |
//TODO check fields |
289 | 290 |
/* jsonObject.put("certificates",repository.getCertificates()); |
290 | 291 |
jsonObject.put("citationguidelineurl",repository.getCitationGuidelineUrl()); |
... | ... | |
305 | 306 |
//datasource.get("platform"); |
306 | 307 |
//datasource.get("subjects");*/ |
307 | 308 |
|
308 |
ObjectMapper mapper = new ObjectMapper(); |
|
309 |
return mapper.writeValueAsString(jsonObject); |
|
309 |
return mapper.writeValueAsString(repositoryMap); |
|
310 | 310 |
} |
311 | 311 |
|
312 | 312 |
public static String repositoryInterfaceObjectToJson(Repository repository,RepositoryInterface repositoryInterface) throws JSONException { |
modules/uoa-repository-manager-service/branches/dev-api/src/main/java/eu/dnetlib/repo/manager/config/Config.java | ||
---|---|---|
7 | 7 |
import org.springframework.context.annotation.Configuration; |
8 | 8 |
import org.springframework.context.annotation.PropertySource; |
9 | 9 |
import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; |
10 |
import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; |
|
10 | 11 |
import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession; |
11 | 12 |
import org.springframework.session.web.http.CookieSerializer; |
12 | 13 |
import org.springframework.session.web.http.DefaultCookieSerializer; |
... | ... | |
16 | 17 |
@Configuration |
17 | 18 |
@EnableRedisHttpSession |
18 | 19 |
@PropertySource(value = {"classpath:application.properties"} ) |
19 |
@ComponentScan(basePackages = "eu.dnetlib.repo.manager.controllers") |
|
20 |
|
|
20 |
@ComponentScan(basePackages = "eu.dnetlib.repo.manager.*") |
|
21 | 21 |
public class Config { |
22 | 22 |
|
23 | 23 |
private static Logger LOGGER = Logger.getLogger(Config.class); |
modules/uoa-repository-manager-service/branches/dev-api/src/main/java/eu/dnetlib/repo/manager/config/SwaggerConfig.java | ||
---|---|---|
1 | 1 |
package eu.dnetlib.repo.manager.config; |
2 | 2 |
|
3 |
import eu.dnetlib.repo.manager.controllers.*; |
|
3 | 4 |
import eu.dnetlib.repo.manager.service.MonitorService; |
4 | 5 |
import eu.dnetlib.repo.manager.service.PiWikService; |
5 | 6 |
import eu.dnetlib.repo.manager.service.RepositoryService; |
... | ... | |
27 | 28 |
@EnableSwagger2 |
28 | 29 |
@EnableWebMvc |
29 | 30 |
@ComponentScan(basePackageClasses = { |
30 |
RepositoryService.class, |
|
31 |
MonitorService.class, |
|
32 |
ValidatorService.class, |
|
33 |
PiWikService.class |
|
34 |
}) |
|
31 |
RepositoryController.class, |
|
32 |
MonitorController.class, |
|
33 |
ValidatorController.class, |
|
34 |
PiWikController.class, |
|
35 |
BrokerController.class, |
|
36 |
StatsController.class, |
|
37 |
UserController.class, |
|
38 |
SushiliteController.class |
|
39 |
},basePackages = "eu.dnetlib.repo.manager.*") |
|
35 | 40 |
public class SwaggerConfig { |
36 | 41 |
|
37 | 42 |
@Bean |
modules/uoa-repository-manager-service/branches/dev-api/src/main/java/eu/dnetlib/repo/manager/controllers/RepositoryController.java | ||
---|---|---|
197 | 197 |
@PreAuthorize("hasRole('ROLE_USER') and #registeredBy == authentication.userInfo.email") |
198 | 198 |
public RepositoryInterface updateRepositoryInterface(@RequestParam("repoId") String repoId, |
199 | 199 |
@RequestParam("registeredBy") String registeredBy, |
200 |
@RequestBody RepositoryInterface repositoryInterface) throws JSONException {
|
|
200 |
@RequestBody RepositoryInterface repositoryInterface) throws Exception { |
|
201 | 201 |
return repositoryService.updateRepositoryInterface(repoId, registeredBy, repositoryInterface); |
202 | 202 |
} |
203 | 203 |
} |
modules/uoa-repository-manager-service/branches/dev-api/src/main/resources/application.properties | ||
---|---|---|
11 | 11 |
ISSNService.url = ${IS.url}/services/isSN |
12 | 12 |
|
13 | 13 |
#ValidatorService.url=http://adonis.athenarc.gr:8080/validator-service/services/validatorWebService |
14 |
ValidatorService.url=http://beta.services.openaire.eu/validator-service/services/validatorWebService |
|
14 |
#ValidatorService.url=http://beta.services.openaire.eu/validator-service/services/validatorWebService |
|
15 |
ValidatorService.url=http://88.197.53.69:8080/validator-service/ |
|
15 | 16 |
|
16 | 17 |
## Broker Service |
17 | 18 |
services.broker.url = http://broker1-dev-dnet.d4science.org |
... | ... | |
60 | 61 |
oidc.id = 767422b9-5461-4807-a80a-f9a2072d3a7d |
61 | 62 |
oidc.secret = AMQtGlbTXNjwjhF0st28LmM6V0XypMdaVS7tJmGuYFlmH36iIv4t7tVqYuLYrNPkhnZ_GPUJvhymBhFupdgb6aU |
62 | 63 |
|
63 |
oidc.dev.home = http://localhost:4200/uoa-repository-manager-service/openid_connect_login
|
|
64 |
webapp.dev.front = http://localhost:4200/landing
|
|
64 |
oidc.dev.home = http://aleka.athenarc.gr:8480/uoa-repository-manager-service/openid_connect_login
|
|
65 |
webapp.dev.front = http://aleka.athenarc.gr:4200/landing
|
|
65 | 66 |
|
66 | 67 |
##REDIS-AAI |
67 | 68 |
|
modules/uoa-repository-manager-service/branches/dev-api/uoa-repository-manager-service.iml | ||
---|---|---|
3 | 3 |
<component name="FacetManager"> |
4 | 4 |
<facet type="Spring" name="Spring"> |
5 | 5 |
<configuration> |
6 |
<fileset id="fileset" name="ApplicationContext" removed="false"> |
|
6 |
<fileset id="fileset" name="Spring Servlet" removed="false"> |
|
7 |
<file>file://$MODULE_DIR$/src/main/webapp/WEB-INF/spring-servlet.xml</file> |
|
8 |
<file>file://$MODULE_DIR$/src/main/webapp/WEB-INF/aai-security.xml</file> |
|
7 | 9 |
<file>file://$MODULE_DIR$/src/main/webapp/WEB-INF/applicationContext.xml</file> |
8 |
<file>file://$MODULE_DIR$/src/main/webapp/WEB-INF/aai-security.xml</file> |
|
9 | 10 |
<file>file://$MODULE_DIR$/src/main/resources/application-context.xml</file> |
10 |
<file>file://$MODULE_DIR$/src/main/webapp/WEB-INF/spring-servlet.xml</file> |
|
11 |
<file>file://$MODULE_DIR$/src/main/java/eu/dnetlib/repo/manager/service/config/Config.java</file> |
|
12 |
<file>file://$MODULE_DIR$/src/main/java/eu/dnetlib/repo/manager/service/config/JdbcConfig.java</file> |
|
13 |
<file>file://$MODULE_DIR$/src/main/java/eu/dnetlib/repo/manager/service/config/PropertyPlaceHolder.java</file> |
|
14 |
<file>file://$MODULE_DIR$/src/main/java/eu/dnetlib/repo/manager/service/config/SwaggerConfig.java</file> |
|
11 |
<file>file://$MODULE_DIR$/src/main/java/eu/dnetlib/repo/manager/config/Config.java</file> |
|
12 |
<file>file://$MODULE_DIR$/src/main/java/eu/dnetlib/repo/manager/config/SwaggerConfig.java</file> |
|
15 | 13 |
</fileset> |
16 | 14 |
</configuration> |
17 | 15 |
</facet> |
... | ... | |
89 | 87 |
<orderEntry type="library" name="Maven: eu.dnetlib:dnet-actionmanager-api:4.0.4-SNAPSHOT" level="project" /> |
90 | 88 |
<orderEntry type="library" name="Maven: javax.mail:javax.mail-api:1.5.6" level="project" /> |
91 | 89 |
<orderEntry type="library" name="Maven: eu.dnetlib:uoa-domain:2.0.1-SNAPSHOT" level="project" /> |
92 |
<orderEntry type="library" name="Maven: junit:junit:4.12" level="project" /> |
|
90 |
<orderEntry type="library" name="Maven: junit:junit:4.13-beta-2" level="project" />
|
|
93 | 91 |
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> |
94 | 92 |
<orderEntry type="library" name="Maven: org.hibernate:hibernate-entitymanager:3.5.6-Final" level="project" /> |
95 | 93 |
<orderEntry type="library" name="Maven: org.hibernate:hibernate-core:3.5.6-Final" level="project" /> |
... | ... | |
129 | 127 |
<orderEntry type="library" name="Maven: eu.dnetlib:cnr-rmi-api:2.6.2-SNAPSHOT" level="project" /> |
130 | 128 |
<orderEntry type="library" name="Maven: eu.dnetlib:dnet-datasource-manager-rmi:4.0.2-SNAPSHOT" level="project" /> |
131 | 129 |
<orderEntry type="library" name="Maven: eu.dnetlib:cnr-enabling-database-api:2.1.2-SNAPSHOT" level="project" /> |
132 |
<orderEntry type="library" name="Maven: eu.dnetlib:dnet-index-client:2.3.2-solr7-SNAPSHOT" level="project" />
|
|
130 |
<orderEntry type="library" name="Maven: eu.dnetlib:dnet-index-client:2.3.3-solr75-SNAPSHOT" level="project" />
|
|
133 | 131 |
<orderEntry type="library" name="Maven: com.mycila:xmltool:3.3" level="project" /> |
134 |
<orderEntry type="library" name="Maven: org.apache.solr:solr-solrj:7.2.0" level="project" />
|
|
132 |
<orderEntry type="library" name="Maven: org.apache.solr:solr-solrj:7.5.0" level="project" />
|
|
135 | 133 |
<orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" /> |
136 | 134 |
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.6" level="project" /> |
137 | 135 |
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.3" level="project" /> |
138 |
<orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.10" level="project" />
|
|
136 |
<orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.11" level="project" />
|
|
139 | 137 |
<orderEntry type="library" name="Maven: org.noggit:noggit:0.8" level="project" /> |
140 |
<orderEntry type="library" name="Maven: eu.dnetlib:cnr-cql-utils:2.1.2-SNAPSHOT" level="project" /> |
|
138 |
<orderEntry type="library" name="Maven: eu.dnetlib:dnet-index-solr-common:2.3.2-solr75" level="project" /> |
|
139 |
<orderEntry type="library" name="Maven: eu.dnetlib:cnr-cql-utils:2.1.3-SNAPSHOT" level="project" /> |
|
141 | 140 |
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:4.9.0" level="project" /> |
142 | 141 |
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:4.9.0" level="project" /> |
143 | 142 |
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:4.9.0" level="project" /> |
144 | 143 |
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:4.9.0" level="project" /> |
145 | 144 |
<orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:3.4.2" level="project" /> |
146 |
<orderEntry type="library" name="Maven: joda-time:joda-time:2.10" level="project" /> |
|
145 |
<orderEntry type="library" name="Maven: joda-time:joda-time:2.10.1" level="project" />
|
|
147 | 146 |
<orderEntry type="library" name="Maven: org.z3950.zing:cql-java:1.7" level="project" /> |
148 | 147 |
<orderEntry type="library" name="Maven: eu.dnetlib:dnet-data-provision-rmi:1.0.2-SNAPSHOT" level="project" /> |
149 | 148 |
<orderEntry type="library" name="Maven: eu.dnetlib:uoa-hcm:2.0.1-SNAPSHOT" level="project" /> |
... | ... | |
188 | 187 |
<orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.1.0.Final" level="project" /> |
189 | 188 |
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.7.0" level="project" /> |
190 | 189 |
<orderEntry type="library" name="Maven: postgresql:postgresql:9.1-901.jdbc3" level="project" /> |
191 |
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-catalina:9.0.12" level="project" />
|
|
192 |
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-servlet-api:9.0.12" level="project" />
|
|
193 |
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jsp-api:9.0.12" level="project" />
|
|
194 |
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-el-api:9.0.12" level="project" />
|
|
195 |
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:9.0.12" level="project" />
|
|
196 |
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-annotations-api:9.0.12" level="project" />
|
|
197 |
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-api:9.0.12" level="project" />
|
|
198 |
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jni:9.0.12" level="project" />
|
|
199 |
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-coyote:9.0.12" level="project" />
|
|
200 |
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-util:9.0.12" level="project" />
|
|
201 |
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-util-scan:9.0.12" level="project" />
|
|
202 |
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jaspic-api:9.0.12" level="project" />
|
|
203 |
<orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
|
|
190 |
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-catalina:9.0.14" level="project" />
|
|
191 |
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-servlet-api:9.0.14" level="project" />
|
|
192 |
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jsp-api:9.0.14" level="project" />
|
|
193 |
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-el-api:9.0.14" level="project" />
|
|
194 |
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:9.0.14" level="project" />
|
|
195 |
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-annotations-api:9.0.14" level="project" />
|
|
196 |
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-api:9.0.14" level="project" />
|
|
197 |
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jni:9.0.14" level="project" />
|
|
198 |
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-coyote:9.0.14" level="project" />
|
|
199 |
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-util:9.0.14" level="project" />
|
|
200 |
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-util-scan:9.0.14" level="project" />
|
|
201 |
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jaspic-api:9.0.14" level="project" />
|
|
202 |
<orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
|
|
204 | 203 |
<orderEntry type="library" name="Maven: org.mitre:openid-connect-client:1.3.0" level="project" /> |
205 | 204 |
<orderEntry type="library" name="Maven: org.mitre:openid-connect-common:1.3.0" level="project" /> |
206 | 205 |
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:4.2.2.RELEASE" level="project" /> |
... | ... | |
224 | 223 |
<orderEntry type="library" name="Maven: org.springframework.session:spring-session:1.3.1.RELEASE" level="project" /> |
225 | 224 |
<orderEntry type="library" name="Maven: redis.clients:jedis:2.9.0" level="project" /> |
226 | 225 |
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.6.2" level="project" /> |
226 |
<orderEntry type="library" name="Maven: com.thetransactioncompany:cors-filter:2.5" level="project" /> |
|
227 |
<orderEntry type="library" name="Maven: com.thetransactioncompany:java-property-utils:1.9.1" level="project" /> |
|
227 | 228 |
</component> |
228 | 229 |
</module> |
modules/uoa-repository-manager-service/branches/dev-api/pom.xml | ||
---|---|---|
234 | 234 |
<version>2.6.2</version> |
235 | 235 |
</dependency> |
236 | 236 |
|
237 |
<dependency> |
|
238 |
<groupId>com.thetransactioncompany</groupId> |
|
239 |
<artifactId>cors-filter</artifactId> |
|
240 |
<version>2.5</version> |
|
241 |
</dependency> |
|
242 |
|
|
237 | 243 |
</dependencies> |
238 | 244 |
|
239 | 245 |
<build> |
Also available in: Unified diff
1. Bug fix on spring setup
2. Bug fix on converter class