[pkg-java] r14980 - in trunk/libspring-2.5-java/debian: . patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Wed Sep 21 12:56:25 UTC 2011
Author: drazzib
Date: 2011-09-21 12:56:25 +0000 (Wed, 21 Sep 2011)
New Revision: 14980
Added:
trunk/libspring-2.5-java/debian/patches/20_jasperreports41.diff
Modified:
trunk/libspring-2.5-java/debian/changelog
trunk/libspring-2.5-java/debian/classpath-debian
trunk/libspring-2.5-java/debian/control
trunk/libspring-2.5-java/debian/patches/series
Log:
* Build-Depends and Recommends libapache-poi-java instead of
libjakarta-poi-java
* d/patches/20_jasperreports41.diff: Fix FTBFS with latest jasperreports.
Modified: trunk/libspring-2.5-java/debian/changelog
===================================================================
--- trunk/libspring-2.5-java/debian/changelog 2011-09-21 12:52:17 UTC (rev 14979)
+++ trunk/libspring-2.5-java/debian/changelog 2011-09-21 12:56:25 UTC (rev 14980)
@@ -1,3 +1,11 @@
+libspring-2.5-java (2.5.6.SEC02-7) unstable; urgency=low
+
+ * Build-Depends and Recommends libapache-poi-java instead of
+ libjakarta-poi-java
+ * d/patches/20_jasperreports41.diff: Fix FTBFS with latest jasperreports.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Wed, 21 Sep 2011 14:41:13 +0200
+
libspring-2.5-java (2.5.6.SEC02-6) unstable; urgency=low
* Since JRuby is now in main, re-enable it in libspring-context-2.5-java.
Modified: trunk/libspring-2.5-java/debian/classpath-debian
===================================================================
--- trunk/libspring-2.5-java/debian/classpath-debian 2011-09-21 12:52:17 UTC (rev 14979)
+++ trunk/libspring-2.5-java/debian/classpath-debian 2011-09-21 12:56:25 UTC (rev 14980)
@@ -20,7 +20,7 @@
usr/share/java/velocity.jar
usr/share/java/log4j-1.2.jar
usr/share/java/commons-attributes-api.jar
-usr/share/java/jakarta-poi.jar
+usr/share/java/poi.jar
usr/share/java/jxl.jar
usr/share/java/itext.jar
usr/share/java/struts-1.2.jar
Modified: trunk/libspring-2.5-java/debian/control
===================================================================
--- trunk/libspring-2.5-java/debian/control 2011-09-21 12:52:17 UTC (rev 14979)
+++ trunk/libspring-2.5-java/debian/control 2011-09-21 12:56:25 UTC (rev 14980)
@@ -8,7 +8,7 @@
libjamon-java, libcommons-pool-java, libcommons-collections3-java, libbackport-util-concurrent-java, libasm3-java,
libc3p0-java, libgnumail-java, libjdo-api-java, libcommons-httpclient-java, libaxis-java, groovy,
libfreemarker-java, velocity, liblog4j1.2-java, libcommons-fileupload-java,
- libjakarta-poi-java, libjexcelapi-java, libitext-java, libstruts1.2-java, libdom4j-java,
+ libapache-poi-java, libjexcelapi-java, libitext-java, libstruts1.2-java, libdom4j-java,
libcglib-java, bsh, glassfish-javaee, libqdox-java, libjarjar-java,
libhibernate3-java (>= 3.5), libhibernate-commons-annotations-java, libhibernate-annotations-java,
libehcache-java, libibatis-java, libquartz-java, libxapool-java, libtiles-java (>= 2.2.1), libvelocity-tools-java,
@@ -95,7 +95,7 @@
Package: libspring-webmvc-2.5-java
Architecture: all
Depends: ${misc:Depends}, libspring-web-2.5-java
-Recommends: libspring-context-support-2.5-java, libvelocity-tools-java, libjasperreports-java, libtiles-java, libitext-java, libjexcelapi-java, libjakarta-poi-java
+Recommends: libspring-context-support-2.5-java, libvelocity-tools-java, libjasperreports-java, libtiles-java, libitext-java, libjexcelapi-java, libapache-poi-java
Description: modular Java/J2EE application framework - MVC
Spring is a layered Java/J2EE application framework offering a lot of freedom
to Java developers yet providing well documented and easy-to-use solutions for
Added: trunk/libspring-2.5-java/debian/patches/20_jasperreports41.diff
===================================================================
--- trunk/libspring-2.5-java/debian/patches/20_jasperreports41.diff (rev 0)
+++ trunk/libspring-2.5-java/debian/patches/20_jasperreports41.diff 2011-09-21 12:56:25 UTC (rev 14980)
@@ -0,0 +1,100 @@
+Description: Don't use deprecated code for JR report compiler (now removed).
+ Use Spring Framework 3.x as example.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2011-09-21
+Forwarded: no
+Index: b/src/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsView.java
+===================================================================
+--- a/src/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsView.java
++++ b/src/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsView.java
+@@ -36,11 +36,10 @@
+ import net.sf.jasperreports.engine.JRException;
+ import net.sf.jasperreports.engine.JRExporterParameter;
+ import net.sf.jasperreports.engine.JRParameter;
++import net.sf.jasperreports.engine.JasperCompileManager;
+ import net.sf.jasperreports.engine.JasperFillManager;
+ import net.sf.jasperreports.engine.JasperPrint;
+ import net.sf.jasperreports.engine.JasperReport;
+-import net.sf.jasperreports.engine.design.JRCompiler;
+-import net.sf.jasperreports.engine.design.JRDefaultCompiler;
+ import net.sf.jasperreports.engine.design.JasperDesign;
+ import net.sf.jasperreports.engine.util.JRLoader;
+ import net.sf.jasperreports.engine.xml.JRXmlLoader;
+@@ -165,11 +164,6 @@
+ private DataSource jdbcDataSource;
+
+ /**
+- * Holds the JRCompiler implementation to use for compiling reports on-the-fly.
+- */
+- private JRCompiler reportCompiler = JRDefaultCompiler.getInstance();
+-
+- /**
+ * The <code>JasperReport</code> that is used to render the view.
+ */
+ private JasperReport report;
+@@ -291,25 +285,6 @@
+ }
+
+ /**
+- * Specify the JRCompiler implementation to use for compiling a ".jrxml"
+- * report file on-the-fly into a report class.
+- * <p>By default, a JRDefaultCompiler will be used, delegating to the
+- * Eclipse JDT compiler or the Sun JDK compiler underneath.
+- * @see net.sf.jasperreports.engine.design.JRDefaultCompiler
+- */
+- public void setReportCompiler(JRCompiler reportCompiler) {
+- this.reportCompiler = (reportCompiler != null ? reportCompiler : JRDefaultCompiler.getInstance());
+- }
+-
+- /**
+- * Return the JRCompiler instance to use for compiling ".jrxml" report files.
+- */
+- protected JRCompiler getReportCompiler() {
+- return this.reportCompiler;
+- }
+-
+-
+- /**
+ * JasperReports views do not strictly required a 'url' value.
+ * Alternatively, the {@link #getReport()} template method may be overridden.
+ */
+@@ -521,7 +496,7 @@
+ logger.info("Compiling Jasper Report loaded from " + resource);
+ }
+ JasperDesign design = JRXmlLoader.load(resource.getInputStream());
+- return getReportCompiler().compileReport(design);
++ return JasperCompileManager.compileReport(design);
+ }
+ else {
+ throw new IllegalArgumentException(
+Index: b/src/org/springframework/web/servlet/view/jasperreports/JasperReportsViewResolver.java
+===================================================================
+--- a/src/org/springframework/web/servlet/view/jasperreports/JasperReportsViewResolver.java
++++ b/src/org/springframework/web/servlet/view/jasperreports/JasperReportsViewResolver.java
+@@ -107,15 +107,6 @@
+ this.jdbcDataSource = jdbcDataSource;
+ }
+
+- /**
+- * Set the {@link JRCompiler} the view class should use.
+- * @see AbstractJasperReportsView#setReportCompiler
+- */
+- public void setReportCompiler(JRCompiler reportCompiler) {
+- this.reportCompiler = reportCompiler;
+- }
+-
+-
+ protected AbstractUrlBasedView buildView(String viewName) throws Exception {
+ AbstractJasperReportsView view = (AbstractJasperReportsView) super.buildView(viewName);
+
+@@ -126,10 +117,6 @@
+ view.setExporterParameters(this.exporterParameters);
+ view.setJdbcDataSource(this.jdbcDataSource);
+
+- if (this.reportCompiler != null) {
+- view.setReportCompiler(this.reportCompiler);
+- }
+-
+ return view;
+ }
+
Modified: trunk/libspring-2.5-java/debian/patches/series
===================================================================
--- trunk/libspring-2.5-java/debian/patches/series 2011-09-21 12:52:17 UTC (rev 14979)
+++ trunk/libspring-2.5-java/debian/patches/series 2011-09-21 12:56:25 UTC (rev 14980)
@@ -16,3 +16,4 @@
17_velocitytools2.diff
18_hibernate_36.diff
19_quartz_17.diff
+20_jasperreports41.diff
More information about the pkg-java-commits
mailing list