=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/resources/struts.xml	2012-11-04 14:58:28 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/resources/struts.xml	2013-03-13 13:59:41 +0000
@@ -1,359 +1,351 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE struts PUBLIC
-"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-"http://struts.apache.org/dtds/struts-2.0.dtd">
+  "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+  "http://struts.apache.org/dtds/struts-2.0.dtd">
 <struts>
 
-	<include file="dhis-web-commons.xml" />
-
-	<package name="dhis-web-mapping" extends="dhis-web-commons"
-		namespace="/dhis-web-mapping">
-
-		<!-- Default -->
-
-		<action name="index" class="org.hisp.dhis.mapping.action.NoAction">
-			<result name="success" type="redirect">app/index.html
-			</result>
-		</action>
-
-        <!-- Initialize -->
-
-        <action name="initialize"
-            class="org.hisp.dhis.mapping.action.InitializeAction">
-            <result name="success" type="velocity-json">
-                /dhis-web-mapping/jsonInitialize.vm</result>
-        </action>
-
-        <!-- UserSetting -->
-
-        <action name="getMapUserSettings"
-            class="org.hisp.dhis.mapping.action.GetMapUserSettingsAction">
-            <result name="success" type="velocity-json">
-                /dhis-web-mapping/jsonUserSettings.vm</result>
-        </action>
-
-        <action name="setMapUserSettings"
-            class="org.hisp.dhis.mapping.action.SetMapUserSettingsAction">
-            <result name="success" type="velocity-json">
-                /dhis-web-mapping/void.vm</result>
-        </action>
-        
-        <!-- SystemSetting -->
-
-        <action name="deleteMapSystemSettings"
-            class="org.hisp.dhis.mapping.action.DeleteMapSystemSettingsAction">
-            <result name="success" type="velocity-json">
-                /dhis-web-mapping/void.vm</result>
-        </action>
-        
-		<!-- OrganisationUnit -->
-
-		<action name="getAllOrganisationUnitLevels"
-			class="org.hisp.dhis.mapping.action.GetAllOrganisationUnitLevelsAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-mapping/jsonOrganisationUnitLevels.vm</result>
-		</action>
-
-        <action name="getOrganisationUnitLevelsByFeatureType"
-            class="org.hisp.dhis.mapping.action.GetOrganisationUnitLevelsByFeatureTypeAction">
-            <result name="success" type="velocity-json">
-                /dhis-web-mapping/jsonOrganisationUnitLevels.vm</result>
-        </action>
-
-		<action name="getOrganisationUnitsAtLevel"
-			class="org.hisp.dhis.mapping.action.GetOrganisationUnitsAtLevelAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-mapping/jsonminOrganisationUnits.vm</result>
-		</action>
-
-		<action name="getOrganisationUnitChildren"
-			class="org.hisp.dhis.mapping.action.GetOrganisationUnitChildrenAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-mapping/jsonOrganisationUnitChildren.vm</result>
-		</action>
-
-        <action name="updateOrganisationUnitCoordinates"
-            class="org.hisp.dhis.mapping.action.UpdateOrganisationUnitCoordinatesAction">
-            <result name="success" type="velocity-json">/dhis-web-mapping/void.vm
-            </result>
-        </action>
-
-		<action name="getFacilityInfo"
-			class="org.hisp.dhis.mapping.action.GetOrganisationUnitInfoFacilityAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-mapping/jsonminFacilityInfo.vm</result>
-		</action>
-
-        <action name="getOrganisationUnitGroupsByGroupSet"
-            class="org.hisp.dhis.mapping.action.GetOrganisationUnitGroupsByGroupSetAction">
-            <result name="success" type="velocity-json">/dhis-web-mapping/jsonminOrganisationUnitGroups.vm
-            </result>
-        </action>
-
-        <!-- OrganisationUnitLevel -->
-
-        <action name="getOrganisationUnitLevels"
-            class="org.hisp.dhis.mapping.action.GetOrganisationUnitLevelsAction">
-            <result name="success" type="velocity-json">
-                /dhis-web-mapping/jsonOrganisationUnitLevels.vm</result>
-        </action>
-
-		<!-- Map values -->
-        
-        <action name="getIndicatorMapValues"
-            class="org.hisp.dhis.mapping.action.GetIndicatorMapValuesAction">
-            <result name="success" type="velocity-json">
-                /dhis-web-mapping/jsonminAggregatedMapValues.vm</result>
-        </action>
-        
-        <action name="getDataElementMapValues"
-            class="org.hisp.dhis.mapping.action.GetDataElementMapValuesAction">
-            <result name="success" type="velocity-json">
-                /dhis-web-mapping/jsonminAggregatedMapValues.vm</result>
-        </action>
-        
-        <action name="getInfrastructuralDataElementMapValues"
-            class="org.hisp.dhis.mapping.action.GetInfrastructuralDataElementMapValuesAction">
-            <result name="success" type="velocity-json">
-                /dhis-web-mapping/jsonInfrastructuralAggregatedMapValues.vm</result>
-        </action>
-
-		<!-- MapLegend -->
-
-		<action name="addOrUpdateMapLegend"
-			class="org.hisp.dhis.mapping.action.AddOrUpdateMapLegendAction">
-			<result name="success" type="velocity-json">/dhis-web-mapping/void.vm
-			</result>
-            <param name="requiredAuthorities">F_GIS_ADMIN</param>
-		</action>
-
-		<action name="deleteMapLegend"
-			class="org.hisp.dhis.mapping.action.DeleteMapLegendAction">
-			<result name="success" type="velocity-json">/dhis-web-mapping/void.vm
-			</result>
-            <param name="requiredAuthorities">F_GIS_ADMIN</param>
-		</action>
-
-		<action name="getAllMapLegends"
-			class="org.hisp.dhis.mapping.action.GetAllMapLegendsAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-mapping/jsonMapLegends.vm</result>
-		</action>
-
-		<action name="getMapLegendsByMapLegendSet"
-			class="org.hisp.dhis.mapping.action.GetMapLegendsByMapLegendSetAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-mapping/jsonMapLegends.vm</result>
-		</action>
-
-		<!-- MapLegendSet -->
-
-		<action name="addOrUpdateMapLegendSet"
-			class="org.hisp.dhis.mapping.action.AddOrUpdateMapLegendSetAction">
-			<result name="success" type="velocity-json">/dhis-web-mapping/void.vm
-			</result>
-            <param name="requiredAuthorities">F_GIS_ADMIN</param>
-		</action>
-
-		<action name="deleteMapLegendSet"
-			class="org.hisp.dhis.mapping.action.DeleteMapLegendSetAction">
-			<result name="success" type="velocity-json">/dhis-web-mapping/void.vm
-			</result>
-            <param name="requiredAuthorities">F_GIS_ADMIN</param>
-		</action>
-
-		<action name="getAllMapLegendSets"
-			class="org.hisp.dhis.mapping.action.GetAllMapLegendSetsAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-mapping/jsonminMapLegendSets.vm</result>
-		</action>
-
-		<action name="getMapLegendSet"
-			class="org.hisp.dhis.mapping.action.GetMapLegendSetAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-mapping/jsonMapLegendSet.vm</result>
-		</action>
-
-		<action name="assignIndicatorsToMapLegendSet"
-			class="org.hisp.dhis.mapping.action.AssignIndicatorsToMapLegendSetAction">
-			<result name="success" type="velocity-json">/dhis-web-mapping/void.vm
-			</result>
-		</action>
-
-        <action name="assignDataElementsToMapLegendSet"
-            class="org.hisp.dhis.mapping.action.AssignDataElementsToMapLegendSetAction">
-            <result name="success" type="velocity-json">/dhis-web-mapping/void.vm
-            </result>
-        </action>
-
-        <!-- Map -->
-
-        <action name="renameMap" class="org.hisp.dhis.mapping.action.RenameMapAction">
-            <result name="success" type="velocity-json">/dhis-web-mapping/void.vm</result>
-        </action>
-
-		<!-- MapView -->
-
-		<action name="deleteMapView" class="org.hisp.dhis.mapping.action.DeleteMapViewAction">
-			<result name="success" type="velocity-json">/dhis-web-mapping/void.vm</result>
-		</action>
-
-		<action name="getMapView" class="org.hisp.dhis.mapping.action.GetMapViewAction">
-			<result name="success" type="velocity-json">/dhis-web-mapping/jsonMapView.vm
-			</result>
-		</action>
-
-		<action name="getAllMapViews"
-			class="org.hisp.dhis.mapping.action.GetAllMapViewsAction">
-			<result name="success" type="velocity-json">/dhis-web-mapping/jsonMapViews.vm
-			</result>
-		</action>
-
-		<action name="getAllMapViewsMin"
-			class="org.hisp.dhis.mapping.action.GetAllMapViewsAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-mapping/jsonminMapViews.vm</result>
-		</action>
-
-		<action name="addMapViewToDashboard"
-			class="org.hisp.dhis.mapping.action.AddMapViewToDashboardAction">
-			<result name="success" type="velocity-json">/dhis-web-mapping/void.vm
-			</result>
-		</action>
-
-		<!-- MapLayer -->
-
-		<action name="addOrUpdateMapLayer"
-			class="org.hisp.dhis.mapping.action.AddOrUpdateMapLayerAction">
-			<result name="success" type="velocity-json">/dhis-web-mapping/void.vm
-			</result>
-            <param name="requiredAuthorities">F_GIS_ADMIN</param>
-		</action>
-
-		<action name="deleteMapLayer"
-			class="org.hisp.dhis.mapping.action.DeleteMapLayerAction">
-			<result name="success" type="velocity-json">/dhis-web-mapping/void.vm
-			</result>
-            <param name="requiredAuthorities">F_GIS_ADMIN</param>
-		</action>
-
-		<action name="getAllMapLayers"
-			class="org.hisp.dhis.mapping.action.GetAllMapLayersAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-mapping/jsonMapLayers.vm</result>
-		</action>
-
-        <action name="getMapLayersByType"
-            class="org.hisp.dhis.mapping.action.GetMapLayersByTypeAction">
-            <result name="success" type="velocity-json">
-                /dhis-web-mapping/jsonMapLayers.vm</result>
-        </action>
-
-		<!-- Indicator -->
-
-		<action name="getAllIndicatorGroups"
-			class="org.hisp.dhis.mapping.action.GetAllIndicatorGroupsAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-mapping/jsonIndicatorGroups.vm</result>
-		</action>
-
-		<action name="getIndicatorsByIndicatorGroup"
-			class="org.hisp.dhis.mapping.action.GetIndicatorsByIndicatorGroupAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-mapping/jsonminIndicators.vm</result>
-            <result name="none" type="velocity-json">
-                /dhis-web-mapping/void.vm</result>
-		</action>
-
-		<action name="getAllIndicators"
-			class="org.hisp.dhis.mapping.action.GetAllIndicatorsAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-mapping/jsonminIndicators.vm</result>
-		</action>
-
-        <!-- DataElement -->
-
-        <action name="getAllDataElementGroupSets"
-            class="org.hisp.dhis.mapping.action.GetAllDataElementGroupSetsAction">
-            <result name="success" type="velocity-json">
-                /dhis-web-mapping/jsonDataElementGroupSets.vm</result>
-        </action>
-
-        <action name="getAllDataElementGroups"
-            class="org.hisp.dhis.mapping.action.GetAllDataElementGroupsAction">
-            <result name="success" type="velocity-json">
-                /dhis-web-mapping/jsonDataElementGroups.vm</result>
-        </action>
-
-        <action name="getDataElementsByDataElementGroup"
-            class="org.hisp.dhis.mapping.action.GetDataElementsByDataElementGroupAction">
-            <result name="success" type="velocity-json">
-                /dhis-web-mapping/jsonminDataElements.vm</result>
-        </action>
-
-        <action name="getAllDataElements"
-            class="org.hisp.dhis.mapping.action.GetAllDataElementsAction">
-            <result name="success" type="velocity-json">
-                /dhis-web-mapping/jsonminDataElements.vm</result>
-        </action>
-
-		<!-- Period -->
-
-		<action name="getAllPeriodTypes"
-			class="org.hisp.dhis.mapping.action.GetAllPeriodTypesAction">
-			<result name="success" type="velocity-json">
-				/dhis-web-mapping/jsonPeriodTypes.vm</result>
-		</action>
-
-		<action name="getPeriodsByPeriodType"
-			class="org.hisp.dhis.mapping.action.GetPeriodsByPeriodTypeAction">
-			<result name="success" type="velocity-json">/dhis-web-mapping/jsonPeriods.vm
-			</result>
-		</action>
-
-		<!-- GeoJson -->
-
-        <action name="getGeoJson"
-            class="org.hisp.dhis.mapping.action.GetGeoJsonAction">
-            <result name="success" type="velocity-json">/dhis-web-mapping/geojsonmin.vm</result>
-        </action>
-
-        <action name="getGeoJsonWithValues"
-            class="org.hisp.dhis.mapping.action.GetGeoJsonWithValuesAction">
-            <result name="success" type="velocity-json">/dhis-web-mapping/geojsonminValues.vm</result>
-        </action>
-
-        <action name="getGeoJsonFacilities"
-            class="org.hisp.dhis.mapping.action.GetGeoJsonFacilitiesAction">
-            <result name="success" type="velocity-json">/dhis-web-mapping/geojsonFacilities.vm</result>
-        </action>
-
-		<action name="getGeoJsonFromFile"
-            class="org.hisp.dhis.mapping.action.GetGeoJsonFromFileAction">
-			<result name="success" type="stream">
-				<param name="contentType">application/json</param>
-				<param name="inputName">inputStream</param>
-				<param name="bufferSize">10240</param>
-			</result>
-		</action>
-
-		<action name="getGeoJsonFiles"
-			class="org.hisp.dhis.mapping.action.GetGeoJsonFilesAction">
-			<result name="success" type="velocity">
-				/dhis-web-mapping/jsonGeoJsonFiles.vm</result>
-		</action>
-
-		<!-- Export Map -->
-
-		<action name="exportImage" class="org.hisp.dhis.mapping.action.ExportImageAction">
-			<result name="success" type="outputStreamResult"/>
-		</action>
-		
-		<!-- i18n -->
-		
-		<action name="i18n" class="org.hisp.dhis.mapping.action.NoAction">
-            <result name="success" type="velocity-javascript">/dhis-web-mapping/i18n.vm</result>
-		</action>
-
-	</package>
+  <include file="dhis-web-commons.xml" />
+
+  <package name="dhis-web-mapping" extends="dhis-web-commons"
+    namespace="/dhis-web-mapping">
+
+    <!-- Default -->
+
+    <action name="index" class="org.hisp.dhis.mapping.action.NoAction">
+      <result name="success" type="redirect">app/index.html</result>
+    </action>
+
+    <!-- Initialize -->
+
+    <action name="initialize" class="org.hisp.dhis.mapping.action.InitializeAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/jsonInitialize.vm</result>
+    </action>
+
+    <!-- UserSetting -->
+
+    <action name="getMapUserSettings" class="org.hisp.dhis.mapping.action.GetMapUserSettingsAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/jsonUserSettings.vm</result>
+    </action>
+
+    <action name="setMapUserSettings" class="org.hisp.dhis.mapping.action.SetMapUserSettingsAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/void.vm</result>
+    </action>
+
+    <!-- SystemSetting -->
+
+    <action name="deleteMapSystemSettings" class="org.hisp.dhis.mapping.action.DeleteMapSystemSettingsAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/void.vm</result>
+    </action>
+
+    <!-- OrganisationUnit -->
+
+    <action name="getAllOrganisationUnitLevels" class="org.hisp.dhis.mapping.action.GetAllOrganisationUnitLevelsAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/jsonOrganisationUnitLevels.vm</result>
+    </action>
+
+    <action name="getOrganisationUnitLevelsByFeatureType" class="org.hisp.dhis.mapping.action.GetOrganisationUnitLevelsByFeatureTypeAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/jsonOrganisationUnitLevels.vm</result>
+    </action>
+
+    <action name="getOrganisationUnitsAtLevel" class="org.hisp.dhis.mapping.action.GetOrganisationUnitsAtLevelAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/jsonminOrganisationUnits.vm</result>
+    </action>
+
+    <action name="getOrganisationUnitChildren" class="org.hisp.dhis.mapping.action.GetOrganisationUnitChildrenAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/jsonOrganisationUnitChildren.vm</result>
+    </action>
+
+    <action name="updateOrganisationUnitCoordinates" class="org.hisp.dhis.mapping.action.UpdateOrganisationUnitCoordinatesAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/void.vm</result>
+    </action>
+
+    <action name="getFacilityInfo" class="org.hisp.dhis.mapping.action.GetOrganisationUnitInfoFacilityAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/jsonminFacilityInfo.vm</result>
+    </action>
+
+    <action name="getOrganisationUnitGroupsByGroupSet" class="org.hisp.dhis.mapping.action.GetOrganisationUnitGroupsByGroupSetAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/jsonminOrganisationUnitGroups.vm</result>
+    </action>
+
+    <!-- OrganisationUnitLevel -->
+
+    <action name="getOrganisationUnitLevels" class="org.hisp.dhis.mapping.action.GetOrganisationUnitLevelsAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/jsonOrganisationUnitLevels.vm</result>
+    </action>
+
+    <!-- Map values -->
+
+    <action name="getIndicatorMapValues" class="org.hisp.dhis.mapping.action.GetIndicatorMapValuesAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/jsonminAggregatedMapValues.vm</result>
+    </action>
+
+    <action name="getDataElementMapValues"
+      class="org.hisp.dhis.mapping.action.GetDataElementMapValuesAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-mapping/jsonminAggregatedMapValues.vm
+      </result>
+    </action>
+
+    <action name="getInfrastructuralDataElementMapValues"
+      class="org.hisp.dhis.mapping.action.GetInfrastructuralDataElementMapValuesAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-mapping/jsonInfrastructuralAggregatedMapValues.vm
+      </result>
+    </action>
+
+    <!-- MapLegend -->
+
+    <action name="addOrUpdateMapLegend"
+      class="org.hisp.dhis.mapping.action.AddOrUpdateMapLegendAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/void.vm
+      </result>
+      <param name="requiredAuthorities">F_GIS_ADMIN</param>
+    </action>
+
+    <action name="deleteMapLegend"
+      class="org.hisp.dhis.mapping.action.DeleteMapLegendAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/void.vm
+      </result>
+      <param name="requiredAuthorities">F_GIS_ADMIN</param>
+    </action>
+
+    <action name="getAllMapLegends"
+      class="org.hisp.dhis.mapping.action.GetAllMapLegendsAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-mapping/jsonMapLegends.vm
+      </result>
+    </action>
+
+    <action name="getMapLegendsByMapLegendSet"
+      class="org.hisp.dhis.mapping.action.GetMapLegendsByMapLegendSetAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-mapping/jsonMapLegends.vm
+      </result>
+    </action>
+
+    <!-- MapLegendSet -->
+
+    <action name="addOrUpdateMapLegendSet"
+      class="org.hisp.dhis.mapping.action.AddOrUpdateMapLegendSetAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/void.vm
+      </result>
+      <param name="requiredAuthorities">F_GIS_ADMIN</param>
+    </action>
+
+    <action name="deleteMapLegendSet"
+      class="org.hisp.dhis.mapping.action.DeleteMapLegendSetAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/void.vm
+      </result>
+      <param name="requiredAuthorities">F_GIS_ADMIN</param>
+    </action>
+
+    <action name="getAllMapLegendSets"
+      class="org.hisp.dhis.mapping.action.GetAllMapLegendSetsAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-mapping/jsonminMapLegendSets.vm
+      </result>
+    </action>
+
+    <action name="getMapLegendSet"
+      class="org.hisp.dhis.mapping.action.GetMapLegendSetAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-mapping/jsonMapLegendSet.vm
+      </result>
+    </action>
+
+    <action name="assignIndicatorsToMapLegendSet"
+      class="org.hisp.dhis.mapping.action.AssignIndicatorsToMapLegendSetAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/void.vm
+      </result>
+    </action>
+
+    <action name="assignDataElementsToMapLegendSet"
+      class="org.hisp.dhis.mapping.action.AssignDataElementsToMapLegendSetAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/void.vm
+      </result>
+    </action>
+
+    <!-- Map -->
+
+    <action name="renameMap" class="org.hisp.dhis.mapping.action.RenameMapAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/void.vm</result>
+    </action>
+
+    <!-- MapView -->
+
+    <action name="deleteMapView" class="org.hisp.dhis.mapping.action.DeleteMapViewAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/void.vm</result>
+    </action>
+
+    <action name="getMapView" class="org.hisp.dhis.mapping.action.GetMapViewAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/jsonMapView.vm
+      </result>
+    </action>
+
+    <action name="getAllMapViews"
+      class="org.hisp.dhis.mapping.action.GetAllMapViewsAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/jsonMapViews.vm
+      </result>
+    </action>
+
+    <action name="getAllMapViewsMin"
+      class="org.hisp.dhis.mapping.action.GetAllMapViewsAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-mapping/jsonminMapViews.vm
+      </result>
+    </action>
+
+    <action name="addMapViewToDashboard"
+      class="org.hisp.dhis.mapping.action.AddMapViewToDashboardAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/void.vm
+      </result>
+    </action>
+
+    <!-- MapLayer -->
+
+    <action name="addOrUpdateMapLayer"
+      class="org.hisp.dhis.mapping.action.AddOrUpdateMapLayerAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/void.vm
+      </result>
+      <param name="requiredAuthorities">F_GIS_ADMIN</param>
+    </action>
+
+    <action name="deleteMapLayer"
+      class="org.hisp.dhis.mapping.action.DeleteMapLayerAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/void.vm
+      </result>
+      <param name="requiredAuthorities">F_GIS_ADMIN</param>
+    </action>
+
+    <action name="getAllMapLayers"
+      class="org.hisp.dhis.mapping.action.GetAllMapLayersAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-mapping/jsonMapLayers.vm
+      </result>
+    </action>
+
+    <action name="getMapLayersByType"
+      class="org.hisp.dhis.mapping.action.GetMapLayersByTypeAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-mapping/jsonMapLayers.vm
+      </result>
+    </action>
+
+    <!-- Indicator -->
+
+    <action name="getAllIndicatorGroups"
+      class="org.hisp.dhis.mapping.action.GetAllIndicatorGroupsAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-mapping/jsonIndicatorGroups.vm
+      </result>
+    </action>
+
+    <action name="getIndicatorsByIndicatorGroup"
+      class="org.hisp.dhis.mapping.action.GetIndicatorsByIndicatorGroupAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-mapping/jsonminIndicators.vm
+      </result>
+      <result name="none" type="velocity-json">
+        /dhis-web-mapping/void.vm
+      </result>
+    </action>
+
+    <action name="getAllIndicators"
+      class="org.hisp.dhis.mapping.action.GetAllIndicatorsAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-mapping/jsonminIndicators.vm
+      </result>
+    </action>
+
+    <!-- DataElement -->
+
+    <action name="getAllDataElementGroupSets"
+      class="org.hisp.dhis.mapping.action.GetAllDataElementGroupSetsAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-mapping/jsonDataElementGroupSets.vm
+      </result>
+    </action>
+
+    <action name="getAllDataElementGroups"
+      class="org.hisp.dhis.mapping.action.GetAllDataElementGroupsAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-mapping/jsonDataElementGroups.vm
+      </result>
+    </action>
+
+    <action name="getDataElementsByDataElementGroup"
+      class="org.hisp.dhis.mapping.action.GetDataElementsByDataElementGroupAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-mapping/jsonminDataElements.vm
+      </result>
+    </action>
+
+    <action name="getAllDataElements"
+      class="org.hisp.dhis.mapping.action.GetAllDataElementsAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-mapping/jsonminDataElements.vm
+      </result>
+    </action>
+
+    <!-- Period -->
+
+    <action name="getAllPeriodTypes"
+      class="org.hisp.dhis.mapping.action.GetAllPeriodTypesAction">
+      <result name="success" type="velocity-json">
+        /dhis-web-mapping/jsonPeriodTypes.vm
+      </result>
+    </action>
+
+    <action name="getPeriodsByPeriodType"
+      class="org.hisp.dhis.mapping.action.GetPeriodsByPeriodTypeAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/jsonPeriods.vm
+      </result>
+    </action>
+
+    <!-- GeoJson -->
+
+    <action name="getGeoJson"
+      class="org.hisp.dhis.mapping.action.GetGeoJsonAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/geojsonmin.vm</result>
+    </action>
+
+    <action name="getGeoJsonWithValues"
+      class="org.hisp.dhis.mapping.action.GetGeoJsonWithValuesAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/geojsonminValues.vm</result>
+    </action>
+
+    <action name="getGeoJsonFacilities"
+      class="org.hisp.dhis.mapping.action.GetGeoJsonFacilitiesAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/geojsonFacilities.vm</result>
+    </action>
+
+    <action name="getGeoJsonFromFile"
+      class="org.hisp.dhis.mapping.action.GetGeoJsonFromFileAction">
+      <result name="success" type="stream">
+        <param name="contentType">application/json</param>
+        <param name="inputName">inputStream</param>
+        <param name="bufferSize">10240</param>
+      </result>
+    </action>
+
+    <action name="getGeoJsonFiles"
+      class="org.hisp.dhis.mapping.action.GetGeoJsonFilesAction">
+      <result name="success" type="velocity">
+        /dhis-web-mapping/jsonGeoJsonFiles.vm
+      </result>
+    </action>
+
+    <!-- Export Map -->
+
+    <action name="exportImage" class="org.hisp.dhis.mapping.action.ExportImageAction">
+      <result name="success" type="outputStreamResult" />
+    </action>
+
+    <!-- i18n -->
+
+    <action name="i18n" class="org.hisp.dhis.mapping.action.NoAction">
+      <result name="success" type="velocity-javascript">/dhis-web-mapping/i18n.vm</result>
+    </action>
+
+  </package>
 </struts>