=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2009-12-11 21:25:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2010-01-19 07:28:20 +0000
@@ -80,7 +80,7 @@
           <li class="menuDropDownItem" onclick="window.location.href='../dhis-web-commons-about/help.action'">$i18n.getString( "help_contents" )&nbsp;</li>
       	  <li class="menuDropDownItem" onclick="window.location.href='../dhis-web-commons-about/displayFeedbackForm.action'">$i18n.getString( "feedback" )&nbsp;</li>
       	  <li class="menuDropDownItem" onclick="window.location.href='../dhis-web-commons-about/displayChangeLog.action'">$i18n.getString( "change_log" )&nbsp;</li>
-          <li class="menuDropDownItem" onclick="window.location.href='../dhis-web-commons-useraccount/showUpdateUserAccountForm.action'">$i18n.getString( "user_account" )&nbsp;</li>
+          <li class="menuDropDownItem" onclick="window.location.href='../dhis-web-commons-about/showUpdateUserAccountForm.action'">$i18n.getString( "user_account" )&nbsp;</li>
           <li class="menuDropDownItem" onclick="window.location.href='../dhis-web-commons-about/about.action'">$i18n.getString( "about_dhis2" )&nbsp;</li>
 	    </ul>
 	  </div>

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml	2009-12-09 09:34:39 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml	2010-01-19 07:28:20 +0000
@@ -4,320 +4,354 @@
 "http://struts.apache.org/dtds/struts-2.0.dtd">
 <struts>
 
-  <include file="struts-default.xml"/>
-  
-  <!-- Properties -->
-  
-  <constant name="struts.velocity.contexts" value="org.hisp.dhis.encoding.velocity.EncoderVelocityContext"/>
-  <constant name="struts.velocity.toolboxlocation" value="toolbox.xml"/> <!-- Work-around -->
-  <constant name="struts.i18n.encoding" value="UTF-8"/>
-  <constant name="struts.multipart.parser" value="jakarta"/>
-  <constant name="struts.multipart.maxSize" value="1073741824"/>
-  
-  <!-- DHIS Web Commons -->
-  
-  <package name="dhis-web-commons" extends="struts-default" namespace="/dhis-web-commons">
-
-    <result-types>
-      <result-type name="plainTextErrorResult"
-        class="org.hisp.dhis.result.PlainTextErrorResult"/>
-      <result-type name="chart"
-        class="org.hisp.dhis.result.ChartResult"/>
-      <result-type name="velocity-xml"
-        class="org.hisp.dhis.result.VelocityXMLResult"/>
-      <result-type name="velocity-json"
-        class="org.hisp.dhis.result.VelocityJsonResult"/>
-      <result-type name="outputStreamResult"
-        class="org.hisp.dhis.result.OutputStreamResult"/>
-    </result-types>
-    
-    <interceptors>
-      <interceptor name="exceptionInterceptor"
-        class="org.hisp.dhis.interceptor.ExceptionInterceptor"/>
-      <interceptor name="i18nInterceptor"
-        class="org.hisp.dhis.interceptor.I18nInterceptor"/>
-      <interceptor name="sortOrderInterceptor"
-        class="org.hisp.dhis.interceptor.SortOrderInterceptor"/>
-      <interceptor name="displayPropertyInterceptor"
-        class="org.hisp.dhis.interceptor.DisplayPropertyInterceptor"/>
-      <interceptor name="dataDictionaryModeInterceptor"
-        class="org.hisp.dhis.interceptor.DataDictionaryModeInterceptor"/>
-      <interceptor name="systemSettingInterceptor"
-        class="org.hisp.dhis.interceptor.SystemSettingInterceptor"/>
-      <interceptor name="styleInterceptor"
-        class="org.hisp.dhis.interceptor.StyleInterceptor"/>
-        
-      <interceptor name="portalParamsInterceptor"
-        class="org.hisp.dhis.webportal.interceptor.WebWorkPortalParamsInterceptor"/>
-      <interceptor name="portalModuleInterceptor"
-        class="org.hisp.dhis.webportal.interceptor.WebWorkPortalModuleInterceptor"/>
-      <interceptor name="portalMenuInterceptor"
-        class="org.hisp.dhis.webportal.interceptor.WebWorkPortalMenuInterceptor"/>
-      <interceptor name="organisationUnitTreeInterceptor"
-        class="org.hisp.dhis.ouwt.interceptor.OrganisationUnitTreeInterceptor"/>
-      <interceptor name="portalUserInterceptor"
-        class="org.hisp.dhis.webportal.interceptor.WebWorkPortalUserInterceptor"/>
-      <interceptor name="securityInterceptor"
-        class="org.hisp.dhis.security.intercept.WebWorkSecurityInterceptor"/>
-      
-      <interceptor-stack name="commonInterceptors">
-        <interceptor-ref name="staticParams"/>
-        <interceptor-ref name="params"/>
-        <interceptor-ref name="chain"/>
-        <interceptor-ref name="i18nInterceptor"/>
-        <!--
-        The securityInterceptor is put after the i18nInterceptor so that the
-        access denied error pages can use internationalisation.
-        -->
-        <interceptor-ref name="securityInterceptor"/>
-        <interceptor-ref name="sortOrderInterceptor"/>
-        <interceptor-ref name="displayPropertyInterceptor"/>
-        <interceptor-ref name="dataDictionaryModeInterceptor"/>
-        <interceptor-ref name="systemSettingInterceptor"/>
-        <interceptor-ref name="styleInterceptor"/>
-        <interceptor-ref name="portalParamsInterceptor"/>
-        <interceptor-ref name="portalMenuInterceptor"/>
-        <interceptor-ref name="portalModuleInterceptor"/>
-        <interceptor-ref name="portalUserInterceptor"/>
-      </interceptor-stack>
-      
-      <interceptor-stack name="exceptionStack">
-        <interceptor-ref name="exceptionInterceptor"/>
-        <interceptor-ref name="commonInterceptors"/>
-      </interceptor-stack>
-      
-      <interceptor-stack name="fileUploadStack">
-        <interceptor-ref name="exceptionInterceptor"/>
-        <interceptor-ref name="fileUpload"/>
-        <interceptor-ref name="commonInterceptors"/>
-      </interceptor-stack>
-      
-      <interceptor-stack name="organisationUnitTreeStack">
-        <interceptor-ref name="organisationUnitTreeInterceptor"/>
-        <interceptor-ref name="commonInterceptors"/>
-      </interceptor-stack>
-    </interceptors>
-    
-    <default-interceptor-ref name="exceptionStack"/>
-    
-    <global-results>
-      <result name="exceptionDefault" type="velocity">/exception.vm</result>
-      <result name="accessDenied" type="velocity">/accessDenied.vm</result>
-      <result name="plainTextError" type="plainTextErrorResult">
-        <param name="parse">true</param>
-        <param name="message">${exception.class.name}: ${exception.message}</param>
-      </result>
-    </global-results>    
-  </package>
-  
-  <!-- Organisation Unit Selection Tree -->
-  
-  <package name="dhis-web-commons-oust" extends="dhis-web-commons" namespace="/dhis-web-commons/oust">
-    
-    <action name="expandSubtree" class="org.hisp.dhis.oust.action.ExpandSubtreeAction">
-      <result name="success" type="velocity">/dhis-web-commons/ouwt/responseExpand.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-    </action>
-    
-    <action name="getExpandedTree" class="org.hisp.dhis.oust.action.GetExpandedTreeAction">
-      <result name="success" type="velocity"> /dhis-web-commons/ouwt/responseTree.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-    </action>
-	     
-    <action name="setorgunit" class="org.hisp.dhis.oust.action.SetSelectedOrganisationUnitAction">
-      <result name="success" type="velocity"> /dhis-web-commons/ouwt/responseSelect.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-    </action>
-    
-    <action name="addorgunit" class="org.hisp.dhis.oust.action.AddSelectedOrganisationUnitAction">
-      <result name="success" type="velocity"> /dhis-web-commons/ouwt/responseSelect.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-    </action>
-    
-    <action name="removeorgunit"
-      class="org.hisp.dhis.oust.action.RemoveSelectedOrganisationUnitAction">
-      <result name="success" type="velocity"> /dhis-web-commons/ouwt/responseSelect.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-    </action>
-	   
-  </package>
-  
-  <!-- Organisation Unit Web Tree -->
-  
-  <package name="dhis-web-commons-ouwt" extends="dhis-web-commons" namespace="/dhis-web-commons/ouwt">
-    
-    <action name="expandSubtree" class="org.hisp.dhis.ouwt.action.ExpandSubtreeAction">
-      <result name="success" type="velocity"> /dhis-web-commons/ouwt/responseExpand.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-    </action>
-    
-    <action name="collapseSubtree" class="org.hisp.dhis.ouwt.action.CollapseSubtreeAction">
-      <result name="success" type="velocity"> /dhis-web-commons/ouwt/responseCollapse.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-    </action>
-    
-    <action name="getExpandedTree" class="org.hisp.dhis.ouwt.action.GetExpandedTreeAction">
-      <result name="success" type="velocity"> /dhis-web-commons/ouwt/responseTree.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-    </action>
-    
-    <action name="setorgunit" class="org.hisp.dhis.ouwt.action.SetSelectedOrganisationUnitAction">
-      <result name="success" type="velocity"> /dhis-web-commons/ouwt/responseSelect.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-    </action>
-    
-    <action name="addorgunit" class="org.hisp.dhis.ouwt.action.AddSelectedOrganisationUnitAction">
-      <result name="success" type="velocity"> /dhis-web-commons/ouwt/responseSelect.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-    </action>
-    
-    <action name="removeorgunit"
-      class="org.hisp.dhis.ouwt.action.RemoveSelectedOrganisationUnitAction">
-      <result name="success" type="velocity"> /dhis-web-commons/ouwt/responseSelect.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-    </action>
-    
-  </package>
-  
-  <!-- Menu -->
-  
-  <package name="dhis-web-commons-menu" extends="dhis-web-commons" namespace="/dhis-web-commons/menu">
-    
-    <action name="setMenuVisible" class="org.hisp.dhis.webportal.menu.action.SetMenuVisibleAction">
-      <result name="success" type="httpheader">
-        <param name="status">204</param>
-      </result>
-      <param name="onExceptionReturn">plainTextError</param>
-    </action>
-    
-    <action name="setMenuHidden" class="org.hisp.dhis.webportal.menu.action.SetMenuHiddenAction">
-      <result name="success" type="httpheader">
-        <param name="status">204</param>
-      </result>
-      <param name="onExceptionReturn">plainTextError</param>
-    </action>
-
-  </package>
-
-  <!-- Help -->
-  
-  <package name="dhis-web-commons-help" extends="dhis-web-commons" namespace="/dhis-web-commons-help">
-    
-    <action name="viewDynamicHelp" class="org.hisp.dhis.help.action.PopupHelpAction">
-      <result name="success" type="velocity">/popup.vm</result>
-      <param name="page">/dhis-web-commons/help/helpPopup.vm</param>   			
-    </action>
-		
-  </package>
-    
-  <!-- Security -->
-  
-  <package name="dhis-web-commons-security" extends="dhis-web-commons" namespace="/dhis-web-commons-security">
-    
-    <action name="loggedIn" class="org.hisp.dhis.security.action.LoggedInAction">
-      <result name="success" type="redirect">/</result>
-    </action>
-    
-  </package>
-
-  <!-- i18n -->
-
-  <package name="dhis-web-commons-i18n" extends="dhis-web-commons" namespace="/dhis-web-commons">
-
-    <action name="i18n" class="org.hisp.dhis.i18n.action.I18nAction">
-      <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-commons/i18n/translate.vm</param>
-      <param name="javascripts">../dhis-web-commons/i18n/i18n.js,../dhis-web-commons/lists/lists.js</param>
-    </action>
-
-    <action name="translate" class="org.hisp.dhis.i18n.action.TranslateAction">
-      <result name="success" type="velocity">/dhis-web-commons/i18n/goback.vm</result>
-    </action>
-
-    <action name="getTranslations" class="org.hisp.dhis.i18n.action.GetTranslationsAction">
-      <result name="success" type="velocity">/dhis-web-commons/i18n/responseTranslations.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-    </action>
-    
-  </package>
-  
-  <!-- Common actions -->
-  
-  <package name="dhis-web-commons-ajax" extends="dhis-web-commons" namespace="/dhis-web-commons-ajax">
-    
-    <action name="getDataElements" class="org.hisp.dhis.commons.action.GetDataElementsAction">
-	  <result name="success" type="velocity">/dhis-web-commons/ajax/responseDataElement.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-    </action>
-		
-    <action name="getDataSets" class="org.hisp.dhis.commons.action.GetDataSetsAction">
-      <result name="success" type="velocity">/dhis-web-commons/ajax/responseDataSet.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-    </action>
-		
-    <action name="getIndicators" class="org.hisp.dhis.commons.action.GetIndicatorsAction">
-      <result name="success" type="velocity">/dhis-web-commons/ajax/responseIndicator.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-    </action>
-		
-    <action name="getOrganisationUnitChildren" class="org.hisp.dhis.commons.action.GetOrganisationUnitChildrenAction">
-      <result name="success" type="velocity">/dhis-web-commons/ajax/responseOrganisationUnit.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-    </action>
-		
-    <action name="getOrganisationUnits" class="org.hisp.dhis.commons.action.GetOrganisationUnitsAction">
-      <result name="success" type="velocity">/dhis-web-commons/ajax/responseOrganisationUnit.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-    </action>
-
-    <action name="getPeriods" class="org.hisp.dhis.commons.action.GetPeriodsAction">
-      <result name="success" type="velocity">/dhis-web-commons/ajax/responsePeriod.vm</result>
-      <param name="onExceptionReturn">plainTextError</param>
-    </action>
-		
-  </package>
-  
-  <!-- About -->
-  
-  <package name="dhis-web-commons-about" extends="dhis-web-commons" namespace="/dhis-web-commons-about">
-    
-    <action name="about" class="org.hisp.dhis.about.action.AboutAction">
-      <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-commons/about/about.vm</param>
-      <param name="menu">/dhis-web-commons/about/menu.vm</param>
-    </action>    
-  
-    <action name="displayFeedbackForm" class="org.hisp.dhis.commons.action.NoAction">
-      <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-commons/about/feedbackForm.vm</param>
-      <param name="menu">/dhis-web-commons/about/menu.vm</param>
-    </action>
-    
-    <action name="sendFeedback" class="org.hisp.dhis.about.action.SendFeedbackAction">
-      <result name="success" type="redirect">about.action</result>
-    </action>
-    
-    <action name="help" class="org.hisp.dhis.about.action.HelpAction">
-      <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-commons/help/help.vm</param>
-      <param name="menu">/dhis-web-commons/about/menu.vm</param>
-    </action>
-    
-    <action name="displayChangeLog" class="org.hisp.dhis.commons.action.NoAction">
-      <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-commons/about/changeLog.vm</param>
-      <param name="menu">/dhis-web-commons/about/menu.vm</param>
-    </action>
-    
-  </package>
-  
-  <!-- user account -->
-  
-  <package name="dhis-web-commons-useraccount" extends="dhis-web-commons" namespace="/dhis-web-commons-useraccount">
-    
-    	<action name="showUpdateUserAccountForm" class="org.hisp.dhis.useraccount.action.GetCurrentUserAction">
-			<result name="success" type="velocity">/main.vm</result>
-     		<param name="menu">/dhis-web-commons/about/menu.vm</param>
+	<include file="struts-default.xml" />
+
+	<!-- Properties -->
+
+	<constant name="struts.velocity.contexts"
+		value="org.hisp.dhis.encoding.velocity.EncoderVelocityContext" />
+	<constant name="struts.velocity.toolboxlocation" value="toolbox.xml" /> <!-- Work-around -->
+	<constant name="struts.i18n.encoding" value="UTF-8" />
+	<constant name="struts.multipart.parser" value="jakarta" />
+	<constant name="struts.multipart.maxSize" value="1073741824" />
+
+	<!-- DHIS Web Commons -->
+
+	<package name="dhis-web-commons" extends="struts-default"
+		namespace="/dhis-web-commons">
+
+		<result-types>
+			<result-type name="plainTextErrorResult"
+				class="org.hisp.dhis.result.PlainTextErrorResult" />
+			<result-type name="chart" class="org.hisp.dhis.result.ChartResult" />
+			<result-type name="velocity-xml"
+				class="org.hisp.dhis.result.VelocityXMLResult" />
+			<result-type name="velocity-json"
+				class="org.hisp.dhis.result.VelocityJsonResult" />
+			<result-type name="outputStreamResult"
+				class="org.hisp.dhis.result.OutputStreamResult" />
+		</result-types>
+
+		<interceptors>
+			<interceptor name="exceptionInterceptor"
+				class="org.hisp.dhis.interceptor.ExceptionInterceptor" />
+			<interceptor name="i18nInterceptor"
+				class="org.hisp.dhis.interceptor.I18nInterceptor" />
+			<interceptor name="sortOrderInterceptor"
+				class="org.hisp.dhis.interceptor.SortOrderInterceptor" />
+			<interceptor name="displayPropertyInterceptor"
+				class="org.hisp.dhis.interceptor.DisplayPropertyInterceptor" />
+			<interceptor name="dataDictionaryModeInterceptor"
+				class="org.hisp.dhis.interceptor.DataDictionaryModeInterceptor" />
+			<interceptor name="systemSettingInterceptor"
+				class="org.hisp.dhis.interceptor.SystemSettingInterceptor" />
+			<interceptor name="styleInterceptor"
+				class="org.hisp.dhis.interceptor.StyleInterceptor" />
+
+			<interceptor name="portalParamsInterceptor"
+				class="org.hisp.dhis.webportal.interceptor.WebWorkPortalParamsInterceptor" />
+			<interceptor name="portalModuleInterceptor"
+				class="org.hisp.dhis.webportal.interceptor.WebWorkPortalModuleInterceptor" />
+			<interceptor name="portalMenuInterceptor"
+				class="org.hisp.dhis.webportal.interceptor.WebWorkPortalMenuInterceptor" />
+			<interceptor name="organisationUnitTreeInterceptor"
+				class="org.hisp.dhis.ouwt.interceptor.OrganisationUnitTreeInterceptor" />
+			<interceptor name="portalUserInterceptor"
+				class="org.hisp.dhis.webportal.interceptor.WebWorkPortalUserInterceptor" />
+			<interceptor name="securityInterceptor"
+				class="org.hisp.dhis.security.intercept.WebWorkSecurityInterceptor" />
+
+			<interceptor-stack name="commonInterceptors">
+				<interceptor-ref name="staticParams" />
+				<interceptor-ref name="params" />
+				<interceptor-ref name="chain" />
+				<interceptor-ref name="i18nInterceptor" />
+				<!--
+					The securityInterceptor is put after the i18nInterceptor so that
+					the access denied error pages can use internationalisation.
+				-->
+				<interceptor-ref name="securityInterceptor" />
+				<interceptor-ref name="sortOrderInterceptor" />
+				<interceptor-ref name="displayPropertyInterceptor" />
+				<interceptor-ref name="dataDictionaryModeInterceptor" />
+				<interceptor-ref name="systemSettingInterceptor" />
+				<interceptor-ref name="styleInterceptor" />
+				<interceptor-ref name="portalParamsInterceptor" />
+				<interceptor-ref name="portalMenuInterceptor" />
+				<interceptor-ref name="portalModuleInterceptor" />
+				<interceptor-ref name="portalUserInterceptor" />
+			</interceptor-stack>
+
+			<interceptor-stack name="exceptionStack">
+				<interceptor-ref name="exceptionInterceptor" />
+				<interceptor-ref name="commonInterceptors" />
+			</interceptor-stack>
+
+			<interceptor-stack name="fileUploadStack">
+				<interceptor-ref name="exceptionInterceptor" />
+				<interceptor-ref name="fileUpload" />
+				<interceptor-ref name="commonInterceptors" />
+			</interceptor-stack>
+
+			<interceptor-stack name="organisationUnitTreeStack">
+				<interceptor-ref name="organisationUnitTreeInterceptor" />
+				<interceptor-ref name="commonInterceptors" />
+			</interceptor-stack>
+		</interceptors>
+
+		<default-interceptor-ref name="exceptionStack" />
+
+		<global-results>
+			<result name="exceptionDefault" type="velocity">/exception.vm
+			</result>
+			<result name="accessDenied" type="velocity">/accessDenied.vm
+			</result>
+			<result name="plainTextError" type="plainTextErrorResult">
+				<param name="parse">true</param>
+				<param name="message">${exception.class.name}:
+					${exception.message}</param>
+			</result>
+		</global-results>
+	</package>
+
+	<!-- Organisation Unit Selection Tree -->
+
+	<package name="dhis-web-commons-oust" extends="dhis-web-commons"
+		namespace="/dhis-web-commons/oust">
+
+		<action name="expandSubtree" class="org.hisp.dhis.oust.action.ExpandSubtreeAction">
+			<result name="success" type="velocity">
+				/dhis-web-commons/ouwt/responseExpand.vm</result>
+			<param name="onExceptionReturn">plainTextError</param>
+		</action>
+
+		<action name="getExpandedTree" class="org.hisp.dhis.oust.action.GetExpandedTreeAction">
+			<result name="success" type="velocity">
+				/dhis-web-commons/ouwt/responseTree.vm</result>
+			<param name="onExceptionReturn">plainTextError</param>
+		</action>
+
+		<action name="setorgunit"
+			class="org.hisp.dhis.oust.action.SetSelectedOrganisationUnitAction">
+			<result name="success" type="velocity">
+				/dhis-web-commons/ouwt/responseSelect.vm</result>
+			<param name="onExceptionReturn">plainTextError</param>
+		</action>
+
+		<action name="addorgunit"
+			class="org.hisp.dhis.oust.action.AddSelectedOrganisationUnitAction">
+			<result name="success" type="velocity">
+				/dhis-web-commons/ouwt/responseSelect.vm</result>
+			<param name="onExceptionReturn">plainTextError</param>
+		</action>
+
+		<action name="removeorgunit"
+			class="org.hisp.dhis.oust.action.RemoveSelectedOrganisationUnitAction">
+			<result name="success" type="velocity">
+				/dhis-web-commons/ouwt/responseSelect.vm</result>
+			<param name="onExceptionReturn">plainTextError</param>
+		</action>
+
+	</package>
+
+	<!-- Organisation Unit Web Tree -->
+
+	<package name="dhis-web-commons-ouwt" extends="dhis-web-commons"
+		namespace="/dhis-web-commons/ouwt">
+
+		<action name="expandSubtree" class="org.hisp.dhis.ouwt.action.ExpandSubtreeAction">
+			<result name="success" type="velocity">
+				/dhis-web-commons/ouwt/responseExpand.vm</result>
+			<param name="onExceptionReturn">plainTextError</param>
+		</action>
+
+		<action name="collapseSubtree" class="org.hisp.dhis.ouwt.action.CollapseSubtreeAction">
+			<result name="success" type="velocity">
+				/dhis-web-commons/ouwt/responseCollapse.vm</result>
+			<param name="onExceptionReturn">plainTextError</param>
+		</action>
+
+		<action name="getExpandedTree" class="org.hisp.dhis.ouwt.action.GetExpandedTreeAction">
+			<result name="success" type="velocity">
+				/dhis-web-commons/ouwt/responseTree.vm</result>
+			<param name="onExceptionReturn">plainTextError</param>
+		</action>
+
+		<action name="setorgunit"
+			class="org.hisp.dhis.ouwt.action.SetSelectedOrganisationUnitAction">
+			<result name="success" type="velocity">
+				/dhis-web-commons/ouwt/responseSelect.vm</result>
+			<param name="onExceptionReturn">plainTextError</param>
+		</action>
+
+		<action name="addorgunit"
+			class="org.hisp.dhis.ouwt.action.AddSelectedOrganisationUnitAction">
+			<result name="success" type="velocity">
+				/dhis-web-commons/ouwt/responseSelect.vm</result>
+			<param name="onExceptionReturn">plainTextError</param>
+		</action>
+
+		<action name="removeorgunit"
+			class="org.hisp.dhis.ouwt.action.RemoveSelectedOrganisationUnitAction">
+			<result name="success" type="velocity">
+				/dhis-web-commons/ouwt/responseSelect.vm</result>
+			<param name="onExceptionReturn">plainTextError</param>
+		</action>
+
+	</package>
+
+	<!-- Menu -->
+
+	<package name="dhis-web-commons-menu" extends="dhis-web-commons"
+		namespace="/dhis-web-commons/menu">
+
+		<action name="setMenuVisible"
+			class="org.hisp.dhis.webportal.menu.action.SetMenuVisibleAction">
+			<result name="success" type="httpheader">
+				<param name="status">204</param>
+			</result>
+			<param name="onExceptionReturn">plainTextError</param>
+		</action>
+
+		<action name="setMenuHidden"
+			class="org.hisp.dhis.webportal.menu.action.SetMenuHiddenAction">
+			<result name="success" type="httpheader">
+				<param name="status">204</param>
+			</result>
+			<param name="onExceptionReturn">plainTextError</param>
+		</action>
+
+	</package>
+
+	<!-- Help -->
+
+	<package name="dhis-web-commons-help" extends="dhis-web-commons"
+		namespace="/dhis-web-commons-help">
+
+		<action name="viewDynamicHelp" class="org.hisp.dhis.help.action.PopupHelpAction">
+			<result name="success" type="velocity">/popup.vm</result>
+			<param name="page">/dhis-web-commons/help/helpPopup.vm</param>
+		</action>
+
+	</package>
+
+	<!-- Security -->
+
+	<package name="dhis-web-commons-security" extends="dhis-web-commons"
+		namespace="/dhis-web-commons-security">
+
+		<action name="loggedIn" class="org.hisp.dhis.security.action.LoggedInAction">
+			<result name="success" type="redirect">/</result>
+		</action>
+
+	</package>
+
+	<!-- i18n -->
+
+	<package name="dhis-web-commons-i18n" extends="dhis-web-commons"
+		namespace="/dhis-web-commons">
+
+		<action name="i18n" class="org.hisp.dhis.i18n.action.I18nAction">
+			<result name="success" type="velocity">/main.vm</result>
+			<param name="page">/dhis-web-commons/i18n/translate.vm</param>
+			<param name="javascripts">../dhis-web-commons/i18n/i18n.js,../dhis-web-commons/lists/lists.js</param>
+		</action>
+
+		<action name="translate" class="org.hisp.dhis.i18n.action.TranslateAction">
+			<result name="success" type="velocity">/dhis-web-commons/i18n/goback.vm
+			</result>
+		</action>
+
+		<action name="getTranslations" class="org.hisp.dhis.i18n.action.GetTranslationsAction">
+			<result name="success" type="velocity">
+				/dhis-web-commons/i18n/responseTranslations.vm</result>
+			<param name="onExceptionReturn">plainTextError</param>
+		</action>
+
+	</package>
+
+	<!-- Common actions -->
+
+	<package name="dhis-web-commons-ajax" extends="dhis-web-commons"
+		namespace="/dhis-web-commons-ajax">
+
+		<action name="getDataElements"
+			class="org.hisp.dhis.commons.action.GetDataElementsAction">
+			<result name="success" type="velocity">
+				/dhis-web-commons/ajax/responseDataElement.vm</result>
+			<param name="onExceptionReturn">plainTextError</param>
+		</action>
+
+		<action name="getDataSets" class="org.hisp.dhis.commons.action.GetDataSetsAction">
+			<result name="success" type="velocity">
+				/dhis-web-commons/ajax/responseDataSet.vm</result>
+			<param name="onExceptionReturn">plainTextError</param>
+		</action>
+
+		<action name="getIndicators" class="org.hisp.dhis.commons.action.GetIndicatorsAction">
+			<result name="success" type="velocity">
+				/dhis-web-commons/ajax/responseIndicator.vm</result>
+			<param name="onExceptionReturn">plainTextError</param>
+		</action>
+
+		<action name="getOrganisationUnitChildren"
+			class="org.hisp.dhis.commons.action.GetOrganisationUnitChildrenAction">
+			<result name="success" type="velocity">
+				/dhis-web-commons/ajax/responseOrganisationUnit.vm</result>
+			<param name="onExceptionReturn">plainTextError</param>
+		</action>
+
+		<action name="getOrganisationUnits"
+			class="org.hisp.dhis.commons.action.GetOrganisationUnitsAction">
+			<result name="success" type="velocity">
+				/dhis-web-commons/ajax/responseOrganisationUnit.vm</result>
+			<param name="onExceptionReturn">plainTextError</param>
+		</action>
+
+		<action name="getPeriods" class="org.hisp.dhis.commons.action.GetPeriodsAction">
+			<result name="success" type="velocity">
+				/dhis-web-commons/ajax/responsePeriod.vm</result>
+			<param name="onExceptionReturn">plainTextError</param>
+		</action>
+
+	</package>
+
+	<!-- About -->
+
+	<package name="dhis-web-commons-about" extends="dhis-web-commons"
+		namespace="/dhis-web-commons-about">
+
+		<action name="about" class="org.hisp.dhis.about.action.AboutAction">
+			<result name="success" type="velocity">/main.vm</result>
+			<param name="page">/dhis-web-commons/about/about.vm</param>
+			<param name="menu">/dhis-web-commons/about/menu.vm</param>
+		</action>
+
+		<action name="displayFeedbackForm" class="org.hisp.dhis.commons.action.NoAction">
+			<result name="success" type="velocity">/main.vm</result>
+			<param name="page">/dhis-web-commons/about/feedbackForm.vm</param>
+			<param name="menu">/dhis-web-commons/about/menu.vm</param>
+		</action>
+
+		<action name="sendFeedback" class="org.hisp.dhis.about.action.SendFeedbackAction">
+			<result name="success" type="redirect">about.action</result>
+		</action>
+
+		<action name="help" class="org.hisp.dhis.about.action.HelpAction">
+			<result name="success" type="velocity">/main.vm</result>
+			<param name="page">/dhis-web-commons/help/help.vm</param>
+			<param name="menu">/dhis-web-commons/about/menu.vm</param>
+		</action>
+
+		<action name="displayChangeLog" class="org.hisp.dhis.commons.action.NoAction">
+			<result name="success" type="velocity">/main.vm</result>
+			<param name="page">/dhis-web-commons/about/changeLog.vm</param>
+			<param name="menu">/dhis-web-commons/about/menu.vm</param>
+		</action>
+
+		<action name="showUpdateUserAccountForm"
+			class="org.hisp.dhis.useraccount.action.GetCurrentUserAction">
+			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-commons/useraccount/updateUserAccountForm.vm</param>
 			<param name="javascripts">/dhis-web-commons/useraccount/javascript/userAccount.js</param>
 		</action>
@@ -325,11 +359,12 @@
 		<action name="updateUserAccount"
 			class="org.hisp.dhis.useraccount.action.UpdateUserAccountAction">
 			<result name="success" type="redirect">
-				showUpdateUserAccountForm.action</result>
+				showUpdateUserAccountForm.action
+			</result>
 			<result name="error" type="velocity-xml">
 				/dhis-web-commons/useraccount/responseError.vm</result>
 		</action>
-		
-   </package> 
-  
+
+	</package>
+
 </struts>