--- jasperreports-3.6.1+dfsg.orig/debian/orig-tar.exclude +++ jasperreports-3.6.1+dfsg/debian/orig-tar.exclude @@ -0,0 +1,5 @@ +lib/* +build/* +dist/* +demo/* +src/org/w3c/tools/codec/Base64* --- jasperreports-3.6.1+dfsg.orig/debian/rules +++ jasperreports-3.6.1+dfsg/debian/rules @@ -0,0 +1,44 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.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 bsh asm2 groovy jcommon \ + spring-core-2.5 spring-beans-2.5 \ + 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 + +DEB_ANT_BUILD_TARGET := jar docs +DEB_ANT_CLEAN_TARGET := clean + +API_DOCS := dist/javadoc/* +SCHEMA_DOC := dist/jasperreports-*-schema.reference.html +CONFIG_DOC := dist/jasperreports-*-config.reference.html +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 + +binary-post-install/libjasperreports-java-doc:: + dh_install -plibjasperreports-java-doc $(API_DOCS) /usr/share/doc/libjasperreports-java/api/ + dh_install -plibjasperreports-java-doc $(SCHEMA_DOC) /usr/share/doc/libjasperreports-java/jasperreports-schema.reference.html + dh_install -plibjasperreports-java-doc $(CONFIG_DOC) /usr/share/doc/libjasperreports-java/jasperreports-config.reference.html + +clean:: + -rm -rf debian/tmp + +get-orig-source: + uscan --force-download --- jasperreports-3.6.1+dfsg.orig/debian/watch +++ jasperreports-3.6.1+dfsg/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts=dversionmangle=s/\+dfsg$// \ + http://sf.net/jasperreports/jasperreports-(.+)-project\.tar\.gz debian debian/orig-tar.sh --- jasperreports-3.6.1+dfsg.orig/debian/changelog +++ jasperreports-3.6.1+dfsg/debian/changelog @@ -0,0 +1,26 @@ +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 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 Thu, 24 Sep 2009 21:17:25 +0200 + +jasperreports (3.5.3+dfsg-1) unstable; urgency=low + + * Initial release. (Closes: #281346) + + -- Damien Raude-Morvan Tue, 25 Aug 2009 23:12:16 +0200 --- jasperreports-3.6.1+dfsg.orig/debian/compat +++ jasperreports-3.6.1+dfsg/debian/compat @@ -0,0 +1 @@ +7 --- jasperreports-3.6.1+dfsg.orig/debian/README.source +++ jasperreports-3.6.1+dfsg/debian/README.source @@ -0,0 +1,9 @@ +Patch System +============ + +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +See /usr/share/doc/quilt/README.source for a detailed explanation. + --- jasperreports-3.6.1+dfsg.orig/debian/libjasperreports-java.poms +++ jasperreports-3.6.1+dfsg/debian/libjasperreports-java.poms @@ -0,0 +1 @@ +pom.xml --- jasperreports-3.6.1+dfsg.orig/debian/libjasperreports-java-doc.doc-base.config +++ jasperreports-3.6.1+dfsg/debian/libjasperreports-java-doc.doc-base.config @@ -0,0 +1,9 @@ +Document: libjasperreports-java-config +Title: Config Reference for JasperReports +Author: JasperReports developers +Abstract: This is the Config Reference provided by the JasperReports library. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libjasperreports-java/jasperreports-config.reference.html +Files: /usr/share/doc/libjasperreports-java/jasperreports-config.reference.html --- jasperreports-3.6.1+dfsg.orig/debian/maven.rules +++ jasperreports-3.6.1+dfsg/debian/maven.rules @@ -0,0 +1,6 @@ +s/ant/org.apache.ant/ * * s/.*/debian/ +junit junit jar s/3\..*/3.x/ +commons-collections commons-collections * s/.*/3.x/ +javax.servlet servlet-api * s/.*/2.5/ +com.lowagie itext * s/.*/1.4/ +antlr antlr * s/.*/2.x/ --- jasperreports-3.6.1+dfsg.orig/debian/orig-tar.sh +++ jasperreports-3.6.1+dfsg/debian/orig-tar.sh @@ -0,0 +1,19 @@ +#!/bin/sh -e + +# $2 = version +# $3 = file +DIR=jasperreports-$2.orig +TAR=jasperreports_$2.orig.tar.gz + +# clean up the upstream tarball +tar zxf $3 +mv jasperreports-* $DIR +GZIP=--best tar czf $TAR -X debian/orig-tar.exclude $DIR +rm -rf $DIR + +# move to directory 'tarballs' +if [ -r .svn/deb-layout ]; then + . .svn/deb-layout + mv $TAR $origDir + echo "moved $TAR to $origDir" +fi --- jasperreports-3.6.1+dfsg.orig/debian/libjasperreports-java-doc.doc-base.schema +++ jasperreports-3.6.1+dfsg/debian/libjasperreports-java-doc.doc-base.schema @@ -0,0 +1,9 @@ +Document: libjasperreports-java-schema +Title: Schema Reference for JasperReports +Author: JasperReports developers +Abstract: This is the Schema Reference provided by the JasperReports library. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libjasperreports-java/jasperreports-schema.reference.html +Files: /usr/share/doc/libjasperreports-java/jasperreports-schema.reference.html --- jasperreports-3.6.1+dfsg.orig/debian/control +++ jasperreports-3.6.1+dfsg/debian/control @@ -0,0 +1,47 @@ +Source: jasperreports +Section: java +Priority: optional +Maintainer: Debian Java maintainers +Uploaders: Damien Raude-Morvan +Build-Depends: cdbs, quilt, 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 +Standards-Version: 3.8.3 +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-collections-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, + libspring-core-2.5-java, libspring-beans-2.5-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. --- jasperreports-3.6.1+dfsg.orig/debian/copyright +++ jasperreports-3.6.1+dfsg/debian/copyright @@ -0,0 +1,61 @@ +This package was debianized by Damien Raude-Morvan on +Thu, 27 Aug 2008 20:59:38 +0200. + +It was downloaded from + http://sourceforge.net/projects/jasperreports/files/ + +Upstreams Authors: + Teodor Danciu + Lucian Chirita + Sanda Zaharia + Ionut Nedelcu + Flavius Sana + Peter Severin + Barry Klawans + Peter Risko + Michael Guenther + Manuel Paul + Marcel Overdijk + Gaganis Giorgos + John Bindel + Michael McMahon + +Copyright: + Copyright (C) 2001-2009 JasperSoft Corporation + Copyright (C) 2005 Works + +License: + + Unless you have purchased a commercial license agreement from Jaspersoft, + the following license terms apply: + + This program is part of JasperReports. + + JasperReports is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + JasperReports is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with JasperReports. If not, see . + +The full text of the LGPL 3 license can be found in +`/usr/share/common-licenses/LGPL-3' on Debian systems. + +Note: + The upstream tarball as been stripped to make a DFSG-compliant version. + Items removed from upstream : + - all packaged JAR + - generated Javadoc + - non-DFSG-compliant Base64 encoder/decoder under W3C license + Repacking can be done using debian/orig-tar.sh script. + Excluded files are listed in debian/orig-tar.exclude. + +The Debian packaging is +Copyright 2008-2009 Damien Raude-Morvan +and is licensed under the LGPL 2.1, see `/usr/share/common-licenses/LGPL-2.1'. --- jasperreports-3.6.1+dfsg.orig/debian/libjasperreports-java-doc.doc-base.api +++ jasperreports-3.6.1+dfsg/debian/libjasperreports-java-doc.doc-base.api @@ -0,0 +1,9 @@ +Document: libjasperreports-java-doc +Title: API Javadoc for JasperReports +Author: JasperReports developers +Abstract: This is the API Javadoc provided by the JasperReports library. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libjasperreports-java/api/index.html +Files: /usr/share/doc/libjasperreports-java/api/* --- jasperreports-3.6.1+dfsg.orig/debian/patches/03_use_pngencoder_from_jcommon.diff +++ jasperreports-3.6.1+dfsg/debian/patches/03_use_pngencoder_from_jcommon.diff @@ -0,0 +1,62 @@ +Description: + - Use ImageIO included JDK 1.4 for converting BI to PNG bytes array + - Strip try { } catch code as IOException is not throw anymore by JDK 1.4 +Fowarded: no +Author: Damien Raude-Morvan +Last-Update: 2009-07-16 +--- a/src/net/sf/jasperreports/engine/util/JRDefaultImageEncoder.java ++++ b/src/net/sf/jasperreports/engine/util/JRDefaultImageEncoder.java +@@ -27,10 +27,11 @@ + import java.io.ByteArrayOutputStream; + import java.io.IOException; + ++import javax.imageio.ImageIO; ++ + import net.sf.jasperreports.engine.JRException; + import net.sf.jasperreports.engine.JRRenderable; + +-import com.keypoint.PngEncoderB; + import com.sun.image.codec.jpeg.JPEGCodec; + import com.sun.image.codec.jpeg.JPEGEncodeParam; + import com.sun.image.codec.jpeg.JPEGImageEncoder; +@@ -55,25 +56,26 @@ + { + case JRRenderable.IMAGE_TYPE_PNG : + { +- bytes = new PngEncoderB(bi).pngEncode(); ++ ByteArrayOutputStream baos = new ByteArrayOutputStream(); ++ ++ try { ++ ImageIO.write(bi, "png", baos); ++ } catch (IOException e) { ++ throw new JRException(e); ++ } ++ ++ bytes = baos.toByteArray(); + break; + } + case JRRenderable.IMAGE_TYPE_JPEG : + { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); +- +- try +- { +- JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(baos); +- JPEGEncodeParam param = encoder.getDefaultJPEGEncodeParam(bi); +- param.setQuality(1f, true);//1f = JPG_QUALITY +- encoder.encode(bi, param); +- } +- catch (IOException e) +- { +- throw new JRException(e); +- } +- ++ ++ JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(baos); ++ JPEGEncodeParam param = encoder.getDefaultJPEGEncodeParam(bi); ++ param.setQuality(1f, true);//1f = JPG_QUALITY ++ encoder.encode(bi, param); ++ + bytes = baos.toByteArray(); + break; + } --- jasperreports-3.6.1+dfsg.orig/debian/patches/08_no_maxmemory_for_javadoc.diff +++ jasperreports-3.6.1+dfsg/debian/patches/08_no_maxmemory_for_javadoc.diff @@ -0,0 +1,14 @@ +Description: build.xml: Don't pass Xmx128m to task. +Fowarded: no +Author: Damien Raude-Morvan +Last-Update: 2009-08-30 +--- a/build.xml ++++ b/build.xml +@@ -344,7 +344,6 @@ + use="true" + windowtitle="JasperReports API version ${version}" + excludepackagenames="org.w3c.tools.codec" +- maxmemory="128m" + encoding="ISO-8859-1"> + JasperReports
version ${version}]]> + © 2001-2009 Jaspersoft Corporation www.jaspersoft.com]]> --- jasperreports-3.6.1+dfsg.orig/debian/patches/01_exclude_olap_and_jpa.diff +++ jasperreports-3.6.1+dfsg/debian/patches/01_exclude_olap_and_jpa.diff @@ -0,0 +1,21 @@ +Description: build.xml: exclude OLAP and JPA modules of JasperReports. +Fowarded: no +Author: Damien Raude-Morvan +Last-Update: 2009-08-30 +--- a/build.xml ++++ b/build.xml +@@ -13,10 +13,10 @@ + + + +- +- +- +- ++ ++ ++ ++ + + + --- jasperreports-3.6.1+dfsg.orig/debian/patches/06_configure_javaflow.diff +++ jasperreports-3.6.1+dfsg/debian/patches/06_configure_javaflow.diff @@ -0,0 +1,38 @@ +Description: build.xml: configure ant task. + Include missing elements from upstream classpath. +Author: Damien Raude-Morvan +Forwarded: not-needed +Last-Update: 2009-07-16 +--- a/build.xml ++++ b/build.xml +@@ -90,12 +90,24 @@ + + + +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + --- jasperreports-3.6.1+dfsg.orig/debian/patches/02_use_debian_asm.diff +++ jasperreports-3.6.1+dfsg/debian/patches/02_use_debian_asm.diff @@ -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 +Last-Update: 2009-07-16 +--- 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; +@@ -167,4 +167,4 @@ + } + + +-} +\ No newline at end of file ++} --- jasperreports-3.6.1+dfsg.orig/debian/patches/11_pom.diff +++ jasperreports-3.6.1+dfsg/debian/patches/11_pom.diff @@ -0,0 +1,58 @@ +Description: Remove dependencies from pom.xml + - png-encoder (see 03_use_pngencoder_from_jcommon.diff) + - mondrian (see 01_exclude_olap_and_jpa.diff) + - barcode4j (see 07_exclude_barcode4j_and_barbecue.diff) + - barbecue (see 07_exclude_barcode4j_and_barbecue.diff) +Author: Damien Raude-Morvan +Last-Update: 2009-11-13 +Forwarded: not-needed +--- a/pom.xml ++++ b/pom.xml +@@ -206,13 +206,6 @@ + true + + +- com.keypoint +- png-encoder +- 1.5 +- compile +- true +- +- + commons-javaflow + commons-javaflow + 20060411 +@@ -220,13 +213,6 @@ + true + + +- mondrian +- mondrian +- 3.1.1.12687 +- compile +- true +- +- + javax.persistence + persistence-api + 1.0 +@@ -342,19 +328,5 @@ + compile + true + +- +- net.sf.barcode4j +- barcode4j +- 2.0 +- compile +- true +- +- +- net.sourceforge.barbecue +- barbecue +- 1.5-beta1 +- compile +- true +- + + --- jasperreports-3.6.1+dfsg.orig/debian/patches/series +++ jasperreports-3.6.1+dfsg/debian/patches/series @@ -0,0 +1,9 @@ +01_exclude_olap_and_jpa.diff +02_use_debian_asm.diff +03_use_pngencoder_from_jcommon.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 +11_pom.diff --- jasperreports-3.6.1+dfsg.orig/debian/patches/09_use_commons_codec.diff +++ jasperreports-3.6.1+dfsg/debian/patches/09_use_commons_codec.diff @@ -0,0 +1,115 @@ +Description: Use Commons Codec Base64 decode/encode + instead of non-DFSG-free W3C one (removed from tarball). +Author: Damien Raude-Morvan +Forwarded: no +Last-Update: 2009-08-29 +--- a/src/net/sf/jasperreports/engine/export/JRXmlExporter.java ++++ b/src/net/sf/jasperreports/engine/export/JRXmlExporter.java +@@ -86,7 +86,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; + + + /** +@@ -832,13 +832,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 +@@ -32,9 +32,7 @@ + import java.util.HashMap; + import java.util.Map; + +-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; + + import net.sf.jasperreports.engine.JRRuntimeException; + +@@ -459,12 +457,9 @@ + { + try + { +- ByteArrayInputStream dataIn = new ByteArrayInputStream(data.getBytes()); +- ByteArrayOutputStream bytesOut = new ByteArrayOutputStream(); +- Base64Decoder dec = new Base64Decoder(dataIn, bytesOut); +- dec.process(); ++ byte[] bytesOut = Base64.decodeBase64(data.getBytes()); + +- ByteArrayInputStream bytesIn = new ByteArrayInputStream(bytesOut.toByteArray()); ++ ByteArrayInputStream bytesIn = new ByteArrayInputStream(bytesOut); + ObjectInputStream objectIn = new ObjectInputStream(bytesIn); + return objectIn.readObject(); + } +@@ -476,10 +471,6 @@ + { + throw new JRRuntimeException(e); + } +- catch (Base64FormatException e) +- { +- throw new JRRuntimeException(e); +- } + } + + public String serialize(Object value) +@@ -491,13 +482,8 @@ + 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 (teodord@users.sourceforge.net) +@@ -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) + { --- jasperreports-3.6.1+dfsg.orig/debian/patches/10_disable_fonts.diff +++ jasperreports-3.6.1+dfsg/debian/patches/10_disable_fonts.diff @@ -0,0 +1,15 @@ +Description: build.xml: don't build -font.jar (not included in our orig source tarball) +Fowarded: no +Author: Damien Raude-Morvan +Last-Update: 2009-10-28 +--- a/build.xml ++++ b/build.xml +@@ -49,7 +49,7 @@ + + + +- ++ + + + --- jasperreports-3.6.1+dfsg.orig/debian/patches/07_exclude_barcode4j_and_barbecue.diff +++ jasperreports-3.6.1+dfsg/debian/patches/07_exclude_barcode4j_and_barbecue.diff @@ -0,0 +1,256 @@ +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 +Last-Update: 2009-08-30 +--- 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; +@@ -98,23 +92,6 @@ + listManager.setComponentFillFactory(new FillListFactory()); + componentManagers.put(LIST_COMPONENT_NAME, listManager); + +- 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); +- } +- + bundle.setComponentManagers(componentManagers); + + REGISTRY = new ExtensionsRegistry() +--- a/src/net/sf/jasperreports/components/ComponentsXmlHandler.java ++++ b/src/net/sf/jasperreports/components/ComponentsXmlHandler.java +@@ -25,24 +25,6 @@ + + import java.io.IOException; + +-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; +@@ -74,8 +56,6 @@ + public void configureDigester(Digester digester) + { + addListRules(digester); +- addBarbecueRules(digester); +- addBarcode4jRules(digester); + } + + protected void addListRules(Digester digester) +@@ -95,103 +75,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}, +- new String[0]); +- digester.addRule(barcodePattern, +- new XmlConstantPropertyRule( +- JRXmlConstants.ATTRIBUTE_evaluationTime, +- JRXmlConstants.getEvaluationTimeMap())); +- +- 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, +- JRXmlConstants.getEvaluationTimeMap())); +- +- 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()); +- } +- + public void writeToXml(ComponentKey componentKey, Component component, + JRXmlWriter reportWriter) throws IOException + { +@@ -200,18 +83,6 @@ + ListComponent list = (ListComponent) component; + writeList(list, 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(); +- } + } + + protected void writeList(ListComponent list, ComponentKey componentKey, +@@ -240,38 +111,4 @@ + 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()); +- if (barcode.getEvaluationTime() != JRExpression.EVALUATION_TIME_NOW) +- { +- writer.addAttribute(JRXmlConstants.ATTRIBUTE_evaluationTime, +- barcode.getEvaluationTime(), +- JRXmlConstants.getEvaluationTimeMap()); +- } +- writer.addAttribute(JRXmlConstants.ATTRIBUTE_evaluationGroup, +- barcode.getEvaluationGroup()); +- +- writer.writeExpression("codeExpression", +- barcode.getCodeExpression(), false); +- writer.writeExpression("applicationIdentifierExpression", +- barcode.getApplicationIdentifierExpression(), false); +- +- writer.closeElement(); +- } +- + } +--- a/build.xml ++++ b/build.xml +@@ -17,6 +17,8 @@ + + + ++ ++ + + +