From a570ba29bfa736e7376c57ca4718de0284ef84e2 Mon Sep 17 00:00:00 2001 From: "c.dumitru@orcid.org" Date: Thu, 23 Feb 2023 11:24:58 +0000 Subject: [PATCH 1/2] Fixed the context path for scheduler for loading orgs cli-s --- .../loader/source/cli/LoadDataForOrganizationSource.java | 2 +- .../ProcessOrganizationAsPartOfGroupForDisambiguatedOrgId.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/orcid-scheduler-web/src/main/java/org/orcid/scheduler/loader/source/cli/LoadDataForOrganizationSource.java b/orcid-scheduler-web/src/main/java/org/orcid/scheduler/loader/source/cli/LoadDataForOrganizationSource.java index c30303bcccf..44007a86fc5 100644 --- a/orcid-scheduler-web/src/main/java/org/orcid/scheduler/loader/source/cli/LoadDataForOrganizationSource.java +++ b/orcid-scheduler-web/src/main/java/org/orcid/scheduler/loader/source/cli/LoadDataForOrganizationSource.java @@ -37,7 +37,7 @@ public class LoadDataForOrganizationSource { */ @SuppressWarnings({ "resource" }) private void init() { - ApplicationContext context = new ClassPathXmlApplicationContext("orcid-scheduler-beans-context.xml"); + ApplicationContext context = new ClassPathXmlApplicationContext("orcid-scheduler-context.xml"); orgLoadManager = (OrgLoadManager) context.getBean("orgLoadManager"); rorOrgSource = (OrgLoadSource) context.getBean("rorOrgDataSource"); fundrefOrgSource = (OrgLoadSource) context.getBean("fundrefOrgDataSource"); diff --git a/orcid-scheduler-web/src/main/java/org/orcid/scheduler/loader/source/cli/ProcessOrganizationAsPartOfGroupForDisambiguatedOrgId.java b/orcid-scheduler-web/src/main/java/org/orcid/scheduler/loader/source/cli/ProcessOrganizationAsPartOfGroupForDisambiguatedOrgId.java index 6a1b54ede80..93880a267fb 100644 --- a/orcid-scheduler-web/src/main/java/org/orcid/scheduler/loader/source/cli/ProcessOrganizationAsPartOfGroupForDisambiguatedOrgId.java +++ b/orcid-scheduler-web/src/main/java/org/orcid/scheduler/loader/source/cli/ProcessOrganizationAsPartOfGroupForDisambiguatedOrgId.java @@ -43,7 +43,7 @@ public class ProcessOrganizationAsPartOfGroupForDisambiguatedOrgId { */ @SuppressWarnings({ "resource" }) private void init() { - ApplicationContext context = new ClassPathXmlApplicationContext("orcid-scheduler-beans-context.xml"); + ApplicationContext context = new ClassPathXmlApplicationContext("orcid-scheduler-context.xml"); orgDisambiguatedManager = (OrgDisambiguatedManager) context.getBean("orgDisambiguatedManager"); rorOrgSource = (OrgLoadSource) context.getBean("rorOrgDataSource"); fundrefOrgSource = (OrgLoadSource) context.getBean("fundrefOrgDataSource"); From 38302e6a32b3259578dbfaa71b3b97e2791f2bf2 Mon Sep 17 00:00:00 2001 From: "c.dumitru@orcid.org" Date: Thu, 23 Feb 2023 14:42:23 +0000 Subject: [PATCH 2/2] Added the orgLoadManager bean in the scheduler context --- .../src/main/resources/orcid-scheduler-context.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/orcid-scheduler-web/src/main/resources/orcid-scheduler-context.xml b/orcid-scheduler-web/src/main/resources/orcid-scheduler-context.xml index 5cd3812f3ff..fed6ce1b844 100644 --- a/orcid-scheduler-web/src/main/resources/orcid-scheduler-context.xml +++ b/orcid-scheduler-web/src/main/resources/orcid-scheduler-context.xml @@ -110,5 +110,7 @@ + +