diff --git a/src/main/java/eu/dnetlib/repo/manager/config/Config.java b/src/main/java/eu/dnetlib/repo/manager/config/Config.java index 44271ce..cbef70b 100644 --- a/src/main/java/eu/dnetlib/repo/manager/config/Config.java +++ b/src/main/java/eu/dnetlib/repo/manager/config/Config.java @@ -8,6 +8,8 @@ import eu.dnetlib.clients.functionality.validator.ws.ValidatorWebServiceClient; import eu.dnetlib.domain.enabling.Vocabulary; import gr.uoa.di.driver.enabling.ISLookUp; import gr.uoa.di.driver.enabling.islookup.ISLookUpImpl; +import gr.uoa.di.driver.enabling.vocabulary.ISVocabularyLoader; +import gr.uoa.di.driver.enabling.vocabulary.VocabularyLoader; import gr.uoa.di.driver.util.ServiceLocator; import gr.uoa.di.driver.util.StaticServiceLocator; import gr.uoa.di.driver.xml.VocabularyXmlConverter; @@ -16,40 +18,21 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.*; @Configuration -@ImportResource("application-compat.xml") -@PropertySource("application-compat.properties") public class Config { - @Value("${ISLookUpService.url}") + @Value("${ISLookUpService.url}") private String lookupURL; @Value("${ValidatorService.url}") private String validatorUrl; - private ServiceLocator createIsLookupServiceLocator() throws Exception { - JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean(); + @Bean(name="vocabularyLoader") + public VocabularyLoader createVocabularyLoader() throws Exception { + ISVocabularyLoader loader = new ISVocabularyLoader(); - factory.setServiceClass(eu.dnetlib.enabling.is.lookup.rmi.ISLookUpService.class); - factory.setAddress(lookupURL); - eu.dnetlib.enabling.is.lookup.rmi.ISLookUpService client = (eu.dnetlib.enabling.is.lookup.rmi.ISLookUpService) factory.create(); + loader.setLookUp(createVocabularyLookUp()); - ISLookUpClient service = new ISLookUpClient(); - service.setWebService(client); - - StaticServiceLocator locator = new StaticServiceLocator<>(); - locator.setService(service); - - return locator; - } - - @Bean(name="vocabularyLookUp") - public ISLookUp createVocabularyLookUp() throws Exception { - ISLookUpImpl lookUp = new ISLookUpImpl<>(); - - lookUp.setLookupLocator(createIsLookupServiceLocator()); - lookUp.setConverter(new VocabularyXmlConverter()); - - return lookUp; + return loader; } @Bean("validatorServiceLocator") @@ -69,4 +52,30 @@ public class Config { return locator; } + + // @Bean(name="vocabularyLookUp") + private ISLookUp createVocabularyLookUp() throws Exception { + ISLookUpImpl lookUp = new ISLookUpImpl<>(); + + lookUp.setLookupLocator(createIsLookupServiceLocator()); + lookUp.setConverter(new VocabularyXmlConverter()); + + return lookUp; + } + + private ServiceLocator createIsLookupServiceLocator() throws Exception { + JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean(); + + factory.setServiceClass(eu.dnetlib.enabling.is.lookup.rmi.ISLookUpService.class); + factory.setAddress(lookupURL); + eu.dnetlib.enabling.is.lookup.rmi.ISLookUpService client = (eu.dnetlib.enabling.is.lookup.rmi.ISLookUpService) factory.create(); + + ISLookUpClient service = new ISLookUpClient(); + service.setWebService(client); + + StaticServiceLocator locator = new StaticServiceLocator<>(); + locator.setService(service); + + return locator; + } } \ No newline at end of file diff --git a/src/main/resources/application-compat.properties b/src/main/resources/application-compat.properties deleted file mode 100644 index 1a7b5af..0000000 --- a/src/main/resources/application-compat.properties +++ /dev/null @@ -1,49 +0,0 @@ -subscription.manager.threads = 2 -subscription.manager.timeToLive = 3600 -notification.manager.threads = 2 - -is.registry.creatorId = ${transport.soap.baseAddress} - -openaire.db.driverClassName = org.postgresql.Driver -openaire.db.url = jdbc:postgresql://node1.d.openaire.research-infrastructures.eu:5432/dnet_openaire -openaire.db.username = dnet -openaire.db.password = dnetPwd - - -transport.soap.baseAddress=http://${container.hostname}:${container.port}/${container.context} -container.context=/ -infrastructure.name=dev -transport.soap.force.local.address=false -services.hcm.serviceName=hcmService - -services.common.nkua.useCache = true -ISLookUpService.url= INVALID LINK!!! ISLookUpService -ISRegistryService.url= INVALID LINK!!! ISRegistryService -ResultSetService.url= INVALID LINK!!! ResultSetService -ISSNService.url= INVALID LINK!!! ISSNService -DBService.url= INVALID LINK!!! DBService -ActionManagerService.url = INALVID LINK!!! action Service -A2Service.url= INVALID LINK!!! A2Service -UserProfileService.url= INVALID LINK!!! UserProfileService -IndexService.url= INVALID LINK!!! IndexService -SearchService.url= INVALID LINK!!! SearchService -CommunityService.url= INVALID LINK!!! CommunityService -CollectionService.url= INVALID LINK!!! CollectionService -PublisherService.url= INVALID LINK!!! PublisherService -RecommendationService.url= INVALID LINK!!! RecommendationService -ValidatorService.url=http://88.197.53.69:8080/uoa-validator-service/services/validatorWebService -ForumService.url = INVALID LINK!!! ForumService -RatingService.url = INVALID LINK!!! RatingService -WebInterfaceService.url = INVALID LINK!!! WebInterfaceService -DatasourceManagerService.url = https://dev-openaire.d4science.org:443/is/services/datasourceManager -MDStoreService.url = INVALID LINK!!! MDStoreService -services.similarityService.ws.url = INVALID LINK!!! similarityService -services.alertService.ws.url = INVALID LINK!!! alertService -services.notificationService.ws.url = INVALID LINK!!! notificationService -services.conversionService.ws.url = INVALID LINK!!! conversionService - -services.registration.delay = 3600 -services.registration.default.hnmlocator = nullHNMLocator - -services.registration.default.removeRegistration=true - diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 4ce18be..d243c62 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -6,30 +6,6 @@ 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.repomanager.mail.host = smtp.gmail.com services.repomanager.mail.port = 465 @@ -42,37 +18,7 @@ services.repomanager.mail.from = test.openaire@gmail.com services.repomanager.mail.replyTo = test.openaire@gmail.com # 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://88.197.53.69:8080/uoa-validator-service/services/validatorWebService # LDAP @@ -126,9 +72,7 @@ services.repomanager.db.password=dnetPwd #services.validator.mail.specialRecipients=antleb@di.uoa.gr #services.validator.repoRegistration.override=antleb@di.uoa.gr -oidc.issuer=https://aai.openaire.eu/oidc/ -oidc.id=767422b9-5461-4807-a80a-f9a2072d3a7d -oidc.secret=AMQtGlbTXNjwjhF0st28LmM6V0XypMdaVS7tJmGuYFlmH36iIv4t7tVqYuLYrNPkhnZ_GPUJvhymBhFupdgb6aU + 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 @@ -165,3 +109,5 @@ aai.registry.production=false aai.registry.authentication.username=provide_openaire aai.registry.authentication.password=u8WfYv2R^f#y7G98 +oidc.id=767422b9-5461-4807-a80a-f9a2072d3a7d +oidc.secret=AMQtGlbTXNjwjhF0st28LmM6V0XypMdaVS7tJmGuYFlmH36iIv4t7tVqYuLYrNPkhnZ_GPUJvhymBhFupdgb6aU \ No newline at end of file