=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/help/DefaultHelpManager.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/help/DefaultHelpManager.java 2013-05-02 18:27:32 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/help/DefaultHelpManager.java 2013-05-02 18:35:25 +0000 @@ -55,11 +55,11 @@ // ------------------------------------------------------------------------- public void getHelpContent( OutputStream out, String id, Locale locale ) - { + { try { ClassPathResource classPathResource = resolveHelpFileResource( locale ); - + Source source = new StreamSource( classPathResource.getInputStream(), ENCODING_UTF8 ); Result result = new StreamResult( out ); @@ -81,7 +81,7 @@ try { ClassPathResource classPathResource = resolveHelpFileResource( locale ); - + Source source = new StreamSource( classPathResource.getInputStream(), ENCODING_UTF8 ); Result result = new StreamResult( out ); @@ -115,13 +115,13 @@ if ( locale != null && locale.getDisplayLanguage() != null ) { helpFile = "help_content_" + locale.getLanguage() + "_" + locale.getCountry() + ".xml"; - + log.debug( "Help file: " + helpFile ); } else { helpFile = "help_content.xml"; - + log.debug( "Help file: " + helpFile ); } @@ -130,10 +130,10 @@ if ( !classPathResource.exists() ) { helpFile = "help_content.xml"; - + classPathResource = new ClassPathResource( helpFile ); - - log.warn( "Help file: " + helpFile + " not available on classpath" ); + + log.warn( "Help file: " + helpFile + " not available on classpath" ); } return classPathResource; === modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.java' --- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.java 2013-04-26 13:15:53 +0000 +++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.java 2013-05-02 18:35:25 +0000 @@ -167,7 +167,7 @@ try { - JRProperties.setProperty("net.sf.jasperreports.awt.ignore.missing.font", "true"); + JRProperties.setProperty( "net.sf.jasperreports.awt.ignore.missing.font", "true" ); JRProperties.setProperty( "net.sf.jasperreports.default.font.name", "DejaVu Sans" ); JasperReport jasperReport = JasperCompileManager.compileReport( StreamUtils.getInputStream( report.getDesignContent() ) ); === modified file 'dhis-2/pom.xml' --- dhis-2/pom.xml 2013-05-02 18:27:32 +0000 +++ dhis-2/pom.xml 2013-05-02 18:35:25 +0000 @@ -38,6 +38,7 @@ + DHIS 2 Maven repository scp://