Revision: 4048
Author: solomax666
Date: Sun Aug 14 03:01:43 2011
Log: - duplicate service definitions are removed
- Quartz jobs are removed in favor of job beans
http://code.google.com/p/openmeetings/source/detail?r=4048
Deleted:
/branches/dev/injection/server/red5/webapps/openmeetings/WEB-INF/red5-services
/branches/dev/injection/src/app/org/openmeetings/app/quartz/scheduler/QuartzMeetingReminderJob.java
/branches/dev/injection/src/app/org/openmeetings/app/quartz/scheduler/QuartzRecordingJob.java
/branches/dev/injection/src/app/org/openmeetings/app/quartz/scheduler/QuartzSessionClear.java
/branches/dev/injection/src/app/org/openmeetings/app/quartz/scheduler/QuartzZombieJob.java
Modified:
/branches/dev/injection/WebContent/WEB-INF/red5-services/flvrecorderservice.service.xml
/branches/dev/injection/WebContent/WEB-INF/red5-services/schedulerJobs.service.xml
/branches/dev/injection/WebContent/WEB-INF/red5-services/userservice.service.xml
/branches/dev/injection/WebContent/WEB-INF/red5-services/whiteboardservice.service.xml
/branches/dev/injection/WebContent/WEB-INF/red5-services/xmlcrm.service.xml
/branches/dev/injection/build.xml
/branches/dev/injection/server/red5/webapps/openmeetings/WEB-INF/red5-applicationContext.xml
/branches/dev/injection/server/red5/webapps/openmeetings/WEB-INF/red5-web.xml
/branches/dev/injection/src/app/org/openmeetings/app/quartz/scheduler/MeetingReminderJob.java
/branches/dev/injection/src/app/org/openmeetings/app/quartz/scheduler/RecordingJob.java
/branches/dev/injection/src/app/org/openmeetings/app/quartz/scheduler/SessionClearJob.java
/branches/dev/injection/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/quartz/scheduler/QuartzMeetingReminderJob.java
Fri Aug 12 11:20:41 2011
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.openmeetings.app.quartz.scheduler;
-
-
-import org.openmeetings.app.data.calendar.management.AppointmentLogic;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
-import org.red5.logging.Red5LoggerFactory;
-import org.red5.server.api.scheduling.IScheduledJob;
-import org.red5.server.api.scheduling.ISchedulingService;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class QuartzMeetingReminderJob implements IScheduledJob {
-
- private static Logger log =
Red5LoggerFactory.getLogger(QuartzMeetingReminderJob.class,
ScopeApplicationAdapter.webAppRootKey);
- @Autowired
- private AppointmentLogic appointmentLogic;
-
- public void execute(ISchedulingService service) {
- //log.debug("QuartzMeetingReminderJob.execute");
- try {
- appointmentLogic.doScheduledMeetingReminder();
- } catch (Exception err){
- log.error("execute",err);
- }
- }
-}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/quartz/scheduler/QuartzRecordingJob.java
Tue May 11 13:54:08 2010
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.openmeetings.app.quartz.scheduler;
-
-//import org.slf4j.Logger;
-//import org.red5.logging.Red5LoggerFactory;
-
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
-
-import org.red5.server.api.scheduling.IScheduledJob;
-import org.red5.server.api.scheduling.ISchedulingService;
-import org.openmeetings.app.data.record.WhiteboardConvertionJobManager;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
-
-public class QuartzRecordingJob implements IScheduledJob {
-
- private static Logger log =
Red5LoggerFactory.getLogger(QuartzRecordingJob.class,
ScopeApplicationAdapter.webAppRootKey);
-
- public void execute(ISchedulingService service) {
- try {
-
- //cntxt.getScheduler().rescheduleJob("Income Session", "SessionClear
Generation", cntxt.getTrigger());
-
- // TODO Generate report
- WhiteboardConvertionJobManager.getInstance().initJobs();
- //System.out.println("ISchedulingService do Clear
Session"+this);
- //log.debug("ISchedulingService do Clear Session",this);
- } catch (Exception err){
- log.error("execute",err);
- }
- }
-
-
-}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/quartz/scheduler/QuartzSessionClear.java
Fri Aug 12 11:20:41 2011
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.openmeetings.app.quartz.scheduler;
-
-//import org.slf4j.Logger;
-//import org.red5.logging.Red5LoggerFactory;
-
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import org.red5.server.api.scheduling.IScheduledJob;
-import org.red5.server.api.scheduling.ISchedulingService;
-import org.openmeetings.app.data.basic.Sessionmanagement;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
-
-public class QuartzSessionClear implements IScheduledJob {
-
- private static Logger log =
Red5LoggerFactory.getLogger(QuartzSessionClear.class,
ScopeApplicationAdapter.webAppRootKey);
- @Autowired
- private Sessionmanagement sessionManagement;
-
- public void execute(ISchedulingService service) {
- try {
-
- //cntxt.getScheduler().rescheduleJob("Income Session", "SessionClear
Generation", cntxt.getTrigger());
-
- // TODO Generate report
- sessionManagement.clearSessionTable();
- //System.out.println("ISchedulingService do Clear
Session"+this);
- //log.debug("ISchedulingService do Clear Session",this);
- } catch (Exception err){
- log.error("execute",err);
- }
- }
-
-
-}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/quartz/scheduler/QuartzZombieJob.java
Tue May 11 13:54:08 2010
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.openmeetings.app.quartz.scheduler;
-
-//import org.slf4j.Logger;
-//import org.red5.logging.Red5LoggerFactory;
-
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
-
-import org.red5.server.api.scheduling.IScheduledJob;
-import org.red5.server.api.scheduling.ISchedulingService;
-
-public class QuartzZombieJob implements IScheduledJob {
-
- private static Logger log =
Red5LoggerFactory.getLogger(QuartzZombieJob.class,
ScopeApplicationAdapter.webAppRootKey);
-
- public void execute(ISchedulingService service) {
- try {
-
- //cntxt.getScheduler().rescheduleJob("Income Session", "SessionClear
Generation", cntxt.getTrigger());
-
- // FIXME: Check for Zombies Issue 583
- //
-
//ScopeApplicationAdapter.getInstance().clearZombiesFromAllConnection();
-
- } catch (Exception err){
- log.error("execute",err);
- }
- }
-
-
-}
=======================================
---
/branches/dev/injection/WebContent/WEB-INF/red5-services/flvrecorderservice.service.xml
Wed Oct 6 07:20:50 2010
+++
/branches/dev/injection/WebContent/WEB-INF/red5-services/flvrecorderservice.service.xml
Sun Aug 14 03:01:43 2011
@@ -19,7 +19,7 @@
<property name="flvInterviewConverterTask"
ref="openmeetings.FlvInterviewConverterTask" />
<property name="flvInterviewReConverterTask"
ref="openmeetings.FlvInterviewReConverterTask" />
<property name="flvRecordingLogDaoImpl"
ref="openmeetings.FlvRecordingLogDaoImpl" />
- <property name="scopeApplicationAdapter"
ref="web.handler.openmeetings" />
+ <property name="scopeApplicationAdapter" ref="web.handler" />
</bean>
<bean id="openmeetings.FlvRecordingDaoImpl"
=======================================
---
/branches/dev/injection/WebContent/WEB-INF/red5-services/schedulerJobs.service.xml
Mon Oct 12 05:52:02 2009
+++
/branches/dev/injection/WebContent/WEB-INF/red5-services/schedulerJobs.service.xml
Sun Aug 14 03:01:43 2011
@@ -6,68 +6,40 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://www.springframework.org/schema/lang
http://www.springframework.org/schema/lang/spring-lang-2.0.xsd";>
-
- <bean id="openmeetings.Sessionmanagement"
- class="org.openmeetings.app.data.basic.Sessionmanagement">
- </bean>
-
- <bean id="openmeetings.SessionClearJob"
- class="org.openmeetings.app.quartz.scheduler.SessionClearJob">
- <property name="sessionmanagement"
ref="openmeetings.Sessionmanagement" />
- </bean>
-
- <bean id="sessionClearJob"
-
class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+ <!-- Session clear -->
+ <bean id="openmeetings.SessionClearJob"
class="org.openmeetings.app.quartz.scheduler.SessionClearJob" />
+
+ <bean id="sessionClearJob"
class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
<property name="targetObject"><ref
bean="openmeetings.SessionClearJob"/></property>
<property name="targetMethod"><value>doIt</value></property>
+ <property name="concurrent" value="false"/>
</bean>
- <bean id="quartzRecordingCheck"
-
class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
- <property name="targetObject"><ref
bean="openmeetings.RecordingJob"/></property>
- <property name="targetMethod"><value>doIt</value></property>
- </bean>
-
- <bean id="openmeetings.RecordingJob"
- class="org.openmeetings.app.quartz.scheduler.RecordingJob">
- <property name="whiteboardConvertionJobManager"
ref="openmeetings.WhiteboardConvertionJobManager" />
- </bean>
-
- <bean id="openmeetings.WhiteboardConvertionJobManager"
-
class="org.openmeetings.app.data.record.WhiteboardConvertionJobManager">
- </bean>
-
-
-
- <bean id="meetingReminderClear"
-
class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
- <property name="targetObject"><ref
bean="openmeetings.MeetingReminderJob"/></property>
- <property name="targetMethod"><value>doIt</value></property>
- </bean>
-
- <bean id="openmeetings.MeetingReminderJob"
- class="org.openmeetings.app.quartz.scheduler.MeetingReminderJob">
- </bean>
-
-
- <!--Trigger für Scheduler -->
-
- <bean id="simpleTriggerMeetingReminder"
class="org.springframework.scheduling.quartz.SimpleTriggerBean">
+ <bean id="triggerSessionClear"
class="org.springframework.scheduling.quartz.SimpleTriggerBean">
<property name="jobDetail">
<!-- see the example of method invoking job above -->
- <ref bean="meetingReminderClear"/>
+ <ref bean="sessionClearJob"/>
</property>
<property name="startDelay">
<!-- 5 seconds -->
- <value>3000</value>
+ <value>5000</value>
</property>
<property name="repeatInterval">
- <!-- repeat every 5000 = 5 seconds -->
- <value>5000</value>
+ <!-- repeat every 300 seconds == 5 minutes -->
+ <value>300000</value>
</property>
</bean>
- <bean id="simpleTriggerRecording"
class="org.springframework.scheduling.quartz.SimpleTriggerBean">
+ <!-- Recording -->
+ <bean id="openmeetings.RecordingJob"
class="org.openmeetings.app.quartz.scheduler.RecordingJob"/>
+
+ <bean id="quartzRecordingCheck"
class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+ <property name="targetObject"><ref
bean="openmeetings.RecordingJob"/></property>
+ <property name="targetMethod"><value>doIt</value></property>
+ <property name="concurrent" value="false"/>
+ </bean>
+
+ <bean id="triggerRecording"
class="org.springframework.scheduling.quartz.SimpleTriggerBean">
<property name="jobDetail">
<ref bean="quartzRecordingCheck"/>
</property>
@@ -76,35 +48,42 @@
<value>5000</value>
</property>
<property name="repeatInterval">
- <!-- repeat every 5000 = 5 seconds -->
- <value>5000</value>
+ <!-- repeat every 3 seconds -->
+ <value>3000</value>
</property>
</bean>
- <bean id="simpleTrigger"
class="org.springframework.scheduling.quartz.SimpleTriggerBean">
+ <!-- Meeting Reminder -->
+ <bean id="openmeetings.MeetingReminderJob"
class="org.openmeetings.app.quartz.scheduler.MeetingReminderJob"/>
+
+ <bean id="meetingReminderClear"
class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+ <property name="targetObject"><ref
bean="openmeetings.MeetingReminderJob"/></property>
+ <property name="targetMethod"><value>doIt</value></property>
+ <property name="concurrent" value="false"/>
+ </bean>
+
+ <bean id="triggerMeetingReminder"
class="org.springframework.scheduling.quartz.SimpleTriggerBean">
<property name="jobDetail">
<!-- see the example of method invoking job above -->
- <ref bean="sessionClearJob"/>
+ <ref bean="meetingReminderClear"/>
</property>
<property name="startDelay">
- <!-- 60 seconds -->
+ <!-- 5 seconds -->
<value>5000</value>
</property>
<property name="repeatInterval">
- <!-- repeat every 300000 seconds == 15 minutes -->
- <value>2000</value>
+ <!-- repeat every 100 seconds -->
+ <value>100000</value>
</property>
</bean>
<bean
class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
<property name="triggers">
<list>
- <ref local="simpleTrigger" />
- <ref local="simpleTriggerRecording" />
- <ref local="simpleTriggerMeetingReminder" />
+ <ref local="triggerSessionClear" />
+ <ref local="triggerRecording" />
+ <ref local="triggerMeetingReminder" />
</list>
</property>
</bean>
-
-
</beans>
=======================================
---
/branches/dev/injection/WebContent/WEB-INF/red5-services/userservice.service.xml
Fri Dec 18 08:09:48 2009
+++
/branches/dev/injection/WebContent/WEB-INF/red5-services/userservice.service.xml
Sun Aug 14 03:01:43 2011
@@ -11,7 +11,7 @@
<bean id="userservice.service"
class="org.openmeetings.app.remote.UserService">
<property name="clientListManager"
ref="openmeetings.ClientListManager" />
- <property name="scopeApplicationAdapter"
ref="web.handler.openmeetings" />
+ <property name="scopeApplicationAdapter" ref="web.handler" />
</bean>
<bean id="openmeetings.UsersDaoImpl"
=======================================
---
/branches/dev/injection/WebContent/WEB-INF/red5-services/whiteboardservice.service.xml
Thu Jun 9 07:06:59 2011
+++
/branches/dev/injection/WebContent/WEB-INF/red5-services/whiteboardservice.service.xml
Sun Aug 14 03:01:43 2011
@@ -10,7 +10,7 @@
<!-- Class for Methods which can be invoked by the client -->
<bean id="whiteboardservice.service"
class="org.openmeetings.app.remote.WhiteBoardService">
- <property name="scopeApplicationAdapter"
ref="web.handler.openmeetings" />
+ <property name="scopeApplicationAdapter" ref="web.handler" />
<property name="clientListManager"
ref="openmeetings.ClientListManager" />
<property name="whiteBoardObjectListManager"
ref="openmeetings.WhiteBoardObjectListManager" />
<property name="whiteBoardObjectListManagerById"
ref="openmeetings.WhiteBoardObjectListManagerById" />
=======================================
---
/branches/dev/injection/WebContent/WEB-INF/red5-services/xmlcrm.service.xml
Wed Jul 28 09:08:05 2010
+++
/branches/dev/injection/WebContent/WEB-INF/red5-services/xmlcrm.service.xml
Sun Aug 14 03:01:43 2011
@@ -18,7 +18,7 @@
<bean id="xmlcrm.service"
class="org.openmeetings.app.remote.MainService">
<property name="clientListManager"
ref="openmeetings.ClientListManager" />
- <property name="scopeApplicationAdapter"
ref="web.handler.openmeetings" />
+ <property name="scopeApplicationAdapter" ref="web.handler" />
</bean>
</beans>
=======================================
--- /branches/dev/injection/build.xml Sat Aug 13 10:02:05 2011
+++ /branches/dev/injection/build.xml Sun Aug 14 03:01:43 2011
@@ -43,7 +43,8 @@
<!-- LPS Properties -->
<property name="out.dir.swf" value
= "${basedir}/${dist.dir}/red5/webapps/${project.distname}/" />
<property name="laszlo.home" value="${basedir}/openlaszlo"/>
- <property name="laszlo.src.dir"
value="${basedir}/WebContent/${project.distname}"/>
+ <property name="webcontent.src.dir" value="${basedir}/WebContent"/>
+ <property name="laszlo.src.dir"
value="${webcontent.src.dir}/${project.distname}"/>
<property name="laszlo.debug" value="false"/>
<property name="laszlo.proxied" value = "solo"/>
@@ -219,7 +220,9 @@
<copy file="${openjpa.lib}/openjpa-all-2.1.0.jar"
todir="${dist.dir}/red5/lib"/>
<copy file="${openjpa.lib}/dom4j-1.6.1.jar"
todir="${dist.dir}/red5/webapps/${project.distname}/WEB-INF/lib"/>
-
+ <copy
todir="${dist.dir}/red5/webapps/${project.distname}/WEB-INF/red5-services">
+ <fileset dir="${webcontent.src.dir}/WEB-INF/red5-services"
includes="*.xml"/>
+ </copy>
<chmod dir="${dist.dir}/red5" perm="755" includes="**/*.sh"/>
<chmod dir="${dist.dir}/red5/webapps/${project.distname}/screen"
perm="755" includes="**/*.sh"/>
=======================================
---
/branches/dev/injection/server/red5/webapps/openmeetings/WEB-INF/red5-applicationContext.xml
Sat Aug 13 23:03:58 2011
+++
/branches/dev/injection/server/red5/webapps/openmeetings/WEB-INF/red5-applicationContext.xml
Sun Aug 14 03:01:43 2011
@@ -150,6 +150,7 @@
<bean id="manageCryptStyle"
class="org.openmeetings.utils.crypt.ManageCryptStyle" />
<bean id="openXGHttpClient"
class="org.openmeetings.app.sip.xmlrpc.OpenXGHttpClient" />
<bean id="appointmentCategoryLogic"
class="org.openmeetings.app.data.calendar.management.AppointmentCategoryLogic"
/>
+ <bean id="whiteboardConvertionJobManager"
class="org.openmeetings.app.data.record.WhiteboardConvertionJobManager" />
<tx:annotation-driven transaction-manager="jpaTransactionManager"/>
<context:annotation-config/>
=======================================
---
/branches/dev/injection/server/red5/webapps/openmeetings/WEB-INF/red5-web.xml
Thu Apr 28 14:04:03 2011
+++
/branches/dev/injection/server/red5/webapps/openmeetings/WEB-INF/red5-web.xml
Sun Aug 14 03:01:43 2011
@@ -6,11 +6,9 @@
<property name="location" value="/WEB-INF/red5-web.properties" />
</bean>
- <bean id="web.context" class="org.red5.server.Context"
- autowire="byType" />
-
- <bean id="web.scope" class="org.red5.server.WebScope"
- init-method="register">
+ <bean id="web.context" class="org.red5.server.Context"
autowire="byType" />
+
+ <bean id="web.scope" class="org.red5.server.WebScope"
init-method="register">
<property name="server" ref="red5.server" />
<property name="parent" ref="global.scope" />
<property name="context" ref="web.context" />
@@ -20,8 +18,7 @@
</bean>
<!-- New Class for the Streaming Handlers -->
- <bean id="web.handler"
- class="org.openmeetings.app.remote.red5.ScopeApplicationAdapter">
+ <bean id="web.handler"
class="org.openmeetings.app.remote.red5.ScopeApplicationAdapter">
<property name="clientListManager"
ref="openmeetings.ClientListManager" />
<property name="emoticonsManager"
ref="openmeetings.EmoticonsManager" />
<property name="whiteBoardService" ref="whiteboardservice.service"
/>
@@ -71,9 +68,7 @@
<import resource="red5-services/printservice.service.xml"/>
<import resource="red5-services/flvrecorderservice.service.xml"/>
<import resource="red5-services/ldapconfigservice.service.xml"/>
- <!--
+
<import resource="red5-services/schedulerJobs.service.xml"/>
- -->
-
</beans>
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/quartz/scheduler/MeetingReminderJob.java
Fri Aug 12 11:20:41 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/quartz/scheduler/MeetingReminderJob.java
Sun Aug 14 03:01:43 2011
@@ -8,20 +8,16 @@
import org.springframework.beans.factory.annotation.Autowired;
public class MeetingReminderJob {
-
private static Logger log =
Red5LoggerFactory.getLogger(MeetingReminderJob.class,
ScopeApplicationAdapter.webAppRootKey);
@Autowired
private AppointmentLogic appointmentLogic;
public void doIt() {
- log.debug("QuartzMeetingReminderJob.execute");
+ log.debug("MeetingReminderJob.execute");
try {
appointmentLogic.doScheduledMeetingReminder();
-
} catch (Exception err){
log.error("execute",err);
}
}
-
-
-}
+}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/quartz/scheduler/RecordingJob.java
Tue May 11 13:54:08 2010
+++
/branches/dev/injection/src/app/org/openmeetings/app/quartz/scheduler/RecordingJob.java
Sun Aug 14 03:01:43 2011
@@ -1,46 +1,23 @@
package org.openmeetings.app.quartz.scheduler;
-//import org.slf4j.Logger;
-//import org.red5.logging.Red5LoggerFactory;
-
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
-
-import org.red5.server.api.scheduling.IScheduledJob;
-import org.red5.server.api.scheduling.ISchedulingService;
import org.openmeetings.app.data.record.WhiteboardConvertionJobManager;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
public class RecordingJob {
-
private static Logger log =
Red5LoggerFactory.getLogger(RecordingJob.class,
ScopeApplicationAdapter.webAppRootKey);
-
- //Spring loaded beans
+ @Autowired
private WhiteboardConvertionJobManager whiteboardConvertionJobManager;
- public WhiteboardConvertionJobManager getWhiteboardConvertionJobManager()
{
- return whiteboardConvertionJobManager;
- }
- public void setWhiteboardConvertionJobManager(
- WhiteboardConvertionJobManager
whiteboardConvertionJobManager) {
- this.whiteboardConvertionJobManager =
whiteboardConvertionJobManager;
- }
-
- public RecordingJob () {}
-
public void doIt() {
+ log.debug("RecordingJob.execute");
try {
-
- //cntxt.getScheduler().rescheduleJob("Income Session", "SessionClear
Generation", cntxt.getTrigger());
-
// TODO Generate report
this.whiteboardConvertionJobManager.initJobs();
- //System.out.println("ISchedulingService do Clear
Session"+this);
- //log.debug("ISchedulingService do Clear Session",this);
} catch (Exception err){
log.error("execute",err);
}
}
-
-
-}
+}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/quartz/scheduler/SessionClearJob.java
Tue May 11 13:54:08 2010
+++
/branches/dev/injection/src/app/org/openmeetings/app/quartz/scheduler/SessionClearJob.java
Sun Aug 14 03:01:43 2011
@@ -1,47 +1,23 @@
package org.openmeetings.app.quartz.scheduler;
-//import org.slf4j.Logger;
-//import org.red5.logging.Red5LoggerFactory;
-
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
-
-import org.red5.server.api.scheduling.IScheduledJob;
-import org.red5.server.api.scheduling.ISchedulingService;
import org.openmeetings.app.data.basic.Sessionmanagement;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
public class SessionClearJob {
-
private static Logger log =
Red5LoggerFactory.getLogger(SessionClearJob.class,
ScopeApplicationAdapter.webAppRootKey);
-
- //Spring loaded Beans
- private Sessionmanagement sessionmanagement;
-
- public Sessionmanagement getSessionmanagement() {
- return sessionmanagement;
- }
- public void setSessionmanagement(Sessionmanagement sessionmanagement) {
- this.sessionmanagement = sessionmanagement;
- }
-
- public SessionClearJob() {
-
- }
+ @Autowired
+ private Sessionmanagement sessionManagement;
public void doIt() {
+ log.debug("SessionClearJob.execute");
try {
-
- //cntxt.getScheduler().rescheduleJob("Income Session", "SessionClear
Generation", cntxt.getTrigger());
-
// TODO Generate report
- this.sessionmanagement.clearSessionTable();
- //System.out.println("ISchedulingService do Clear
Session"+this);
- //log.debug("ISchedulingService do Clear Session",this);
+ sessionManagement.clearSessionTable();
} catch (Exception err){
log.error("execute",err);
}
}
-
-
-}
+}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Sat Aug 13 21:43:12 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Sun Aug 14 03:01:43 2011
@@ -28,9 +28,6 @@
import org.openmeetings.app.persistence.beans.recording.RoomClient;
import org.openmeetings.app.persistence.beans.rooms.Rooms;
import org.openmeetings.app.persistence.beans.user.Users;
-import org.openmeetings.app.quartz.scheduler.QuartzMeetingReminderJob;
-import org.openmeetings.app.quartz.scheduler.QuartzRecordingJob;
-import org.openmeetings.app.quartz.scheduler.QuartzSessionClear;
import org.openmeetings.app.remote.FLVRecorderService;
import org.openmeetings.app.remote.PollService;
import org.openmeetings.app.remote.WhiteBoardService;
@@ -177,19 +174,7 @@
// init your handler here
- // The scheduled Jobs did go into the Spring-Managed
Beans, see
- // schedulerJobs.service.xml
-
- QuartzSessionClear quartzSessionClear = new
QuartzSessionClear();
- QuartzRecordingJob quartzRecordingJob = new
QuartzRecordingJob();
- QuartzMeetingReminderJob reminderJob = new
QuartzMeetingReminderJob();
-
- // QuartzZombieJob quartzZombieJob = new
QuartzZombieJob();
- addScheduledJob(300000, quartzSessionClear);
- addScheduledJob(3000, quartzRecordingJob);
- addScheduledJob(100000, reminderJob);
-
- // addScheduledJob(2000,quartzZombieJob);
+ // The scheduled Jobs did go into the Spring-Managed Beans, see
schedulerJobs.service.xml
// Spring Definition does not work here, its too early,
Instance is
// not set yet
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
