[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16441: PT DV GIS ER EV web modules moved to dhis-web-apps.

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)

···

------------------------------------------------------------
revno: 16441 [merge]
committer: Jan Henrik Overland <janhenrik.overland@gmail.com>
branch nick: dhis2
timestamp: Tue 2014-08-19 11:39:19 +0200
message:
  PT DV GIS ER EV web modules moved to dhis-web-apps.
removed:
  dhis-2/dhis-web/dhis-web-event-reports/
  dhis-2/dhis-web/dhis-web-event-reports/pom.xml
  dhis-2/dhis-web/dhis-web-event-reports/src/
  dhis-2/dhis-web/dhis-web-event-reports/src/main/
  dhis-2/dhis-web/dhis-web-event-reports/src/main/resources/
  dhis-2/dhis-web/dhis-web-event-reports/src/main/resources/org/
  dhis-2/dhis-web/dhis-web-event-reports/src/main/resources/org/hisp/
  dhis-2/dhis-web/dhis-web-event-reports/src/main/resources/org/hisp/dhis/
  dhis-2/dhis-web/dhis-web-event-reports/src/main/resources/org/hisp/dhis/eventreport/
  dhis-2/dhis-web/dhis-web-event-reports/src/main/resources/org/hisp/dhis/eventreport/i18n_module.properties
  dhis-2/dhis-web/dhis-web-event-reports/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/
  dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/WEB-INF/
  dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/WEB-INF/classes/
  dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/WEB-INF/classes/velocity.properties
  dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/i18n.json
  dhis-2/dhis-web/dhis-web-event-visualizer/
  dhis-2/dhis-web/dhis-web-event-visualizer/pom.xml
  dhis-2/dhis-web/dhis-web-event-visualizer/src/
  dhis-2/dhis-web/dhis-web-event-visualizer/src/main/
  dhis-2/dhis-web/dhis-web-event-visualizer/src/main/resources/
  dhis-2/dhis-web/dhis-web-event-visualizer/src/main/resources/org/
  dhis-2/dhis-web/dhis-web-event-visualizer/src/main/resources/org/hisp/
  dhis-2/dhis-web/dhis-web-event-visualizer/src/main/resources/org/hisp/dhis/
  dhis-2/dhis-web/dhis-web-event-visualizer/src/main/resources/org/hisp/dhis/eventvisualizer/
  dhis-2/dhis-web/dhis-web-event-visualizer/src/main/resources/org/hisp/dhis/eventvisualizer/i18n_module.properties
  dhis-2/dhis-web/dhis-web-event-visualizer/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/
  dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/WEB-INF/
  dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/WEB-INF/classes/
  dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/WEB-INF/classes/velocity.properties
  dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/dhis-web-event-visualizer/app/i18n.json
  dhis-2/dhis-web/dhis-web-mapping/
  dhis-2/dhis-web/dhis-web-mapping/pom.xml
  dhis-2/dhis-web/dhis-web-mapping/src/
  dhis-2/dhis-web/dhis-web-mapping/src/main/
  dhis-2/dhis-web/dhis-web-mapping/src/main/java/
  dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/
  dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/
  dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/
  dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/
  dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/
  dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportImageAction.java
  dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetGeoJsonAction.java
  dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetGeoJsonFacilitiesAction.java
  dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetGeoJsonFilesAction.java
  dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetGeoJsonFromFileAction.java
  dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetInfrastructuralDataElementMapValuesAction.java
  dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetOrganisationUnitGroupsByGroupSetAction.java
  dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetPeriodsByPeriodTypeAction.java
  dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/InitializeAction.java
  dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/NoAction.java
  dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/RenameMapAction.java
  dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/UpdateOrganisationUnitCoordinatesAction.java
  dhis-2/dhis-web/dhis-web-mapping/src/main/resources/
  dhis-2/dhis-web/dhis-web-mapping/src/main/resources/META-INF/
  dhis-2/dhis-web/dhis-web-mapping/src/main/resources/META-INF/dhis/
  dhis-2/dhis-web/dhis-web-mapping/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/
  dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/
  dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/
  dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/
  dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties
  dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_ar.properties
  dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_es.properties
  dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_fr.properties
  dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_id.properties
  dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_lo.properties
  dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_my.properties
  dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_pt.properties
  dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_pt_BR.properties
  dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_ru.properties
  dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_tg.properties
  dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_vi.properties
  dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_zh.properties
  dhis-2/dhis-web/dhis-web-mapping/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/WEB-INF/
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/WEB-INF/classes/
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/WEB-INF/classes/velocity.properties
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/dhis-web-pivot/
  dhis-2/dhis-web/dhis-web-pivot/pom.xml
  dhis-2/dhis-web/dhis-web-pivot/src/
  dhis-2/dhis-web/dhis-web-pivot/src/main/
  dhis-2/dhis-web/dhis-web-pivot/src/main/resources/
  dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/
  dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/hisp/
  dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/hisp/dhis/
  dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/hisp/dhis/pivot/
  dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/hisp/dhis/pivot/i18n_module.properties
  dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/hisp/dhis/pivot/i18n_module_ar.properties
  dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/hisp/dhis/pivot/i18n_module_es.properties
  dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/hisp/dhis/pivot/i18n_module_fr.properties
  dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/hisp/dhis/pivot/i18n_module_lo.properties
  dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/hisp/dhis/pivot/i18n_module_pt.properties
  dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/hisp/dhis/pivot/i18n_module_ru.properties
  dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/hisp/dhis/pivot/i18n_module_tg.properties
  dhis-2/dhis-web/dhis-web-pivot/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/WEB-INF/
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/WEB-INF/classes/
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/WEB-INF/classes/velocity.properties
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/dhis-web-visualizer/
  dhis-2/dhis-web/dhis-web-visualizer/pom.xml
  dhis-2/dhis-web/dhis-web-visualizer/src/
  dhis-2/dhis-web/dhis-web-visualizer/src/main/
  dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/
  dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/
  dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/
  dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/
  dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/
  dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties
  dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_ar.properties
  dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_es.properties
  dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_fr.properties
  dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_id.properties
  dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_lo.properties
  dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_my.properties
  dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_pt.properties
  dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_pt_BR.properties
  dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_ru.properties
  dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_tg.properties
  dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_vi.properties
  dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_zh.properties
  dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/WEB-INF/
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/WEB-INF/classes/
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/WEB-INF/classes/velocity.properties
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/WEB-INF/web.xml
added:
  dhis-2/dhis-web/dhis-web-apps/
  dhis-2/dhis-web/dhis-web-apps/pom.xml
  dhis-2/dhis-web/dhis-web-apps/src/
  dhis-2/dhis-web/dhis-web-apps/src/main/
  dhis-2/dhis-web/dhis-web-apps/src/main/resources/
  dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/WEB-INF/
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/WEB-INF/classes/
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/WEB-INF/classes/velocity.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-apps/
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/i18n/
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/i18n/en.json
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/i18n/
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/i18n/en.json
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/es.json
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/fr.json
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/i18n_module.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/i18n_module_ar.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/i18n_module_es.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/i18n_module_fr.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/i18n_module_id.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/i18n_module_lo.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/i18n_module_my.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/i18n_module_pt.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/i18n_module_pt_BR.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/i18n_module_ru.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/i18n_module_tg.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/i18n_module_vi.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/i18n_module_zh.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/pt.json
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/i18n/es.json
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/i18n/fr.json
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/i18n/i18n_module_ar.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/i18n/i18n_module_lo.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/i18n/i18n_module_pt.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/i18n/i18n_module_ru.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/i18n/i18n_module_tg.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/i18n/pt.json
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/es.json
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/fr.json
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/i18n_module.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/i18n_module_ar.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/i18n_module_es.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/i18n_module_fr.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/i18n_module_id.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/i18n_module_lo.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/i18n_module_my.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/i18n_module_pt.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/i18n_module_pt_BR.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/i18n_module_ru.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/i18n_module_tg.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/i18n_module_vi.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/i18n_module_zh.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/pt.json
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/index.html
renamed:
  dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/
  dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/dhis-web-event-visualizer/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/scripts/app.js
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/scripts/app.js
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/scripts/core.js
  dhis-2/dhis-web/dhis-web-portal/india-pom.xml
  dhis-2/dhis-web/dhis-web-portal/pom.xml
  dhis-2/dhis-web/pom.xml
The size of the diff (20146 lines) is larger than your specified limit of 5000 lines

--
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