MaDgIK
/
uoa-repository-manager-service
13
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

property name cleanup

This commit is contained in:
Antonis Lempesis 2021-10-07 12:49:49 +00:00
parent 7fc4f004b3
commit 174059b991
4 changed files with 73 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/eu/dnetlib/repo/manager/config/DatasourceConfiguration.java
View File

@ -14,16 +14,16 @@ public class DatasourceConfiguration {
private static Logger LOGGER = Logger.getLogger(DatasourceConfiguration.class); private static Logger LOGGER = Logger.getLogger(DatasourceConfiguration.class);
@Value("${repomanager.db.driverClassName}") @Value("${services.repomanager.db.driverClassName}")
private String driverClassname; private String driverClassname;
@Value("${repomanager.db.url}") @Value("${services.repomanager.db.url}")
private String URL; private String URL;
@Value("${repomanager.db.username}") @Value("${services.repomanager.db.username}")
private String username; private String username;
@Value("${repomanager.db.password}") @Value("${services.repomanager.db.password}")
private String password; private String password;
@Bean @Bean

18
src/main/java/eu/dnetlib/repo/manager/config/MailConfig.java
View File

@ -8,31 +8,31 @@ import org.springframework.context.annotation.Configuration;
@Configuration @Configuration
public class MailConfig { public class MailConfig {
@Value("${services.validator.mail.host}") @Value("${services.repomanager.mail.host}")
private String host; private String host;
@Value("${services.validator.mail.port}") @Value("${services.repomanager.mail.port}")
private int port; private int port;
@Value("${services.validator.mail.authenticate}") @Value("${services.repomanager.mail.authenticate}")
private boolean authenticate; private boolean authenticate;
@Value("${services.validator.mail.username}") @Value("${services.repomanager.mail.username}")
private String username; private String username;
@Value("${services.validator.mail.password}") @Value("${services.repomanager.mail.password}")
private String password; private String password;
@Value("${services.validator.mail.from}") @Value("${services.repomanager.mail.from}")
private String from; private String from;
@Value("${services.validator.mail.replyTo}") @Value("${services.repomanager.mail.replyTo}")
private String replyTo; private String replyTo;
@Value("${services.validator.mail.mode}") @Value("${services.repomanager.mail.mode}")
private String mode; private String mode;
@Value("${services.validator.mail.debug}") @Value("${services.repomanager.mail.debug}")
private boolean debug; private boolean debug;
@Bean @Bean

129
src/main/resources/application.properties
View File

@ -11,44 +11,35 @@ container.port = 8080
#container.context = <yourContext> #container.context = <yourContext>
# BASIC SETTINGS # BASIC SETTINGS
services.validator.mode.user = ldap #services.validator.mode.user = ldap
services.validator.mail.override = false #services.validator.mail.override = false
services.validator.mode.repo = dms #services.validator.mode.repo = dms
services.validator.baseUrl = http://${container.hostname}:${container.port}/${container.context} #services.validator.baseUrl = http://${container.hostname}:${container.port}/${container.context}
services.validator.dnetWorkflow = true #services.validator.dnetWorkflow = true
services.validator.deploy.environment = openaire-beta #services.validator.deploy.environment = openaire-beta
#services.validator.deploy.environment = mincyt ##services.validator.deploy.environment = mincyt
services.validator.registration.files.download = true #services.validator.registration.files.download = true
services.validator.autoRestoreOnStartup = false #services.validator.autoRestoreOnStartup = false
services.validator.mode.standalone = false #services.validator.mode.standalone = false
services.validator.mail.override = false #services.validator.mail.override = false
services.validator.adminEmail = antleb@di.uoa.gr #services.validator.adminEmail = antleb@di.uoa.gr
services.validator.admins.master = antleb@di.uoa.gr #services.validator.admins.master = antleb@di.uoa.gr
services.validator.admins.secondary = ant.lebesis@gmail.com #services.validator.admins.secondary = ant.lebesis@gmail.com
services.validator.adminBaseUrl = ../validator-admin #services.validator.adminBaseUrl = ../validator-admin
services.validator.webBaseUrl = http://${container.hostname}:${container.port}/validator #services.validator.webBaseUrl = http://${container.hostname}:${container.port}/validator
services.validator.registrationsReport.email = ant.lebesis@gmail.com #services.validator.registrationsReport.email = ant.lebesis@gmail.com
services.repo-manager.repository.testing.mode = false #services.repo-manager.repository.testing.mode = false
# EMAIL SETTINGS # EMAIL SETTINGS
services.validator.mail.host = smtp.gmail.com services.repomanager.mail.host = smtp.gmail.com
services.validator.mail.port = 465 services.repomanager.mail.port = 465
services.validator.mail.username = test.openaire@gmail.com services.repomanager.mail.username = test.openaire@gmail.com
services.validator.mail.password = ^($*@$)*!$ services.repomanager.mail.password = ^($*@$)*!$
services.validator.mail.authenticate = true services.repomanager.mail.authenticate = true
services.validator.mail.mode = ssl services.repomanager.mail.debug = false
ervices.validator.mail.fromAddress = no-reply@mpagasas.openaire.eu services.repomanager.mail.mode = ssl
services.validator.mail.override = false services.repomanager.mail.from = test.openaire@gmail.com
services.validator.mail.overrideEmail = nikonas@di.uoa.gr services.repomanager.mail.replyTo = test.openaire@gmail.com
services.validator.mail.specialRecipients = antleb@di.uoa.gr
# VALIDATOR DB
services.validator.db.driverClassName = org.postgresql.Driver
#services.validator.db.url = jdbc:postgresql://194.177.192.119:5432/validator
services.validator.db.url = jdbc:postgresql://88.197.53.70:5432/validator
services.validator.db.username = dnet
services.validator.db.password = dnetPwd
# IS # IS
#ISLookUpService.url = http://node1.t.openaire.research-infrastructures.eu:8280/is/services/isLookUp #ISLookUpService.url = http://node1.t.openaire.research-infrastructures.eu:8280/is/services/isLookUp
@ -91,18 +82,18 @@ ValidatorService.url=http://estella.athenarc.gr:8080/validator-service/services/
#services.validator.ldap.username = cn=admin,dc=openaire,dc=eu #services.validator.ldap.username = cn=admin,dc=openaire,dc=eu
#services.validator.ldap.password = serenata #services.validator.ldap.password = serenata
#services.validator.ldap.usersDN = ou=users,dc=openaire,dc=eu #services.validator.ldap.usersDN = ou=users,dc=openaire,dc=eu
#
services.users.ldap.address = 194.177.192.119 #services.users.ldap.address = 194.177.192.119
services.users.ldap.port = 389 #services.users.ldap.port = 389
services.users.ldap.username = cn=admin,dc=openaire,dc=eu #services.users.ldap.username = cn=admin,dc=openaire,dc=eu
services.users.ldap.password = serenata #services.users.ldap.password = serenata
services.users.ldap.usersDN = ou=users,dc=openaire,dc=eu #services.users.ldap.usersDN = ou=users,dc=openaire,dc=eu
#
services.validator.ldap.address = 194.177.192.119 #services.validator.ldap.address = 194.177.192.119
services.validator.ldap.port = 389 #services.validator.ldap.port = 389
services.validator.ldap.username = cn=admin,dc=openaire,dc=eu #services.validator.ldap.username = cn=admin,dc=openaire,dc=eu
services.validator.ldap.password = serenata #services.validator.ldap.password = serenata
services.validator.ldap.usersDN = ou=users,dc=openaire,dc=eu #services.validator.ldap.usersDN = ou=users,dc=openaire,dc=eu
#AAI-REDIS #AAI-REDIS
redis.host = estella.athenarc.gr redis.host = estella.athenarc.gr
@ -112,28 +103,28 @@ redis.password = redis123
oidc.dev.home = http://localhost:8480/uoa-repository-manager-service/openid_connect_login oidc.dev.home = http://localhost:8480/uoa-repository-manager-service/openid_connect_login
webapp.dev.front = http://localhost:4200/dashboard webapp.dev.front = http://localhost:4200/dashboard
repomanager.db.driverClassName=org.postgresql.Driver services.repomanager.db.driverClassName=org.postgresql.Driver
repomanager.db.url=jdbc:postgresql://194.177.192.119:5432/repomanager services.repomanager.db.url=jdbc:postgresql://194.177.192.119:5432/repomanager
repomanager.db.username=dnet services.repomanager.db.username=dnet
repomanager.db.password=dnetPwd services.repomanager.db.password=dnetPwd
infrastructure.name=integration #infrastructure.name=integration
transport.soap.baseAddress=http://${container.hostname}:${container.port}/${container.context} #transport.soap.baseAddress=http://${container.hostname}:${container.port}/${container.context}
transport.soap.force.local.address=false #transport.soap.force.local.address=false
services.validator.mail.host=smtp.gmail.com #services.validator.mail.host=smtp.gmail.com
services.validator.mail.port=465 #services.validator.mail.port=465
services.validator.mail.fromAddress=no-reply@openaire.eu #services.validator.mail.fromAddress=no-reply@openaire.eu
services.validator.mail.replyToAddress=no-reply@openaire.eu #services.validator.mail.replyToAddress=no-reply@openaire.eu
services.validator.mail.username=test.openaire@gmail.com #services.validator.mail.username=test.openaire@gmail.com
services.validator.mail.password=^($*@$)*!$ #services.validator.mail.password=^($*@$)*!$
services.validator.mail.authenticate=true #services.validator.mail.authenticate=true
services.validator.mail.override=false #services.validator.mail.override=false
services.validator.mail.logonly=false #services.validator.mail.logonly=false
services.validator.mail.mode=ssl #services.validator.mail.mode=ssl
services.validator.mail.debug=false #services.validator.mail.debug=false
services.validator.mail.overrideEmail=antleb@di.uoa.gr #services.validator.mail.overrideEmail=antleb@di.uoa.gr
services.validator.mail.specialRecipients=antleb@di.uoa.gr #services.validator.mail.specialRecipients=antleb@di.uoa.gr
services.validator.repoRegistration.override=antleb@di.uoa.gr #services.validator.repoRegistration.override=antleb@di.uoa.gr
oidc.issuer=https://aai.openaire.eu/oidc/ oidc.issuer=https://aai.openaire.eu/oidc/
oidc.id=767422b9-5461-4807-a80a-f9a2072d3a7d oidc.id=767422b9-5461-4807-a80a-f9a2072d3a7d

15
src/main/webapp/WEB-INF/applicationContext.xml
View File

@ -21,21 +21,6 @@
<!--<import resource="classpath*:/gr/uoa/di/driver/app/springContext-registrator.xml"/>--> <!--<import resource="classpath*:/gr/uoa/di/driver/app/springContext-registrator.xml"/>-->
<bean id="maillib" class="eu.dnetlib.utils.MailLibrary" init-method="init">
<property name="mailhost" value="${services.validator.mail.host}"/>
<property name="smtpPort" value="${services.validator.mail.port}"/>
<property name="authenticate" value="${services.validator.mail.authenticate}"/>
<property name="username" value="${services.validator.mail.username}"/>
<property name="password" value="${services.validator.mail.password}"/>
<property name="from" value="${services.validator.mail.fromAddress}"/>
<property name="replyTo" value="${services.validator.mail.replyToAddress}"/>
<property name="mode" value="${services.validator.mail.mode}"/>
<property name="debug" value="${services.validator.mail.debug}"/>
</bean>
<bean class="eu.dnetlib.repo.manager.config.CascadingPropertyLoader" <bean class="eu.dnetlib.repo.manager.config.CascadingPropertyLoader"
id="propertyLoader"> id="propertyLoader">
<property name="order" value="2"/> <property name="order" value="2"/>