=== modified file 'local/in/dhis-mobile/dhis-web-mobile/pom.xml'
--- local/in/dhis-mobile/dhis-web-mobile/pom.xml	2011-12-26 07:15:40 +0000
+++ local/in/dhis-mobile/dhis-web-mobile/pom.xml	2011-12-26 07:49:43 +0000
@@ -46,6 +46,11 @@
         <version>1.3.2</version>
     </dependency>
 
+	<dependency>
+		<groupId>javax.servlet</groupId>
+		<artifactId>servlet-api</artifactId>
+    </dependency>
+	
   </dependencies>
   <properties>
     <rootDir>../../</rootDir>

=== modified file 'local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/app/action/CreateMobileAppAction.java'
--- local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/app/action/CreateMobileAppAction.java	2011-12-05 05:56:00 +0000
+++ local/in/dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/app/action/CreateMobileAppAction.java	2011-12-26 07:49:43 +0000
@@ -43,9 +43,10 @@
     private String[] splashImg;
     private String[] availableDatasets;
     private String mobileAppFilename;
-
+    
     public String getMobileAppFilename() {
         String webappPath = ServletActionContext.getServletContext().getRealPath("/");
+       // String webappPath = ActionContext.getContext().getRealPath("/");
         String appPath = webappPath + "/dhis-web-mobile/javame_src/target";
         File appFile = new File(appPath, "dhis-javame-1.0.0-me.jar");
         if (appFile.exists()) {

=== modified file 'local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateGroupWiseDataStatusResultAction.java'
--- local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateGroupWiseDataStatusResultAction.java	2011-12-14 10:18:12 +0000
+++ local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dataanalyser/ds/action/GenerateGroupWiseDataStatusResultAction.java	2011-12-26 07:49:43 +0000
@@ -115,14 +115,14 @@
     {
         this.displayPropertyHandler = displayPropertyHandler;
     }
-/*    
+/*   
     private SectionService sectionService;
     
     public void setSectionService( SectionService sectionService )
     {
         this.sectionService = sectionService;
     }
-*/    
+ */  
     // ---------------------------------------------------------------
     // Output Parameters
     // ---------------------------------------------------------------
@@ -534,12 +534,23 @@
         */
         // for dataSet Sections
         
+ 
+        
+        
         //Collection<Section> sections = selDataSet.getSections();
         sections = new ArrayList<Section>();
+        
         //sections = new ArrayList<Section>( sectionService.getAllSections() );
-        sections = new ArrayList<Section>( selDataSet.getSections() );
+        
+        DataSet dataSet = dataSetService.getDataSet( selDataSet.getId() );
+
+        sections = new ArrayList<Section>( dataSet.getSections() );
+
         Collections.sort( sections, new SectionOrderComparator() );
         
+       // sections = new ArrayList<Section>( selDataSet.getSections() );
+        //Collections.sort( sections, new SectionOrderComparator() );
+        System.out.println( "---- Size of dataSet Section is --" + sections.size() );
         for ( Section section : sections )
         {
             for ( DataElement de : section.getDataElements() )

=== modified file 'local/in/dhis-web-dashboard/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-dashboard/src/main/resources/META-INF/dhis/beans.xml	2011-12-03 07:44:11 +0000
+++ local/in/dhis-web-dashboard/src/main/resources/META-INF/dhis/beans.xml	2011-12-26 07:49:43 +0000
@@ -884,7 +884,7 @@
         </property>
         <property name="sessionFactory" ref="sessionFactory"/>
         <property name="jdbcTemplate" ref="jdbcTemplate"/>
-<!--    <property name="sectionService">
+<!--	<property name="sectionService">
             <ref bean="org.hisp.dhis.dataset.SectionService"/>
         </property>-->
     </bean>

=== modified file 'local/in/dhis-web-dashboard/src/main/resources/struts.xml'
--- local/in/dhis-web-dashboard/src/main/resources/struts.xml	2011-12-03 07:44:11 +0000
+++ local/in/dhis-web-dashboard/src/main/resources/struts.xml	2011-12-26 07:49:43 +0000
@@ -580,10 +580,8 @@
 		
 		<action name="groupWiseDataStatusResult"
 			class="org.hisp.dhis.dataanalyser.ds.action.GenerateGroupWiseDataStatusResultAction">
-			<result name="success" type="velocity">
-				/dhis-web-dashboard/groupWiseDataStatusResult.vm</result>
-			<param name="javascripts">
-				javascript/ds.js,javascript/hashtable.js,javascript/date.js</param>
+			<result name="success" type="velocity">/dhis-web-dashboard/groupWiseDataStatusResult.vm</result>
+			<param name="javascripts">javascript/ds.js,javascript/hashtable.js,javascript/date.js</param>
 			<param name="stylesheets">css/StylesForTags.css</param>
 		</action>
 		

=== modified file 'local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/gadataelement.js'
--- local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/gadataelement.js	2011-09-03 09:46:15 +0000
+++ local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/gadataelement.js	2011-12-26 07:49:43 +0000
@@ -594,5 +594,4 @@
   	
   	return true;
 } 
-
 // formValidations Function Indicators End

=== modified file 'local/in/dhis-web-linelisting-in/src/main/java/org/hisp/dhis/ll/action/lldataentry/GetOrgUnitsAction.java'
--- local/in/dhis-web-linelisting-in/src/main/java/org/hisp/dhis/ll/action/lldataentry/GetOrgUnitsAction.java	2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-linelisting-in/src/main/java/org/hisp/dhis/ll/action/lldataentry/GetOrgUnitsAction.java	2011-12-26 07:49:43 +0000
@@ -3,10 +3,10 @@
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.organisationunit.OrganisationUnitService;
 
-import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Action;
 
 public class GetOrgUnitsAction
-    extends ActionSupport
+    implements Action
 {
     // -------------------------------------------------------------------------
     // Dependencies
@@ -57,7 +57,7 @@
             orgUnit = organisationUnitService.getOrganisationUnit( orgUnitId );
         }
 
-        orgUnitLevel = organisationUnitService.getLevelOfOrganisationUnit( orgUnit );
+        orgUnitLevel = organisationUnitService.getLevelOfOrganisationUnit( orgUnit.getId() );
 
         return SUCCESS;
     }

=== modified file 'local/in/dhis-web-maintenance-in/src/main/java/org/hisp/dhis/config/action/TakeMySqlBackupAction.java'
--- local/in/dhis-web-maintenance-in/src/main/java/org/hisp/dhis/config/action/TakeMySqlBackupAction.java	2011-09-08 05:43:00 +0000
+++ local/in/dhis-web-maintenance-in/src/main/java/org/hisp/dhis/config/action/TakeMySqlBackupAction.java	2011-12-26 07:49:43 +0000
@@ -8,7 +8,6 @@
 import org.hisp.dhis.config.ConfigurationService;
 import org.hisp.dhis.config.Configuration_IN;
 import org.hisp.dhis.system.database.DatabaseInfoProvider;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Required;
 
 import com.opensymphony.xwork2.Action;

=== modified file 'local/in/dhis-web-reports-national/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-reports-national/src/main/resources/META-INF/dhis/beans.xml	2011-12-14 11:06:08 +0000
+++ local/in/dhis-web-reports-national/src/main/resources/META-INF/dhis/beans.xml	2011-12-26 07:49:43 +0000
@@ -436,8 +436,8 @@
         <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
         <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
         <property name="reportService" ref="org.hisp.dhis.reports.ReportService" />
-		<property name="organisationUnitGroupService" ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
-<!--    <property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
+<!--	<property name="organisationUnitGroupService" ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
+		<property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
         <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />-->
     </bean>