Merge pull request #6737 from ORCID/8503-bug-the-organization-loader-…

…per-organization-type Fixed the context path for scheduler for loading orgs cli-s
ORCID · Feb 23, 2023 · f1bc33f · f1bc33f
2 parents 0f1106b + 38302e6
commit f1bc33f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/...eb/src/main/java/org/orcid/scheduler/loader/source/cli/LoadDataForOrganizationSource.java b/...eb/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/...id/scheduler/loader/source/cli/ProcessOrganizationAsPartOfGroupForDisambiguatedOrgId.java b/...id/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");

diff --git 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 @@
     <bean id="slackManager" class="org.orcid.utils.alerting.impl.SlackManagerImpl" />
 
 	<bean id="statisticsManager" class="org.orcid.core.stats.impl.StatisticsManagerImpl"/>
+
+	<bean id="orgLoadManager"  class="org.orcid.scheduler.loader.manager.impl.OrgLoadManagerImpl"/>
 
 </beans>