[Branch ~dhis2-devs-core/dhis2/trunk] Rev 5799: Changed packing for web api module from WAR to JAR. This means we can use the web api during sing...

Merge authors:
  Lars Helge Øverland (larshelge)

revision-diff.txt (55.3 KB)

···

------------------------------------------------------------
revno: 5799 [merge]
committer: Lars Helge Overland <larshelge@gmail.com>
branch nick: dhis2
timestamp: Tue 2012-01-24 16:19:23 +0100
message:
  Changed packing for web api module from WAR to JAR. This means we can use the web api during single module development without introducing another cumbersome WAR dependency. Web api module can still be run during development with jetty-run.
removed:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/action/
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/action/NoAction.java
  dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-web/dhis-web-api/src/main/resources/struts.xml
added:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/ContextUtils.java
modified:
  dhis-2/dhis-web/dhis-web-api/pom.xml
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AggregatedValueController.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ChartController.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DocumentController.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/MapController.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/MessageConversationController.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ReportController.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ReportTableController.java
  dhis-2/dhis-web/dhis-web-api/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/dhis-web-caseentry/pom.xml
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/dhis-web-dashboard-integration/pom.xml
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/dhis-web-dataentry/pom.xml
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/dhis-web-datamart/pom.xml
  dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/dhis-web-importexport/pom.xml
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/dhis-web-light/pom.xml
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/pom.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/pom.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/pom.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/pom.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/pom.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/pom.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/pom.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/pom.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/dhis-web-mapping/pom.xml
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/dhis-web-portal/india-pom.xml
  dhis-2/dhis-web/dhis-web-portal/pom.xml
  dhis-2/dhis-web/dhis-web-portal/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/dhis-web-reporting/pom.xml
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/dhis-web-validationrule/pom.xml
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/dhis-web-visualizer/pom.xml
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/pom.xml

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