Author: drazzib Date: 2010-07-14 11:52:34 +0000 (Wed, 14 Jul 2010) New Revision: 12753
Added: tags/jasperreports/3.7.3+dfsg-1/ tags/jasperreports/3.7.3+dfsg-1/debian/changelog tags/jasperreports/3.7.3+dfsg-1/debian/control tags/jasperreports/3.7.3+dfsg-1/debian/patches/02_use_debian_asm.diff tags/jasperreports/3.7.3+dfsg-1/debian/patches/08_no_maxmemory_for_javadoc.diff tags/jasperreports/3.7.3+dfsg-1/debian/patches/09_use_commons_codec.diff tags/jasperreports/3.7.3+dfsg-1/debian/patches/12_samples.diff Removed: tags/jasperreports/3.7.3+dfsg-1/debian/changelog tags/jasperreports/3.7.3+dfsg-1/debian/control tags/jasperreports/3.7.3+dfsg-1/debian/patches/02_use_debian_asm.diff tags/jasperreports/3.7.3+dfsg-1/debian/patches/08_no_maxmemory_for_javadoc.diff tags/jasperreports/3.7.3+dfsg-1/debian/patches/09_use_commons_codec.diff tags/jasperreports/3.7.3+dfsg-1/debian/patches/12_samples.diff Log: [svn-buildpackage] Tagging jasperreports 3.7.3+dfsg-1 Deleted: tags/jasperreports/3.7.3+dfsg-1/debian/changelog =================================================================== --- trunk/jasperreports/debian/changelog 2010-07-14 05:34:26 UTC (rev 12749) +++ tags/jasperreports/3.7.3+dfsg-1/debian/changelog 2010-07-14 11:52:34 UTC (rev 12753) @@ -1,77 +0,0 @@ -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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Thu, 24 Sep 2009 21:17:25 +0200 - -jasperreports (3.5.3+dfsg-1) unstable; urgency=low - - * Initial release. (Closes: #281346) - - -- Damien Raude-Morvan <[email protected]> Tue, 25 Aug 2009 23:12:16 +0200 Copied: tags/jasperreports/3.7.3+dfsg-1/debian/changelog (from rev 12752, trunk/jasperreports/debian/changelog) =================================================================== --- tags/jasperreports/3.7.3+dfsg-1/debian/changelog (rev 0) +++ tags/jasperreports/3.7.3+dfsg-1/debian/changelog 2010-07-14 11:52:34 UTC (rev 12753) @@ -0,0 +1,85 @@ +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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Thu, 24 Sep 2009 21:17:25 +0200 + +jasperreports (3.5.3+dfsg-1) unstable; urgency=low + + * Initial release. (Closes: #281346) + + -- Damien Raude-Morvan <[email protected]> Tue, 25 Aug 2009 23:12:16 +0200 Deleted: tags/jasperreports/3.7.3+dfsg-1/debian/control =================================================================== --- trunk/jasperreports/debian/control 2010-07-14 05:34:26 UTC (rev 12749) +++ tags/jasperreports/3.7.3+dfsg-1/debian/control 2010-07-14 11:52:34 UTC (rev 12753) @@ -1,48 +0,0 @@ -Source: jasperreports -Section: java -Priority: optional -Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Damien Raude-Morvan <[email protected]> -Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant -Build-Depends-Indep: ant-optional, bsh, libasm2-java, groovy, libjcommon-java, - libspring-core-2.5-java, libspring-beans-2.5-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, rhino -Standards-Version: 3.8.4 -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}, default-jre-headless | java5-runtime-headless, - 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-2.5-java, libspring-beans-2.5-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/3.7.3+dfsg-1/debian/control (from rev 12752, trunk/jasperreports/debian/control) =================================================================== --- tags/jasperreports/3.7.3+dfsg-1/debian/control (rev 0) +++ tags/jasperreports/3.7.3+dfsg-1/debian/control 2010-07-14 11:52:34 UTC (rev 12753) @@ -0,0 +1,48 @@ +Source: jasperreports +Section: java +Priority: optional +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: Damien Raude-Morvan <[email protected]> +Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant +Build-Depends-Indep: ant-optional, bsh, libasm2-java, groovy, libjcommon-java, + libspring-core-2.5-java, libspring-beans-2.5-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, rhino +Standards-Version: 3.9.0 +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}, default-jre-headless | java5-runtime-headless, + 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-2.5-java, libspring-beans-2.5-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. Deleted: tags/jasperreports/3.7.3+dfsg-1/debian/patches/02_use_debian_asm.diff =================================================================== --- trunk/jasperreports/debian/patches/02_use_debian_asm.diff 2010-07-14 05:34:26 UTC (rev 12749) +++ tags/jasperreports/3.7.3+dfsg-1/debian/patches/02_use_debian_asm.diff 2010-07-14 11:52:34 UTC (rev 12753) @@ -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 <[email protected]> -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; -@@ -168,4 +168,4 @@ - } - - --} -\ No newline at end of file -+} Copied: tags/jasperreports/3.7.3+dfsg-1/debian/patches/02_use_debian_asm.diff (from rev 12752, trunk/jasperreports/debian/patches/02_use_debian_asm.diff) =================================================================== --- tags/jasperreports/3.7.3+dfsg-1/debian/patches/02_use_debian_asm.diff (rev 0) +++ tags/jasperreports/3.7.3+dfsg-1/debian/patches/02_use_debian_asm.diff 2010-07-14 11:52:34 UTC (rev 12753) @@ -0,0 +1,25 @@ +Description: Use Debian provided ASM2 instead of the upstream one in their groovy jar. +Fowarded: no +Origin: vendor +Author: Damien Raude-Morvan <[email protected]> +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 ++} Deleted: tags/jasperreports/3.7.3+dfsg-1/debian/patches/08_no_maxmemory_for_javadoc.diff =================================================================== --- trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff 2010-07-14 05:34:26 UTC (rev 12749) +++ tags/jasperreports/3.7.3+dfsg-1/debian/patches/08_no_maxmemory_for_javadoc.diff 2010-07-14 11:52:34 UTC (rev 12753) @@ -1,14 +0,0 @@ -Description: build.xml: Don't pass Xmx128m to <javadoc> task. -Fowarded: no -Author: Damien Raude-Morvan <[email protected]> -Last-Update: 2010-04-20 ---- a/build.xml -+++ b/build.xml -@@ -350,7 +350,6 @@ - use="true" - windowtitle="JasperReports ${version} API" - excludepackagenames="org.w3c.tools.codec" -- maxmemory="128m" - encoding="ISO-8859-1"> - <doctitle> - <![CDATA[ Copied: tags/jasperreports/3.7.3+dfsg-1/debian/patches/08_no_maxmemory_for_javadoc.diff (from rev 12752, trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff) =================================================================== --- tags/jasperreports/3.7.3+dfsg-1/debian/patches/08_no_maxmemory_for_javadoc.diff (rev 0) +++ tags/jasperreports/3.7.3+dfsg-1/debian/patches/08_no_maxmemory_for_javadoc.diff 2010-07-14 11:52:34 UTC (rev 12753) @@ -0,0 +1,14 @@ +Description: build.xml: Don't pass Xmx128m to <javadoc> task. +Fowarded: no +Author: Damien Raude-Morvan <[email protected]> +Last-Update: 2010-04-20 +--- a/build.xml ++++ b/build.xml +@@ -417,7 +417,6 @@ + use="true" + windowtitle="JasperReports ${version} API" + excludepackagenames="org.w3c.tools.codec" +- maxmemory="128m" + encoding="ISO-8859-1"> + <doctitle> + <![CDATA[ Deleted: tags/jasperreports/3.7.3+dfsg-1/debian/patches/09_use_commons_codec.diff =================================================================== --- trunk/jasperreports/debian/patches/09_use_commons_codec.diff 2010-07-14 05:34:26 UTC (rev 12749) +++ tags/jasperreports/3.7.3+dfsg-1/debian/patches/09_use_commons_codec.diff 2010-07-14 11:52:34 UTC (rev 12753) @@ -1,117 +0,0 @@ -Description: Use Commons Codec Base64 decode/encode - instead of non-DFSG-free W3C one (removed from tarball). -Author: Damien Raude-Morvan <[email protected]> -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 -@@ -88,7 +88,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; - - - /** -@@ -837,13 +837,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,8 +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; - - /** - * @author Teodor Danciu ([email protected]) -@@ -79,13 +78,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/3.7.3+dfsg-1/debian/patches/09_use_commons_codec.diff (from rev 12752, trunk/jasperreports/debian/patches/09_use_commons_codec.diff) =================================================================== --- tags/jasperreports/3.7.3+dfsg-1/debian/patches/09_use_commons_codec.diff (rev 0) +++ tags/jasperreports/3.7.3+dfsg-1/debian/patches/09_use_commons_codec.diff 2010-07-14 11:52:34 UTC (rev 12753) @@ -0,0 +1,117 @@ +Description: Use Commons Codec Base64 decode/encode + instead of non-DFSG-free W3C one (removed from tarball). +Author: Damien Raude-Morvan <[email protected]> +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 +@@ -88,7 +88,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; + + + /** +@@ -841,13 +841,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,8 +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; + + /** + * @author Teodor Danciu ([email protected]) +@@ -79,13 +78,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/3.7.3+dfsg-1/debian/patches/12_samples.diff =================================================================== --- trunk/jasperreports/debian/patches/12_samples.diff 2010-07-14 05:34:26 UTC (rev 12749) +++ tags/jasperreports/3.7.3+dfsg-1/debian/patches/12_samples.diff 2010-07-14 11:52:34 UTC (rev 12753) @@ -1,14 +0,0 @@ -Description: Disable build of sampleref -Author: Damien Raude-Morvan <[email protected]> -Last-Update: 2010-04-20 -Forwarded: no ---- a/build.xml -+++ b/build.xml -@@ -459,6 +459,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/3.7.3+dfsg-1/debian/patches/12_samples.diff (from rev 12752, trunk/jasperreports/debian/patches/12_samples.diff) =================================================================== --- tags/jasperreports/3.7.3+dfsg-1/debian/patches/12_samples.diff (rev 0) +++ tags/jasperreports/3.7.3+dfsg-1/debian/patches/12_samples.diff 2010-07-14 11:52:34 UTC (rev 12753) @@ -0,0 +1,14 @@ +Description: Disable build of sampleref +Author: Damien Raude-Morvan <[email protected]> +Last-Update: 2010-04-20 +Forwarded: no +--- a/build.xml ++++ b/build.xml +@@ -525,6 +525,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> _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
