Commits

Anonymous committed 2f5ce55

Comments (0)

Files changed (3)

src/java/com/opensymphony/webwork/views/jasperreports/CompileReport.java

  */
 package com.opensymphony.webwork.views.jasperreports;
 
-import dori.jasper.engine.JRException;
-import dori.jasper.engine.JasperCompileManager;
-
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JasperCompileManager;
 
 /**
  * Ported to WebWork2:
 
         System.exit(0);
     }
-}
+}

src/java/com/opensymphony/webwork/views/jasperreports/JasperReportsResult.java

 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import com.opensymphony.xwork.util.TextParseUtil;
-import dori.jasper.engine.*;
-import dori.jasper.engine.export.*;
+import net.sf.jasperreports.engine.*;
+import net.sf.jasperreports.engine.export.*;
+import net.sf.jasperreports.engine.util.JRLoader;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import java.util.HashMap;
 import java.util.Map;
 
-
 /**
  * Genreates a JasperReports report using the specified format or PDF if no format is specified.
  * The following parameters are required:
 
             // Fill the report and produce a print object
             try {
-                JasperReport jasperReport = JasperManager.loadReport(systemId);
-                jasperPrint = JasperFillManager.fillReport(jasperReport, parameters, stackDataSource);
+    			JasperReport jasperReport = (JasperReport) JRLoader.loadObject(systemId);
+
+    			jasperPrint =
+    				JasperFillManager.fillReport(
+    					jasperReport,
+    					parameters,
+    					stackDataSource
+    					);
             } catch (JRException e) {
                 LOG.error("Error building report for uri " + systemId, e);
                 throw new ServletException(e.getMessage(), e);
      * @param jasperPrint The Print object to render as CSV
      * @param exporter    The exporter to use to export the report
      * @return A CSV formatted report
-     * @throws dori.jasper.engine.JRException If there is a problem running the report
+     * @throws net.sf.jasperreports.engine.JRException If there is a problem running the report
      */
     private byte[] exportReportToBytes(JasperPrint jasperPrint, JRExporter exporter) throws JRException {
         byte[] output;

src/java/com/opensymphony/webwork/views/jasperreports/OgnlValueStackDataSource.java

 
 import com.opensymphony.webwork.util.MakeIterator;
 import com.opensymphony.xwork.util.OgnlValueStack;
-import dori.jasper.engine.JRDataSource;
-import dori.jasper.engine.JRException;
-import dori.jasper.engine.JRField;
+import net.sf.jasperreports.engine.JRDataSource;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JRField;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import java.util.Iterator;
 
-
 /**
- * Ported to WebWork2:
+ * Ported to WebWork2.
  *
  * @author <a href="hermanns@aixcept.de">Rainer Hermanns</a>
  * @version $Id$