dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17684
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-12-09 09:39:09 +0200
message:
  Import module, set beans to be prototypes
modified:
  dhis-2/dhis-web/dhis-web-importexport/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-importexport/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/META-INF/dhis/beans.xml	2014-12-04 06:39:46 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/META-INF/dhis/beans.xml	2014-12-09 07:39:09 +0000
@@ -5,25 +5,30 @@
   <!-- Data value import -->
 
   <bean id="org.hisp.dhis.importexport.action.datavalue.ImportDataValueAction"
-    class="org.hisp.dhis.importexport.action.datavalue.ImportDataValueAction" />
+    class="org.hisp.dhis.importexport.action.datavalue.ImportDataValueAction"
+    scope="prototype" />
 
   <bean id="org.hisp.dhis.importexport.action.GetImportSummaryAction"
-    class="org.hisp.dhis.importexport.action.GetImportSummaryAction">
+    class="org.hisp.dhis.importexport.action.GetImportSummaryAction"
+    scope="prototype">
     <property name="category" value="DATAVALUE_IMPORT" />
   </bean>
 
   <!-- Data value export -->
 
   <bean id="org.hisp.dhis.importexport.action.datavalue.ExportDataValueAction"
-    class="org.hisp.dhis.importexport.action.datavalue.ExportDataValueAction" />
+    class="org.hisp.dhis.importexport.action.datavalue.ExportDataValueAction"
+    scope="prototype" />
 
   <!-- Events -->
 
   <bean id="org.hisp.dhis.importexport.action.event.ImportEventAction"
-    class="org.hisp.dhis.importexport.action.event.ImportEventAction" />
+    class="org.hisp.dhis.importexport.action.event.ImportEventAction"
+    scope="prototype" />
 
   <bean id="org.hisp.dhis.importexport.action.event.ExportEventAction"
-    class="org.hisp.dhis.importexport.action.event.ExportEventAction" />
+    class="org.hisp.dhis.importexport.action.event.ExportEventAction"
+    scope="prototype" />
 
   <!-- Import -->
 
@@ -122,14 +127,11 @@
 
   <!-- Export -->
 
-    <bean id="org.hisp.dhis.importexport.action.exp.MetaDataExportAction"
+  <bean id="org.hisp.dhis.importexport.action.exp.MetaDataExportAction"
     class="org.hisp.dhis.importexport.action.exp.MetaDataExportAction"
     scope="prototype">
     <property name="serviceProvider" ref="exportServiceProvider" />
     <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
-    <!-- New services -->
-    <!-- <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
-    <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" /> -->
   </bean>
   
   <bean id="org.hisp.dhis.importexport.action.exp.DataExportAction"
@@ -137,12 +139,10 @@
     scope="prototype">
     <property name="serviceProvider" ref="exportServiceProvider" />
     <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
-    <!-- New services -->
     <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
     <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
   </bean>
 
-
   <bean id="org.hisp.dhis.importexport.action.exp.DetailedMetaDataExportAction"
     class="org.hisp.dhis.importexport.action.exp.DetailedMetaDataExportAction"
     scope="prototype">
@@ -198,7 +198,7 @@
   <!-- DXF2 MetaData import/export -->
 
   <bean id="org.hisp.dhis.importexport.action.dxf2.MetaDataExportFormAction"
-    class="org.hisp.dhis.importexport.action.dxf2.MetaDataExportFormAction" />
+    class="org.hisp.dhis.importexport.action.dxf2.MetaDataExportFormAction" scope="prototype"/>
 
   <bean id="org.hisp.dhis.importexport.action.dxf2.MetaDataImportAction"
     class="org.hisp.dhis.importexport.action.dxf2.MetaDataImportAction" />