Author: drazzib Date: 2010-07-27 13:40:41 +0000 (Tue, 27 Jul 2010) New Revision: 12823
Added: tags/jasperreports/3.7.4+dfsg-1/ tags/jasperreports/3.7.4+dfsg-1/debian/changelog tags/jasperreports/3.7.4+dfsg-1/debian/control tags/jasperreports/3.7.4+dfsg-1/debian/patches/07_exclude_barcode4j_and_barbecue.diff Removed: tags/jasperreports/3.7.4+dfsg-1/debian/changelog tags/jasperreports/3.7.4+dfsg-1/debian/control tags/jasperreports/3.7.4+dfsg-1/debian/patches/07_exclude_barcode4j_and_barbecue.diff Log: [svn-buildpackage] Tagging jasperreports 3.7.4+dfsg-1 Deleted: tags/jasperreports/3.7.4+dfsg-1/debian/changelog =================================================================== --- trunk/jasperreports/debian/changelog 2010-07-26 08:54:32 UTC (rev 12818) +++ tags/jasperreports/3.7.4+dfsg-1/debian/changelog 2010-07-27 13:40:41 UTC (rev 12823) @@ -1,85 +0,0 @@ -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 Copied: tags/jasperreports/3.7.4+dfsg-1/debian/changelog (from rev 12822, trunk/jasperreports/debian/changelog) =================================================================== --- tags/jasperreports/3.7.4+dfsg-1/debian/changelog (rev 0) +++ tags/jasperreports/3.7.4+dfsg-1/debian/changelog 2010-07-27 13:40:41 UTC (rev 12823) @@ -0,0 +1,94 @@ +jasperreports (3.7.4+dfsg-1) unstable; urgency=low + + * New upstream release: + - Refresh 07_exclude_barcode4j_and_barbecue.diff patch + * Bump Standards-Version to 3.9.1: no changes needed. + * Drop Depends on JRE: not requested anymore by new Java Policy. + + -- Damien Raude-Morvan <[email protected]> Tue, 27 Jul 2010 15:32:56 +0200 + +jasperreports (3.7.3+dfsg-1) unstable; urgency=low + + * New upstream release: + - Refresh all patches + * Bump Standards-Version to 3.9.0 (no changes needed) + + -- Damien Raude-Morvan <[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.4+dfsg-1/debian/control =================================================================== --- trunk/jasperreports/debian/control 2010-07-26 08:54:32 UTC (rev 12818) +++ tags/jasperreports/3.7.4+dfsg-1/debian/control 2010-07-27 13:40:41 UTC (rev 12823) @@ -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.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. Copied: tags/jasperreports/3.7.4+dfsg-1/debian/control (from rev 12822, trunk/jasperreports/debian/control) =================================================================== --- tags/jasperreports/3.7.4+dfsg-1/debian/control (rev 0) +++ tags/jasperreports/3.7.4+dfsg-1/debian/control 2010-07-27 13:40:41 UTC (rev 12823) @@ -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.1 +Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jasperreports/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jasperreports/ +Homepage: http://jasperforge.org/jasperreports + +Package: libjasperreports-java +Architecture: all +Depends: ${misc:Depends}, + libcommons-digester-java, libcommons-collections3-java, libcommons-logging-java, + libcommons-beanutils-java, libcommons-codec-java, libecj-java, libxalan2-java, + libjcommon-java +Recommends: libjexcelapi-java, libjakarta-poi-java (>= 3.2), libitext-java, + libbatik-java (>= 1.7), libjfreechart-java, libhibernate3-java +Suggests: bsh, libasm2-java, groovy, libmondrian-java, libolap4j-java, + libspring-core-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.4+dfsg-1/debian/patches/07_exclude_barcode4j_and_barbecue.diff =================================================================== --- trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff 2010-07-26 08:54:32 UTC (rev 12818) +++ tags/jasperreports/3.7.4+dfsg-1/debian/patches/07_exclude_barcode4j_and_barbecue.diff 2010-07-27 13:40:41 UTC (rev 12823) @@ -1,257 +0,0 @@ -Description: - - build.xml: exclude Barcode4J and Barbecue modules of JasperReports. - - Disable Barcode4J and Barbecue classes in - src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java - and src/net/sf/jasperreports/components/ComponentsXmlHandler.java -Fowarded: no -Author: Damien Raude-Morvan <[email protected]> -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; -@@ -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 -@@ -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 -@@ -7,6 +7,8 @@ - <target name="compile" description="Compiles the java source files of the library."> - <mkdir dir="./build/classes"/> - <javac destdir="./build/classes" debug="true" optimize="false" deprecation="true" target="1.5" source="1.5" encoding="ISO-8859-1"> -+ <exclude name="**/barcode4j/*.java"/> -+ <exclude name="**/barbecue/*.java"/> - <classpath> - <pathelement location="./build/classes"/> - <fileset dir="./lib"> Copied: tags/jasperreports/3.7.4+dfsg-1/debian/patches/07_exclude_barcode4j_and_barbecue.diff (from rev 12822, trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff) =================================================================== --- tags/jasperreports/3.7.4+dfsg-1/debian/patches/07_exclude_barcode4j_and_barbecue.diff (rev 0) +++ tags/jasperreports/3.7.4+dfsg-1/debian/patches/07_exclude_barcode4j_and_barbecue.diff 2010-07-27 13:40:41 UTC (rev 12823) @@ -0,0 +1,275 @@ +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 <[email protected]> +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; +@@ -111,23 +105,6 @@ + tableManager.setComponentFillFactory(new FillTableFactory()); + componentManagers.put(TABLE_COMPONENT_NAME, tableManager); + +- DefaultComponentManager barbecueManager = new DefaultComponentManager(); +- barbecueManager.setDesignConverter(new BarbecueDesignConverter()); +- barbecueManager.setComponentCompiler(new BarbecueCompiler()); +- barbecueManager.setComponentXmlWriter(xmlHandler); +- barbecueManager.setComponentFillFactory(new BarbecueFillFactory()); +- componentManagers.put(BARBECUE_COMPONENT_NAME, barbecueManager); +- +- DefaultComponentManager barcode4jManager = new DefaultComponentManager(); +- barcode4jManager.setDesignConverter(new BarcodeDesignConverter()); +- barcode4jManager.setComponentCompiler(new BarcodeCompiler()); +- barcode4jManager.setComponentXmlWriter(xmlHandler); +- barcode4jManager.setComponentFillFactory(new BarcodeFillFactory()); +- for (int i = 0; i < BARCODE4J_COMPONENT_NAMES.length; i++) +- { +- componentManagers.put(BARCODE4J_COMPONENT_NAMES[i], barcode4jManager); +- } +- + DefaultComponentManager spiderChartManager = new DefaultComponentManager(); + spiderChartManager.setDesignConverter(new SpiderChartDesignConverter()); + spiderChartManager.setComponentCompiler(new SpiderChartCompiler()); +--- a/src/net/sf/jasperreports/components/ComponentsXmlHandler.java ++++ b/src/net/sf/jasperreports/components/ComponentsXmlHandler.java +@@ -28,24 +28,24 @@ + + import net.sf.jasperreports.charts.design.JRDesignCategorySeries; + import net.sf.jasperreports.charts.xml.JRCategorySeriesFactory; +-import net.sf.jasperreports.components.barbecue.BarbecueComponent; +-import net.sf.jasperreports.components.barbecue.StandardBarbecueComponent; +-import net.sf.jasperreports.components.barcode4j.BarcodeComponent; +-import net.sf.jasperreports.components.barcode4j.BarcodeXmlWriter; +-import net.sf.jasperreports.components.barcode4j.CodabarComponent; +-import net.sf.jasperreports.components.barcode4j.Code128Component; +-import net.sf.jasperreports.components.barcode4j.Code39Component; +-import net.sf.jasperreports.components.barcode4j.DataMatrixComponent; +-import net.sf.jasperreports.components.barcode4j.EAN128Component; +-import net.sf.jasperreports.components.barcode4j.EAN13Component; +-import net.sf.jasperreports.components.barcode4j.EAN8Component; +-import net.sf.jasperreports.components.barcode4j.Interleaved2Of5Component; +-import net.sf.jasperreports.components.barcode4j.PDF417Component; +-import net.sf.jasperreports.components.barcode4j.POSTNETComponent; +-import net.sf.jasperreports.components.barcode4j.RoyalMailCustomerComponent; +-import net.sf.jasperreports.components.barcode4j.UPCAComponent; +-import net.sf.jasperreports.components.barcode4j.UPCEComponent; +-import net.sf.jasperreports.components.barcode4j.USPSIntelligentMailComponent; ++//import net.sf.jasperreports.components.barbecue.BarbecueComponent; ++//import net.sf.jasperreports.components.barbecue.StandardBarbecueComponent; ++//import net.sf.jasperreports.components.barcode4j.BarcodeComponent; ++//import net.sf.jasperreports.components.barcode4j.BarcodeXmlWriter; ++//import net.sf.jasperreports.components.barcode4j.CodabarComponent; ++//import net.sf.jasperreports.components.barcode4j.Code128Component; ++//import net.sf.jasperreports.components.barcode4j.Code39Component; ++//import net.sf.jasperreports.components.barcode4j.DataMatrixComponent; ++//import net.sf.jasperreports.components.barcode4j.EAN128Component; ++//import net.sf.jasperreports.components.barcode4j.EAN13Component; ++//import net.sf.jasperreports.components.barcode4j.EAN8Component; ++//import net.sf.jasperreports.components.barcode4j.Interleaved2Of5Component; ++//import net.sf.jasperreports.components.barcode4j.PDF417Component; ++//import net.sf.jasperreports.components.barcode4j.POSTNETComponent; ++//import net.sf.jasperreports.components.barcode4j.RoyalMailCustomerComponent; ++//import net.sf.jasperreports.components.barcode4j.UPCAComponent; ++//import net.sf.jasperreports.components.barcode4j.UPCEComponent; ++//import net.sf.jasperreports.components.barcode4j.USPSIntelligentMailComponent; + import net.sf.jasperreports.components.list.DesignListContents; + import net.sf.jasperreports.components.list.ListComponent; + import net.sf.jasperreports.components.list.ListContents; +@@ -107,8 +107,6 @@ + public void configureDigester(Digester digester) + { + addListRules(digester); +- addBarbecueRules(digester); +- addBarcode4jRules(digester); + addTableRules(digester); + addSpiderChartRules(digester); + } +@@ -130,103 +128,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"; +@@ -318,18 +219,6 @@ + TableComponent table = (TableComponent) component; + writeTable(table, componentKey, reportWriter); + } +- else if (component instanceof BarbecueComponent) +- { +- BarbecueComponent barcode = (BarbecueComponent) component; +- writeBarbecue(barcode, componentKey, reportWriter); +- } +- else if (component instanceof BarcodeComponent) +- { +- BarcodeComponent barcode = (BarcodeComponent) component; +- BarcodeXmlWriter barcodeWriter = new BarcodeXmlWriter( +- reportWriter, barcode, componentKey); +- barcodeWriter.writeBarcode(); +- } + else if (component instanceof SpiderChartComponent) + { + SpiderChartComponent spiderChart = (SpiderChartComponent) component; +@@ -362,39 +251,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 +@@ -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"> _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
