dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12220
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-09-24 09:18:23 +0200
message:
  Resource tables, avoiding outer transaction for generate all method
modified:
  dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java


--
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/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java	2013-09-24 07:05:03 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java	2013-09-24 07:18:23 +0000
@@ -79,7 +79,6 @@
 /**
  * @author Lars Helge Overland
  */
-@Transactional
 public class DefaultResourceTableService
     implements ResourceTableService
 {
@@ -191,6 +190,7 @@
     // OrganisationUnitStructure
     // -------------------------------------------------------------------------
 
+    @Transactional
     public void generateOrganisationUnitStructures()
     {
         int maxLevel = organisationUnitService.getMaxOfOrganisationUnitLevels();
@@ -240,6 +240,7 @@
     // DataElementCategoryOptionComboName
     // -------------------------------------------------------------------------
 
+    @Transactional
     public void generateCategoryOptionComboNames()
     {
         resourceTableStore.createDataElementCategoryOptionComboName();
@@ -268,6 +269,7 @@
     // DataElementGroupSetTable
     // -------------------------------------------------------------------------
 
+    @Transactional
     public void generateDataElementGroupSetTable()
     {
         // ---------------------------------------------------------------------
@@ -315,6 +317,7 @@
     // IndicatorGroupSetTable
     // -------------------------------------------------------------------------
 
+    @Transactional
     public void generateIndicatorGroupSetTable()
     {
         // ---------------------------------------------------------------------
@@ -362,6 +365,7 @@
     // OrganisationUnitGroupSetTable
     // -------------------------------------------------------------------------
 
+    @Transactional
     public void generateOrganisationUnitGroupSetTable()
     {
         // ---------------------------------------------------------------------
@@ -411,6 +415,7 @@
     // CategoryTable
     // -------------------------------------------------------------------------
 
+    @Transactional
     public void generateCategoryTable()
     {
         // ---------------------------------------------------------------------
@@ -457,6 +462,7 @@
     // DataElementTable
     // -------------------------------------------------------------------------
 
+    @Transactional
     public void generateDataElementTable()
     {
         // ---------------------------------------------------------------------
@@ -494,6 +500,7 @@
     // PeriodTable
     // -------------------------------------------------------------------------
 
+    @Transactional
     public void generateDatePeriodTable()
     {
         // ---------------------------------------------------------------------
@@ -535,7 +542,8 @@
         
         resourceTableStore.batchUpdate( PeriodType.PERIOD_TYPES.size() + 1, TABLE_NAME_DATE_PERIOD_STRUCTURE, batchArgs );
     }    
-    
+
+    @Transactional
     public void generatePeriodTable()
     {
         // ---------------------------------------------------------------------
@@ -585,6 +593,7 @@
     // DataElementCategoryOptionComboTable
     // -------------------------------------------------------------------------
 
+    @Transactional
     public void generateDataElementCategoryOptionComboTable()
     {
         resourceTableStore.createAndGenerateDataElementCategoryOptionCombo();