=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml	2012-09-24 21:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml	2012-10-31 13:56:02 +0000
@@ -175,14 +175,17 @@
       <param name="javascripts">../dhis-web-commons/ckeditor/ckeditor.js,
         ../dhis-web-commons/ckeditor/adapters/jquery.js,
         javascript/dataEntryForm.js</param>
+      <param name="requiredAuthorities">F_DATASET_ADD</param>
     </action>
 
     <action name="saveDataEntryForm" class="org.hisp.dhis.dataset.action.dataentryform.SaveDataEntryFormAction">
       <result name="success" type="redirect">dataSet.action</result>
+      <param name="requiredAuthorities">F_DATASET_ADD</param>
     </action>
 
     <action name="autoSaveDataEntryForm" class="org.hisp.dhis.dataset.action.dataentryform.AutoSaveDataEntryFormAction">
       <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+      <param name="requiredAuthorities">F_DATASET_ADD</param>
     </action>
 
     <action name="validateDataEntryForm" class="org.hisp.dhis.dataset.action.dataentryform.ValidateDataEntryFormAction">
@@ -193,6 +196,7 @@
 
     <action name="delDataEntryForm" class="org.hisp.dhis.dataset.action.dataentryform.DelDataEntryFormAction">
       <result name="success" type="redirect">dataSet.action</result>
+      <param name="requiredAuthorities">F_DATASET_DELETE</param>
     </action>
 
     <action name="getSelectedDataElements" class="org.hisp.dhis.dataset.action.dataentryform.GetSelectedDataElementsAction">
@@ -204,10 +208,12 @@
     <action name="displayCompulsoryDataElementsForm" class="org.hisp.dhis.dataset.action.compulsory.GetCompulsoryDataElementsAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-dataset/compulsoryDataElementsForm.vm</param>
+      <param name="requiredAuthorities">F_DATASET_ADD</param>
     </action>
 
     <action name="saveCompulsoryDataElements" class="org.hisp.dhis.dataset.action.compulsory.SaveCompulsoryDataElementsAction">
       <result name="success" type="redirect">dataSet.action</result>
+      <param name="requiredAuthorities">F_DATASET_ADD</param>
     </action>
 
 	<!-- Dataset Editor -->
@@ -217,18 +223,22 @@
       <param name="page">/dhis-web-maintenance-dataset/viewEditorForm.vm</param>
       <param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
       <param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/editor.js</param>
+      <param name="requiredAuthorities">F_DATASET_ADD</param>
     </action>
 
     <action name="showedAssociationsEditor" class="org.hisp.dhis.dataset.action.editor.ShowedAssociationsEditorAction">
       <result name="success" type="velocity">/dhis-web-maintenance-dataset/htmlGrid.vm</result>
+      <param name="requiredAuthorities">F_DATASET_ADD</param>
     </action>
 
     <action name="definedAssociationEditor" class="org.hisp.dhis.dataset.action.editor.DefinedAssociationEditorAction">
       <result name="success" type="velocity">/dhis-web-maintenance-dataset/loadIcon.vm</result>
+      <param name="requiredAuthorities">F_DATASET_ADD</param>
     </action>
 
     <action name="definedMultiAssociationsEditor" class="org.hisp.dhis.dataset.action.editor.DefinedMultiAssociationsEditorAction">
       <result name="success" type="velocity">/dhis-web-maintenance-dataset/loadIcons.vm</result>
+      <param name="requiredAuthorities">F_DATASET_ADD</param>
     </action>
 
   </package>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/struts.xml	2012-10-22 08:51:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/struts.xml	2012-10-31 13:56:02 +0000
@@ -21,8 +21,7 @@
       <param name="page">/dhis-web-maintenance-mobile/smsSettings.vm</param>
       <param name="menu">/dhis-web-maintenance-mobile/menu.vm</param>
       <param name="requiredAuthorities">F_MOBILE_SETTINGS</param>
-    </action>
-  
+    </action>  
 
 	<!-- Sending SMS Action -->
   
@@ -38,6 +37,7 @@
     	<result name="success" type="velocity">/main.vm</result>
     	<param name="page">/dhis-web-maintenance-mobile/showSentSMSPage.vm</param>
     	<param name="menu">/dhis-web-maintenance-mobile/menu.vm</param>
+      <param name="requiredAuthorities">F_MOBILE_SENDSMS</param>
     </action>
     
     <!-- Receiving SMS Action -->
@@ -137,10 +137,12 @@
       <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
       <result name="input" type="velocity-json">../dhis-web-commons/ajax/jsonResponseInput.vm</result>
       <param name="onExceptionReturn">plainTextError</param>
+      <param name="requiredAuthorities">F_MOBILE_SETTINGS</param>
     </action>
 	
     <action name="saveSmsConfiguration" class="org.hisp.dhis.mobile.action.SaveSmsConfigurationAction">
       <result name="success" type="redirect">showSMSConfigureForm.action</result>
+      <param name="requiredAuthorities">F_MOBILE_SETTINGS</param>
     </action>
 
     <action name="saveBulkSMSConfig" class="org.hisp.dhis.mobile.action.UpdateBulkGateWayConfigAction">
@@ -151,30 +153,35 @@
     <action name="updateSMPPConfig" class="org.hisp.dhis.mobile.action.UpdateSMPPGateWayConfigAction">
       <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
       <param name="onExceptionReturn">plainTextError</param>
+      <param name="requiredAuthorities">F_MOBILE_SETTINGS</param>
     </action>
   
     <action name="saveModemConfig" class="org.hisp.dhis.mobile.action.UpdateModemGateWayConfigAction">
       <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
       <param name="onExceptionReturn">plainTextError</param>
+      <param name="requiredAuthorities">F_MOBILE_SETTINGS</param>
     </action>
 
     <action name="saveClickatellConfig" class="org.hisp.dhis.mobile.action.UpdateClickatellGateWayConfigAction">
       <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
       <param name="onExceptionReturn">plainTextError</param>
+      <param name="requiredAuthorities">F_MOBILE_SETTINGS</param>
     </action>
 	
     <action name="saveHTTPConfig" class="org.hisp.dhis.mobile.action.UpdateGenericHTTPGateWayConfigAction">
       <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
       <param name="onExceptionReturn">plainTextError</param>
+      <param name="requiredAuthorities">F_MOBILE_SETTINGS</param>
     </action>
 	
     <action name="removeGatewayConfig" class="org.hisp.dhis.mobile.action.RemoveGatewayConfigAction">
       <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
       <param name="onExceptionReturn">plainTextError</param>
-    </action>
-    
+      <param name="requiredAuthorities">F_MOBILE_SETTINGS</param>
+    </action>    
       
     <!-- SMSCommmand start -->
+    
      <action name="SMSCommands" class="org.hisp.dhis.mobile.action.smscommand.SMSCommandAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-mobile/smscommand/sms-commands.vm</param>
@@ -201,30 +208,34 @@
     
     <action name="saveEditSMSCommandForm" class="org.hisp.dhis.mobile.action.smscommand.EditSMSCommandForm">
           <result name="success" type="redirect">SMSCommands.action</result>
+      <param name="requiredAuthorities">F_MOBILE_SENDSMS</param>  
     </action>
 
     <action name="createSMSCommandForm" class="org.hisp.dhis.mobile.action.smscommand.CreateSMSCommandForm">
           <result name="success" type="redirect">SMSCommands.action</result>
+      <param name="requiredAuthorities">F_MOBILE_SENDSMS</param>  
     </action>
     
     <action name="deleteSMSCommand" class="org.hisp.dhis.mobile.action.smscommand.DeleteSMSCommandAction">
           <result name="success" type="redirect">SMSCommands.action</result>
+      <param name="requiredAuthorities">F_MOBILE_SENDSMS</param>  
     </action>
     
-    <!-- SMSCommand end -->
     <action name="sendSMS" class="org.hisp.dhis.mobile.action.ProcessingSendSMSAction">
       <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
       <result name="error" type="velocity-json">../dhis-web-commons/ajax/jsonResponseError.vm</result>
       <param name="onExceptionReturn">plainTextError</param>
+      <param name="requiredAuthorities">F_MOBILE_SENDSMS</param>  
     </action>
     
     <!-- J2ME Client Update -->
     
     <action name="showJ2meClientUpdatePage" class="org.hisp.dhis.mobile.action.J2meClientUpdateAction">
-    	<result name="success" type="velocity">/main.vm</result>
-    	<param name="page">/dhis-web-maintenance-mobile/j2meClientUpdatePage.vm</param>
-    	<param name="menu">/dhis-web-maintenance-mobile/menu.vm</param>
-    	<param name="javascripts">javascript/gateway.js</param>
+      <result name="success" type="velocity">/main.vm</result>
+      <param name="page">/dhis-web-maintenance-mobile/j2meClientUpdatePage.vm</param>
+      <param name="menu">/dhis-web-maintenance-mobile/menu.vm</param>
+      <param name="javascripts">javascript/gateway.js</param>
+      <param name="requiredAuthorities">F_MOBILE_SENDSMS</param>  
     </action>
 	
   </package>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2012-10-31 09:05:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2012-10-31 13:56:02 +0000
@@ -222,6 +222,7 @@
 F_IMPORT_DATA=Import data
 F_EXPORT_DATA=Export data
 F_VIEW_DATABROWSER=View data browser
+F_RUN_VALIDATION=Run validation
 
 #-- User module ---------------------------------------------------------------#
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml	2012-06-01 13:19:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml	2012-10-31 13:56:02 +0000
@@ -78,6 +78,8 @@
       <param name="onExceptionReturn">plainTextError</param>
     </action>
 
+    <!-- WTF? -->
+
     <action name="selectOrganisationUnitGroupMembers" class="org.hisp.dhis.user.action.SelectOrganisationUnitGroupMembersAction">
       <result name="success" type="velocity-xml">/dhis-web-maintenance-user/responseSuccess.vm</result>
       <param name="onExceptionReturn">plainTextError</param>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml	2012-10-01 10:50:34 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml	2012-10-31 13:56:02 +0000
@@ -13,13 +13,7 @@
       <param name="page">/dhis-web-reporting/index.vm</param>
       <param name="menu">/dhis-web-reporting/menu.vm</param>
     </action>
-	
-    <action name="viewGroups" class="org.hisp.dhis.reporting.action.NoAction">
-      <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-reporting/viewGroups.vm</param>
-      <param name="menu">/dhis-web-reporting/menu.vm</param>
-    </action>
-    
+	    
     <!-- Document -->
 
     <action name="saveDocument" class="org.hisp.dhis.reporting.document.action.SaveDocumentAction">

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml	2012-07-26 11:14:41 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml	2012-10-31 13:56:02 +0000
@@ -135,6 +135,7 @@
       <param name="page">/dhis-web-validationrule/runValidationForm.vm</param>
       <param name="menu">/dhis-web-validationrule/menu.vm</param>
       <param name="javascripts">../dhis-web-commons/oust/oust.js,../dhis-web-commons/ouwt/ouwt.js,javascript/general.js,javascript/runValidation.js</param>
+      <param name="requiredAuthorities">F_RUN_VALIDATION</param>
     </action>
 
     <action name="validateRunValidation" class="org.hisp.dhis.validationrule.action.ValidateRunValidationAction">
@@ -144,6 +145,7 @@
 
     <action name="runValidationAction" class="org.hisp.dhis.validationrule.action.RunValidationAction">
       <result name="success" type="velocity">/dhis-web-validationrule/viewValidationResultForm.vm</result>
+      <param name="requiredAuthorities">F_RUN_VALIDATION</param>
     </action>
 
     <action name="viewValidationResultDetails" class="org.hisp.dhis.validationrule.action.GetValidationResultDetailsAction">
@@ -170,17 +172,20 @@
         javascript/editDataValue.js
       </param>
       <interceptor-ref name="organisationUnitTreeStack" />
+      <param name="requiredAuthorities">F_RUN_VALIDATION</param>
     </action>
 
     <action name="viewFollowUpAnalysisForm" class="org.hisp.dhis.validationrule.action.NoAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-validationrule/followUpAnalysisForm.vm</param>
       <param name="menu">/dhis-web-validationrule/menu.vm</param>
-      <param name="javascripts"> javascript/dataAnalysis.js,javascript/editDataValue.js</param>
+      <param name="javascripts"> javascript/dataAnalysis.js,javascript/editDataValue.js</param>
+      <param name="requiredAuthorities">F_RUN_VALIDATION</param>
     </action>
 
     <action name="getAnalysis" class="org.hisp.dhis.validationrule.action.dataanalysis.GetAnalysisAction">
       <result name="success" type="velocity">/dhis-web-validationrule/searchResult.vm</result>
+      <param name="requiredAuthorities">F_RUN_VALIDATION</param>
     </action>
 
     <action name="editDataValue" class="org.hisp.dhis.validationrule.action.dataanalysis.EditDataValueAction">