FXOLAT-206: make the Quartz Job which clean-up Adobe Connect Meeting works...

FXOLAT-206: make the Quartz Job which clean-up Adobe Connect Meeting works without change in the XML configuration

--HG--
branch : FXOLAT-282-virtualclassroom

src/main/java/de/bps/course/nodes/vc/_spring/vcContext.xml

@@ -68,17 +68,6 @@
 <!-- ################################## -->
 <!-- # VIRTUAL CLASSROOM SERVICE JOBS # -->
 <!-- ################################## -->
-
-	<!-- Activation of the service jobs -->
-	<bean class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
-		<property name="triggers">
-			<list>
-				<!--  <ref local="adobeCleanupJob" /> -->
-			</list>
-		</property>
-	</bean>
-	
-	<!-- Definition of the service jobs -->
 	<bean id="adobeCleanupJob" class="org.springframework.scheduling.quartz.CronTriggerBean">
     	<property name="jobDetail">
     		<bean class="org.springframework.scheduling.quartz.JobDetailBean">
@@ -94,6 +83,7 @@
 			</bean>
     	</property>
     	<property name="cronExpression" value="0 0 2 * * ?"/><!-- 2am, daily -->
+    	<property name="startDelay" value="45000" />
 	</bean>
 	
 </beans>
\ No newline at end of file

src/main/java/de/bps/course/nodes/vc/provider/adobe/AdobeConnectCleanupJob.java

@@ -53,9 +53,7 @@ public class AdobeConnectCleanupJob extends QuartzJobBean {
 		AdobeConnectProvider adobe = null;
 		
 		boolean success = VCProviderFactory.existsProvider(providerId);
-		if(!success) {
-			throw new JobExecutionException("Invalid configuration: defined a virtual classroom cleanup job for non existing provider \"" + providerId + "\"");
-		}
+		if(!success) return;//same as dummy job
 		
 		try {
 			adobe = (AdobeConnectProvider) VCProviderFactory.createProvider(providerId);
@@ -63,9 +61,9 @@ public class AdobeConnectCleanupJob extends QuartzJobBean {
 			throw new JobExecutionException("Invalid configuration: defined a virtual classroom cleanup job and provider implementation doesn't fit");
 		}
 		
-		success = adobe.isProviderAvailable();
+		success = adobe.isProviderAvailable() && adobe.isEnabled();
 		if(!success) {
-			logger.error("Tried to cleanup Adobe Connect meetings but it's actually not available");
+			logger.debug("Tried to cleanup Adobe Connect meetings but it's actually not available");
 			return;
 		}
 

src/main/resources/serviceconfig/org/olat/core/commons/scheduler/_spring/olatextconfig.xml

@@ -36,6 +36,7 @@ How to add a new job:
             <ref bean="changePresenceJobTrigger" />
             <!-- <ref bean="dumpJMXJobTrigger"/> -->
             <ref bean="registrationTrigger"/>
+            <ref bean="adobeCleanupJob"/>
 		    <!--
 			<ref bean="translationToolStatusGeneratorTrigger"/>
 			-->

src/main/resources/serviceconfig/org/olat/core/commons/scheduler/_spring/schedulerCorecontext.xml

@@ -23,6 +23,7 @@ How to add a new job:
 
 
 <!-- this tells spring to create the quartz scheduler -->
+<!-- 
 <bean id="schedulerFactoryBean" class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
 	<property name="quartzProperties">
 		<props>
@@ -31,11 +32,11 @@ How to add a new job:
 	</property>
 	<property name="triggers">
         <list>
-        	<!-- Include every bean here that should be scheduled -->
-            <!-- <ref bean="cronTrigger" /> -->
+        	
         </list>
     </property>
 </bean>
+-->
 
 <!-- Example bean for cron style scheduling--> 
 <!-- OLAT-5093 start delay ensures there's no conflict with server startup and db not being ready yet -->