dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11885
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-09-03 20:28:10 +0200
message:
  Loading jasper reports properties from config file
added:
  dhis-2/dhis-services/dhis-service-reporting/src/main/resources/jasperreports.properties
modified:
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.java


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

=== 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-09-03 15:04:30 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.java	2013-09-03 18:28:10 +0000
@@ -47,7 +47,6 @@
 import net.sf.jasperreports.engine.JasperFillManager;
 import net.sf.jasperreports.engine.JasperPrint;
 import net.sf.jasperreports.engine.JasperReport;
-import net.sf.jasperreports.engine.util.JRProperties;
 
 import org.apache.velocity.VelocityContext;
 import org.hisp.dhis.common.GenericIdentifiableObjectStore;
@@ -170,9 +169,6 @@
 
         try
         {
-            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() ) );
 
             if ( report.hasReportTable() ) // Use JR data source

=== added file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/jasperreports.properties'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/jasperreports.properties	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/jasperreports.properties	2013-09-03 18:28:10 +0000
@@ -0,0 +1,2 @@
+net.sf.jasperreports.awt.ignore.missing.font=true
+net.sf.jasperreports.default.font.name=DejaVu Sans
\ No newline at end of file