------------------------------------------------------------ revno: 13271 committer: Lars Helge Øverland <[email protected]> branch nick: dhis2 timestamp: Tue 2013-12-17 09:41:46 +0100 message: Bean scope fix modified: dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/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-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/META-INF/dhis/beans.xml 2013-12-13 07:04:37 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/META-INF/dhis/beans.xml 2013-12-17 08:41:46 +0000 @@ -4,13 +4,15 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd";> <bean id="org.hisp.dhis.mobile.action.incoming.ReimportSMSAction" - class="org.hisp.dhis.mobile.action.incoming.ReimportSMSAction"> + class="org.hisp.dhis.mobile.action.incoming.ReimportSMSAction" + scope="prototype"> <property name="incomingSmsService" ref="org.hisp.dhis.sms.incoming.IncomingSmsService" /> </bean> <bean id="org.hisp.dhis.mobile.caseentry.state.SelectedStateManager" - class="org.hisp.dhis.mobile.caseentry.state.DefaultSelectedStateManager"> + class="org.hisp.dhis.mobile.caseentry.state.DefaultSelectedStateManager" + scope="prototype"> <property name="patientService" ref="org.hisp.dhis.patient.PatientService" /> <property name="selectionManager" ref="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" /> @@ -23,7 +25,8 @@ scope="prototype" /> <bean id="org.hisp.dhis.mobile.action.incoming.ReceivingSMSAction" - class="org.hisp.dhis.mobile.action.incoming.ReceivingSMSAction" scope="prototype"> + class="org.hisp.dhis.mobile.action.incoming.ReceivingSMSAction" + scope="prototype"> <property name="incomingSmsService" ref="org.hisp.dhis.sms.incoming.IncomingSmsService" /> <property name="userService" ref="org.hisp.dhis.user.UserService" /> @@ -37,7 +40,8 @@ ref="org.hisp.dhis.sms.incoming.IncomingSmsService" /> </bean> - <bean id="org.hisp.dhis.mobile.action.DeleteSentSMSAction" class="org.hisp.dhis.mobile.action.DeleteSentSMSAction" + <bean id="org.hisp.dhis.mobile.action.DeleteSentSMSAction" + class="org.hisp.dhis.mobile.action.DeleteSentSMSAction" scope="prototype"> <property name="outboundSmsService" ref="org.hisp.dhis.sms.outbound.OutboundSmsService" /> @@ -50,7 +54,8 @@ ref="org.hisp.dhis.sms.incoming.IncomingSmsService" /> </bean> - <bean id="org.hisp.dhis.mobile.action.ShowSentSMSAction" class="org.hisp.dhis.mobile.action.ShowSentSMSAction" + <bean id="org.hisp.dhis.mobile.action.ShowSentSMSAction" + class="org.hisp.dhis.mobile.action.ShowSentSMSAction" scope="prototype"> <property name="outboundSmsService" ref="org.hisp.dhis.sms.outbound.OutboundSmsService" /> @@ -62,7 +67,8 @@ <!-- Patient Mobile Settings --> <bean id="org.hisp.dhis.mobile.action.ShowMobileSettingFormAction" - class="org.hisp.dhis.mobile.action.ShowMobileSettingFormAction" scope="prototype"> + class="org.hisp.dhis.mobile.action.ShowMobileSettingFormAction" + scope="prototype"> <property name="patientMobileSettingService" ref="org.hisp.dhis.mobile.service.PatientMobileSettingService" /> <property name="patientAttributeService" @@ -70,7 +76,8 @@ </bean> <bean id="org.hisp.dhis.mobile.action.UpdateMobileSettingAction" - class="org.hisp.dhis.mobile.action.UpdateMobileSettingAction" scope="prototype"> + class="org.hisp.dhis.mobile.action.UpdateMobileSettingAction" + scope="prototype"> <property name="patientMobileSettingService" ref="org.hisp.dhis.mobile.service.PatientMobileSettingService" /> <property name="patientAttributeService" @@ -80,22 +87,26 @@ <!-- Mobile DataSet --> <bean id="org.hisp.dhis.mobile.action.MobileDataSetListAction" - class="org.hisp.dhis.mobile.action.MobileDataSetListAction" scope="prototype"> + class="org.hisp.dhis.mobile.action.MobileDataSetListAction" + scope="prototype"> <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" /> </bean> <bean id="org.hisp.dhis.mobile.action.UpdateMobileDataSetAction" - class="org.hisp.dhis.mobile.action.UpdateMobileDataSetAction" scope="prototype"> + class="org.hisp.dhis.mobile.action.UpdateMobileDataSetAction" + scope="prototype"> <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" /> </bean> <!-- SMS Service Configuration --> <bean id="org.hisp.dhis.mobile.action.GetSmsConfigurationAction" - class="org.hisp.dhis.mobile.action.GetSmsConfigurationAction" scope="prototype" /> + class="org.hisp.dhis.mobile.action.GetSmsConfigurationAction" + scope="prototype" /> <bean id="org.hisp.dhis.mobile.action.SaveSmsConfigurationAction" - class="org.hisp.dhis.mobile.action.SaveSmsConfigurationAction" scope="prototype" /> + class="org.hisp.dhis.mobile.action.SaveSmsConfigurationAction" + scope="prototype" /> <bean id="org.hisp.dhis.mobile.action.UpdateBulkGateWayConfigAction" class="org.hisp.dhis.mobile.action.UpdateBulkGateWayConfigAction" @@ -115,21 +126,23 @@ scope="prototype" /> <bean id="org.hisp.dhis.mobile.action.UpdateDefaultGatewayAction" - class="org.hisp.dhis.mobile.action.UpdateDefaultGatewayAction" scope="prototype" /> + class="org.hisp.dhis.mobile.action.UpdateDefaultGatewayAction" + scope="prototype" /> <bean id="org.hisp.dhis.mobile.action.RemoveGatewayConfigAction" - class="org.hisp.dhis.mobile.action.RemoveGatewayConfigAction" scope="prototype" /> + class="org.hisp.dhis.mobile.action.RemoveGatewayConfigAction" + scope="prototype" /> <bean id="org.hisp.dhis.mobile.action.ReloadStartStopServiceAction" class="org.hisp.dhis.mobile.action.ReloadStartStopServiceAction" scope="prototype" /> <bean id="org.hisp.dhis.mobile.action.smscommand.SMSCommandAction" - class="org.hisp.dhis.mobile.action.smscommand.SMSCommandAction" scope="prototype"> + class="org.hisp.dhis.mobile.action.smscommand.SMSCommandAction" + scope="prototype"> <property name="smsCommandService" ref="smsCommandService" /> <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" /> <property name="userGroupService" ref="org.hisp.dhis.user.UserGroupService" /> - </bean> <bean id="org.hisp.dhis.mobile.action.smscommand.EditSMSCommandForm" @@ -157,13 +170,15 @@ </bean> <bean id="org.hisp.dhis.mobile.action.J2meClientUpdateAction" - class="org.hisp.dhis.mobile.action.J2meClientUpdateAction" scope="prototype"> + class="org.hisp.dhis.mobile.action.J2meClientUpdateAction" + scope="prototype"> <property name="patientMobileSettingService" ref="org.hisp.dhis.mobile.service.PatientMobileSettingService" /> </bean> <bean id="org.hisp.dhis.mobile.action.incoming.ProcessingSendQuickSMSAction" - class="org.hisp.dhis.mobile.action.incoming.ProcessingSendQuickSMSAction" scope="prototype"/> + class="org.hisp.dhis.mobile.action.incoming.ProcessingSendQuickSMSAction" + scope="prototype"/> <!-- <bean id="org.hisp.dhis.mobile.action.MobilePhonesPatternAction" class="org.hisp.dhis.mobile.action.MobilePhonesPatternAction" scope="prototype"> </bean> -->
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
