[pkg-java] r14974 - in trunk/jasperreports/debian: . patches

Damien Raude-Morvan drazzib at alioth.debian.org
Wed Sep 21 12:15:08 UTC 2011


Author: drazzib
Date: 2011-09-21 12:15:08 +0000 (Wed, 21 Sep 2011)
New Revision: 14974

Added:
   trunk/jasperreports/debian/patches/01_disable_deprecation_warning.diff
   trunk/jasperreports/debian/patches/13_disable_ooxml_support.diff
   trunk/jasperreports/debian/patches/14_velocity.diff
Modified:
   trunk/jasperreports/debian/changelog
   trunk/jasperreports/debian/control
   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/12_samples.diff
   trunk/jasperreports/debian/patches/series
   trunk/jasperreports/debian/rules
Log:
* New upstream release:
  - Refresh all debian/patches/*.
  - Add Build-Depends on velocity, libcastor-core-java
    and libcastor-xml-java.
* Build-Depends and Recommends libapache-poi-java instead of
  libjakarta-poi-java (renamed package). (Closes: #642280).
* d/patches/13_disable_ooxml_support.diff: Disable OOXML support in JR since
  libapache-poi-java doesn't provide it.
* d/patches/14_velocity.diff: Fix some missing exception not handled by JR.

Modified: trunk/jasperreports/debian/changelog
===================================================================
--- trunk/jasperreports/debian/changelog	2011-09-21 01:54:46 UTC (rev 14973)
+++ trunk/jasperreports/debian/changelog	2011-09-21 12:15:08 UTC (rev 14974)
@@ -1,3 +1,17 @@
+jasperreports (4.1.2+dfsg-1) unstable; urgency=low
+
+  * New upstream release:
+    - Refresh all debian/patches/*.
+    - Add Build-Depends on velocity, libcastor-core-java
+      and libcastor-xml-java.
+  * Build-Depends and Recommends libapache-poi-java instead of
+    libjakarta-poi-java (renamed package). (Closes: #642280).
+  * d/patches/13_disable_ooxml_support.diff: Disable OOXML support in JR since
+    libapache-poi-java doesn't provide it.
+  * d/patches/14_velocity.diff: Fix some missing exception not handled by JR.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 21 Sep 2011 14:06:31 +0200
+
 jasperreports (4.0.2+dfsg-2) unstable; urgency=low
 
   [ Miguel Landaeta ]

Modified: trunk/jasperreports/debian/control
===================================================================
--- trunk/jasperreports/debian/control	2011-09-21 01:54:46 UTC (rev 14973)
+++ trunk/jasperreports/debian/control	2011-09-21 12:15:08 UTC (rev 14974)
@@ -9,10 +9,10 @@
   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,
+  libjexcelapi-java, libapache-poi-java (>= 3.2), libitext-java,
   libbatik-java (>= 1.7), libjfreechart-java, libhibernate3-java,
   glassfish-javaee, maven-repo-helper, libmondrian-java, libolap4j-java,
-  libantlr-java, librhino-java
+  libantlr-java, librhino-java, velocity, libcastor-core-java, libcastor-xml-java
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jasperreports/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jasperreports/
@@ -24,10 +24,10 @@
   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
+Recommends: libjexcelapi-java, libapache-poi-java (>= 3.2), libitext-java,
+  libbatik-java (>= 1.7), libjfreechart-java, libhibernate3-java, libcastor-core-java, libcastor-xml-java
 Suggests: bsh, libasm2-java, groovy, libmondrian-java, libolap4j-java,
-  libspring-core-java, libspring-beans-java, libantlr-java
+  libspring-core-java, libspring-beans-java, libantlr-java, velocity
 Description: Java reporting generator library
  JasperReports is a Java reporting generator library. XML report templates
  are used to generate ready to print documents using data from customizable data

Added: trunk/jasperreports/debian/patches/01_disable_deprecation_warning.diff
===================================================================
--- trunk/jasperreports/debian/patches/01_disable_deprecation_warning.diff	                        (rev 0)
+++ trunk/jasperreports/debian/patches/01_disable_deprecation_warning.diff	2011-09-21 12:15:08 UTC (rev 14974)
@@ -0,0 +1,17 @@
+Description: Disable javac deprecation warning during Debian build.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2011-09-21
+Forwarded: not-needed
+Index: b/build.xml
+===================================================================
+--- a/build.xml
++++ b/build.xml
+@@ -6,7 +6,7 @@
+ 
+ 	<target name="compile" description="Compiles the java source files of the library.">
+ 		<mkdir dir="./build/classes"/> 
+-		<javac destdir="./build/classes" debug="true" optimize="false" deprecation="true" target="1.5" source="1.5" encoding="ISO-8859-1">
++		<javac destdir="./build/classes" debug="true" optimize="false" deprecation="false" target="1.5" source="1.5" encoding="ISO-8859-1">
+ 			<classpath>
+ 				<pathelement location="./build/classes"/>
+ 				<fileset dir="./lib">

Modified: trunk/jasperreports/debian/patches/02_use_debian_asm.diff
===================================================================
--- trunk/jasperreports/debian/patches/02_use_debian_asm.diff	2011-09-21 01:54:46 UTC (rev 14973)
+++ trunk/jasperreports/debian/patches/02_use_debian_asm.diff	2011-09-21 12:15:08 UTC (rev 14974)
@@ -3,6 +3,8 @@
 Origin: vendor
 Author: Damien Raude-Morvan <drazzib at debian.org>
 Last-Update: 2010-04-10
+Index: b/src/net/sf/jasperreports/compilers/JRGroovyCompiler.java
+===================================================================
 --- a/src/net/sf/jasperreports/compilers/JRGroovyCompiler.java
 +++ b/src/net/sf/jasperreports/compilers/JRGroovyCompiler.java
 @@ -28,8 +28,8 @@
@@ -16,7 +18,7 @@
  
  import java.io.ByteArrayInputStream;
  import java.io.File;
-@@ -181,4 +181,4 @@
+@@ -180,4 +180,4 @@
  	}
  
  

Modified: trunk/jasperreports/debian/patches/06_configure_javaflow.diff
===================================================================
--- trunk/jasperreports/debian/patches/06_configure_javaflow.diff	2011-09-21 01:54:46 UTC (rev 14973)
+++ trunk/jasperreports/debian/patches/06_configure_javaflow.diff	2011-09-21 12:15:08 UTC (rev 14974)
@@ -3,9 +3,11 @@
 Author: Damien Raude-Morvan <drazzib at debian.org>
 Forwarded: not-needed
 Last-Update: 2010-04-20
+Index: b/build.xml
+===================================================================
 --- a/build.xml
 +++ b/build.xml
-@@ -71,12 +71,25 @@
+@@ -75,12 +75,25 @@
  		</replace>
  
  		<javaflow srcdir="./build/javaflow" dstdir="./build/javaflow" mode="bcel">

Modified: trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff
===================================================================
--- trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff	2011-09-21 01:54:46 UTC (rev 14973)
+++ trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff	2011-09-21 12:15:08 UTC (rev 14974)
@@ -5,12 +5,27 @@
     and src/net/sf/jasperreports/components/ComponentsXmlHandler.java
 Fowarded: no
 Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2010-04-20
+Last-Update: 2011-09-21
+Index: b/build.xml
+===================================================================
+--- a/build.xml
++++ b/build.xml
+@@ -7,6 +7,8 @@
+ 	<target name="compile" description="Compiles the java source files of the library.">
+ 		<mkdir dir="./build/classes"/> 
+ 		<javac destdir="./build/classes" debug="true" optimize="false" deprecation="false" target="1.5" source="1.5" encoding="ISO-8859-1">
++           <exclude name="**/barcode4j/*.java"/>
++           <exclude name="**/barbecue/*.java"/>
+ 			<classpath>
+ 				<pathelement location="./build/classes"/>
+ 				<fileset dir="./lib">
+Index: b/src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java
+===================================================================
 --- a/src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java
 +++ b/src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java
-@@ -27,12 +27,6 @@
+@@ -25,12 +25,6 @@
+ 
  import java.util.HashMap;
- import java.util.List;
  
 -import net.sf.jasperreports.components.barbecue.BarbecueCompiler;
 -import net.sf.jasperreports.components.barbecue.BarbecueDesignConverter;
@@ -21,7 +36,7 @@
  import net.sf.jasperreports.components.list.FillListFactory;
  import net.sf.jasperreports.components.list.ListComponent;
  import net.sf.jasperreports.components.list.ListComponentCompiler;
-@@ -113,23 +107,6 @@
+@@ -121,23 +115,6 @@
  		tableManager.setComponentFillFactory(new FillTableFactory());
  		componentManagers.put(TABLE_COMPONENT_NAME, tableManager);
  		
@@ -45,12 +60,14 @@
  		DefaultComponentManager spiderChartManager = new DefaultComponentManager();
  		spiderChartManager.setDesignConverter(new SpiderChartDesignConverter());
  		spiderChartManager.setComponentCompiler(new SpiderChartCompiler());
+Index: b/src/net/sf/jasperreports/components/ComponentsXmlHandler.java
+===================================================================
 --- a/src/net/sf/jasperreports/components/ComponentsXmlHandler.java
 +++ b/src/net/sf/jasperreports/components/ComponentsXmlHandler.java
-@@ -28,24 +28,24 @@
+@@ -26,24 +26,6 @@
+ import java.io.IOException;
+ import java.util.List;
  
- 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;
@@ -69,37 +86,19 @@
 -import net.sf.jasperreports.components.barcode4j.UPCAComponent;
 -import net.sf.jasperreports.components.barcode4j.UPCEComponent;
 -import net.sf.jasperreports.components.barcode4j.USPSIntelligentMailComponent;
-+//import net.sf.jasperreports.components.barbecue.BarbecueComponent;
-+//import net.sf.jasperreports.components.barbecue.StandardBarbecueComponent;
-+//import net.sf.jasperreports.components.barcode4j.BarcodeComponent;
-+//import net.sf.jasperreports.components.barcode4j.BarcodeXmlWriter;
-+//import net.sf.jasperreports.components.barcode4j.CodabarComponent;
-+//import net.sf.jasperreports.components.barcode4j.Code128Component;
-+//import net.sf.jasperreports.components.barcode4j.Code39Component;
-+//import net.sf.jasperreports.components.barcode4j.DataMatrixComponent;
-+//import net.sf.jasperreports.components.barcode4j.EAN128Component;
-+//import net.sf.jasperreports.components.barcode4j.EAN13Component;
-+//import net.sf.jasperreports.components.barcode4j.EAN8Component;
-+//import net.sf.jasperreports.components.barcode4j.Interleaved2Of5Component;
-+//import net.sf.jasperreports.components.barcode4j.PDF417Component;
-+//import net.sf.jasperreports.components.barcode4j.POSTNETComponent;
-+//import net.sf.jasperreports.components.barcode4j.RoyalMailCustomerComponent;
-+//import net.sf.jasperreports.components.barcode4j.UPCAComponent;
-+//import net.sf.jasperreports.components.barcode4j.UPCEComponent;
-+//import net.sf.jasperreports.components.barcode4j.USPSIntelligentMailComponent;
- import net.sf.jasperreports.components.charts.ChartSettings;
- import net.sf.jasperreports.components.charts.ChartSettingsXmlFactory;
  import net.sf.jasperreports.components.list.DesignListContents;
-@@ -108,8 +108,6 @@
+ import net.sf.jasperreports.components.list.ListComponent;
+ import net.sf.jasperreports.components.list.ListContents;
+@@ -102,8 +84,6 @@
  	public void configureDigester(Digester digester)
  	{
  		addListRules(digester);
 -		addBarbecueRules(digester);
 -		addBarcode4jRules(digester);
  		addTableRules(digester);
- 		addSpiderChartRules(digester);
- 	}
-@@ -131,107 +129,6 @@
+ 		SpiderChartDigester.addSpiderChartRules(digester);
+ 		addMapRules(digester);
+@@ -127,107 +107,6 @@
  		digester.addSetNext(listContentsPattern, "setContents");
  	}
  
@@ -175,8 +174,8 @@
 -				"*/componentElement/PDF417", PDF417Component.class);
 -	}
 -	
--	protected void addBaseBarcode4jRules(Digester digester, 
--			String barcodePattern, Class barcodeComponentClass)
+-	protected <T> void addBaseBarcode4jRules(Digester digester, 
+-			String barcodePattern, Class<T> barcodeComponentClass)
 -	{
 -		digester.addObjectCreate(barcodePattern, barcodeComponentClass);
 -		digester.addSetProperties(barcodePattern,
@@ -204,10 +203,10 @@
 -				JRExpression.class.getName());
 -	}
 -
- 	protected void addTableRules(Digester digester)
+ 	protected void addMapRules(Digester digester)
  	{
- 		String tablePattern = "*/componentElement/table";
-@@ -323,18 +220,6 @@
+ 		String mapPattern = "*/componentElement/map";
+@@ -355,18 +234,6 @@
  			TableComponent table = (TableComponent) component;
  			writeTable(table, componentKey, reportWriter);
  		}
@@ -226,7 +225,7 @@
  		else if (component instanceof SpiderChartComponent)
  		{
  			SpiderChartComponent spiderChart = (SpiderChartComponent) component;
-@@ -367,40 +252,6 @@
+@@ -410,41 +277,7 @@
  		
  		writer.closeElement();
  	}
@@ -258,23 +257,14 @@
 -				barcode.getEvaluationGroup());
 -
 -		writer.writeExpression("codeExpression", 
--				barcode.getCodeExpression(), false);
+-				barcode.getCodeExpression());
 -		writer.writeExpression("applicationIdentifierExpression", 
--				barcode.getApplicationIdentifierExpression(), false);
+-				barcode.getApplicationIdentifierExpression());
 -		
 -		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">
+-
++	
+ 	protected void writeMap(MapComponent map, ComponentKey componentKey,
+ 			JRXmlWriter reportWriter) throws IOException
+ 	{

Modified: trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff
===================================================================
--- trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff	2011-09-21 01:54:46 UTC (rev 14973)
+++ trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff	2011-09-21 12:15:08 UTC (rev 14974)
@@ -2,9 +2,11 @@
 Fowarded: no
 Author: Damien Raude-Morvan <drazzib at debian.org>
 Last-Update: 2010-04-20
+Index: b/build.xml
+===================================================================
 --- a/build.xml
 +++ b/build.xml
-@@ -340,7 +340,6 @@
+@@ -349,7 +349,6 @@
  				use="true"
  				windowtitle="JasperReports ${version} API"
  				excludepackagenames="org.w3c.tools.codec"

Modified: trunk/jasperreports/debian/patches/09_use_commons_codec.diff
===================================================================
--- trunk/jasperreports/debian/patches/09_use_commons_codec.diff	2011-09-21 01:54:46 UTC (rev 14973)
+++ trunk/jasperreports/debian/patches/09_use_commons_codec.diff	2011-09-21 12:15:08 UTC (rev 14974)
@@ -3,9 +3,11 @@
 Author: Damien Raude-Morvan <drazzib at debian.org>
 Forwarded: no
 Last-Update: 2010-04-20
+Index: b/src/net/sf/jasperreports/engine/export/JRXmlExporter.java
+===================================================================
 --- a/src/net/sf/jasperreports/engine/export/JRXmlExporter.java
 +++ b/src/net/sf/jasperreports/engine/export/JRXmlExporter.java
-@@ -90,7 +90,7 @@
+@@ -89,7 +89,7 @@
  import net.sf.jasperreports.engine.util.JRXmlWriteHelper;
  import net.sf.jasperreports.engine.xml.JRXmlConstants;
  
@@ -14,7 +16,7 @@
  
  
  /**
-@@ -843,13 +843,8 @@
+@@ -807,13 +807,8 @@
  			{
  				try
  				{
@@ -30,6 +32,8 @@
  				}
  				catch (IOException e)
  				{
+Index: b/src/net/sf/jasperreports/engine/util/JRValueStringUtils.java
+===================================================================
 --- a/src/net/sf/jasperreports/engine/util/JRValueStringUtils.java
 +++ b/src/net/sf/jasperreports/engine/util/JRValueStringUtils.java
 @@ -34,9 +34,7 @@
@@ -87,6 +91,8 @@
  			}
  			catch (NotSerializableException e)
  			{
+Index: b/src/net/sf/jasperreports/engine/xml/JRPrintImageSourceObject.java
+===================================================================
 --- a/src/net/sf/jasperreports/engine/xml/JRPrintImageSourceObject.java
 +++ b/src/net/sf/jasperreports/engine/xml/JRPrintImageSourceObject.java
 @@ -30,7 +30,7 @@

Modified: trunk/jasperreports/debian/patches/10_disable_fonts.diff
===================================================================
--- trunk/jasperreports/debian/patches/10_disable_fonts.diff	2011-09-21 01:54:46 UTC (rev 14973)
+++ trunk/jasperreports/debian/patches/10_disable_fonts.diff	2011-09-21 12:15:08 UTC (rev 14974)
@@ -2,9 +2,11 @@
 Fowarded: no
 Author: Damien Raude-Morvan <drazzib at debian.org>
 Last-Update: 2010-04-20
+Index: b/build.xml
+===================================================================
 --- a/build.xml
 +++ b/build.xml
-@@ -41,7 +41,7 @@
+@@ -45,7 +45,7 @@
  		</antlr>
  	</target>
  

Modified: trunk/jasperreports/debian/patches/12_samples.diff
===================================================================
--- trunk/jasperreports/debian/patches/12_samples.diff	2011-09-21 01:54:46 UTC (rev 14973)
+++ trunk/jasperreports/debian/patches/12_samples.diff	2011-09-21 12:15:08 UTC (rev 14974)
@@ -2,9 +2,11 @@
 Author: Damien Raude-Morvan <drazzib at debian.org>
 Last-Update: 2010-04-20
 Forwarded: no
+Index: b/build.xml
+===================================================================
 --- a/build.xml
 +++ b/build.xml
-@@ -448,6 +448,6 @@
+@@ -457,6 +457,6 @@
  		</copy>
  	</target>
  	

Added: trunk/jasperreports/debian/patches/13_disable_ooxml_support.diff
===================================================================
--- trunk/jasperreports/debian/patches/13_disable_ooxml_support.diff	                        (rev 0)
+++ trunk/jasperreports/debian/patches/13_disable_ooxml_support.diff	2011-09-21 12:15:08 UTC (rev 14974)
@@ -0,0 +1,65 @@
+Description: Apache POI's Debian package doesn't yet provide support for
+ OOXML formats, so disable JR support for it.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2011-09-21
+Forwarded: not-needed
+Index: b/build.xml
+===================================================================
+--- a/build.xml
++++ b/build.xml
+@@ -9,6 +9,10 @@
+ 		<javac destdir="./build/classes" debug="true" optimize="false" deprecation="false" target="1.5" source="1.5" encoding="ISO-8859-1">
+            <exclude name="**/barcode4j/*.java"/>
+            <exclude name="**/barbecue/*.java"/>
++           <exclude name="**/JRXlsxDataSource.java"/>
++           <exclude name="**/XlsxDataAdapterService.java"/>
++           <exclude name="**/JRXlsxQueryExecuter.java"/>
++           <exclude name="**/JRXlsxQueryExecuterFactory"/>
+ 			<classpath>
+ 				<pathelement location="./build/classes"/>
+ 				<fileset dir="./lib">
+Index: b/src/net/sf/jasperreports/data/DefaultDataAdapterServiceFactory.java
+===================================================================
+--- a/src/net/sf/jasperreports/data/DefaultDataAdapterServiceFactory.java
++++ b/src/net/sf/jasperreports/data/DefaultDataAdapterServiceFactory.java
+@@ -41,8 +41,6 @@
+ import net.sf.jasperreports.data.qe.QueryExecuterDataAdapterService;
+ import net.sf.jasperreports.data.xls.XlsDataAdapter;
+ import net.sf.jasperreports.data.xls.XlsDataAdapterService;
+-import net.sf.jasperreports.data.xlsx.XlsxDataAdapter;
+-import net.sf.jasperreports.data.xlsx.XlsxDataAdapterService;
+ import net.sf.jasperreports.data.xml.RemoteXmlDataAdapter;
+ import net.sf.jasperreports.data.xml.RemoteXmlDataAdapterService;
+ import net.sf.jasperreports.data.xml.XmlDataAdapter;
+@@ -112,10 +110,6 @@
+ 		{
+ 			dataAdapterService = new XlsDataAdapterService((XlsDataAdapter)dataAdapter);
+ 		}
+-		else if (dataAdapter instanceof XlsxDataAdapter)
+-		{
+-			dataAdapterService = new XlsxDataAdapterService((XlsxDataAdapter)dataAdapter);
+-		}
+ 		else if (dataAdapter instanceof RemoteXmlDataAdapter)
+ 		{
+ 			dataAdapterService = new RemoteXmlDataAdapterService((RemoteXmlDataAdapter)dataAdapter);
+Index: b/src/net/sf/jasperreports/engine/data/JRXlsxDataSource.java
+===================================================================
+--- a/src/net/sf/jasperreports/engine/data/JRXlsxDataSource.java
++++ b/src/net/sf/jasperreports/engine/data/JRXlsxDataSource.java
+@@ -47,7 +47,6 @@
+ import org.apache.poi.ss.usermodel.Row;
+ import org.apache.poi.ss.usermodel.Sheet;
+ import org.apache.poi.ss.usermodel.Workbook;
+-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+ 
+ 
+ /**
+@@ -95,7 +94,7 @@
+ 		try
+ 		{
+ 			this.inputStream = is;
+-			this.workbook = new XSSFWorkbook(is);
++			this.workbook = null; //new XSSFWorkbook(is);
+ 			this.closeWorkbook = true;
+ 			this.closeInputStream = false;
+ 		}

Added: trunk/jasperreports/debian/patches/14_velocity.diff
===================================================================
--- trunk/jasperreports/debian/patches/14_velocity.diff	                        (rev 0)
+++ trunk/jasperreports/debian/patches/14_velocity.diff	2011-09-21 12:15:08 UTC (rev 14974)
@@ -0,0 +1,93 @@
+Description: Handle java.lang.Exception during init ov VelocityEngine
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2011-09-21
+Forwarded: no
+Index: b/src/net/sf/jasperreports/components/BaseElementHtmlHandler.java
+===================================================================
+--- a/src/net/sf/jasperreports/components/BaseElementHtmlHandler.java
++++ b/src/net/sf/jasperreports/components/BaseElementHtmlHandler.java
+@@ -37,9 +37,13 @@
+ 	
+ 	static {
+ 		velocityEngine = new VelocityEngine();
++		try {
+ 		velocityEngine.setProperty("file.resource.loader.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
+ 		velocityEngine.setProperty("file.resource.loader.cache", "true");
+ 		velocityEngine.init();
++		} catch (java.lang.Exception e) {
++			e.printStackTrace();
++		}
+ 	}
+ 	
+ 	protected VelocityEngine getVelocityEngine() {
+Index: b/src/net/sf/jasperreports/components/sort/SortElementHtmlHandler.java
+===================================================================
+--- a/src/net/sf/jasperreports/components/sort/SortElementHtmlHandler.java
++++ b/src/net/sf/jasperreports/components/sort/SortElementHtmlHandler.java
+@@ -75,7 +75,12 @@
+ 			String sortDatasetName = element.getPropertiesMap().getProperty(SortElement.PROPERTY_DATASET_RUN);
+ 			String isFilterable = element.getPropertiesMap().getProperty(SortElement.PROPERTY_IS_FILTERABLE);
+ 			
+-			Template template = getVelocityEngine().getTemplate(SortElementHtmlHandler.SORT_ELEMENT_HTML_TEMPLATE);
++			Template template = null;
++			try {
++                template = getVelocityEngine().getTemplate(SortElementHtmlHandler.SORT_ELEMENT_HTML_TEMPLATE);
++			} catch (java.lang.Exception e) {
++				e.printStackTrace();
++			}
+ 			
+ 			String appContextPath = (String)reportContext.getParameterValue("net.sf.jasperreports.web.app.context.path");//FIXMEJIVE define constant
+ 			
+@@ -129,7 +134,11 @@
+ 			}
+ 			
+ 			StringWriter writer = new StringWriter(128);
++			try {
+ 			template.merge(velocityContext, writer);
++			} catch (java.io.IOException e) {
++				e.printStackTrace();
++			}
+ 			writer.flush();
+ 			try {
+ 				writer.close();
+Index: b/src/net/sf/jasperreports/web/util/VelocityUtil.java
+===================================================================
+--- a/src/net/sf/jasperreports/web/util/VelocityUtil.java
++++ b/src/net/sf/jasperreports/web/util/VelocityUtil.java
+@@ -47,9 +47,13 @@
+ 	
+ 	static {
+ 		velocityEngine = new VelocityEngine();
++		try {
+ 		velocityEngine.setProperty("file.resource.loader.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
+ 		velocityEngine.setProperty("file.resource.loader.cache", "true");
+ 		velocityEngine.init();
++        } catch (java.lang.Exception e) {
++            e.printStackTrace();
++        }
+ 	}
+ 	
+ 	public static VelocityEngine getVelocityEngine() {
+@@ -57,13 +61,18 @@
+ 	}
+ 	
+ 	public static String processTemplate(String templateName, VelocityContext vContext) {
+-		Template template = getVelocityEngine().getTemplate(templateName);
++        Template template = null;
++        try {
++            template = getVelocityEngine().getTemplate(templateName);
++        } catch (java.lang.Exception e) {
++            e.printStackTrace();
++        }
+ 
+ 		StringWriter writer = new StringWriter(128);
+-		template.merge(vContext, writer);
+-		writer.flush();
+ 		try {
+-			writer.close();
++            template.merge(vContext, writer);
++            writer.flush();
++            writer.close();
+ 		} catch (IOException e) {
+ 			e.printStackTrace();
+ 		}

Modified: trunk/jasperreports/debian/patches/series
===================================================================
--- trunk/jasperreports/debian/patches/series	2011-09-21 01:54:46 UTC (rev 14973)
+++ trunk/jasperreports/debian/patches/series	2011-09-21 12:15:08 UTC (rev 14974)
@@ -1,3 +1,4 @@
+01_disable_deprecation_warning.diff
 02_use_debian_asm.diff
 06_configure_javaflow.diff
 07_exclude_barcode4j_and_barbecue.diff
@@ -5,3 +6,5 @@
 09_use_commons_codec.diff
 10_disable_fonts.diff
 12_samples.diff
+13_disable_ooxml_support.diff
+14_velocity.diff

Modified: trunk/jasperreports/debian/rules
===================================================================
--- trunk/jasperreports/debian/rules	2011-09-21 01:54:46 UTC (rev 14973)
+++ trunk/jasperreports/debian/rules	2011-09-21 12:15:08 UTC (rev 14974)
@@ -11,7 +11,7 @@
             commons-digester commons-collections3 commons-logging \
             commons-beanutils commons-codec commons-javaflow \
             eclipse-ecj xalan2 jaxen xml-apis-ext \
-            jxl jakarta-poi itext \
+            jxl poi itext velocity castor-core castor-xml \
             batik-all jfreechart hibernate3 \
             glassfish-javaee mondrian olap4j antlr js
 
@@ -33,4 +33,4 @@
 	mh_clean
 
 get-orig-source:
-	uscan --force-download
+	uscan --force-download --rename




More information about the pkg-java-commits mailing list