[pkg-java] r14975 - in tags/jasperreports: . 4.1.2+dfsg-1/debian 4.1.2+dfsg-1/debian/patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Wed Sep 21 12:16:40 UTC 2011
Author: drazzib
Date: 2011-09-21 12:16:39 +0000 (Wed, 21 Sep 2011)
New Revision: 14975
Added:
tags/jasperreports/4.1.2+dfsg-1/
tags/jasperreports/4.1.2+dfsg-1/debian/changelog
tags/jasperreports/4.1.2+dfsg-1/debian/control
tags/jasperreports/4.1.2+dfsg-1/debian/patches/01_disable_deprecation_warning.diff
tags/jasperreports/4.1.2+dfsg-1/debian/patches/02_use_debian_asm.diff
tags/jasperreports/4.1.2+dfsg-1/debian/patches/06_configure_javaflow.diff
tags/jasperreports/4.1.2+dfsg-1/debian/patches/07_exclude_barcode4j_and_barbecue.diff
tags/jasperreports/4.1.2+dfsg-1/debian/patches/08_no_maxmemory_for_javadoc.diff
tags/jasperreports/4.1.2+dfsg-1/debian/patches/09_use_commons_codec.diff
tags/jasperreports/4.1.2+dfsg-1/debian/patches/10_disable_fonts.diff
tags/jasperreports/4.1.2+dfsg-1/debian/patches/12_samples.diff
tags/jasperreports/4.1.2+dfsg-1/debian/patches/13_disable_ooxml_support.diff
tags/jasperreports/4.1.2+dfsg-1/debian/patches/14_velocity.diff
tags/jasperreports/4.1.2+dfsg-1/debian/patches/series
tags/jasperreports/4.1.2+dfsg-1/debian/rules
Removed:
tags/jasperreports/4.1.2+dfsg-1/debian/changelog
tags/jasperreports/4.1.2+dfsg-1/debian/control
tags/jasperreports/4.1.2+dfsg-1/debian/patches/02_use_debian_asm.diff
tags/jasperreports/4.1.2+dfsg-1/debian/patches/06_configure_javaflow.diff
tags/jasperreports/4.1.2+dfsg-1/debian/patches/07_exclude_barcode4j_and_barbecue.diff
tags/jasperreports/4.1.2+dfsg-1/debian/patches/08_no_maxmemory_for_javadoc.diff
tags/jasperreports/4.1.2+dfsg-1/debian/patches/09_use_commons_codec.diff
tags/jasperreports/4.1.2+dfsg-1/debian/patches/10_disable_fonts.diff
tags/jasperreports/4.1.2+dfsg-1/debian/patches/12_samples.diff
tags/jasperreports/4.1.2+dfsg-1/debian/patches/series
tags/jasperreports/4.1.2+dfsg-1/debian/rules
Log:
[svn-buildpackage] Tagging jasperreports 4.1.2+dfsg-1
Deleted: tags/jasperreports/4.1.2+dfsg-1/debian/changelog
===================================================================
--- trunk/jasperreports/debian/changelog 2011-09-21 01:54:46 UTC (rev 14973)
+++ tags/jasperreports/4.1.2+dfsg-1/debian/changelog 2011-09-21 12:16:39 UTC (rev 14975)
@@ -1,134 +0,0 @@
-jasperreports (4.0.2+dfsg-2) unstable; urgency=low
-
- [ Miguel Landaeta ]
- * Team upload.
- * Switch dependencies on Spring Framework 2.5 with 3.0. (Closes: #638391).
- * Add mh_clean call in clean target.
-
- [ Damien Raude-Morvan ]
- * Upload to unstable.
-
- -- Damien Raude-Morvan <drazzib at debian.org> Sat, 20 Aug 2011 13:22:48 +0200
-
-jasperreports (4.0.2+dfsg-1) unstable; urgency=low
-
- * New upstream release.
- * B-D and Suggests libaspectj-java instead of aspectj (ie. so no JRE
- in dependencies graph).
- * d/patches/09_use_commons_codec.diff
- d/patches/08_no_maxmemory_for_javadoc.diff
- d/patches/12_samples.diff: Refreshed.
- * Bump Standards-Version to 3.9.2 (no changes needed).
-
- -- Damien Raude-Morvan <drazzib at debian.org> Sun, 08 May 2011 00:05:57 +0200
-
-jasperreports (4.0.1+dfsg-1) unstable; urgency=low
-
- * New upstream release: Refreshed all patches.
-
- -- Damien Raude-Morvan <drazzib at debian.org> Tue, 15 Mar 2011 19:58:44 +0100
-
-jasperreports (4.0.0+dfsg-1) unstable; urgency=low
-
- * New upstream release:
- - d/patches/09_use_commons_codec.diff: Refreshed.
- - d/patches/07_exclude_barcode4j_and_barbecue.diff: Refreshed.
- - d/patches/12_samples.diff: Refreshed.
- * d/copyright: Use DEP-5 format.
-
- -- Damien Raude-Morvan <drazzib at debian.org> Tue, 22 Feb 2011 22:29:56 +0100
-
-jasperreports (3.7.4+dfsg-1) unstable; urgency=low
-
- * New upstream release:
- - Refresh 07_exclude_barcode4j_and_barbecue.diff patch
- * Bump Standards-Version to 3.9.1: no changes needed.
- * Drop Depends on JRE: not requested anymore by new Java Policy.
-
- -- Damien Raude-Morvan <drazzib at debian.org> Tue, 27 Jul 2010 15:32:56 +0200
-
-jasperreports (3.7.3+dfsg-1) unstable; urgency=low
-
- * New upstream release:
- - Refresh all patches
- * Bump Standards-Version to 3.9.0 (no changes needed)
-
- -- Damien Raude-Morvan <drazzib at debian.org> Thu, 08 Jul 2010 02:23:43 +0200
-
-jasperreports (3.7.2+dfsg-1) unstable; urgency=low
-
- [ Torsten Werner ]
- * Change maintainers into Maintainers.
-
- [ Damien Raude-Morvan ]
- * New upstream release:
- - Drop d/patches/01_exclude_jpa.diff
- - Drop d/patches/03_use_pngencoder_from_jcommon.diff
- - Refresh others patches
- * Switch to 3.0 (quilt) source format:
- - d/source/format: Set 3.0 (quilt)
- - d/rules: Remove /usr/share/cdbs/1/rules/patchsys-quilt.mk
- - d/control: Remove B-D on quilt
- - d/README.source: Removed
- * Replace d/patches/11_pom.diff by some d/maven.ignoreRules
-
- -- Damien Raude-Morvan <drazzib at debian.org> Tue, 20 Apr 2010 23:50:28 +0200
-
-jasperreports (3.7.1+dfsg-2) unstable; urgency=low
-
- * Fix FTBFS: (Closes: #571398)
- - debian/control: Build-Depends on rhino
- (since OpenJDK now only Recommends it)
- - debian/rules: add js.jar to classpath
-
- -- Damien Raude-Morvan <drazzib at debian.org> Fri, 26 Feb 2010 00:13:25 +0100
-
-jasperreports (3.7.1+dfsg-1) unstable; urgency=low
-
- * New upstream release
- - Remove debian/patches/12_itext.diff (merged upstream)
- - Refresh others patches
- * Enable OLAP components:
- - Update debian/patches/01_exclude_olap_and_jpa.diff
- - debian/control: Build-Depends on libmondrian-java, libolap4j-java,
- libantlr-java
- - debian/rules: add those libs into DEB_JARS
- * Bump Standards-Version to 3.8.4 (no changes needed)
-
- -- Damien Raude-Morvan <drazzib at debian.org> Sat, 06 Feb 2010 22:03:56 +0100
-
-jasperreports (3.7.0+dfsg-1) unstable; urgency=low
-
- * New upstream release
- - new patch 12_itext.diff to fix utf32 compatibility
- * Depends on libcommons-collection3-java
- * Fix debian/maven.rules to transform more dependencies
-
- -- Damien Raude-Morvan <drazzib at debian.org> Sat, 12 Dec 2009 14:13:19 +0100
-
-jasperreports (3.6.1+dfsg-1) unstable; urgency=low
-
- * New upstream release
- * debian/patches/11_pom.diff: remove uneeded dependencies removed from
- Debian package
- * debian/patches/10_disable_fonts.diff: don't build "font" package
- * Build-Depends on libcommons-collections3-java instead of
- libcommons-collections-java
-
- -- Damien Raude-Morvan <drazzib at debian.org> Mon, 16 Nov 2009 22:38:49 +0100
-
-jasperreports (3.6.0+dfsg-1) unstable; urgency=low
-
- * New upstream release.
- * Refresh all debian/patches
- * debian/copyright:
- - Change upstream license to LGPLv3
- * Update my email address
-
- -- Damien Raude-Morvan <drazzib at debian.org> Thu, 24 Sep 2009 21:17:25 +0200
-
-jasperreports (3.5.3+dfsg-1) unstable; urgency=low
-
- * Initial release. (Closes: #281346)
-
- -- Damien Raude-Morvan <drazzib at drazzib.com> Tue, 25 Aug 2009 23:12:16 +0200
Copied: tags/jasperreports/4.1.2+dfsg-1/debian/changelog (from rev 14974, trunk/jasperreports/debian/changelog)
===================================================================
--- tags/jasperreports/4.1.2+dfsg-1/debian/changelog (rev 0)
+++ tags/jasperreports/4.1.2+dfsg-1/debian/changelog 2011-09-21 12:16:39 UTC (rev 14975)
@@ -0,0 +1,148 @@
+jasperreports (4.1.2+dfsg-1) unstable; urgency=low
+
+ * New upstream release:
+ - Refresh all debian/patches/*.
+ - Add Build-Depends on velocity, libcastor-core-java
+ and libcastor-xml-java.
+ * Build-Depends and Recommends libapache-poi-java instead of
+ libjakarta-poi-java (renamed package). (Closes: #642280).
+ * d/patches/13_disable_ooxml_support.diff: Disable OOXML support in JR since
+ libapache-poi-java doesn't provide it.
+ * d/patches/14_velocity.diff: Fix some missing exception not handled by JR.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Wed, 21 Sep 2011 14:06:31 +0200
+
+jasperreports (4.0.2+dfsg-2) unstable; urgency=low
+
+ [ Miguel Landaeta ]
+ * Team upload.
+ * Switch dependencies on Spring Framework 2.5 with 3.0. (Closes: #638391).
+ * Add mh_clean call in clean target.
+
+ [ Damien Raude-Morvan ]
+ * Upload to unstable.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sat, 20 Aug 2011 13:22:48 +0200
+
+jasperreports (4.0.2+dfsg-1) unstable; urgency=low
+
+ * New upstream release.
+ * B-D and Suggests libaspectj-java instead of aspectj (ie. so no JRE
+ in dependencies graph).
+ * d/patches/09_use_commons_codec.diff
+ d/patches/08_no_maxmemory_for_javadoc.diff
+ d/patches/12_samples.diff: Refreshed.
+ * Bump Standards-Version to 3.9.2 (no changes needed).
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sun, 08 May 2011 00:05:57 +0200
+
+jasperreports (4.0.1+dfsg-1) unstable; urgency=low
+
+ * New upstream release: Refreshed all patches.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Tue, 15 Mar 2011 19:58:44 +0100
+
+jasperreports (4.0.0+dfsg-1) unstable; urgency=low
+
+ * New upstream release:
+ - d/patches/09_use_commons_codec.diff: Refreshed.
+ - d/patches/07_exclude_barcode4j_and_barbecue.diff: Refreshed.
+ - d/patches/12_samples.diff: Refreshed.
+ * d/copyright: Use DEP-5 format.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Tue, 22 Feb 2011 22:29:56 +0100
+
+jasperreports (3.7.4+dfsg-1) unstable; urgency=low
+
+ * New upstream release:
+ - Refresh 07_exclude_barcode4j_and_barbecue.diff patch
+ * Bump Standards-Version to 3.9.1: no changes needed.
+ * Drop Depends on JRE: not requested anymore by new Java Policy.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Tue, 27 Jul 2010 15:32:56 +0200
+
+jasperreports (3.7.3+dfsg-1) unstable; urgency=low
+
+ * New upstream release:
+ - Refresh all patches
+ * Bump Standards-Version to 3.9.0 (no changes needed)
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Thu, 08 Jul 2010 02:23:43 +0200
+
+jasperreports (3.7.2+dfsg-1) unstable; urgency=low
+
+ [ Torsten Werner ]
+ * Change maintainers into Maintainers.
+
+ [ Damien Raude-Morvan ]
+ * New upstream release:
+ - Drop d/patches/01_exclude_jpa.diff
+ - Drop d/patches/03_use_pngencoder_from_jcommon.diff
+ - Refresh others patches
+ * Switch to 3.0 (quilt) source format:
+ - d/source/format: Set 3.0 (quilt)
+ - d/rules: Remove /usr/share/cdbs/1/rules/patchsys-quilt.mk
+ - d/control: Remove B-D on quilt
+ - d/README.source: Removed
+ * Replace d/patches/11_pom.diff by some d/maven.ignoreRules
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Tue, 20 Apr 2010 23:50:28 +0200
+
+jasperreports (3.7.1+dfsg-2) unstable; urgency=low
+
+ * Fix FTBFS: (Closes: #571398)
+ - debian/control: Build-Depends on rhino
+ (since OpenJDK now only Recommends it)
+ - debian/rules: add js.jar to classpath
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Fri, 26 Feb 2010 00:13:25 +0100
+
+jasperreports (3.7.1+dfsg-1) unstable; urgency=low
+
+ * New upstream release
+ - Remove debian/patches/12_itext.diff (merged upstream)
+ - Refresh others patches
+ * Enable OLAP components:
+ - Update debian/patches/01_exclude_olap_and_jpa.diff
+ - debian/control: Build-Depends on libmondrian-java, libolap4j-java,
+ libantlr-java
+ - debian/rules: add those libs into DEB_JARS
+ * Bump Standards-Version to 3.8.4 (no changes needed)
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sat, 06 Feb 2010 22:03:56 +0100
+
+jasperreports (3.7.0+dfsg-1) unstable; urgency=low
+
+ * New upstream release
+ - new patch 12_itext.diff to fix utf32 compatibility
+ * Depends on libcommons-collection3-java
+ * Fix debian/maven.rules to transform more dependencies
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sat, 12 Dec 2009 14:13:19 +0100
+
+jasperreports (3.6.1+dfsg-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/patches/11_pom.diff: remove uneeded dependencies removed from
+ Debian package
+ * debian/patches/10_disable_fonts.diff: don't build "font" package
+ * Build-Depends on libcommons-collections3-java instead of
+ libcommons-collections-java
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Mon, 16 Nov 2009 22:38:49 +0100
+
+jasperreports (3.6.0+dfsg-1) unstable; urgency=low
+
+ * New upstream release.
+ * Refresh all debian/patches
+ * debian/copyright:
+ - Change upstream license to LGPLv3
+ * Update my email address
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Thu, 24 Sep 2009 21:17:25 +0200
+
+jasperreports (3.5.3+dfsg-1) unstable; urgency=low
+
+ * Initial release. (Closes: #281346)
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com> Tue, 25 Aug 2009 23:12:16 +0200
Deleted: tags/jasperreports/4.1.2+dfsg-1/debian/control
===================================================================
--- trunk/jasperreports/debian/control 2011-09-21 01:54:46 UTC (rev 14973)
+++ tags/jasperreports/4.1.2+dfsg-1/debian/control 2011-09-21 12:16:39 UTC (rev 14975)
@@ -1,48 +0,0 @@
-Source: jasperreports
-Section: java
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant
-Build-Depends-Indep: ant-optional, bsh, libasm2-java, groovy, libjcommon-java,
- libspring-core-java, libspring-beans-java,
- libcommons-digester-java, libcommons-collections3-java, libcommons-logging-java,
- libcommons-beanutils-java, libcommons-codec-java, libcommons-javaflow-java,
- libecj-java, libxalan2-java, libjaxen-java, libxml-commons-external-java,
- libjexcelapi-java, libjakarta-poi-java (>= 3.2), libitext-java,
- libbatik-java (>= 1.7), libjfreechart-java, libhibernate3-java,
- glassfish-javaee, maven-repo-helper, libmondrian-java, libolap4j-java,
- libantlr-java, librhino-java
-Standards-Version: 3.9.2
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jasperreports/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jasperreports/
-Homepage: http://jasperforge.org/jasperreports
-
-Package: libjasperreports-java
-Architecture: all
-Depends: ${misc:Depends},
- libcommons-digester-java, libcommons-collections3-java, libcommons-logging-java,
- libcommons-beanutils-java, libcommons-codec-java, libecj-java, libxalan2-java,
- libjcommon-java
-Recommends: libjexcelapi-java, libjakarta-poi-java (>= 3.2), libitext-java,
- libbatik-java (>= 1.7), libjfreechart-java, libhibernate3-java
-Suggests: bsh, libasm2-java, groovy, libmondrian-java, libolap4j-java,
- libspring-core-java, libspring-beans-java, libantlr-java
-Description: Java reporting generator library
- JasperReports is a Java reporting generator library. XML report templates
- are used to generate ready to print documents using data from customizable data
- sources, including JDBC. The output can be delivered to the screen,
- printer, or stored in PDF, HTML, XLS, CSV, and XML format.
-
-Package: libjasperreports-java-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Suggests: libjasperreports-java
-Description: Java reporting generator library - documentation
- JasperReports is a Java reporting generator library. XML report templates
- are used to generate ready to print documents using data from customizable data
- sources, including JDBC. The output can be delivered to the screen,
- printer, or stored in PDF, HTML, XLS, CSV, and XML format.
- .
- This package contains Javadoc API and Schema Reference for JasperReports.
Copied: tags/jasperreports/4.1.2+dfsg-1/debian/control (from rev 14974, trunk/jasperreports/debian/control)
===================================================================
--- tags/jasperreports/4.1.2+dfsg-1/debian/control (rev 0)
+++ tags/jasperreports/4.1.2+dfsg-1/debian/control 2011-09-21 12:16:39 UTC (rev 14975)
@@ -0,0 +1,48 @@
+Source: jasperreports
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant
+Build-Depends-Indep: ant-optional, bsh, libasm2-java, groovy, libjcommon-java,
+ libspring-core-java, libspring-beans-java,
+ libcommons-digester-java, libcommons-collections3-java, libcommons-logging-java,
+ libcommons-beanutils-java, libcommons-codec-java, libcommons-javaflow-java,
+ libecj-java, libxalan2-java, libjaxen-java, libxml-commons-external-java,
+ libjexcelapi-java, libapache-poi-java (>= 3.2), libitext-java,
+ libbatik-java (>= 1.7), libjfreechart-java, libhibernate3-java,
+ glassfish-javaee, maven-repo-helper, libmondrian-java, libolap4j-java,
+ libantlr-java, librhino-java, velocity, libcastor-core-java, libcastor-xml-java
+Standards-Version: 3.9.2
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jasperreports/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jasperreports/
+Homepage: http://jasperforge.org/jasperreports
+
+Package: libjasperreports-java
+Architecture: all
+Depends: ${misc:Depends},
+ libcommons-digester-java, libcommons-collections3-java, libcommons-logging-java,
+ libcommons-beanutils-java, libcommons-codec-java, libecj-java, libxalan2-java,
+ libjcommon-java
+Recommends: libjexcelapi-java, libapache-poi-java (>= 3.2), libitext-java,
+ libbatik-java (>= 1.7), libjfreechart-java, libhibernate3-java, libcastor-core-java, libcastor-xml-java
+Suggests: bsh, libasm2-java, groovy, libmondrian-java, libolap4j-java,
+ libspring-core-java, libspring-beans-java, libantlr-java, velocity
+Description: Java reporting generator library
+ JasperReports is a Java reporting generator library. XML report templates
+ are used to generate ready to print documents using data from customizable data
+ sources, including JDBC. The output can be delivered to the screen,
+ printer, or stored in PDF, HTML, XLS, CSV, and XML format.
+
+Package: libjasperreports-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Suggests: libjasperreports-java
+Description: Java reporting generator library - documentation
+ JasperReports is a Java reporting generator library. XML report templates
+ are used to generate ready to print documents using data from customizable data
+ sources, including JDBC. The output can be delivered to the screen,
+ printer, or stored in PDF, HTML, XLS, CSV, and XML format.
+ .
+ This package contains Javadoc API and Schema Reference for JasperReports.
Copied: tags/jasperreports/4.1.2+dfsg-1/debian/patches/01_disable_deprecation_warning.diff (from rev 14974, trunk/jasperreports/debian/patches/01_disable_deprecation_warning.diff)
===================================================================
--- tags/jasperreports/4.1.2+dfsg-1/debian/patches/01_disable_deprecation_warning.diff (rev 0)
+++ tags/jasperreports/4.1.2+dfsg-1/debian/patches/01_disable_deprecation_warning.diff 2011-09-21 12:16:39 UTC (rev 14975)
@@ -0,0 +1,17 @@
+Description: Disable javac deprecation warning during Debian build.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2011-09-21
+Forwarded: not-needed
+Index: b/build.xml
+===================================================================
+--- a/build.xml
++++ b/build.xml
+@@ -6,7 +6,7 @@
+
+ <target name="compile" description="Compiles the java source files of the library.">
+ <mkdir dir="./build/classes"/>
+- <javac destdir="./build/classes" debug="true" optimize="false" deprecation="true" target="1.5" source="1.5" encoding="ISO-8859-1">
++ <javac destdir="./build/classes" debug="true" optimize="false" deprecation="false" target="1.5" source="1.5" encoding="ISO-8859-1">
+ <classpath>
+ <pathelement location="./build/classes"/>
+ <fileset dir="./lib">
Deleted: tags/jasperreports/4.1.2+dfsg-1/debian/patches/02_use_debian_asm.diff
===================================================================
--- trunk/jasperreports/debian/patches/02_use_debian_asm.diff 2011-09-21 01:54:46 UTC (rev 14973)
+++ tags/jasperreports/4.1.2+dfsg-1/debian/patches/02_use_debian_asm.diff 2011-09-21 12:16:39 UTC (rev 14975)
@@ -1,25 +0,0 @@
-Description: Use Debian provided ASM2 instead of the upstream one in their groovy jar.
-Fowarded: no
-Origin: vendor
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2010-04-10
---- a/src/net/sf/jasperreports/compilers/JRGroovyCompiler.java
-+++ b/src/net/sf/jasperreports/compilers/JRGroovyCompiler.java
-@@ -28,8 +28,8 @@
- */
- package net.sf.jasperreports.compilers;
-
--import groovyjarjarasm.asm.ClassVisitor;
--import groovyjarjarasm.asm.ClassWriter;
-+import org.objectweb.asm.ClassVisitor;
-+import org.objectweb.asm.ClassWriter;
-
- import java.io.ByteArrayInputStream;
- import java.io.File;
-@@ -181,4 +181,4 @@
- }
-
-
--}
-\ No newline at end of file
-+}
Copied: tags/jasperreports/4.1.2+dfsg-1/debian/patches/02_use_debian_asm.diff (from rev 14974, trunk/jasperreports/debian/patches/02_use_debian_asm.diff)
===================================================================
--- tags/jasperreports/4.1.2+dfsg-1/debian/patches/02_use_debian_asm.diff (rev 0)
+++ tags/jasperreports/4.1.2+dfsg-1/debian/patches/02_use_debian_asm.diff 2011-09-21 12:16:39 UTC (rev 14975)
@@ -0,0 +1,27 @@
+Description: Use Debian provided ASM2 instead of the upstream one in their groovy jar.
+Fowarded: no
+Origin: vendor
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-04-10
+Index: b/src/net/sf/jasperreports/compilers/JRGroovyCompiler.java
+===================================================================
+--- a/src/net/sf/jasperreports/compilers/JRGroovyCompiler.java
++++ b/src/net/sf/jasperreports/compilers/JRGroovyCompiler.java
+@@ -28,8 +28,8 @@
+ */
+ package net.sf.jasperreports.compilers;
+
+-import groovyjarjarasm.asm.ClassVisitor;
+-import groovyjarjarasm.asm.ClassWriter;
++import org.objectweb.asm.ClassVisitor;
++import org.objectweb.asm.ClassWriter;
+
+ import java.io.ByteArrayInputStream;
+ import java.io.File;
+@@ -180,4 +180,4 @@
+ }
+
+
+-}
+\ No newline at end of file
++}
Deleted: tags/jasperreports/4.1.2+dfsg-1/debian/patches/06_configure_javaflow.diff
===================================================================
--- trunk/jasperreports/debian/patches/06_configure_javaflow.diff 2011-09-21 01:54:46 UTC (rev 14973)
+++ tags/jasperreports/4.1.2+dfsg-1/debian/patches/06_configure_javaflow.diff 2011-09-21 12:16:39 UTC (rev 14975)
@@ -1,33 +0,0 @@
-Description: build.xml: configure <javaflow> ant task.
- Include missing elements from upstream classpath.
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Forwarded: not-needed
-Last-Update: 2010-04-20
---- a/build.xml
-+++ b/build.xml
-@@ -71,12 +71,25 @@
- </replace>
-
- <javaflow srcdir="./build/javaflow" dstdir="./build/javaflow" mode="bcel">
-+ <include name="net/sf/jasperreports/engine/JRStyle.class"/>
-+ <include name="net/sf/jasperreports/engine/JRTemplateReference.class"/>
-+ <include name="net/sf/jasperreports/engine/JRStyleSetter.class"/>
-+ <include name="net/sf/jasperreports/engine/JRVirtualizer.class"/>
-+ <include name="net/sf/jasperreports/engine/base/JRBasePrintPage.class"/>
-+ <include name="net/sf/jasperreports/engine/base/JRVirtualPrintPage.class"/>
-+ <include name="net/sf/jasperreports/engine/util/FormatFactory.class"/>
- <include name="net/sf/jasperreports/engine/fill/JRBaseFiller.class"/>
- <include name="net/sf/jasperreports/engine/fill/JRVerticalFiller.class"/>
- <include name="net/sf/jasperreports/engine/fill/JRHorizontalFiller.class"/>
- <include name="net/sf/jasperreports/engine/fill/JRFillSubreport.class"/>
- <include name="net/sf/jasperreports/engine/fill/JRSubreportRunnable.class"/>
- <include name="net/sf/jasperreports/engine/fill/JRContinuationSubreportRunner.class"/>
-+ <include name="net/sf/jasperreports/engine/fill/JRFillBand.class"/>
-+ <include name="net/sf/jasperreports/engine/fill/JRFillGroup.class"/>
-+ <include name="net/sf/jasperreports/engine/fill/JRBaseFiller.class"/>
-+ <include name="net/sf/jasperreports/engine/fill/JRFillReportTemplate.class"/>
-+ <include name="net/sf/jasperreports/engine/fill/JREvaluationTime.class"/>
-+ <include name="net/sf/jasperreports/engine/fill/DatasetExpressionEvaluator.class"/>
- </javaflow>
-
- <mkdir dir="./dist"/>
Copied: tags/jasperreports/4.1.2+dfsg-1/debian/patches/06_configure_javaflow.diff (from rev 14974, trunk/jasperreports/debian/patches/06_configure_javaflow.diff)
===================================================================
--- tags/jasperreports/4.1.2+dfsg-1/debian/patches/06_configure_javaflow.diff (rev 0)
+++ tags/jasperreports/4.1.2+dfsg-1/debian/patches/06_configure_javaflow.diff 2011-09-21 12:16:39 UTC (rev 14975)
@@ -0,0 +1,35 @@
+Description: build.xml: configure <javaflow> ant task.
+ Include missing elements from upstream classpath.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Forwarded: not-needed
+Last-Update: 2010-04-20
+Index: b/build.xml
+===================================================================
+--- a/build.xml
++++ b/build.xml
+@@ -75,12 +75,25 @@
+ </replace>
+
+ <javaflow srcdir="./build/javaflow" dstdir="./build/javaflow" mode="bcel">
++ <include name="net/sf/jasperreports/engine/JRStyle.class"/>
++ <include name="net/sf/jasperreports/engine/JRTemplateReference.class"/>
++ <include name="net/sf/jasperreports/engine/JRStyleSetter.class"/>
++ <include name="net/sf/jasperreports/engine/JRVirtualizer.class"/>
++ <include name="net/sf/jasperreports/engine/base/JRBasePrintPage.class"/>
++ <include name="net/sf/jasperreports/engine/base/JRVirtualPrintPage.class"/>
++ <include name="net/sf/jasperreports/engine/util/FormatFactory.class"/>
+ <include name="net/sf/jasperreports/engine/fill/JRBaseFiller.class"/>
+ <include name="net/sf/jasperreports/engine/fill/JRVerticalFiller.class"/>
+ <include name="net/sf/jasperreports/engine/fill/JRHorizontalFiller.class"/>
+ <include name="net/sf/jasperreports/engine/fill/JRFillSubreport.class"/>
+ <include name="net/sf/jasperreports/engine/fill/JRSubreportRunnable.class"/>
+ <include name="net/sf/jasperreports/engine/fill/JRContinuationSubreportRunner.class"/>
++ <include name="net/sf/jasperreports/engine/fill/JRFillBand.class"/>
++ <include name="net/sf/jasperreports/engine/fill/JRFillGroup.class"/>
++ <include name="net/sf/jasperreports/engine/fill/JRBaseFiller.class"/>
++ <include name="net/sf/jasperreports/engine/fill/JRFillReportTemplate.class"/>
++ <include name="net/sf/jasperreports/engine/fill/JREvaluationTime.class"/>
++ <include name="net/sf/jasperreports/engine/fill/DatasetExpressionEvaluator.class"/>
+ </javaflow>
+
+ <mkdir dir="./dist"/>
Deleted: tags/jasperreports/4.1.2+dfsg-1/debian/patches/07_exclude_barcode4j_and_barbecue.diff
===================================================================
--- trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff 2011-09-21 01:54:46 UTC (rev 14973)
+++ tags/jasperreports/4.1.2+dfsg-1/debian/patches/07_exclude_barcode4j_and_barbecue.diff 2011-09-21 12:16:39 UTC (rev 14975)
@@ -1,280 +0,0 @@
-Description:
- - build.xml: exclude Barcode4J and Barbecue modules of JasperReports.
- - Disable Barcode4J and Barbecue classes in
- src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java
- and src/net/sf/jasperreports/components/ComponentsXmlHandler.java
-Fowarded: no
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2010-04-20
---- a/src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java
-+++ b/src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java
-@@ -27,12 +27,6 @@
- import java.util.HashMap;
- import java.util.List;
-
--import net.sf.jasperreports.components.barbecue.BarbecueCompiler;
--import net.sf.jasperreports.components.barbecue.BarbecueDesignConverter;
--import net.sf.jasperreports.components.barbecue.BarbecueFillFactory;
--import net.sf.jasperreports.components.barcode4j.BarcodeCompiler;
--import net.sf.jasperreports.components.barcode4j.BarcodeDesignConverter;
--import net.sf.jasperreports.components.barcode4j.BarcodeFillFactory;
- import net.sf.jasperreports.components.list.FillListFactory;
- import net.sf.jasperreports.components.list.ListComponent;
- import net.sf.jasperreports.components.list.ListComponentCompiler;
-@@ -113,23 +107,6 @@
- tableManager.setComponentFillFactory(new FillTableFactory());
- componentManagers.put(TABLE_COMPONENT_NAME, tableManager);
-
-- DefaultComponentManager barbecueManager = new DefaultComponentManager();
-- barbecueManager.setDesignConverter(new BarbecueDesignConverter());
-- barbecueManager.setComponentCompiler(new BarbecueCompiler());
-- barbecueManager.setComponentXmlWriter(xmlHandler);
-- barbecueManager.setComponentFillFactory(new BarbecueFillFactory());
-- componentManagers.put(BARBECUE_COMPONENT_NAME, barbecueManager);
--
-- DefaultComponentManager barcode4jManager = new DefaultComponentManager();
-- barcode4jManager.setDesignConverter(new BarcodeDesignConverter());
-- barcode4jManager.setComponentCompiler(new BarcodeCompiler());
-- barcode4jManager.setComponentXmlWriter(xmlHandler);
-- barcode4jManager.setComponentFillFactory(new BarcodeFillFactory());
-- for (int i = 0; i < BARCODE4J_COMPONENT_NAMES.length; i++)
-- {
-- componentManagers.put(BARCODE4J_COMPONENT_NAMES[i], barcode4jManager);
-- }
--
- DefaultComponentManager spiderChartManager = new DefaultComponentManager();
- spiderChartManager.setDesignConverter(new SpiderChartDesignConverter());
- spiderChartManager.setComponentCompiler(new SpiderChartCompiler());
---- a/src/net/sf/jasperreports/components/ComponentsXmlHandler.java
-+++ b/src/net/sf/jasperreports/components/ComponentsXmlHandler.java
-@@ -28,24 +28,24 @@
-
- import net.sf.jasperreports.charts.design.JRDesignCategorySeries;
- import net.sf.jasperreports.charts.xml.JRCategorySeriesFactory;
--import net.sf.jasperreports.components.barbecue.BarbecueComponent;
--import net.sf.jasperreports.components.barbecue.StandardBarbecueComponent;
--import net.sf.jasperreports.components.barcode4j.BarcodeComponent;
--import net.sf.jasperreports.components.barcode4j.BarcodeXmlWriter;
--import net.sf.jasperreports.components.barcode4j.CodabarComponent;
--import net.sf.jasperreports.components.barcode4j.Code128Component;
--import net.sf.jasperreports.components.barcode4j.Code39Component;
--import net.sf.jasperreports.components.barcode4j.DataMatrixComponent;
--import net.sf.jasperreports.components.barcode4j.EAN128Component;
--import net.sf.jasperreports.components.barcode4j.EAN13Component;
--import net.sf.jasperreports.components.barcode4j.EAN8Component;
--import net.sf.jasperreports.components.barcode4j.Interleaved2Of5Component;
--import net.sf.jasperreports.components.barcode4j.PDF417Component;
--import net.sf.jasperreports.components.barcode4j.POSTNETComponent;
--import net.sf.jasperreports.components.barcode4j.RoyalMailCustomerComponent;
--import net.sf.jasperreports.components.barcode4j.UPCAComponent;
--import net.sf.jasperreports.components.barcode4j.UPCEComponent;
--import net.sf.jasperreports.components.barcode4j.USPSIntelligentMailComponent;
-+//import net.sf.jasperreports.components.barbecue.BarbecueComponent;
-+//import net.sf.jasperreports.components.barbecue.StandardBarbecueComponent;
-+//import net.sf.jasperreports.components.barcode4j.BarcodeComponent;
-+//import net.sf.jasperreports.components.barcode4j.BarcodeXmlWriter;
-+//import net.sf.jasperreports.components.barcode4j.CodabarComponent;
-+//import net.sf.jasperreports.components.barcode4j.Code128Component;
-+//import net.sf.jasperreports.components.barcode4j.Code39Component;
-+//import net.sf.jasperreports.components.barcode4j.DataMatrixComponent;
-+//import net.sf.jasperreports.components.barcode4j.EAN128Component;
-+//import net.sf.jasperreports.components.barcode4j.EAN13Component;
-+//import net.sf.jasperreports.components.barcode4j.EAN8Component;
-+//import net.sf.jasperreports.components.barcode4j.Interleaved2Of5Component;
-+//import net.sf.jasperreports.components.barcode4j.PDF417Component;
-+//import net.sf.jasperreports.components.barcode4j.POSTNETComponent;
-+//import net.sf.jasperreports.components.barcode4j.RoyalMailCustomerComponent;
-+//import net.sf.jasperreports.components.barcode4j.UPCAComponent;
-+//import net.sf.jasperreports.components.barcode4j.UPCEComponent;
-+//import net.sf.jasperreports.components.barcode4j.USPSIntelligentMailComponent;
- import net.sf.jasperreports.components.charts.ChartSettings;
- import net.sf.jasperreports.components.charts.ChartSettingsXmlFactory;
- import net.sf.jasperreports.components.list.DesignListContents;
-@@ -108,8 +108,6 @@
- public void configureDigester(Digester digester)
- {
- addListRules(digester);
-- addBarbecueRules(digester);
-- addBarcode4jRules(digester);
- addTableRules(digester);
- addSpiderChartRules(digester);
- }
-@@ -131,107 +129,6 @@
- digester.addSetNext(listContentsPattern, "setContents");
- }
-
-- protected void addBarbecueRules(Digester digester)
-- {
-- String barcodePattern = "*/componentElement/barbecue";
-- digester.addObjectCreate(barcodePattern, StandardBarbecueComponent.class);
-- digester.addSetProperties(barcodePattern,
-- //properties to be ignored by this rule
-- new String[]{JRXmlConstants.ATTRIBUTE_evaluationTime, StandardBarbecueComponent.PROPERTY_ROTATION},
-- new String[0]);
-- digester.addRule(barcodePattern,
-- new XmlConstantPropertyRule(
-- JRXmlConstants.ATTRIBUTE_evaluationTime, "evaluationTimeValue",
-- EvaluationTimeEnum.values()));
-- digester.addRule(barcodePattern,
-- new XmlConstantPropertyRule(
-- StandardBarbecueComponent.PROPERTY_ROTATION,
-- RotationEnum.values()));
--
-- String barcodeExpressionPattern = barcodePattern + "/codeExpression";
-- digester.addFactoryCreate(barcodeExpressionPattern,
-- JRExpressionFactory.StringExpressionFactory.class.getName());
-- digester.addCallMethod(barcodeExpressionPattern, "setText", 0);
-- digester.addSetNext(barcodeExpressionPattern, "setCodeExpression",
-- JRExpression.class.getName());
--
-- String applicationIdentifierExpressionPattern = barcodePattern
-- + "/applicationIdentifierExpression";
-- digester.addFactoryCreate(applicationIdentifierExpressionPattern,
-- JRExpressionFactory.StringExpressionFactory.class.getName());
-- digester.addCallMethod(applicationIdentifierExpressionPattern, "setText", 0);
-- digester.addSetNext(applicationIdentifierExpressionPattern,
-- "setApplicationIdentifierExpression",
-- JRExpression.class.getName());
-- }
--
-- protected void addBarcode4jRules(Digester digester)
-- {
-- addBaseBarcode4jRules(digester,
-- "*/componentElement/Codabar",
-- CodabarComponent.class);
-- addBaseBarcode4jRules(digester,
-- "*/componentElement/Code128",
-- Code128Component.class);
-- addBaseBarcode4jRules(digester,
-- "*/componentElement/EAN128",
-- EAN128Component.class);
-- addBaseBarcode4jRules(digester,
-- "*/componentElement/DataMatrix",
-- DataMatrixComponent.class);
-- addBaseBarcode4jRules(digester,
-- "*/componentElement/RoyalMailCustomer",
-- RoyalMailCustomerComponent.class);
-- addBaseBarcode4jRules(digester,
-- "*/componentElement/USPSIntelligentMail",
-- USPSIntelligentMailComponent.class);
-- addBaseBarcode4jRules(digester,
-- "*/componentElement/Code39", Code39Component.class);
-- addBaseBarcode4jRules(digester,
-- "*/componentElement/Interleaved2Of5", Interleaved2Of5Component.class);
-- addBaseBarcode4jRules(digester,
-- "*/componentElement/UPCA", UPCAComponent.class);
-- addBaseBarcode4jRules(digester,
-- "*/componentElement/UPCE", UPCEComponent.class);
-- addBaseBarcode4jRules(digester,
-- "*/componentElement/EAN13", EAN13Component.class);
-- addBaseBarcode4jRules(digester,
-- "*/componentElement/EAN8", EAN8Component.class);
-- addBaseBarcode4jRules(digester,
-- "*/componentElement/POSTNET", POSTNETComponent.class);
-- addBaseBarcode4jRules(digester,
-- "*/componentElement/PDF417", PDF417Component.class);
-- }
--
-- protected void addBaseBarcode4jRules(Digester digester,
-- String barcodePattern, Class barcodeComponentClass)
-- {
-- digester.addObjectCreate(barcodePattern, barcodeComponentClass);
-- digester.addSetProperties(barcodePattern,
-- //properties to be ignored by this rule
-- new String[]{JRXmlConstants.ATTRIBUTE_evaluationTime},
-- new String[0]);
-- //rule to set evaluation time
-- digester.addRule(barcodePattern,
-- new XmlConstantPropertyRule(
-- JRXmlConstants.ATTRIBUTE_evaluationTime, "evaluationTimeValue",
-- EvaluationTimeEnum.values()));
--
-- String codeExpressionPattern = barcodePattern + "/codeExpression";
-- digester.addFactoryCreate(codeExpressionPattern,
-- JRExpressionFactory.StringExpressionFactory.class.getName());
-- digester.addCallMethod(codeExpressionPattern, "setText", 0);
-- digester.addSetNext(codeExpressionPattern, "setCodeExpression",
-- JRExpression.class.getName());
--
-- String patternExpressionPattern = barcodePattern + "/patternExpression";
-- digester.addFactoryCreate(patternExpressionPattern,
-- JRExpressionFactory.StringExpressionFactory.class.getName());
-- digester.addCallMethod(patternExpressionPattern, "setText", 0);
-- digester.addSetNext(patternExpressionPattern, "setPatternExpression",
-- JRExpression.class.getName());
-- }
--
- protected void addTableRules(Digester digester)
- {
- String tablePattern = "*/componentElement/table";
-@@ -323,18 +220,6 @@
- TableComponent table = (TableComponent) component;
- writeTable(table, componentKey, reportWriter);
- }
-- else if (component instanceof BarbecueComponent)
-- {
-- BarbecueComponent barcode = (BarbecueComponent) component;
-- writeBarbecue(barcode, componentKey, reportWriter);
-- }
-- else if (component instanceof BarcodeComponent)
-- {
-- BarcodeComponent barcode = (BarcodeComponent) component;
-- BarcodeXmlWriter barcodeWriter = new BarcodeXmlWriter(
-- reportWriter, barcode, componentKey);
-- barcodeWriter.writeBarcode();
-- }
- else if (component instanceof SpiderChartComponent)
- {
- SpiderChartComponent spiderChart = (SpiderChartComponent) component;
-@@ -367,40 +252,6 @@
-
- writer.closeElement();
- }
--
-- protected void writeBarbecue(BarbecueComponent barcode, ComponentKey componentKey,
-- JRXmlWriter reportWriter) throws IOException
-- {
-- JRXmlWriteHelper writer = reportWriter.getXmlWriteHelper();
--
-- XmlNamespace namespace = new XmlNamespace(
-- ComponentsExtensionsRegistryFactory.NAMESPACE,
-- componentKey.getNamespacePrefix(),
-- ComponentsExtensionsRegistryFactory.XSD_LOCATION);
--
-- writer.startElement("barbecue", namespace);
--
-- writer.addAttribute("type", barcode.getType());
-- writer.addAttribute("drawText", barcode.isDrawText());
-- writer.addAttribute("checksumRequired", barcode.isChecksumRequired());
-- writer.addAttribute("barWidth", barcode.getBarWidth());
-- writer.addAttribute("barHeight", barcode.getBarHeight());
-- writer.addAttribute("rotation", barcode.getOwnRotation());
-- if (barcode.getEvaluationTimeValue() != EvaluationTimeEnum.NOW)
-- {
-- writer.addAttribute(JRXmlConstants.ATTRIBUTE_evaluationTime,
-- barcode.getEvaluationTimeValue());
-- }
-- writer.addAttribute(JRXmlConstants.ATTRIBUTE_evaluationGroup,
-- barcode.getEvaluationGroup());
--
-- writer.writeExpression("codeExpression",
-- barcode.getCodeExpression(), false);
-- writer.writeExpression("applicationIdentifierExpression",
-- barcode.getApplicationIdentifierExpression(), false);
--
-- writer.closeElement();
-- }
-
- protected void writeTable(TableComponent table, ComponentKey componentKey,
- final JRXmlWriter reportWriter) throws IOException
---- a/build.xml
-+++ b/build.xml
-@@ -7,6 +7,8 @@
- <target name="compile" description="Compiles the java source files of the library.">
- <mkdir dir="./build/classes"/>
- <javac destdir="./build/classes" debug="true" optimize="false" deprecation="true" target="1.5" source="1.5" encoding="ISO-8859-1">
-+ <exclude name="**/barcode4j/*.java"/>
-+ <exclude name="**/barbecue/*.java"/>
- <classpath>
- <pathelement location="./build/classes"/>
- <fileset dir="./lib">
Copied: tags/jasperreports/4.1.2+dfsg-1/debian/patches/07_exclude_barcode4j_and_barbecue.diff (from rev 14974, trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff)
===================================================================
--- tags/jasperreports/4.1.2+dfsg-1/debian/patches/07_exclude_barcode4j_and_barbecue.diff (rev 0)
+++ tags/jasperreports/4.1.2+dfsg-1/debian/patches/07_exclude_barcode4j_and_barbecue.diff 2011-09-21 12:16:39 UTC (rev 14975)
@@ -0,0 +1,270 @@
+Description:
+ - build.xml: exclude Barcode4J and Barbecue modules of JasperReports.
+ - Disable Barcode4J and Barbecue classes in
+ src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java
+ and src/net/sf/jasperreports/components/ComponentsXmlHandler.java
+Fowarded: no
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2011-09-21
+Index: b/build.xml
+===================================================================
+--- a/build.xml
++++ b/build.xml
+@@ -7,6 +7,8 @@
+ <target name="compile" description="Compiles the java source files of the library.">
+ <mkdir dir="./build/classes"/>
+ <javac destdir="./build/classes" debug="true" optimize="false" deprecation="false" target="1.5" source="1.5" encoding="ISO-8859-1">
++ <exclude name="**/barcode4j/*.java"/>
++ <exclude name="**/barbecue/*.java"/>
+ <classpath>
+ <pathelement location="./build/classes"/>
+ <fileset dir="./lib">
+Index: b/src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java
+===================================================================
+--- a/src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java
++++ b/src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java
+@@ -25,12 +25,6 @@
+
+ import java.util.HashMap;
+
+-import net.sf.jasperreports.components.barbecue.BarbecueCompiler;
+-import net.sf.jasperreports.components.barbecue.BarbecueDesignConverter;
+-import net.sf.jasperreports.components.barbecue.BarbecueFillFactory;
+-import net.sf.jasperreports.components.barcode4j.BarcodeCompiler;
+-import net.sf.jasperreports.components.barcode4j.BarcodeDesignConverter;
+-import net.sf.jasperreports.components.barcode4j.BarcodeFillFactory;
+ import net.sf.jasperreports.components.list.FillListFactory;
+ import net.sf.jasperreports.components.list.ListComponent;
+ import net.sf.jasperreports.components.list.ListComponentCompiler;
+@@ -121,23 +115,6 @@
+ tableManager.setComponentFillFactory(new FillTableFactory());
+ componentManagers.put(TABLE_COMPONENT_NAME, tableManager);
+
+- DefaultComponentManager barbecueManager = new DefaultComponentManager();
+- barbecueManager.setDesignConverter(new BarbecueDesignConverter());
+- barbecueManager.setComponentCompiler(new BarbecueCompiler());
+- barbecueManager.setComponentXmlWriter(xmlHandler);
+- barbecueManager.setComponentFillFactory(new BarbecueFillFactory());
+- componentManagers.put(BARBECUE_COMPONENT_NAME, barbecueManager);
+-
+- DefaultComponentManager barcode4jManager = new DefaultComponentManager();
+- barcode4jManager.setDesignConverter(new BarcodeDesignConverter());
+- barcode4jManager.setComponentCompiler(new BarcodeCompiler());
+- barcode4jManager.setComponentXmlWriter(xmlHandler);
+- barcode4jManager.setComponentFillFactory(new BarcodeFillFactory());
+- for (int i = 0; i < BARCODE4J_COMPONENT_NAMES.length; i++)
+- {
+- componentManagers.put(BARCODE4J_COMPONENT_NAMES[i], barcode4jManager);
+- }
+-
+ DefaultComponentManager spiderChartManager = new DefaultComponentManager();
+ spiderChartManager.setDesignConverter(new SpiderChartDesignConverter());
+ spiderChartManager.setComponentCompiler(new SpiderChartCompiler());
+Index: b/src/net/sf/jasperreports/components/ComponentsXmlHandler.java
+===================================================================
+--- a/src/net/sf/jasperreports/components/ComponentsXmlHandler.java
++++ b/src/net/sf/jasperreports/components/ComponentsXmlHandler.java
+@@ -26,24 +26,6 @@
+ import java.io.IOException;
+ import java.util.List;
+
+-import net.sf.jasperreports.components.barbecue.BarbecueComponent;
+-import net.sf.jasperreports.components.barbecue.StandardBarbecueComponent;
+-import net.sf.jasperreports.components.barcode4j.BarcodeComponent;
+-import net.sf.jasperreports.components.barcode4j.BarcodeXmlWriter;
+-import net.sf.jasperreports.components.barcode4j.CodabarComponent;
+-import net.sf.jasperreports.components.barcode4j.Code128Component;
+-import net.sf.jasperreports.components.barcode4j.Code39Component;
+-import net.sf.jasperreports.components.barcode4j.DataMatrixComponent;
+-import net.sf.jasperreports.components.barcode4j.EAN128Component;
+-import net.sf.jasperreports.components.barcode4j.EAN13Component;
+-import net.sf.jasperreports.components.barcode4j.EAN8Component;
+-import net.sf.jasperreports.components.barcode4j.Interleaved2Of5Component;
+-import net.sf.jasperreports.components.barcode4j.PDF417Component;
+-import net.sf.jasperreports.components.barcode4j.POSTNETComponent;
+-import net.sf.jasperreports.components.barcode4j.RoyalMailCustomerComponent;
+-import net.sf.jasperreports.components.barcode4j.UPCAComponent;
+-import net.sf.jasperreports.components.barcode4j.UPCEComponent;
+-import net.sf.jasperreports.components.barcode4j.USPSIntelligentMailComponent;
+ import net.sf.jasperreports.components.list.DesignListContents;
+ import net.sf.jasperreports.components.list.ListComponent;
+ import net.sf.jasperreports.components.list.ListContents;
+@@ -102,8 +84,6 @@
+ public void configureDigester(Digester digester)
+ {
+ addListRules(digester);
+- addBarbecueRules(digester);
+- addBarcode4jRules(digester);
+ addTableRules(digester);
+ SpiderChartDigester.addSpiderChartRules(digester);
+ addMapRules(digester);
+@@ -127,107 +107,6 @@
+ digester.addSetNext(listContentsPattern, "setContents");
+ }
+
+- protected void addBarbecueRules(Digester digester)
+- {
+- String barcodePattern = "*/componentElement/barbecue";
+- digester.addObjectCreate(barcodePattern, StandardBarbecueComponent.class);
+- digester.addSetProperties(barcodePattern,
+- //properties to be ignored by this rule
+- new String[]{JRXmlConstants.ATTRIBUTE_evaluationTime, StandardBarbecueComponent.PROPERTY_ROTATION},
+- new String[0]);
+- digester.addRule(barcodePattern,
+- new XmlConstantPropertyRule(
+- JRXmlConstants.ATTRIBUTE_evaluationTime, "evaluationTimeValue",
+- EvaluationTimeEnum.values()));
+- digester.addRule(barcodePattern,
+- new XmlConstantPropertyRule(
+- StandardBarbecueComponent.PROPERTY_ROTATION,
+- RotationEnum.values()));
+-
+- String barcodeExpressionPattern = barcodePattern + "/codeExpression";
+- digester.addFactoryCreate(barcodeExpressionPattern,
+- JRExpressionFactory.StringExpressionFactory.class.getName());
+- digester.addCallMethod(barcodeExpressionPattern, "setText", 0);
+- digester.addSetNext(barcodeExpressionPattern, "setCodeExpression",
+- JRExpression.class.getName());
+-
+- String applicationIdentifierExpressionPattern = barcodePattern
+- + "/applicationIdentifierExpression";
+- digester.addFactoryCreate(applicationIdentifierExpressionPattern,
+- JRExpressionFactory.StringExpressionFactory.class.getName());
+- digester.addCallMethod(applicationIdentifierExpressionPattern, "setText", 0);
+- digester.addSetNext(applicationIdentifierExpressionPattern,
+- "setApplicationIdentifierExpression",
+- JRExpression.class.getName());
+- }
+-
+- protected void addBarcode4jRules(Digester digester)
+- {
+- addBaseBarcode4jRules(digester,
+- "*/componentElement/Codabar",
+- CodabarComponent.class);
+- addBaseBarcode4jRules(digester,
+- "*/componentElement/Code128",
+- Code128Component.class);
+- addBaseBarcode4jRules(digester,
+- "*/componentElement/EAN128",
+- EAN128Component.class);
+- addBaseBarcode4jRules(digester,
+- "*/componentElement/DataMatrix",
+- DataMatrixComponent.class);
+- addBaseBarcode4jRules(digester,
+- "*/componentElement/RoyalMailCustomer",
+- RoyalMailCustomerComponent.class);
+- addBaseBarcode4jRules(digester,
+- "*/componentElement/USPSIntelligentMail",
+- USPSIntelligentMailComponent.class);
+- addBaseBarcode4jRules(digester,
+- "*/componentElement/Code39", Code39Component.class);
+- addBaseBarcode4jRules(digester,
+- "*/componentElement/Interleaved2Of5", Interleaved2Of5Component.class);
+- addBaseBarcode4jRules(digester,
+- "*/componentElement/UPCA", UPCAComponent.class);
+- addBaseBarcode4jRules(digester,
+- "*/componentElement/UPCE", UPCEComponent.class);
+- addBaseBarcode4jRules(digester,
+- "*/componentElement/EAN13", EAN13Component.class);
+- addBaseBarcode4jRules(digester,
+- "*/componentElement/EAN8", EAN8Component.class);
+- addBaseBarcode4jRules(digester,
+- "*/componentElement/POSTNET", POSTNETComponent.class);
+- addBaseBarcode4jRules(digester,
+- "*/componentElement/PDF417", PDF417Component.class);
+- }
+-
+- protected <T> void addBaseBarcode4jRules(Digester digester,
+- String barcodePattern, Class<T> barcodeComponentClass)
+- {
+- digester.addObjectCreate(barcodePattern, barcodeComponentClass);
+- digester.addSetProperties(barcodePattern,
+- //properties to be ignored by this rule
+- new String[]{JRXmlConstants.ATTRIBUTE_evaluationTime},
+- new String[0]);
+- //rule to set evaluation time
+- digester.addRule(barcodePattern,
+- new XmlConstantPropertyRule(
+- JRXmlConstants.ATTRIBUTE_evaluationTime, "evaluationTimeValue",
+- EvaluationTimeEnum.values()));
+-
+- String codeExpressionPattern = barcodePattern + "/codeExpression";
+- digester.addFactoryCreate(codeExpressionPattern,
+- JRExpressionFactory.StringExpressionFactory.class.getName());
+- digester.addCallMethod(codeExpressionPattern, "setText", 0);
+- digester.addSetNext(codeExpressionPattern, "setCodeExpression",
+- JRExpression.class.getName());
+-
+- String patternExpressionPattern = barcodePattern + "/patternExpression";
+- digester.addFactoryCreate(patternExpressionPattern,
+- JRExpressionFactory.StringExpressionFactory.class.getName());
+- digester.addCallMethod(patternExpressionPattern, "setText", 0);
+- digester.addSetNext(patternExpressionPattern, "setPatternExpression",
+- JRExpression.class.getName());
+- }
+-
+ protected void addMapRules(Digester digester)
+ {
+ String mapPattern = "*/componentElement/map";
+@@ -355,18 +234,6 @@
+ TableComponent table = (TableComponent) component;
+ writeTable(table, componentKey, reportWriter);
+ }
+- else if (component instanceof BarbecueComponent)
+- {
+- BarbecueComponent barcode = (BarbecueComponent) component;
+- writeBarbecue(barcode, componentKey, reportWriter);
+- }
+- else if (component instanceof BarcodeComponent)
+- {
+- BarcodeComponent barcode = (BarcodeComponent) component;
+- BarcodeXmlWriter barcodeWriter = new BarcodeXmlWriter(
+- reportWriter, barcode, componentKey);
+- barcodeWriter.writeBarcode();
+- }
+ else if (component instanceof SpiderChartComponent)
+ {
+ SpiderChartComponent spiderChart = (SpiderChartComponent) component;
+@@ -410,41 +277,7 @@
+
+ writer.closeElement();
+ }
+-
+- protected void writeBarbecue(BarbecueComponent barcode, ComponentKey componentKey,
+- JRXmlWriter reportWriter) throws IOException
+- {
+- JRXmlWriteHelper writer = reportWriter.getXmlWriteHelper();
+-
+- XmlNamespace namespace = new XmlNamespace(
+- ComponentsExtensionsRegistryFactory.NAMESPACE,
+- componentKey.getNamespacePrefix(),
+- ComponentsExtensionsRegistryFactory.XSD_LOCATION);
+-
+- writer.startElement("barbecue", namespace);
+-
+- writer.addAttribute("type", barcode.getType());
+- writer.addAttribute("drawText", barcode.isDrawText());
+- writer.addAttribute("checksumRequired", barcode.isChecksumRequired());
+- writer.addAttribute("barWidth", barcode.getBarWidth());
+- writer.addAttribute("barHeight", barcode.getBarHeight());
+- writer.addAttribute("rotation", barcode.getOwnRotation());
+- if (barcode.getEvaluationTimeValue() != EvaluationTimeEnum.NOW)
+- {
+- writer.addAttribute(JRXmlConstants.ATTRIBUTE_evaluationTime,
+- barcode.getEvaluationTimeValue());
+- }
+- writer.addAttribute(JRXmlConstants.ATTRIBUTE_evaluationGroup,
+- barcode.getEvaluationGroup());
+-
+- writer.writeExpression("codeExpression",
+- barcode.getCodeExpression());
+- writer.writeExpression("applicationIdentifierExpression",
+- barcode.getApplicationIdentifierExpression());
+-
+- writer.closeElement();
+- }
+-
++
+ protected void writeMap(MapComponent map, ComponentKey componentKey,
+ JRXmlWriter reportWriter) throws IOException
+ {
Deleted: tags/jasperreports/4.1.2+dfsg-1/debian/patches/08_no_maxmemory_for_javadoc.diff
===================================================================
--- trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff 2011-09-21 01:54:46 UTC (rev 14973)
+++ tags/jasperreports/4.1.2+dfsg-1/debian/patches/08_no_maxmemory_for_javadoc.diff 2011-09-21 12:16:39 UTC (rev 14975)
@@ -1,14 +0,0 @@
-Description: build.xml: Don't pass Xmx128m to <javadoc> task.
-Fowarded: no
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2010-04-20
---- a/build.xml
-+++ b/build.xml
-@@ -340,7 +340,6 @@
- use="true"
- windowtitle="JasperReports ${version} API"
- excludepackagenames="org.w3c.tools.codec"
-- maxmemory="128m"
- encoding="ISO-8859-1">
- <doctitle>
- <![CDATA[
Copied: tags/jasperreports/4.1.2+dfsg-1/debian/patches/08_no_maxmemory_for_javadoc.diff (from rev 14974, trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff)
===================================================================
--- tags/jasperreports/4.1.2+dfsg-1/debian/patches/08_no_maxmemory_for_javadoc.diff (rev 0)
+++ tags/jasperreports/4.1.2+dfsg-1/debian/patches/08_no_maxmemory_for_javadoc.diff 2011-09-21 12:16:39 UTC (rev 14975)
@@ -0,0 +1,16 @@
+Description: build.xml: Don't pass Xmx128m to <javadoc> task.
+Fowarded: no
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-04-20
+Index: b/build.xml
+===================================================================
+--- a/build.xml
++++ b/build.xml
+@@ -349,7 +349,6 @@
+ use="true"
+ windowtitle="JasperReports ${version} API"
+ excludepackagenames="org.w3c.tools.codec"
+- maxmemory="128m"
+ encoding="ISO-8859-1">
+ <doctitle>
+ <![CDATA[
Deleted: tags/jasperreports/4.1.2+dfsg-1/debian/patches/09_use_commons_codec.diff
===================================================================
--- trunk/jasperreports/debian/patches/09_use_commons_codec.diff 2011-09-21 01:54:46 UTC (rev 14973)
+++ tags/jasperreports/4.1.2+dfsg-1/debian/patches/09_use_commons_codec.diff 2011-09-21 12:16:39 UTC (rev 14975)
@@ -1,116 +0,0 @@
-Description: Use Commons Codec Base64 decode/encode
- instead of non-DFSG-free W3C one (removed from tarball).
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Forwarded: no
-Last-Update: 2010-04-20
---- a/src/net/sf/jasperreports/engine/export/JRXmlExporter.java
-+++ b/src/net/sf/jasperreports/engine/export/JRXmlExporter.java
-@@ -90,7 +90,7 @@
- import net.sf.jasperreports.engine.util.JRXmlWriteHelper;
- import net.sf.jasperreports.engine.xml.JRXmlConstants;
-
--import org.w3c.tools.codec.Base64Encoder;
-+import org.apache.commons.codec.binary.Base64;
-
-
- /**
-@@ -843,13 +843,8 @@
- {
- try
- {
-- ByteArrayInputStream bais = new ByteArrayInputStream(renderer.getImageData());
-- ByteArrayOutputStream baos = new ByteArrayOutputStream();
--
-- Base64Encoder encoder = new Base64Encoder(bais, baos);
-- encoder.process();
--
-- imageSource = new String(baos.toByteArray(), DEFAULT_XML_ENCODING);
-+ byte[] byteOut = Base64.decodeBase64(renderer.getImageData());
-+ imageSource = new String(byteOut, DEFAULT_XML_ENCODING);
- }
- catch (IOException e)
- {
---- a/src/net/sf/jasperreports/engine/util/JRValueStringUtils.java
-+++ b/src/net/sf/jasperreports/engine/util/JRValueStringUtils.java
-@@ -34,9 +34,7 @@
-
- import net.sf.jasperreports.engine.JRRuntimeException;
-
--import org.w3c.tools.codec.Base64Decoder;
--import org.w3c.tools.codec.Base64Encoder;
--import org.w3c.tools.codec.Base64FormatException;
-+import org.apache.commons.codec.binary.Base64;
-
-
- /**
-@@ -459,12 +457,8 @@
- {
- try
- {
-- ByteArrayInputStream dataIn = new ByteArrayInputStream(data.getBytes());
-- ByteArrayOutputStream bytesOut = new ByteArrayOutputStream();
-- Base64Decoder dec = new Base64Decoder(dataIn, bytesOut);
-- dec.process();
--
-- ByteArrayInputStream bytesIn = new ByteArrayInputStream(bytesOut.toByteArray());
-+ byte[] bytesOut = Base64.decodeBase64(data.getBytes());
-+ ByteArrayInputStream bytesIn = new ByteArrayInputStream(bytesOut);
- ObjectInputStream objectIn = new ObjectInputStream(bytesIn);
- return objectIn.readObject();
- }
-@@ -476,10 +470,6 @@
- {
- throw new JRRuntimeException(e);
- }
-- catch (Base64FormatException e)
-- {
-- throw new JRRuntimeException(e);
-- }
- }
-
- public String serialize(Object value)
-@@ -490,14 +480,9 @@
- ObjectOutputStream objectOut = new ObjectOutputStream(bytesOut);
- objectOut.writeObject(value);
- objectOut.close();
--
-- ByteArrayInputStream bytesIn = new ByteArrayInputStream(bytesOut.toByteArray());
-- ByteArrayOutputStream dataOut = new ByteArrayOutputStream();
--
-- Base64Encoder enc = new Base64Encoder(bytesIn, dataOut);
-- enc.process();
--
-- return new String(dataOut.toByteArray(), "UTF-8");
-+
-+ byte[] dataOut = Base64.decodeBase64(bytesOut.toByteArray());
-+ return new String(dataOut, "UTF-8");
- }
- catch (NotSerializableException e)
- {
---- a/src/net/sf/jasperreports/engine/xml/JRPrintImageSourceObject.java
-+++ b/src/net/sf/jasperreports/engine/xml/JRPrintImageSourceObject.java
-@@ -30,7 +30,7 @@
- import net.sf.jasperreports.engine.JRImageRenderer;
- import net.sf.jasperreports.engine.JRPrintImage;
-
--import org.w3c.tools.codec.Base64Decoder;
-+import org.apache.commons.codec.binary.Base64;
-
-
- /**
-@@ -79,13 +79,8 @@
- {
- try
- {
-- ByteArrayInputStream bais = new ByteArrayInputStream(imageSource.getBytes("UTF-8"));//FIXMENOW other encodings ?
-- ByteArrayOutputStream baos = new ByteArrayOutputStream();
--
-- Base64Decoder decoder = new Base64Decoder(bais, baos);
-- decoder.process();
--
-- printImage.setRenderer(JRImageRenderer.getInstance(baos.toByteArray()));//, JRImage.ON_ERROR_TYPE_ERROR));
-+ byte[] decodedBytes = Base64.decodeBase64(imageSource.getBytes("UTF-8"));//FIXMENOW other encodings ?
-+ printImage.setRenderer(JRImageRenderer.getInstance(decodedBytes));//, JRImage.ON_ERROR_TYPE_ERROR));
- }
- catch (Exception e)
- {
Copied: tags/jasperreports/4.1.2+dfsg-1/debian/patches/09_use_commons_codec.diff (from rev 14974, trunk/jasperreports/debian/patches/09_use_commons_codec.diff)
===================================================================
--- tags/jasperreports/4.1.2+dfsg-1/debian/patches/09_use_commons_codec.diff (rev 0)
+++ tags/jasperreports/4.1.2+dfsg-1/debian/patches/09_use_commons_codec.diff 2011-09-21 12:16:39 UTC (rev 14975)
@@ -0,0 +1,122 @@
+Description: Use Commons Codec Base64 decode/encode
+ instead of non-DFSG-free W3C one (removed from tarball).
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Forwarded: no
+Last-Update: 2010-04-20
+Index: b/src/net/sf/jasperreports/engine/export/JRXmlExporter.java
+===================================================================
+--- a/src/net/sf/jasperreports/engine/export/JRXmlExporter.java
++++ b/src/net/sf/jasperreports/engine/export/JRXmlExporter.java
+@@ -89,7 +89,7 @@
+ import net.sf.jasperreports.engine.util.JRXmlWriteHelper;
+ import net.sf.jasperreports.engine.xml.JRXmlConstants;
+
+-import org.w3c.tools.codec.Base64Encoder;
++import org.apache.commons.codec.binary.Base64;
+
+
+ /**
+@@ -807,13 +807,8 @@
+ {
+ try
+ {
+- ByteArrayInputStream bais = new ByteArrayInputStream(renderer.getImageData());
+- ByteArrayOutputStream baos = new ByteArrayOutputStream();
+-
+- Base64Encoder encoder = new Base64Encoder(bais, baos);
+- encoder.process();
+-
+- imageSource = new String(baos.toByteArray(), DEFAULT_XML_ENCODING);
++ byte[] byteOut = Base64.decodeBase64(renderer.getImageData());
++ imageSource = new String(byteOut, DEFAULT_XML_ENCODING);
+ }
+ catch (IOException e)
+ {
+Index: b/src/net/sf/jasperreports/engine/util/JRValueStringUtils.java
+===================================================================
+--- a/src/net/sf/jasperreports/engine/util/JRValueStringUtils.java
++++ b/src/net/sf/jasperreports/engine/util/JRValueStringUtils.java
+@@ -34,9 +34,7 @@
+
+ import net.sf.jasperreports.engine.JRRuntimeException;
+
+-import org.w3c.tools.codec.Base64Decoder;
+-import org.w3c.tools.codec.Base64Encoder;
+-import org.w3c.tools.codec.Base64FormatException;
++import org.apache.commons.codec.binary.Base64;
+
+
+ /**
+@@ -459,12 +457,8 @@
+ {
+ try
+ {
+- ByteArrayInputStream dataIn = new ByteArrayInputStream(data.getBytes());
+- ByteArrayOutputStream bytesOut = new ByteArrayOutputStream();
+- Base64Decoder dec = new Base64Decoder(dataIn, bytesOut);
+- dec.process();
+-
+- ByteArrayInputStream bytesIn = new ByteArrayInputStream(bytesOut.toByteArray());
++ byte[] bytesOut = Base64.decodeBase64(data.getBytes());
++ ByteArrayInputStream bytesIn = new ByteArrayInputStream(bytesOut);
+ ObjectInputStream objectIn = new ObjectInputStream(bytesIn);
+ return objectIn.readObject();
+ }
+@@ -476,10 +470,6 @@
+ {
+ throw new JRRuntimeException(e);
+ }
+- catch (Base64FormatException e)
+- {
+- throw new JRRuntimeException(e);
+- }
+ }
+
+ public String serialize(Object value)
+@@ -490,14 +480,9 @@
+ ObjectOutputStream objectOut = new ObjectOutputStream(bytesOut);
+ objectOut.writeObject(value);
+ objectOut.close();
+-
+- ByteArrayInputStream bytesIn = new ByteArrayInputStream(bytesOut.toByteArray());
+- ByteArrayOutputStream dataOut = new ByteArrayOutputStream();
+-
+- Base64Encoder enc = new Base64Encoder(bytesIn, dataOut);
+- enc.process();
+-
+- return new String(dataOut.toByteArray(), "UTF-8");
++
++ byte[] dataOut = Base64.decodeBase64(bytesOut.toByteArray());
++ return new String(dataOut, "UTF-8");
+ }
+ catch (NotSerializableException e)
+ {
+Index: b/src/net/sf/jasperreports/engine/xml/JRPrintImageSourceObject.java
+===================================================================
+--- a/src/net/sf/jasperreports/engine/xml/JRPrintImageSourceObject.java
++++ b/src/net/sf/jasperreports/engine/xml/JRPrintImageSourceObject.java
+@@ -30,7 +30,7 @@
+ import net.sf.jasperreports.engine.JRImageRenderer;
+ import net.sf.jasperreports.engine.JRPrintImage;
+
+-import org.w3c.tools.codec.Base64Decoder;
++import org.apache.commons.codec.binary.Base64;
+
+
+ /**
+@@ -79,13 +79,8 @@
+ {
+ try
+ {
+- ByteArrayInputStream bais = new ByteArrayInputStream(imageSource.getBytes("UTF-8"));//FIXMENOW other encodings ?
+- ByteArrayOutputStream baos = new ByteArrayOutputStream();
+-
+- Base64Decoder decoder = new Base64Decoder(bais, baos);
+- decoder.process();
+-
+- printImage.setRenderer(JRImageRenderer.getInstance(baos.toByteArray()));//, JRImage.ON_ERROR_TYPE_ERROR));
++ byte[] decodedBytes = Base64.decodeBase64(imageSource.getBytes("UTF-8"));//FIXMENOW other encodings ?
++ printImage.setRenderer(JRImageRenderer.getInstance(decodedBytes));//, JRImage.ON_ERROR_TYPE_ERROR));
+ }
+ catch (Exception e)
+ {
Deleted: tags/jasperreports/4.1.2+dfsg-1/debian/patches/10_disable_fonts.diff
===================================================================
--- trunk/jasperreports/debian/patches/10_disable_fonts.diff 2011-09-21 01:54:46 UTC (rev 14973)
+++ tags/jasperreports/4.1.2+dfsg-1/debian/patches/10_disable_fonts.diff 2011-09-21 12:16:39 UTC (rev 14975)
@@ -1,15 +0,0 @@
-Description: build.xml: don't build -font.jar (not included in our orig source tarball)
-Fowarded: no
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2010-04-20
---- a/build.xml
-+++ b/build.xml
-@@ -41,7 +41,7 @@
- </antlr>
- </target>
-
-- <target name="jar" depends="compile, javaflow, applet, fonts" description="Builds the JasperReports JAR files.">
-+ <target name="jar" depends="compile, javaflow, applet" description="Builds the JasperReports JAR files.">
- <mkdir dir="./dist"/>
- <jar jarfile="./dist/jasperreports-${version}.jar" manifest="src/META-INF/MANIFEST.MF">
- <fileset dir="./build/classes"/>
Copied: tags/jasperreports/4.1.2+dfsg-1/debian/patches/10_disable_fonts.diff (from rev 14974, trunk/jasperreports/debian/patches/10_disable_fonts.diff)
===================================================================
--- tags/jasperreports/4.1.2+dfsg-1/debian/patches/10_disable_fonts.diff (rev 0)
+++ tags/jasperreports/4.1.2+dfsg-1/debian/patches/10_disable_fonts.diff 2011-09-21 12:16:39 UTC (rev 14975)
@@ -0,0 +1,17 @@
+Description: build.xml: don't build -font.jar (not included in our orig source tarball)
+Fowarded: no
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-04-20
+Index: b/build.xml
+===================================================================
+--- a/build.xml
++++ b/build.xml
+@@ -45,7 +45,7 @@
+ </antlr>
+ </target>
+
+- <target name="jar" depends="compile, javaflow, applet, fonts" description="Builds the JasperReports JAR files.">
++ <target name="jar" depends="compile, javaflow, applet" description="Builds the JasperReports JAR files.">
+ <mkdir dir="./dist"/>
+ <jar jarfile="./dist/jasperreports-${version}.jar" manifest="src/META-INF/MANIFEST.MF">
+ <fileset dir="./build/classes"/>
Deleted: tags/jasperreports/4.1.2+dfsg-1/debian/patches/12_samples.diff
===================================================================
--- trunk/jasperreports/debian/patches/12_samples.diff 2011-09-21 01:54:46 UTC (rev 14973)
+++ tags/jasperreports/4.1.2+dfsg-1/debian/patches/12_samples.diff 2011-09-21 12:16:39 UTC (rev 14975)
@@ -1,14 +0,0 @@
-Description: Disable build of sampleref
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2010-04-20
-Forwarded: no
---- a/build.xml
-+++ b/build.xml
-@@ -448,6 +448,6 @@
- </copy>
- </target>
-
-- <target name="docs" depends="javadoc, schemaref, configref, sampleref" description="Generates all documentation."/>
-+ <target name="docs" depends="javadoc, schemaref, configref" description="Generates all documentation."/>
-
- </project>
Copied: tags/jasperreports/4.1.2+dfsg-1/debian/patches/12_samples.diff (from rev 14974, trunk/jasperreports/debian/patches/12_samples.diff)
===================================================================
--- tags/jasperreports/4.1.2+dfsg-1/debian/patches/12_samples.diff (rev 0)
+++ tags/jasperreports/4.1.2+dfsg-1/debian/patches/12_samples.diff 2011-09-21 12:16:39 UTC (rev 14975)
@@ -0,0 +1,16 @@
+Description: Disable build of sampleref
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-04-20
+Forwarded: no
+Index: b/build.xml
+===================================================================
+--- a/build.xml
++++ b/build.xml
+@@ -457,6 +457,6 @@
+ </copy>
+ </target>
+
+- <target name="docs" depends="javadoc, schemaref, configref, sampleref" description="Generates all documentation."/>
++ <target name="docs" depends="javadoc, schemaref, configref" description="Generates all documentation."/>
+
+ </project>
Copied: tags/jasperreports/4.1.2+dfsg-1/debian/patches/13_disable_ooxml_support.diff (from rev 14974, trunk/jasperreports/debian/patches/13_disable_ooxml_support.diff)
===================================================================
--- tags/jasperreports/4.1.2+dfsg-1/debian/patches/13_disable_ooxml_support.diff (rev 0)
+++ tags/jasperreports/4.1.2+dfsg-1/debian/patches/13_disable_ooxml_support.diff 2011-09-21 12:16:39 UTC (rev 14975)
@@ -0,0 +1,65 @@
+Description: Apache POI's Debian package doesn't yet provide support for
+ OOXML formats, so disable JR support for it.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2011-09-21
+Forwarded: not-needed
+Index: b/build.xml
+===================================================================
+--- a/build.xml
++++ b/build.xml
+@@ -9,6 +9,10 @@
+ <javac destdir="./build/classes" debug="true" optimize="false" deprecation="false" target="1.5" source="1.5" encoding="ISO-8859-1">
+ <exclude name="**/barcode4j/*.java"/>
+ <exclude name="**/barbecue/*.java"/>
++ <exclude name="**/JRXlsxDataSource.java"/>
++ <exclude name="**/XlsxDataAdapterService.java"/>
++ <exclude name="**/JRXlsxQueryExecuter.java"/>
++ <exclude name="**/JRXlsxQueryExecuterFactory"/>
+ <classpath>
+ <pathelement location="./build/classes"/>
+ <fileset dir="./lib">
+Index: b/src/net/sf/jasperreports/data/DefaultDataAdapterServiceFactory.java
+===================================================================
+--- a/src/net/sf/jasperreports/data/DefaultDataAdapterServiceFactory.java
++++ b/src/net/sf/jasperreports/data/DefaultDataAdapterServiceFactory.java
+@@ -41,8 +41,6 @@
+ import net.sf.jasperreports.data.qe.QueryExecuterDataAdapterService;
+ import net.sf.jasperreports.data.xls.XlsDataAdapter;
+ import net.sf.jasperreports.data.xls.XlsDataAdapterService;
+-import net.sf.jasperreports.data.xlsx.XlsxDataAdapter;
+-import net.sf.jasperreports.data.xlsx.XlsxDataAdapterService;
+ import net.sf.jasperreports.data.xml.RemoteXmlDataAdapter;
+ import net.sf.jasperreports.data.xml.RemoteXmlDataAdapterService;
+ import net.sf.jasperreports.data.xml.XmlDataAdapter;
+@@ -112,10 +110,6 @@
+ {
+ dataAdapterService = new XlsDataAdapterService((XlsDataAdapter)dataAdapter);
+ }
+- else if (dataAdapter instanceof XlsxDataAdapter)
+- {
+- dataAdapterService = new XlsxDataAdapterService((XlsxDataAdapter)dataAdapter);
+- }
+ else if (dataAdapter instanceof RemoteXmlDataAdapter)
+ {
+ dataAdapterService = new RemoteXmlDataAdapterService((RemoteXmlDataAdapter)dataAdapter);
+Index: b/src/net/sf/jasperreports/engine/data/JRXlsxDataSource.java
+===================================================================
+--- a/src/net/sf/jasperreports/engine/data/JRXlsxDataSource.java
++++ b/src/net/sf/jasperreports/engine/data/JRXlsxDataSource.java
+@@ -47,7 +47,6 @@
+ import org.apache.poi.ss.usermodel.Row;
+ import org.apache.poi.ss.usermodel.Sheet;
+ import org.apache.poi.ss.usermodel.Workbook;
+-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+
+
+ /**
+@@ -95,7 +94,7 @@
+ try
+ {
+ this.inputStream = is;
+- this.workbook = new XSSFWorkbook(is);
++ this.workbook = null; //new XSSFWorkbook(is);
+ this.closeWorkbook = true;
+ this.closeInputStream = false;
+ }
Copied: tags/jasperreports/4.1.2+dfsg-1/debian/patches/14_velocity.diff (from rev 14974, trunk/jasperreports/debian/patches/14_velocity.diff)
===================================================================
--- tags/jasperreports/4.1.2+dfsg-1/debian/patches/14_velocity.diff (rev 0)
+++ tags/jasperreports/4.1.2+dfsg-1/debian/patches/14_velocity.diff 2011-09-21 12:16:39 UTC (rev 14975)
@@ -0,0 +1,93 @@
+Description: Handle java.lang.Exception during init ov VelocityEngine
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2011-09-21
+Forwarded: no
+Index: b/src/net/sf/jasperreports/components/BaseElementHtmlHandler.java
+===================================================================
+--- a/src/net/sf/jasperreports/components/BaseElementHtmlHandler.java
++++ b/src/net/sf/jasperreports/components/BaseElementHtmlHandler.java
+@@ -37,9 +37,13 @@
+
+ static {
+ velocityEngine = new VelocityEngine();
++ try {
+ velocityEngine.setProperty("file.resource.loader.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
+ velocityEngine.setProperty("file.resource.loader.cache", "true");
+ velocityEngine.init();
++ } catch (java.lang.Exception e) {
++ e.printStackTrace();
++ }
+ }
+
+ protected VelocityEngine getVelocityEngine() {
+Index: b/src/net/sf/jasperreports/components/sort/SortElementHtmlHandler.java
+===================================================================
+--- a/src/net/sf/jasperreports/components/sort/SortElementHtmlHandler.java
++++ b/src/net/sf/jasperreports/components/sort/SortElementHtmlHandler.java
+@@ -75,7 +75,12 @@
+ String sortDatasetName = element.getPropertiesMap().getProperty(SortElement.PROPERTY_DATASET_RUN);
+ String isFilterable = element.getPropertiesMap().getProperty(SortElement.PROPERTY_IS_FILTERABLE);
+
+- Template template = getVelocityEngine().getTemplate(SortElementHtmlHandler.SORT_ELEMENT_HTML_TEMPLATE);
++ Template template = null;
++ try {
++ template = getVelocityEngine().getTemplate(SortElementHtmlHandler.SORT_ELEMENT_HTML_TEMPLATE);
++ } catch (java.lang.Exception e) {
++ e.printStackTrace();
++ }
+
+ String appContextPath = (String)reportContext.getParameterValue("net.sf.jasperreports.web.app.context.path");//FIXMEJIVE define constant
+
+@@ -129,7 +134,11 @@
+ }
+
+ StringWriter writer = new StringWriter(128);
++ try {
+ template.merge(velocityContext, writer);
++ } catch (java.io.IOException e) {
++ e.printStackTrace();
++ }
+ writer.flush();
+ try {
+ writer.close();
+Index: b/src/net/sf/jasperreports/web/util/VelocityUtil.java
+===================================================================
+--- a/src/net/sf/jasperreports/web/util/VelocityUtil.java
++++ b/src/net/sf/jasperreports/web/util/VelocityUtil.java
+@@ -47,9 +47,13 @@
+
+ static {
+ velocityEngine = new VelocityEngine();
++ try {
+ velocityEngine.setProperty("file.resource.loader.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
+ velocityEngine.setProperty("file.resource.loader.cache", "true");
+ velocityEngine.init();
++ } catch (java.lang.Exception e) {
++ e.printStackTrace();
++ }
+ }
+
+ public static VelocityEngine getVelocityEngine() {
+@@ -57,13 +61,18 @@
+ }
+
+ public static String processTemplate(String templateName, VelocityContext vContext) {
+- Template template = getVelocityEngine().getTemplate(templateName);
++ Template template = null;
++ try {
++ template = getVelocityEngine().getTemplate(templateName);
++ } catch (java.lang.Exception e) {
++ e.printStackTrace();
++ }
+
+ StringWriter writer = new StringWriter(128);
+- template.merge(vContext, writer);
+- writer.flush();
+ try {
+- writer.close();
++ template.merge(vContext, writer);
++ writer.flush();
++ writer.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
Deleted: tags/jasperreports/4.1.2+dfsg-1/debian/patches/series
===================================================================
--- trunk/jasperreports/debian/patches/series 2011-09-21 01:54:46 UTC (rev 14973)
+++ tags/jasperreports/4.1.2+dfsg-1/debian/patches/series 2011-09-21 12:16:39 UTC (rev 14975)
@@ -1,7 +0,0 @@
-02_use_debian_asm.diff
-06_configure_javaflow.diff
-07_exclude_barcode4j_and_barbecue.diff
-08_no_maxmemory_for_javadoc.diff
-09_use_commons_codec.diff
-10_disable_fonts.diff
-12_samples.diff
Copied: tags/jasperreports/4.1.2+dfsg-1/debian/patches/series (from rev 14974, trunk/jasperreports/debian/patches/series)
===================================================================
--- tags/jasperreports/4.1.2+dfsg-1/debian/patches/series (rev 0)
+++ tags/jasperreports/4.1.2+dfsg-1/debian/patches/series 2011-09-21 12:16:39 UTC (rev 14975)
@@ -0,0 +1,10 @@
+01_disable_deprecation_warning.diff
+02_use_debian_asm.diff
+06_configure_javaflow.diff
+07_exclude_barcode4j_and_barbecue.diff
+08_no_maxmemory_for_javadoc.diff
+09_use_commons_codec.diff
+10_disable_fonts.diff
+12_samples.diff
+13_disable_ooxml_support.diff
+14_velocity.diff
Deleted: tags/jasperreports/4.1.2+dfsg-1/debian/rules
===================================================================
--- trunk/jasperreports/debian/rules 2011-09-21 01:54:46 UTC (rev 14973)
+++ tags/jasperreports/4.1.2+dfsg-1/debian/rules 2011-09-21 12:16:39 UTC (rev 14975)
@@ -1,36 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-ANT_HOME := /usr/share/ant
-
-DEB_JARS := ant-trax ant-nodeps bsh asm2 groovy jcommon \
- spring3-core spring3-beans \
- commons-digester commons-collections3 commons-logging \
- commons-beanutils commons-codec commons-javaflow \
- eclipse-ecj xalan2 jaxen xml-apis-ext \
- jxl jakarta-poi itext \
- batik-all jfreechart hibernate3 \
- glassfish-javaee mondrian olap4j antlr js
-
-DEB_ANT_BUILD_TARGET := jar docs
-DEB_ANT_CLEAN_TARGET := clean
-
-VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e s/\+dfsg//)
-
-binary-post-install/libjasperreports-java::
- mh_installpoms -plibjasperreports-java
- mh_installjar -plibjasperreports-java -l pom.xml dist/jasperreports-$(VERSION).jar
- dh_install -plibjasperreports-java dist/jasperreports-applet-$(VERSION).jar /usr/share/java/
- dh_link /usr/share/java/jasperreports-applet-$(VERSION).jar /usr/share/java/jasperreports-applet.jar
- dh_install -plibjasperreports-java dist/jasperreports-javaflow-$(VERSION).jar /usr/share/java/
- dh_link /usr/share/java/jasperreports-javaflow-$(VERSION).jar /usr/share/java/jasperreports-javaflow.jar
-
-clean::
- -rm -rf debian/tmp
- mh_clean
-
-get-orig-source:
- uscan --force-download
Copied: tags/jasperreports/4.1.2+dfsg-1/debian/rules (from rev 14974, trunk/jasperreports/debian/rules)
===================================================================
--- tags/jasperreports/4.1.2+dfsg-1/debian/rules (rev 0)
+++ tags/jasperreports/4.1.2+dfsg-1/debian/rules 2011-09-21 12:16:39 UTC (rev 14975)
@@ -0,0 +1,36 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+JAVA_HOME := /usr/lib/jvm/default-java
+ANT_HOME := /usr/share/ant
+
+DEB_JARS := ant-trax ant-nodeps bsh asm2 groovy jcommon \
+ spring3-core spring3-beans \
+ commons-digester commons-collections3 commons-logging \
+ commons-beanutils commons-codec commons-javaflow \
+ eclipse-ecj xalan2 jaxen xml-apis-ext \
+ jxl poi itext velocity castor-core castor-xml \
+ batik-all jfreechart hibernate3 \
+ glassfish-javaee mondrian olap4j antlr js
+
+DEB_ANT_BUILD_TARGET := jar docs
+DEB_ANT_CLEAN_TARGET := clean
+
+VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e s/\+dfsg//)
+
+binary-post-install/libjasperreports-java::
+ mh_installpoms -plibjasperreports-java
+ mh_installjar -plibjasperreports-java -l pom.xml dist/jasperreports-$(VERSION).jar
+ dh_install -plibjasperreports-java dist/jasperreports-applet-$(VERSION).jar /usr/share/java/
+ dh_link /usr/share/java/jasperreports-applet-$(VERSION).jar /usr/share/java/jasperreports-applet.jar
+ dh_install -plibjasperreports-java dist/jasperreports-javaflow-$(VERSION).jar /usr/share/java/
+ dh_link /usr/share/java/jasperreports-javaflow-$(VERSION).jar /usr/share/java/jasperreports-javaflow.jar
+
+clean::
+ -rm -rf debian/tmp
+ mh_clean
+
+get-orig-source:
+ uscan --force-download --rename
More information about the pkg-java-commits
mailing list