Project

General

Profile

« Previous | Next » 

Revision 54924

Merge with dev branch

View differences:

modules/uoa-repository-manager-service/trunk/deploy.info
1

  
2
{
3
  "type_source": "SVN", 
4
  "goal": "package -U -T 4C source:jar", 
5
  "url": "http://svn-public.driver.research-infrastructures.eu/driver/dnet45/modules/uoa-repository-manager-service/trunk", 
6
  "deploy_repository": "dnet45-snapshots", 
7
  "version": "4", 
8
  "mail": "antleb@di.uoa.gr, stefania.martziou@imis.athena-innovation.gr, pkanakakis@di.uoa.gr", 
9
  "deploy_repository_url": "http://maven.research-infrastructures.eu/nexus/content/repositories/dnet45-snapshots", 
10
  "name": "uoa-repository-manager-service"
11
}
modules/uoa-repository-manager-service/trunk/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java
412 412
            HttpEntity<String> httpEntity = new HttpEntity<String>(json_repository, httpHeaders);
413 413
            ResponseEntity responseEntity = restTemplate.exchange(uriComponents.toUri(),HttpMethod.POST, httpEntity, ResponseEntity.class);
414 414

  
415
            if (responseEntity.getStatusCode().equals(HttpStatus.OK))
415
            if (responseEntity.getStatusCode().equals(HttpStatus.OK)) {
416 416
                emailUtils.sendUserRegistrationEmail(repository, authentication);
417
            else
417
            }else
418 418
                LOGGER.debug(responseEntity.getBody().toString());
419 419

  
420 420
            return repository;
modules/uoa-repository-manager-service/trunk/src/main/resources/eu/dnetlib/repo/manager/service/application.properties
1
infrastructure.name=integration
2

  
3
# Container properties
4
container.hostname = localhost
5
container.context=repoManager
6
container.port = 8080
7

  
8
# IS
9
ISLookUpService.url = http://node6.t.openaire.research-infrastructures.eu/is/services/isLookUp
10
ISRegistryService.url = http://node6.t.openaire.research-infrastructures.eu/is/services/isRegistry
11
ISSNService.url = http://node6.t.openaire.research-infrastructures.eu/is/services/isSN
12
#ISLookUpService.url = http://localhost:9190/is/services/isLookUp
13
#ISRegistryService.url = http://localhost:9190/is/services/isRegistry
14
#ISSNService.url = http://localhost:9190/is/services/isSN
15
# LDAP
16
services.users.ldap.address = 194.177.192.119
17
services.users.ldap.port = 389
18
services.users.ldap.username = cn=admin,dc=openaire,dc=eu
19
services.users.ldap.password = serenata
20
services.users.ldap.usersDN = ou=users,dc=openaire,dc=eu
21

  
22
#services.repo-manager.repository.testing.mode = true
23

  
24
ValidatorService.url=http://adonis.athenarc.gr:8080/validator-service/services/validatorWebService
25

  
26
# Broker Service
27
services.broker.url = http://broker1-dev-dnet.d4science.org
28
#services.broker.url = http://localhost
29
services.broker.port = 8080
30
#services.broker.port = 9090
31
services.broker.api = api/
32
services.broker.openaire = openaireBroker
33

  
34
#
35
# Configuration file classpath
36
configurationFileClassPath=classpath:application-context.xml
37

  
38
api.baseAddress=https://dev-openaire.d4science.org/openaire
39
#api.baseAddress=http://beta.services.openaire.eu:8080/openaire/
40

  
41

  
42
service.repository-rest-api.baseUrl = http://localhost:8080
43

  
44

  
45
# the address where validator is running and is accessible from the controllers of the web
46
services.repo-manager.baseUrl = http://${container.hostname}:${container.port}/${container.context}
47

  
48
# base address for soap web services
49
transport.soap.baseAddress = http://${container.hostname}:${container.port}/${container.context}
50

  
51
transport.soap.force.local.address = false
52

  
53
# the email of the administrator
54
# he will receive all the automatic bug reports and feedback created
55
services.repo-manager.adminEmail = nikonas@di.uoa.gr
56

  
57
# if set to true, getRepositories will return dummy repositories
58
services.repo-manager.repository.testing.mode = false
59

  
60
services.repo-manager.deploy.environment = development
61

  
62
# the mailhost for the mail service
63
services.validator.mail.host = smtp.gmail.com
64
# the port where the mail service is running
65
services.validator.mail.port = 465
66
# the address that appears in the from field in the mails send by the validator
67
services.validator.mail.fromAddress = no-reply@openaire.eu
68
# the reply-to field value in the mails send by the validator
69
services.validator.mail.replyToAddress = no-reply@openaire.eu
70
# the username of the account used to login in the mail server
71
services.validator.mail.username = test.openaire@gmail.com
72
# the password of the account used to login in the mail server
73
services.validator.mail.password = ^($*@$)*!$
74
# if authentication should take place
75
# if set to false username and password is not needed
76
services.validator.mail.authenticate = true
77
# is set to yes then all mails will not be sent to their targets but to the address specified in services.validator.mail.overrideEmail
78
services.validator.mail.override = false
79
# if set to true then no mails are send, they are only logged as a debug message
80
services.validator.mail.logonly = false
81
# the mode used for the mails send by the validator
82
services.validator.mail.mode = ssl
83
# used by eu.dnetlib.utils.MailLibrary to control debuggin messages
84
services.validator.mail.debug = false
85
# if services.validator.mail.override is true then all mails will be send only to this address
86
services.validator.mail.overrideEmail = nikonas@di.uoa.gr
87
# a comma-seperated list of address that will receive all mails about validations and repo registrations
88
services.validator.mail.specialRecipients = nikonas@di.uoa.gr
89

  
90
# a comma-seperated list of addresses that have the ability to register repos without the need for validation and registration
91
services.validator.repoRegistration.override = nikonas@di.uoa.gr
92

  
93

  
94
repomanager.db.driverClassName = org.postgresql.Driver
95
repomanager.db.url = jdbc:postgresql://194.177.192.119:5432/repomanager
96
repomanager.db.username = dnet
97
repomanager.db.password = dnetPwd
98

  
99
services.repomanager.analyticsURL = http://analytics.openaire.eu/addsite.php?
100

  
101
topic_types.url = https://beta.services.openaire.eu/provision/mvc/vocabularies/dnet:topic_types.json
102

  
103
#oidc.issuer = https://aai.openminted.eu/oidc/
104
#oidc.id = 24e83176-1312-4ba3-bc0b-ffeebea1603e
105
#oidc.secret = U_gLOupYu2trYIOwfxGgZkkZoOHG_zGfaViOUsXcZ7qVQuF1rcJeQYKIDX1TY3z27CIoHaqq9ht2rmAiUmBRYQ
106
#webapp.home = http://localhost:8380/repomanager-service/openid_connect_login
107
#webapp.front=http://localhost:8380/
108

  
109
redis.host = 83.212.101.85
110
#redis.port = 6379
111
#redis.password
112

  
113
services.repomanager.usageStatisticsDiagramsBaseURL = https://beta.openaire.eu/stats3/
114
services.repomanager.usageStatisticsNumbersBaseURL = https://beta.services.openaire.eu/usagestats/datasources/
115
services.repomanager.usagestats.adminEmail = repositoryusagestats@openaire.eu
modules/uoa-repository-manager-service/trunk/pom.xml
12 12
    <groupId>eu.dnetlib</groupId>
13 13
    <artifactId>uoa-repository-manager-service</artifactId>
14 14
    <version>1.0.0-SNAPSHOT</version>
15
    <packaging>jar</packaging>
15
    <packaging>war</packaging>
16 16

  
17 17

  
18 18
    <dependencies>
......
113 113
        </dependency>
114 114

  
115 115
        <dependency>
116
            <groupId>org.slf4j</groupId>
117
            <artifactId>slf4j-log4j12</artifactId>
118
            <version>1.5.6</version>
119
        </dependency>
120

  
121
        <dependency>
122 116
            <groupId>xerces</groupId>
123 117
            <artifactId>xercesImpl</artifactId>
124 118
            <version>2.11.0</version>

Also available in: Unified diff