Merge remote-tracking branch 'origin/maven/fixes/9.1' into maven/rele…

…ase/9.1
edu-sharing · Jul 4, 2024 · 7a65e08 · 7a65e08
2 parents e5d2114 + fa9ac1d
commit 7a65e08
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/...services/core/src/main/java/org/edu_sharing/repository/server/jobs/quartz/JobHandler.java b/...services/core/src/main/java/org/edu_sharing/repository/server/jobs/quartz/JobHandler.java
@@ -3,37 +3,36 @@
  */
 package org.edu_sharing.repository.server.jobs.quartz;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.text.ParseException;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
-
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigValue;
 import net.sf.acegisecurity.AuthenticationCredentialsNotFoundException;
-
 import org.alfresco.service.ServiceRegistry;
 import org.apache.log4j.Logger;
-import org.edu_sharing.alfrescocontext.gate.AlfAppContextGate;
 import org.edu_sharing.alfresco.lightbend.LightbendConfigLoader;
+import org.edu_sharing.alfrescocontext.gate.AlfAppContextGate;
 import org.edu_sharing.spring.scope.refresh.RefreshScopeRefreshedEvent;
 import org.jetbrains.annotations.NotNull;
 import org.quartz.*;
 import org.quartz.impl.JobDetailImpl;
 import org.quartz.impl.matchers.GroupMatcher;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationListener;
 import org.springframework.scheduling.quartz.SchedulerFactoryBean;
 import org.springframework.stereotype.Component;
 
-import org.springframework.context.ApplicationContext;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.text.ParseException;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
 
+import static org.quartz.CronScheduleBuilder.cronSchedule;
+import static org.quartz.CronScheduleBuilder.dailyAtHourAndMinute;
 import static org.quartz.JobBuilder.newJob;
 import static org.quartz.SimpleScheduleBuilder.simpleSchedule;
 import static org.quartz.TriggerBuilder.newTrigger;
-import static org.quartz.CronScheduleBuilder.*;
 
 /**
  * @author rudi start jobs, start scheduling of an job, stop scheduling of a job
@@ -432,7 +431,7 @@ public synchronized void refresh(boolean triggerImmediateJobs) {
             }
             logger.info("primary repository, will register and handle quartz jobs");
 
-            ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+            ClassLoader classLoader = this.getClass().getClassLoader();
             List<? extends Config> list = LightbendConfigLoader.get().getConfigList("jobs.entries");
             jobConfigList.clear();
             for (String groupName : quartzScheduler.getJobGroupNames()) {

diff --git a/Backend/services/core/src/main/resources/org/edu_sharing/spring/base-services.xml b/Backend/services/core/src/main/resources/org/edu_sharing/spring/base-services.xml
@@ -52,6 +52,11 @@
       </list>
     </property>
   </bean>
+	<bean id="trackingServiceImpl" class="org.edu_sharing.service.tracking.TrackingServiceImpl">
+		<property name="nodeService">
+			<ref bean="nodeServiceImpl" />
+		</property>
+	</bean>
   <bean id="trackingServiceInterceptor" class="org.edu_sharing.service.tracking.TrackingServiceInterceptor"
         init-method="init"/>