=== modified file 'dhis-2/dhis-api/pom.xml' --- dhis-2/dhis-api/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-api/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis - 2.4 + 2.5-SNAPSHOT dhis-api === modified file 'dhis-2/dhis-services/dhis-service-administration/pom.xml' --- dhis-2/dhis-services/dhis-service-administration/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-services/dhis-service-administration/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-services - 2.4 + 2.5-SNAPSHOT dhis-service-administration === modified file 'dhis-2/dhis-services/dhis-service-aggregationengine-default/pom.xml' --- dhis-2/dhis-services/dhis-service-aggregationengine-default/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-services/dhis-service-aggregationengine-default/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-services - 2.4 + 2.5-SNAPSHOT dhis-service-aggregationengine-default === modified file 'dhis-2/dhis-services/dhis-service-core/pom.xml' --- dhis-2/dhis-services/dhis-service-core/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-services/dhis-service-core/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-services - 2.4 + 2.5-SNAPSHOT dhis-service-core === modified file 'dhis-2/dhis-services/dhis-service-datamart-default/pom.xml' --- dhis-2/dhis-services/dhis-service-datamart-default/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-services/dhis-service-datamart-default/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-services - 2.4 + 2.5-SNAPSHOT dhis-service-datamart-default === modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.java' --- dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.java 2011-08-13 10:41:20 +0000 +++ dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.java 2011-08-28 17:52:59 +0000 @@ -260,7 +260,7 @@ ConcurrentUtils.waitForCompletion( futures ); - clock.logTime( "Exported values for data element operands (" + allOperands.size() + ")" ); + clock.logTime( "Exported values for data element operands (" + allOperands.size() + "), number of pages: " + periodPages.size() ); } // --------------------------------------------------------------------- @@ -288,7 +288,7 @@ ConcurrentUtils.waitForCompletion( futures ); - clock.logTime( "Exported values for indicators (" + indicators.size() + ")" ); + clock.logTime( "Exported values for indicators (" + indicators.size() + "), number of pages: " + periodPages.size() ); } // --------------------------------------------------------------------- === modified file 'dhis-2/dhis-services/dhis-service-i18n/pom.xml' --- dhis-2/dhis-services/dhis-service-i18n/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-services/dhis-service-i18n/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-services - 2.4 + 2.5-SNAPSHOT dhis-service-i18n === modified file 'dhis-2/dhis-services/dhis-service-importexport/pom.xml' --- dhis-2/dhis-services/dhis-service-importexport/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-services - 2.4 + 2.5-SNAPSHOT dhis-service-importexport === modified file 'dhis-2/dhis-services/dhis-service-mapping/pom.xml' --- dhis-2/dhis-services/dhis-service-mapping/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-services/dhis-service-mapping/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-services - 2.4 + 2.5-SNAPSHOT dhis-service-mapping === modified file 'dhis-2/dhis-services/dhis-service-options/pom.xml' --- dhis-2/dhis-services/dhis-service-options/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-services/dhis-service-options/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-services - 2.4 + 2.5-SNAPSHOT dhis-service-options === modified file 'dhis-2/dhis-services/dhis-service-patient/pom.xml' --- dhis-2/dhis-services/dhis-service-patient/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-services/dhis-service-patient/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-services - 2.4 + 2.5-SNAPSHOT dhis-service-patient === modified file 'dhis-2/dhis-services/dhis-service-reporting/pom.xml' --- dhis-2/dhis-services/dhis-service-reporting/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-services/dhis-service-reporting/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-services - 2.4 + 2.5-SNAPSHOT dhis-service-reporting === modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java' --- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java 2011-07-21 11:52:46 +0000 +++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java 2011-08-28 17:52:59 +0000 @@ -338,8 +338,7 @@ // Interpolation DataSet // --------------------------------------------------------------------- - if ( x.size() >= 3 ) // minimum 3 data points required for - // interpolation + if ( x.size() >= 3 ) // minimum 3 points required for interpolation { periodCount = 0; === modified file 'dhis-2/dhis-services/pom.xml' --- dhis-2/dhis-services/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-services/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis - 2.4 + 2.5-SNAPSHOT dhis-services === modified file 'dhis-2/dhis-support/dhis-support-external/pom.xml' --- dhis-2/dhis-support/dhis-support-external/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-support/dhis-support-external/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-support - 2.4 + 2.5-SNAPSHOT dhis-support-external === modified file 'dhis-2/dhis-support/dhis-support-hibernate/pom.xml' --- dhis-2/dhis-support/dhis-support-hibernate/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-support/dhis-support-hibernate/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-support - 2.4 + 2.5-SNAPSHOT dhis-support-hibernate === modified file 'dhis-2/dhis-support/dhis-support-jdbc-test/pom.xml' --- dhis-2/dhis-support/dhis-support-jdbc-test/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-support/dhis-support-jdbc-test/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-support - 2.4 + 2.5-SNAPSHOT dhis-support-jdbc-test === modified file 'dhis-2/dhis-support/dhis-support-jdbc/pom.xml' --- dhis-2/dhis-support/dhis-support-jdbc/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-support/dhis-support-jdbc/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-support - 2.4 + 2.5-SNAPSHOT dhis-support-jdbc === modified file 'dhis-2/dhis-support/dhis-support-system/pom.xml' --- dhis-2/dhis-support/dhis-support-system/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-support/dhis-support-system/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-support - 2.4 + 2.5-SNAPSHOT dhis-support-system === modified file 'dhis-2/dhis-support/dhis-support-test/pom.xml' --- dhis-2/dhis-support/dhis-support-test/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-support/dhis-support-test/pom.xml 2011-08-28 17:52:59 +0000 @@ -5,7 +5,7 @@ org.hisp.dhis dhis-support - 2.4 + 2.5-SNAPSHOT dhis-support-test === modified file 'dhis-2/dhis-support/dhis-support-xml/pom.xml' --- dhis-2/dhis-support/dhis-support-xml/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-support/dhis-support-xml/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-support - 2.4 + 2.5-SNAPSHOT dhis-support-xml === modified file 'dhis-2/dhis-support/pom.xml' --- dhis-2/dhis-support/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-support/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis - 2.4 + 2.5-SNAPSHOT dhis-support === modified file 'dhis-2/dhis-web/dhis-web-api/pom.xml' --- dhis-2/dhis-web/dhis-web-api/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-web/dhis-web-api/pom.xml 2011-08-28 17:52:59 +0000 @@ -5,7 +5,7 @@ org.hisp.dhis dhis-web - 2.4 + 2.5-SNAPSHOT dhis-web-api === modified file 'dhis-2/dhis-web/dhis-web-caseentry/pom.xml' --- dhis-2/dhis-web/dhis-web-caseentry/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-web - 2.4 + 2.5-SNAPSHOT dhis-web-caseentry === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/pom.xml' --- dhis-2/dhis-web/dhis-web-commons-resources/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-web - 2.4 + 2.5-SNAPSHOT dhis-web-commons-resources === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm 2011-08-22 08:08:11 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm 2011-08-28 17:52:59 +0000 @@ -1,5 +1,5 @@ CACHE MANIFEST -# 2.4-SNAPSHOT Version 14 +# 2.4-SNAPSHOT Version 15 NETWORK: * CACHE: === modified file 'dhis-2/dhis-web/dhis-web-commons/pom.xml' --- dhis-2/dhis-web/dhis-web-commons/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-web/dhis-web-commons/pom.xml 2011-08-28 17:52:59 +0000 @@ -5,7 +5,7 @@ org.hisp.dhis dhis-web - 2.4 + 2.5-SNAPSHOT dhis-web-commons === modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/pom.xml' --- dhis-2/dhis-web/dhis-web-dashboard-integration/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-web - 2.4 + 2.5-SNAPSHOT dhis-web-dashboard-integration === modified file 'dhis-2/dhis-web/dhis-web-dataentry/pom.xml' --- dhis-2/dhis-web/dhis-web-dataentry/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-web - 2.4 + 2.5-SNAPSHOT dhis-web-dataentry === modified file 'dhis-2/dhis-web/dhis-web-datamart/pom.xml' --- dhis-2/dhis-web/dhis-web-datamart/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-web/dhis-web-datamart/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-web - 2.4 + 2.5-SNAPSHOT dhis-web-datamart === modified file 'dhis-2/dhis-web/dhis-web-importexport/pom.xml' --- dhis-2/dhis-web/dhis-web-importexport/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-web - 2.4 + 2.5-SNAPSHOT dhis-web-importexport === modified file 'dhis-2/dhis-web/dhis-web-light/pom.xml' --- dhis-2/dhis-web/dhis-web-light/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-web/dhis-web-light/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-web - 2.4 + 2.5-SNAPSHOT dhis-web-light === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/pom.xml' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-web-maintenance - 2.4 + 2.5-SNAPSHOT dhis-web-maintenance-dataadmin === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/pom.xml' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-web-maintenance - 2.4 + 2.5-SNAPSHOT dhis-web-maintenance-datadictionary === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/pom.xml' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ dhis-web-maintenance org.hisp.dhis - 2.4 + 2.5-SNAPSHOT dhis-web-maintenance-dataset === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/pom.xml' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-web-maintenance - 2.4 + 2.5-SNAPSHOT dhis-web-maintenance-organisationunit === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/pom.xml' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ dhis-web-maintenance org.hisp.dhis - 2.4 + 2.5-SNAPSHOT dhis-web-maintenance-patient === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/pom.xml' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-web-maintenance - 2.4 + 2.5-SNAPSHOT dhis-web-maintenance-settings === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/pom.xml' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/pom.xml 2011-08-28 17:52:59 +0000 @@ -5,7 +5,7 @@ org.hisp.dhis dhis-web-maintenance - 2.4 + 2.5-SNAPSHOT dhis-web-maintenance-user === modified file 'dhis-2/dhis-web/dhis-web-maintenance/pom.xml' --- dhis-2/dhis-web/dhis-web-maintenance/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-web - 2.4 + 2.5-SNAPSHOT dhis-web-maintenance === modified file 'dhis-2/dhis-web/dhis-web-mapping/pom.xml' --- dhis-2/dhis-web/dhis-web-mapping/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-web - 2.4 + 2.5-SNAPSHOT dhis-web-mapping === modified file 'dhis-2/dhis-web/dhis-web-portal/pom.xml' --- dhis-2/dhis-web/dhis-web-portal/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-web/dhis-web-portal/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-web - 2.4 + 2.5-SNAPSHOT dhis-web-portal === modified file 'dhis-2/dhis-web/dhis-web-reporting/pom.xml' --- dhis-2/dhis-web/dhis-web-reporting/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-web/dhis-web-reporting/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-web - 2.4 + 2.5-SNAPSHOT dhis-web-reporting === modified file 'dhis-2/dhis-web/dhis-web-validationrule/pom.xml' --- dhis-2/dhis-web/dhis-web-validationrule/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-web/dhis-web-validationrule/pom.xml 2011-08-28 17:52:59 +0000 @@ -6,7 +6,7 @@ org.hisp.dhis dhis-web - 2.4 + 2.5-SNAPSHOT dhis-web-validationrule === modified file 'dhis-2/dhis-web/pom.xml' --- dhis-2/dhis-web/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/dhis-web/pom.xml 2011-08-28 17:52:59 +0000 @@ -4,7 +4,7 @@ org.hisp.dhis dhis - 2.4 + 2.5-SNAPSHOT dhis-web pom === modified file 'dhis-2/pom.xml' --- dhis-2/pom.xml 2011-08-27 16:13:10 +0000 +++ dhis-2/pom.xml 2011-08-28 17:52:59 +0000 @@ -3,7 +3,7 @@ 4.0.0 org.hisp.dhis dhis - 2.4 + 2.5-SNAPSHOT pom DHIS 2 http://dhis2.org