[pkg-java] r12187 - in trunk/jasperreports/debian: . patches source
Damien Raude-Morvan
drazzib at alioth.debian.org
Tue Apr 20 22:19:33 UTC 2010
Author: drazzib
Date: 2010-04-20 22:19:32 +0000 (Tue, 20 Apr 2010)
New Revision: 12187
Added:
trunk/jasperreports/debian/maven.ignoreRules
trunk/jasperreports/debian/patches/12_samples.diff
trunk/jasperreports/debian/source/
trunk/jasperreports/debian/source/format
Removed:
trunk/jasperreports/debian/README.source
trunk/jasperreports/debian/patches/01_exclude_jpa.diff
trunk/jasperreports/debian/patches/03_use_pngencoder_from_jcommon.diff
trunk/jasperreports/debian/patches/11_pom.diff
Modified:
trunk/jasperreports/debian/changelog
trunk/jasperreports/debian/control
trunk/jasperreports/debian/maven.rules
trunk/jasperreports/debian/orig-tar.sh
trunk/jasperreports/debian/patches/02_use_debian_asm.diff
trunk/jasperreports/debian/patches/06_configure_javaflow.diff
trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff
trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff
trunk/jasperreports/debian/patches/09_use_commons_codec.diff
trunk/jasperreports/debian/patches/10_disable_fonts.diff
trunk/jasperreports/debian/patches/series
trunk/jasperreports/debian/rules
Log:
* 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
Deleted: trunk/jasperreports/debian/README.source
===================================================================
--- trunk/jasperreports/debian/README.source 2010-04-20 21:34:26 UTC (rev 12186)
+++ trunk/jasperreports/debian/README.source 2010-04-20 22:19:32 UTC (rev 12187)
@@ -1,9 +0,0 @@
-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.
-
Modified: trunk/jasperreports/debian/changelog
===================================================================
--- trunk/jasperreports/debian/changelog 2010-04-20 21:34:26 UTC (rev 12186)
+++ trunk/jasperreports/debian/changelog 2010-04-20 22:19:32 UTC (rev 12187)
@@ -1,10 +1,22 @@
-jasperreports (3.7.1+dfsg-3) unstable; urgency=low
+jasperreports (3.7.2+dfsg-1) unstable; urgency=low
- UNRELEASED
+ [ Torsten Werner ]
* Change maintainers into Maintainers.
- -- Torsten Werner <twerner at debian.org> Sun, 11 Apr 2010 21:52:16 +0200
+ [ 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)
Modified: trunk/jasperreports/debian/control
===================================================================
--- trunk/jasperreports/debian/control 2010-04-20 21:34:26 UTC (rev 12186)
+++ trunk/jasperreports/debian/control 2010-04-20 22:19:32 UTC (rev 12187)
@@ -3,7 +3,7 @@
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, quilt, debhelper (>= 7), default-jdk, ant
+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,
Added: trunk/jasperreports/debian/maven.ignoreRules
===================================================================
--- trunk/jasperreports/debian/maven.ignoreRules (rev 0)
+++ trunk/jasperreports/debian/maven.ignoreRules 2010-04-20 22:19:32 UTC (rev 12187)
@@ -0,0 +1,5 @@
+com.keypoint png-encoder * *
+eclipse jdtcore * *
+org.apache.tomcat jasper-jdt * *
+net.sf.barcode4j barcode4j * *
+net.sourceforge.barbecue barbecue * *
Modified: trunk/jasperreports/debian/maven.rules
===================================================================
--- trunk/jasperreports/debian/maven.rules 2010-04-20 21:34:26 UTC (rev 12186)
+++ trunk/jasperreports/debian/maven.rules 2010-04-20 22:19:32 UTC (rev 12187)
@@ -5,3 +5,5 @@
antlr antlr * s/.*/2.x/
org.springframework * * s/2\..*/2.x/
javax.servlet servlet-api jar s/.*/2.5/
+s/commons-javaflow/org.apache.commons/ commons-javaflow * s/.*/debian/
+s/javax.xml.soap/axis/ s/saaj-api/axis-saaj/ * s/.*/debian/
Modified: trunk/jasperreports/debian/orig-tar.sh
===================================================================
--- trunk/jasperreports/debian/orig-tar.sh 2010-04-20 21:34:26 UTC (rev 12186)
+++ trunk/jasperreports/debian/orig-tar.sh 2010-04-20 22:19:32 UTC (rev 12187)
@@ -7,7 +7,7 @@
# clean up the upstream tarball
tar zxf $3
-mv jasperreports-* $DIR
+mv jasperreports* $DIR
GZIP=--best tar czf $TAR -X debian/orig-tar.exclude $DIR
rm -rf $DIR
Deleted: trunk/jasperreports/debian/patches/01_exclude_jpa.diff
===================================================================
--- trunk/jasperreports/debian/patches/01_exclude_jpa.diff 2010-04-20 21:34:26 UTC (rev 12186)
+++ trunk/jasperreports/debian/patches/01_exclude_jpa.diff 2010-04-20 22:19:32 UTC (rev 12187)
@@ -1,18 +0,0 @@
-Description: build.xml: exclude JPA modules of JasperReports.
-Fowarded: no
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2010-02-06
---- a/build.xml
-+++ b/build.xml
-@@ -13,10 +13,7 @@
- </or>
- </condition>
- <javac destdir="./build/classes" debug="true" optimize="false" deprecation="true" target="1.4" source="1.4" encoding="ISO-8859-1">
-- <exclude name="**/net/sf/jasperreports/engine/util/Java15BigDecimalHandler.java" unless="using.jdk.1.5"/>
-- <exclude name="**/olap/**/*.java" unless="using.jdk.1.5"/>
-- <exclude name="**/JRJpa*.java" unless="using.jdk.1.5"/>
-- <exclude name="**/Java15BigDecimalHandler.java" unless="using.jdk.1.5"/>
-+ <exclude name="**/JRJpa*.java"/>
- <classpath>
- <pathelement location="./build/classes"/>
- <fileset dir="./lib">
Modified: trunk/jasperreports/debian/patches/02_use_debian_asm.diff
===================================================================
--- trunk/jasperreports/debian/patches/02_use_debian_asm.diff 2010-04-20 21:34:26 UTC (rev 12186)
+++ trunk/jasperreports/debian/patches/02_use_debian_asm.diff 2010-04-20 22:19:32 UTC (rev 12187)
@@ -1,25 +1,25 @@
Description: Use Debian provided ASM2 instead of the upstream one in their groovy jar.
Fowarded: no
Origin: vendor
-Author: Damien Raude-Morvan <drazzib at drazzib.com>
-Last-Update: 2009-07-16
+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;
-@@ -167,4 +167,4 @@
- }
-
-
+ */
+ 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
-+}
++}
Deleted: trunk/jasperreports/debian/patches/03_use_pngencoder_from_jcommon.diff
===================================================================
--- trunk/jasperreports/debian/patches/03_use_pngencoder_from_jcommon.diff 2010-04-20 21:34:26 UTC (rev 12186)
+++ trunk/jasperreports/debian/patches/03_use_pngencoder_from_jcommon.diff 2010-04-20 22:19:32 UTC (rev 12187)
@@ -1,62 +0,0 @@
-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 <drazzib at drazzib.com>
-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;
- }
Modified: trunk/jasperreports/debian/patches/06_configure_javaflow.diff
===================================================================
--- trunk/jasperreports/debian/patches/06_configure_javaflow.diff 2010-04-20 21:34:26 UTC (rev 12186)
+++ trunk/jasperreports/debian/patches/06_configure_javaflow.diff 2010-04-20 22:19:32 UTC (rev 12187)
@@ -1,38 +1,33 @@
Description: build.xml: configure <javaflow> ant task.
Include missing elements from upstream classpath.
-Author: Damien Raude-Morvan <drazzib at drazzib.com>
+Author: Damien Raude-Morvan <drazzib at debian.org>
Forwarded: not-needed
-Last-Update: 2009-07-16
+Last-Update: 2010-04-20
--- a/build.xml
+++ b/build.xml
-@@ -87,12 +87,24 @@
- </replace>
-
- <javaflow srcdir="./build/javaflow" dstdir="./build/javaflow" mode="bcel">
-- <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/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"/>
- </javaflow>
-
- <mkdir dir="./dist"/>
+@@ -82,12 +82,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"/>
Modified: trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff
===================================================================
--- trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff 2010-04-20 21:34:26 UTC (rev 12186)
+++ trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff 2010-04-20 22:19:32 UTC (rev 12187)
@@ -4,253 +4,254 @@
src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java
and src/net/sf/jasperreports/components/ComponentsXmlHandler.java
Fowarded: no
-Author: Damien Raude-Morvan <drazzib at drazzib.com>
-Last-Update: 2009-08-30
+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;
-@@ -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()
+ 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;
+@@ -107,23 +101,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);
+- }
+-
+ 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();
-- }
--
- }
+@@ -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;
+@@ -92,8 +74,6 @@
+ public void configureDigester(Digester digester)
+ {
+ addListRules(digester);
+- addBarbecueRules(digester);
+- addBarcode4jRules(digester);
+ addTableRules(digester);
+ }
+
+@@ -114,103 +94,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, "evaluationTimeValue",
+- EvaluationTimeEnum.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";
+@@ -302,18 +185,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();
+- }
+ }
+
+ protected void writeList(ListComponent list, ComponentKey componentKey,
+@@ -340,39 +211,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());
+- 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
-@@ -14,6 +14,8 @@
- </condition>
- <javac destdir="./build/classes" debug="true" optimize="false" deprecation="true" target="1.4" source="1.4" encoding="ISO-8859-1">
- <exclude name="**/JRJpa*.java"/>
-+ <exclude name="**/barcode4j/*.java"/>
-+ <exclude name="**/barbecue/*.java"/>
- <classpath>
- <pathelement location="./build/classes"/>
- <fileset dir="./lib">
+@@ -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">
Modified: trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff
===================================================================
--- trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff 2010-04-20 21:34:26 UTC (rev 12186)
+++ trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff 2010-04-20 22:19:32 UTC (rev 12187)
@@ -1,22 +1,14 @@
Description: build.xml: Don't pass Xmx128m to <javadoc> task.
Fowarded: no
-Author: Damien Raude-Morvan <drazzib at drazzib.com>
-Last-Update: 2009-08-30
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-04-20
--- a/build.xml
+++ b/build.xml
-@@ -341,7 +341,6 @@
- use="true"
- windowtitle="JasperReports ${version} API"
- excludepackagenames="org.w3c.tools.codec"
-- maxmemory="128m"
- encoding="ISO-8859-1">
- <doctitle>
- <![CDATA[
-@@ -450,6 +449,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>
+@@ -350,7 +350,6 @@
+ use="true"
+ windowtitle="JasperReports ${version} API"
+ excludepackagenames="org.w3c.tools.codec"
+- maxmemory="128m"
+ encoding="ISO-8859-1">
+ <doctitle>
+ <![CDATA[
Modified: trunk/jasperreports/debian/patches/09_use_commons_codec.diff
===================================================================
--- trunk/jasperreports/debian/patches/09_use_commons_codec.diff 2010-04-20 21:34:26 UTC (rev 12186)
+++ trunk/jasperreports/debian/patches/09_use_commons_codec.diff 2010-04-20 22:19:32 UTC (rev 12187)
@@ -1,90 +1,92 @@
Description: Use Commons Codec Base64 decode/encode
instead of non-DFSG-free W3C one (removed from tarball).
-Author: Damien Raude-Morvan <drazzib at drazzib.com>
+Author: Damien Raude-Morvan <drazzib at debian.org>
Forwarded: no
-Last-Update: 2009-08-29
+Last-Update: 2010-04-20
--- 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;
-
-
- /**
-@@ -835,13 +835,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)
- {
+@@ -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
-@@ -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)
- {
+@@ -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 @@
Modified: trunk/jasperreports/debian/patches/10_disable_fonts.diff
===================================================================
--- trunk/jasperreports/debian/patches/10_disable_fonts.diff 2010-04-20 21:34:26 UTC (rev 12186)
+++ trunk/jasperreports/debian/patches/10_disable_fonts.diff 2010-04-20 22:19:32 UTC (rev 12187)
@@ -1,15 +1,15 @@
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: 2009-10-28
+Last-Update: 2010-04-20
--- a/build.xml
+++ b/build.xml
-@@ -49,7 +49,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>
+@@ -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>
Deleted: trunk/jasperreports/debian/patches/11_pom.diff
===================================================================
--- trunk/jasperreports/debian/patches/11_pom.diff 2010-04-20 21:34:26 UTC (rev 12186)
+++ trunk/jasperreports/debian/patches/11_pom.diff 2010-04-20 22:19:32 UTC (rev 12187)
@@ -1,58 +0,0 @@
-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 <drazzib at debian.org>
-Last-Update: 2009-11-13
-Forwarded: not-needed
---- a/pom.xml
-+++ b/pom.xml
-@@ -208,13 +208,6 @@
- <optional>true</optional>
- </dependency>
- <dependency>
-- <groupId>com.keypoint</groupId>
-- <artifactId>png-encoder</artifactId>
-- <version>1.5</version>
-- <scope>compile</scope>
-- <optional>true</optional>
-- </dependency>
-- <dependency>
- <groupId>commons-javaflow</groupId>
- <artifactId>commons-javaflow</artifactId>
- <version>20060411</version>
-@@ -222,13 +215,6 @@
- <optional>true</optional>
- </dependency>
- <dependency>
-- <groupId>mondrian</groupId>
-- <artifactId>mondrian</artifactId>
-- <version>3.1.1.12687</version>
-- <scope>compile</scope>
-- <optional>true</optional>
-- </dependency>
-- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
-@@ -344,19 +330,5 @@
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
-- <dependency>
-- <groupId>net.sf.barcode4j</groupId>
-- <artifactId>barcode4j</artifactId>
-- <version>2.0</version>
-- <scope>compile</scope>
-- <optional>true</optional>
-- </dependency>
-- <dependency>
-- <groupId>net.sourceforge.barbecue</groupId>
-- <artifactId>barbecue</artifactId>
-- <version>1.5-beta1</version>
-- <scope>compile</scope>
-- <optional>true</optional>
-- </dependency>
- </dependencies>
- </project>
Added: trunk/jasperreports/debian/patches/12_samples.diff
===================================================================
--- trunk/jasperreports/debian/patches/12_samples.diff (rev 0)
+++ trunk/jasperreports/debian/patches/12_samples.diff 2010-04-20 22:19:32 UTC (rev 12187)
@@ -0,0 +1,14 @@
+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
+@@ -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>
Modified: trunk/jasperreports/debian/patches/series
===================================================================
--- trunk/jasperreports/debian/patches/series 2010-04-20 21:34:26 UTC (rev 12186)
+++ trunk/jasperreports/debian/patches/series 2010-04-20 22:19:32 UTC (rev 12187)
@@ -1,9 +1,7 @@
-01_exclude_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
+12_samples.diff
Modified: trunk/jasperreports/debian/rules
===================================================================
--- trunk/jasperreports/debian/rules 2010-04-20 21:34:26 UTC (rev 12186)
+++ trunk/jasperreports/debian/rules 2010-04-20 22:19:32 UTC (rev 12187)
@@ -1,7 +1,6 @@
#!/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
Added: trunk/jasperreports/debian/source/format
===================================================================
--- trunk/jasperreports/debian/source/format (rev 0)
+++ trunk/jasperreports/debian/source/format 2010-04-20 22:19:32 UTC (rev 12187)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the pkg-java-commits
mailing list