diff --git a/pom.xml b/pom.xml
index 0468742..a7dccd0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,8 +32,7 @@
log4j
log4j
- (1.2, 1.5]
- runtime
+ ${log4j.version}
@@ -241,6 +240,12 @@
org.springframework.cloud
spring-cloud-starter-hystrix
1.1.5.RELEASE
+
+
+
+
+
+
@@ -281,6 +286,12 @@
org.eurocris
openaire-cris-validator
1.0.1-SNAPSHOT
+
+
+
+
+
+
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index cdf21ac..7390b5e 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,41 +1,125 @@
+#container.hostname = dl114.madgik.di.uoa.gr
+#container.hostname = mpagasas.di.uoa.gr
+#container.hostname = adonis.athenarc.gr
+container.hostname = estella.athenarc.gr
+
+provider.endpoint=http://estella.athenarc.gr:8480/uoa-repository-manager-service
+
+
+#container.hostname = validator.mincyt.research-infrastructures.eu
+container.port = 8080
+#container.context =
+
+# BASIC SETTINGS
+services.validator.mode.user = ldap
+services.validator.mail.override = false
+services.validator.mode.repo = dms
+services.validator.baseUrl = http://${container.hostname}:${container.port}/${container.context}
+services.validator.dnetWorkflow = true
+services.validator.deploy.environment = openaire-beta
+#services.validator.deploy.environment = mincyt
+services.validator.registration.files.download = true
+services.validator.autoRestoreOnStartup = false
+services.validator.mode.standalone = false
+services.validator.mail.override = false
+services.validator.adminEmail = antleb@di.uoa.gr
+services.validator.admins.master = antleb@di.uoa.gr
+services.validator.admins.secondary = ant.lebesis@gmail.com
+services.validator.adminBaseUrl = ../validator-admin
+services.validator.webBaseUrl = http://${container.hostname}:${container.port}/validator
+services.validator.registrationsReport.email = ant.lebesis@gmail.com
+services.repo-manager.repository.testing.mode = false
+
+# EMAIL SETTINGS
+services.validator.mail.host = smtp.gmail.com
+services.validator.mail.port = 465
+services.validator.mail.username = test.openaire@gmail.com
+services.validator.mail.password = ^($*@$)*!$
+services.validator.mail.authenticate = true
+services.validator.mail.mode = ssl
+ervices.validator.mail.fromAddress = no-reply@mpagasas.openaire.eu
+services.validator.mail.override = false
+services.validator.mail.overrideEmail = nikonas@di.uoa.gr
+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
+#ISLookUpService.url = http://node1.t.openaire.research-infrastructures.eu:8280/is/services/isLookUp
+#ISRegistryService.url = http://node1.t.openaire.research-infrastructures.eu:8280/is/services/isRegistry
+#ISSNService.url = http://node1.t.openaire.research-infrastructures.eu:8280/is/services/isSN
+
+#ISLookUpService.url = http://skalny.icm.edu.pl:8280/is/services/isLookUp
+#ISRegistryService.url = http://skalny.icm.edu.pl:8280/is/services/isRegistry
+#ISSNService.url = skalny.icm.edu.pl:8280/is/services/isSN
+
+#ISLookUpService.url = http://node0.t.openaire.research-infrastructures.eu:8080/is/services/isLookUp
+#ISRegistryService.url = http://node0.t.openaire.research-infrastructures.eu:8080/is/services/isRegistry
+#ISSNService.url = http://node0.t.openaire.research-infrastructures.eu:8080/is/services/isSN
+
+#ISLookUpService.url = http://node6.t.openaire.research-infrastructures.eu:8980/dnet/services/isLookUp
+#ISRegistryService.url = http://node6.t.openaire.research-infrastructures.eu:8980/dnet/services/isRegistry
+#ISSNService.url = http://node6.t.openaire.research-infrastructures.eu:8980/dnet/services/isSN
+
+#ISLookUpService.url = http://node6.t.openaire.research-infrastructures.eu:8280/is/services/isLookUp
+#ISRegistryService.url = http://node6.t.openaire.research-infrastructures.eu:8280/is/services/isRegistry
+#ISSNService.url = http://node6.t.openaire.research-infrastructures.eu:8280/is/services/isSN
+
+#ISLookUpService.url = http://aggregator.mincyt.research-infrastructures.eu:8080/is/services/isLookUp
+#ISRegistryService.url = http://aggregator.mincyt.research-infrastructures.eu:8080/is/services/isRegistry
+#ISSNService.url = http://aggregator.mincyt.research-infrastructures.eu:8080/is/services/isSN
+
+#ISLookUpService.url = http://node0.d.hudl.research-infrastructures.eu:8080/is/services/isLookUp
+#ISRegistryService.url = http://node0.d.hudl.research-infrastructures.eu:8080/is/services/isRegistry
+#ISSNService.url = http://node0.d.hudl.research-infrastructures.eu:8080/is/is/services/isSN
+
+ISLookUpService.url = https://dev-openaire.d4science.org:443/is/services/isLookUp
+ISRegistryService.url = https://dev-openaire.d4science.org:443/is/services/isRegistry
+ISSNService.url = https://dev-openaire.d4science.org:443/is/services/isSN
+ValidatorService.url=http://estella.athenarc.gr:8080/validator-service/services/validatorWebService
+
+# LDAP
+#services.validator.ldap.address = 88.197.53.113
+#services.validator.ldap.address = 194.197.192.119
+#services.validator.ldap.port = 389
+#services.validator.ldap.username = cn=admin,dc=openaire,dc=eu
+#services.validator.ldap.password = serenata
+#services.validator.ldap.usersDN = ou=users,dc=openaire,dc=eu
+
+services.users.ldap.address = 194.177.192.119
+services.users.ldap.port = 389
+services.users.ldap.username = cn=admin,dc=openaire,dc=eu
+services.users.ldap.password = serenata
+services.users.ldap.usersDN = ou=users,dc=openaire,dc=eu
+
+services.validator.ldap.address = 194.177.192.119
+services.validator.ldap.port = 389
+services.validator.ldap.username = cn=admin,dc=openaire,dc=eu
+services.validator.ldap.password = serenata
+services.validator.ldap.usersDN = ou=users,dc=openaire,dc=eu
+
+#AAI-REDIS
+redis.host = estella.athenarc.gr
+redis.port = 6379
+redis.password = redis123
+
+oidc.dev.home = http://localhost:8480/uoa-repository-manager-service/openid_connect_login
+webapp.dev.front = http://localhost:4200/dashboard
+
+repomanager.db.driverClassName=org.postgresql.Driver
+repomanager.db.url=jdbc:postgresql://194.177.192.119:5432/repomanager
+repomanager.db.username=dnet
+repomanager.db.password=dnetPwd
infrastructure.name=integration
-## Container properties
-container.hostname=localhost
-container.context=uoa-repository-manager-service
-container.port=8480
-
-IS.url=https://dev-openaire.d4science.org/is/services
-ISLookUpService.url=${IS.url}/isLookUp
-ISRegistryService.url=${IS.url}/isRegistry
-ISSNService.url=${IS.url}/services/isSN
-
-#ValidatorService.url=http://88.197.53.69:8080/validator-service/services/validatorWebService
-#ValidatorService.url=http://beta.services.openaire.eu/validator-service/services/validatorWebService
-ValidatorService.url=http://localhost:8080/validator-service/services/validatorWebService
-
-services.provide.adminEmail=provide-admin@openaire.eu
-
-## Broker Service
-services.broker.url=http://broker1-dev-dnet.d4science.org
-services.broker.port=8080
-services.broker.api=api/
-services.broker.openaire=openaireBroker
-
-#api.baseAddress=https://dev-openaire.d4science.org/openaire
-api.baseAddress=http://beta.services.openaire.eu/openaire
-
-service.repository-rest-api.baseUrl=http://${container.hostname}:${container.port}
-services.repo-manager.baseUrl=http://${container.hostname}:${container.port}/${container.context}
-
transport.soap.baseAddress=http://${container.hostname}:${container.port}/${container.context}
transport.soap.force.local.address=false
-
-
-validator.results.url=https://${container.hostname}:${container.port}/compatibility/browseHistory/
-services.repo-manager.adminEmail=antleb@di.uoa.gr
-services.repo-manager.repository.testing.mode=false
-services.repo-manager.deploy.environment=development
services.validator.mail.host=smtp.gmail.com
services.validator.mail.port=465
services.validator.mail.fromAddress=no-reply@openaire.eu
@@ -49,41 +133,35 @@ services.validator.mail.mode=ssl
services.validator.mail.debug=false
services.validator.mail.overrideEmail=antleb@di.uoa.gr
services.validator.mail.specialRecipients=antleb@di.uoa.gr
-
services.validator.repoRegistration.override=antleb@di.uoa.gr
-repomanager.db.driverClassName=org.postgresql.Driver
-repomanager.db.url=jdbc:postgresql://194.177.192.119:5432/repomanager
-repomanager.db.username=dnet
-repomanager.db.password=dnetPwd
-
-services.repomanager.analyticsURL=http://analytics.openaire.eu/addsite.php?
-
-topic_types.url=https://beta.services.openaire.eu/provision/mvc/vocabularies/dnet:topic_types.json
-
oidc.issuer=https://aai.openaire.eu/oidc/
oidc.id=767422b9-5461-4807-a80a-f9a2072d3a7d
oidc.secret=AMQtGlbTXNjwjhF0st28LmM6V0XypMdaVS7tJmGuYFlmH36iIv4t7tVqYuLYrNPkhnZ_GPUJvhymBhFupdgb6aU
-
-oidc.dev.home=http://localhost:8480/uoa-repository-manager-service/openid_connect_login
-webapp.dev.front=http://localhost:4200/landing
-
-##REDIS-AAI
-
-redis.host=localhost
-redis.port=6379
-redis.password=redis123
-aai.mode=develop
-
-
-services.repomanager.usageStatisticsDiagramsBaseURL=https://beta.openaire.eu/stats3/
-services.repomanager.usageStatisticsNumbersBaseURL=https://beta.services.openaire.eu/usagestats/datasources/
-services.repomanager.usagestats.adminEmail=antleb@di.uoa.gr
-
-##SUSHI
-services.repomanager.usagestats.sushiliteEndpoint=http://beta.services.openaire.eu/usagestats/sushilite/
-
-##SEARCH API
search.api.baseAddress=https://beta.services.openaire.eu/search/v2/api
search.api.usagestats=https://services.openaire.eu/usagestats
search.api.usageEvents=http://beta.lbs.openaire.eu:8080/ajax/summary
+api.baseAddress=http://beta.services.openaire.eu/openaire
+services.repo-manager.baseUrl=http://${container.hostname}:${container.port}/${container.context}
+services.repo-manager.adminEmail=antleb@di.uoa.gr
+services.repo-manager.repository.testing.mode=false
+services.repo-manager.deploy.environment=development
+services.repomanager.usageStatisticsDiagramsBaseURL=https://beta.openaire.eu/stats3/
+services.repomanager.usageStatisticsNumbersBaseURL=https://beta.services.openaire.eu/usagestats/datasources/
+services.repomanager.usagestats.adminEmail=antleb@di.uoa.gr
+services.repomanager.usagestats.sushiliteEndpoint=http://beta.services.openaire.eu/usagestats/sushilite/
+services.repomanager.analyticsURL=https://analytics.openaire.eu/addsite.php?
+
+aai.mode=develop
+#uoa-repository-manager-service
+#oidc.dev.home=http://88.197.53.69:8080/uoa-repository-manager-service/openid_connect_login
+#webapp.dev.front=http://88.197.53.69/landing
+services.repo-manager.adminEmail=antleb@di.uoa.gr
+services.repomanager.usagestats.adminEmail=antleb@di.uoa.gr
+services.provide.adminEmail=antleb@di.uoa.gr
+validator.results.url=https://beta.provide.openaire.eu/compatibility/browseHistory/
+topic_types.url=https://beta.services.openaire.eu/provision/mvc/vocabularies/dnet:topic_types.json
+services.broker.url=http://broker1-dev-dnet.d4science.org
+services.broker.port=8080
+services.broker.api=api/
+services.broker.openaire=openaireBroker
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
deleted file mode 100644
index ec03ff6..0000000
--- a/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-log4j.rootLogger = INFO, R
-
-log4j.logger.eu.dnetlib = INFO
-log4j.logger.eu.dnetlib.repo.manager = INFO
-log4j.logger.eu.dnetlib.clients.data.datasourcemanager.ws.Converter = FATAL
-log4j.logger.org.springframework = INFO
-
-log4j.appender.R=org.apache.log4j.RollingFileAppender
-log4j.appender.R.File=/var/log/dnet/repository-manager.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
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/log4j.properties b/src/main/webapp/WEB-INF/log4j.properties
index ec03ff6..c5f0b25 100644
--- a/src/main/webapp/WEB-INF/log4j.properties
+++ b/src/main/webapp/WEB-INF/log4j.properties
@@ -1,9 +1,9 @@
-log4j.rootLogger = INFO, R
+log4j.rootLogger = INFO
-log4j.logger.eu.dnetlib = INFO
-log4j.logger.eu.dnetlib.repo.manager = INFO
+log4j.logger.eu.dnetlib = INFO, R
+log4j.logger.eu.dnetlib.repo.manager = INFO, R
log4j.logger.eu.dnetlib.clients.data.datasourcemanager.ws.Converter = FATAL
-log4j.logger.org.springframework = INFO
+log4j.logger.org.springframework = INFO, R
log4j.appender.R=org.apache.log4j.RollingFileAppender
log4j.appender.R.File=/var/log/dnet/repository-manager.log
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index ec73e02..363cf07 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -4,11 +4,6 @@
org.springframework.web.context.ContextLoaderListener
-
- org.springframework.web.util.Log4jConfigListener
-
-
-
contextConfigLocation
@@ -17,10 +12,6 @@
/WEB-INF/aai-security.xml
-
- log4jConfigLocation
- /WEB-INF/log4j.properties
-
log4jRefreshInterval
1000