From bbe25492dd9a379d30680d7be6b2736a21d519c8 Mon Sep 17 00:00:00 2001
From: Keith Woodlock <keithwoodlock@gmail.com>
Date: Mon, 25 Jun 2012 11:17:41 +0100
Subject: [PATCH] tidy up dependency management of pentaho reporting libraries.

---
 mifosng-provider/build.gradle                 | 48 ++++++++++---------
 .../ReadExtraDataAndReportingServiceImpl.java |  2 +-
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/mifosng-provider/build.gradle b/mifosng-provider/build.gradle
index 65df0243f..a4e3e1f2e 100644
--- a/mifosng-provider/build.gradle
+++ b/mifosng-provider/build.gradle
@@ -43,11 +43,11 @@ repositories {
     maven {
         url "http://download.java.net/maven/2"
     }
-    flatDir {
-    	dirs '../repos'
+    maven {
+    	url "http://repository.pentaho.org/artifactory/pentaho/"
     }
     flatDir {
-        dirs 'pentaho-jars-lib'
+    	dirs '../repos'
     }
 }
 
@@ -113,26 +113,28 @@ dependencies {
 	            
 	            [group: 'mysql', name: 'mysql-connector-java', version: '5.1.18'],
 	            
-	            [name: 'bsf', version: '2.4.0'],
- 	        	[name: 'bsh', version: '1.3.0'],
- 	        	[name: 'itext', version: '2.1.7'],
- 	        	[name: 'libbase', version: '1.2.2'],
- 	        	[name: 'libdocbundle', version: '1.2.3'],
- 	        	[name: 'libfonts', version: '1.2.3'],
- 	        	[name: 'libformat', version: '1.2.4'],
- 	        	[name: 'libformula', version: '1.2.3'],
- 	        	[name: 'libloader', version: '1.2.3'],
- 	        	[name: 'librepository', version: '1.2.3'],
- 	        	[name: 'libserializer', version: '1.2.2'],
- 	        	[name: 'libsparkline', version: '1.2.1'],
- 	        	[name: 'libxml', version: '1.2.2'],
- 	        	[name: 'pentaho-reporting-engine-classic-core', version: '3.8.3-GA'],
- 	        	[name: 'pentaho-reporting-engine-classic-extensions', version: '3.8.3-GA'],
- 	        	[name: 'pentaho-reporting-engine-wizard-core', version: '3.8.3-GA'],
- 	        	[name: 'pentaho-reporting-engine-wizard-xul', version: '3.8.3-GA'],
- 	        	[name: 'poi', version: '3.6'],
- 	        	[name: 'poi-ooxml', version: '3.6'],
- 	        	[name: 'poi-ooxml-schemas', version: '3.6'],
+	            [group: 'pentaho-reporting-engine', name: 'pentaho-reporting-engine-classic-core', version: '3.8.3-GA'],
+	            [group: 'pentaho-reporting-engine', name: 'pentaho-reporting-engine-classic-extensions', version: '3.8.3-GA'],
+				[group: 'pentaho-reporting-engine', name: 'pentaho-reporting-engine-wizard-core', version: '3.8.3-GA'],
+	            [group: 'pentaho-report-designer', name: 'pentaho-reporting-engine-wizard-xul', version: '3.8.3-GA'],
+	            
+	            [group: 'pentaho-library', name: 'libbase', version: '1.2.2'],
+ 	        	[group: 'pentaho-library',name: 'libdocbundle', version: '1.2.3'],
+ 	        	[group: 'pentaho-library',name: 'libfonts', version: '1.2.3'],
+ 	        	[group: 'pentaho-library',name: 'libformat', version: '1.2.4'],
+ 	        	[group: 'pentaho-library',name: 'libformula', version: '1.2.3'],
+ 	        	[group: 'pentaho-library',name: 'libloader', version: '1.2.3'],
+ 	        	[group: 'pentaho-library',name: 'librepository', version: '1.2.3'],
+ 	        	[group: 'pentaho-library',name: 'libserializer', version: '1.2.2'],
+ 	        	[group: 'pentaho-library',name: 'libsparkline', version: '1.2.1'],
+ 	        	[group: 'pentaho-library',name: 'libxml', version: '1.2.2'],
+ 	        	
+ 	        	[group: 'org.apache.poi',name: 'poi', version: '3.6'],
+ 	        	[group: 'org.apache.poi',name: 'poi-ooxml', version: '3.6'],
+ 	        	[group: 'org.apache.poi',name: 'poi-ooxml-schemas', version: '3.6'],
+	            
+	            [group: 'com.lowagie', name: 'itext', version: '2.1.7'],
+	            [group: 'com.lowagie', name: 'itext-rtf', version: '2.1.7'],
  	        )
  	        
  	 testCompile 'junit:junit:4.10', 
diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/ReadExtraDataAndReportingServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/ReadExtraDataAndReportingServiceImpl.java
index b8ee003cb..341e416c5 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/ReadExtraDataAndReportingServiceImpl.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/ReadExtraDataAndReportingServiceImpl.java
@@ -27,7 +27,7 @@ import org.mifosng.platform.api.data.ResultsetDataRow;
 import org.mifosng.platform.exceptions.AdditionalFieldsNotFoundException;
 import org.mifosng.platform.exceptions.PlatformDataIntegrityException;
 import org.mifosng.platform.exceptions.ReportNotFoundException;
-import org.pentaho.reporting.engine.classic.core.ClassicEngineBoot;
+//import org.pentaho.reporting.engine.classic.core.ClassicEngineBoot;
 import org.pentaho.reporting.engine.classic.core.MasterReport;
 import org.pentaho.reporting.engine.classic.core.ReportProcessingException;
 import org.pentaho.reporting.engine.classic.core.modules.output.pageable.pdf.PdfReportUtil;