dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #36012
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 18447: Background tasks, giving all backgroud tasks prototype bean scope. This to ensure that state is c...
------------------------------------------------------------
revno: 18447
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-02-27 14:42:52 +0100
message:
Background tasks, giving all backgroud tasks prototype bean scope. This to ensure that state is cleared before each task run, and to allow multiple tasks to run in parallel.
modified:
dhis-2/dhis-services/dhis-service-administration/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-analytics/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-dxf2/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-administration/src/main/resources/META-INF/dhis/beans.xml 2015-02-20 14:46:12 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/resources/META-INF/dhis/beans.xml 2015-02-27 13:42:52 +0000
@@ -100,8 +100,8 @@
<!-- Scheduled tasks -->
- <bean id="resourceTableTask" class="org.hisp.dhis.resourcetable.scheduling.ResourceTableTask" />
+ <bean id="resourceTableTask" class="org.hisp.dhis.resourcetable.scheduling.ResourceTableTask" scope="prototype" />
- <bean id="resourceTable15MinTask" class="org.hisp.dhis.resourcetable.scheduling.ResourceTableTask" />
+ <bean id="resourceTable15MinTask" class="org.hisp.dhis.resourcetable.scheduling.ResourceTableTask" scope="prototype" />
</beans>
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/resources/META-INF/dhis/beans.xml 2014-12-04 06:39:46 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/resources/META-INF/dhis/beans.xml 2015-02-27 13:42:52 +0000
@@ -60,13 +60,13 @@
<!-- Scheduled tasks -->
- <bean id="analyticsAllTask" class="org.hisp.dhis.analytics.scheduling.AnalyticsTableTask"/>
+ <bean id="analyticsAllTask" class="org.hisp.dhis.analytics.scheduling.AnalyticsTableTask" scope="prototype" />
- <bean id="analyticsLast2YearsTask" class="org.hisp.dhis.analytics.scheduling.AnalyticsTableTask">
+ <bean id="analyticsLast2YearsTask" class="org.hisp.dhis.analytics.scheduling.AnalyticsTableTask" scope="prototype">
<property name="lastYears" value="2" />
</bean>
- <bean id="analyticsLast3YearsTask" class="org.hisp.dhis.analytics.scheduling.AnalyticsTableTask">
+ <bean id="analyticsLast3YearsTask" class="org.hisp.dhis.analytics.scheduling.AnalyticsTableTask" scope="prototype">
<property name="lastYears" value="3" />
</bean>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2015-02-24 13:16:58 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2015-02-27 13:42:52 +0000
@@ -871,7 +871,7 @@
<bean id="org.hisp.dhis.sms.SmsMessageSender" class="org.hisp.dhis.sms.SmsMessageSender"/>
- <bean id="org.hisp.dhis.sms.task.SendSmsTask" class="org.hisp.dhis.sms.task.SendSmsTask" />
+ <bean id="org.hisp.dhis.sms.task.SendSmsTask" class="org.hisp.dhis.sms.task.SendSmsTask" scope="prototype" />
<!-- I18nService -->
@@ -906,7 +906,7 @@
<!-- Scheduled task for data monitoring -->
- <bean id="monitoringLastDayTask" class="org.hisp.dhis.validation.scheduling.MonitoringTask" />
+ <bean id="monitoringLastDayTask" class="org.hisp.dhis.validation.scheduling.MonitoringTask" scope="prototype" />
<!-- Startup routine definitions -->
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/resources/META-INF/dhis/beans.xml 2015-02-24 13:16:58 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/resources/META-INF/dhis/beans.xml 2015-02-27 13:42:52 +0000
@@ -49,7 +49,7 @@
<bean id="org.hisp.dhis.dxf2.synch.SynchronizationManager" class="org.hisp.dhis.dxf2.synch.DefaultSynchronizationManager" />
- <bean id="dataSynchTask" class="org.hisp.dhis.dxf2.synch.DataSynchronizationTask" />
+ <bean id="dataSynchTask" class="org.hisp.dhis.dxf2.synch.DataSynchronizationTask" scope="prototype" />
<!-- register idObject handlers -->
=== modified file 'dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources/META-INF/dhis/beans.xml 2014-12-04 06:39:46 +0000
+++ dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources/META-INF/dhis/beans.xml 2015-02-27 13:42:52 +0000
@@ -57,7 +57,7 @@
<bean id="aggregateQueryBuilder"
class="org.hisp.dhis.scheduling.CaseAggregateConditionTask"
- parent="abstractRunCaseAggregateConditionTask">
+ parent="abstractRunCaseAggregateConditionTask" scope="prototype">
</bean>
<bean id="org.hisp.dhis.scheduling.ProgramSchedulingManager"
@@ -87,13 +87,13 @@
<bean id="sendMessageScheduled"
class="org.hisp.dhis.scheduling.SendScheduledMessageTask"
- parent="abstractScheduledMessageTask">
+ parent="abstractScheduledMessageTask" scope="prototype">
<property name="sendingMessage" value="true" />
</bean>
<bean id="scheduleMessage"
class="org.hisp.dhis.scheduling.SendScheduledMessageTask"
- parent="abstractScheduledMessageTask">
+ parent="abstractScheduledMessageTask" scope="prototype">
<property name="sendingMessage" value="false" />
</bean>
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml 2015-02-17 13:27:11 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml 2015-02-27 13:42:52 +0000
@@ -200,7 +200,7 @@
<!-- Scheduled tasks -->
- <bean id="dataMartLastYearTask" class="org.hisp.dhis.scheduling.DataMartTask" />
+ <bean id="dataMartLastYearTask" class="org.hisp.dhis.scheduling.DataMartTask" scope="prototype" />
<bean id="org.hisp.dhis.common.ReportingIdentityPopulator" class="org.hisp.dhis.common.IdentityPopulator">
<property name="name" value="ReportingIdentityPopulator" />
