[jasperreports] 03/07: Refreshed the patches

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon Dec 11 12:25:12 UTC 2017


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jasperreports.

commit cda34f99bfa8200bf74474d24095b5e5b2eadf2e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Dec 11 09:14:30 2017 +0100

    Refreshed the patches
---
 debian/changelog                                   |  4 +-
 debian/patches/build.patch                         | 27 +++++----
 debian/patches/commons-codec-Base64.patch          | 60 +++++++++-----------
 .../patches/exclude-barcode4j-and-barbecue.patch   | 54 +++++++++---------
 debian/patches/no-commons-javaflow.patch           | 64 ++++++++++++++++++++--
 5 files changed, 131 insertions(+), 78 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6383f1e..b33a6a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-jasperreports (6.2.2-6) UNRELEASED; urgency=medium
+jasperreports (6.3.0-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patches
   * Track and download the new releases from GitHub
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 11 Dec 2017 08:52:07 +0100
diff --git a/debian/patches/build.patch b/debian/patches/build.patch
index 140f8f7..c8180c1 100644
--- a/debian/patches/build.patch
+++ b/debian/patches/build.patch
@@ -1,15 +1,15 @@
 Description: Set fileset dir to /usr/share/java.
 Author: Markus Koschany <apo at gambaru.de>
 Forwarded: not-needed
---- a/build.xml
-+++ b/build.xml
+--- a/jasperreports/build.xml
++++ b/jasperreports/build.xml
 @@ -1,18 +1,48 @@
 -<project name="JasperReports" default="compile" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
 +<project name="JasperReports" default="compile" basedir=".">
  
  	<description>Helps build the JasperReports distribution files.</description>
  
- 	<property name="version" value="6.2.2"/>
+ 	<property name="version" value="6.3.0"/>
  
  	<path id="project-classpath">
 -		<path refid="project-lib"/>
@@ -53,7 +53,7 @@ Forwarded: not-needed
  		<mkdir dir="./build/classes"/>
 -		<ivy:configure file="./ivysettings.xml" override="true"/>
 -		<ivy:cachepath pathid="project-lib" log="download-only" conf="compile"/> 
- 		<javac destdir="./build/classes" debug="true" optimize="false" deprecation="true" target="1.6" source="1.6" 
+ 		<javac destdir="./build/classes" debug="true" optimize="false" deprecation="true" target="1.7" source="1.7" 
  				encoding="ISO-8859-1" includeantruntime="false" excludes="**/package-info.java">
  			<classpath refid="project-classpath"/>
 @@ -66,7 +96,6 @@
@@ -61,7 +61,7 @@ Forwarded: not-needed
  
  	<target name="javaflow" depends="compile" description="Builds the JavaFlow instrumentated JAR file.">
 -		<ivy:cachepath pathid="project-lib" log="download-only" conf="javaflow"/> 
- 		<taskdef name="javaflow" classname="org.apache.commons.javaflow.ant.AntRewriteTask">
+ 		<taskdef name="javaflow" classname="net.sf.jasperreports.ant.JavaflowRewriteTask">
  			<classpath refid="project-classpath"/>
  		</taskdef>
 @@ -136,7 +165,6 @@
@@ -72,7 +72,7 @@ Forwarded: not-needed
  		<condition property="javadoc-arg" value="-Xdoclint:none" else="">
  			<or>
  				<matches pattern="1.8.*" string="${java.version}"/>
-@@ -193,7 +221,6 @@
+@@ -196,7 +224,6 @@
  	</target>
  	
  	<target name="schemaref" description="Generates the Schema Reference.">
@@ -80,7 +80,7 @@ Forwarded: not-needed
  		<xslt basedir="src/net/sf/jasperreports/engine/dtds" in="src/net/sf/jasperreports/engine/dtds/jasperreport.xsd" destdir="dist/docs" style="docs/schema.reference.xsl" out="./dist/docs/schema.reference.html">
  			<param name="sf.net" expression="${sf.net}"/>
  			<param name="version" expression="${version}"/>
-@@ -202,7 +229,6 @@
+@@ -205,7 +232,6 @@
  	</target>
  	
  	<target name="partschemaref" description="Generates the Report Parts Schema Reference.">
@@ -88,7 +88,7 @@ Forwarded: not-needed
  		<xslt basedir="src/net/sf/jasperreports/parts" in="src/net/sf/jasperreports/parts/parts.xsd" destdir="dist/docs" style="docs/parts.schema.reference.xsl" out="./dist/docs/parts.schema.reference.html">
  			<param name="sf.net" expression="${sf.net}"/>
  			<param name="version" expression="${version}"/>
-@@ -211,7 +237,6 @@
+@@ -214,7 +240,6 @@
  	</target>
  	
  	<target name="componentschemaref" description="Generates the Component Schema Reference.">
@@ -96,7 +96,7 @@ Forwarded: not-needed
  		<xslt basedir="src/net/sf/jasperreports/components" in="src/net/sf/jasperreports/components/components.xsd" destdir="dist/docs" style="docs/components.schema.reference.xsl" out="./dist/docs/components.schema.reference.html">
  			<param name="sf.net" expression="${sf.net}"/>
  			<param name="version" expression="${version}"/>
-@@ -220,7 +245,6 @@
+@@ -223,7 +248,6 @@
  	</target>
  	
  	<target name="configref" description="Generates the Configuration Reference.">
@@ -104,7 +104,7 @@ Forwarded: not-needed
  		<xslt basedir="docs" in="docs/config.reference.xml" destdir="dist/docs" style="docs/config.reference.xsl" out="./dist/docs/config.reference.html">
  			<param name="sf.net" expression="${sf.net}"/>
  			<param name="version" expression="${version}"/>
-@@ -229,7 +253,6 @@
+@@ -232,7 +256,6 @@
  	</target>
  	
  	<target name="sampleref" depends="compile" description="Generates the Sample Reference.">
@@ -112,3 +112,10 @@ Forwarded: not-needed
  		<xslt basedir="docs" in="docs/sample.reference.xml" destdir="dist/docs" style="docs/sample.reference.xsl" out="./dist/docs/sample.reference.html">
  			<param name="sf.net" expression="${sf.net}"/>
  			<param name="version" expression="${version}"/>
+@@ -270,6 +293,5 @@
+ 	<target name="docs" depends="preparedocs, javadoc, schemaref, partschemaref, componentschemaref, configref, sampleref" description="Generates all documentation."/>
+ 
+ 	<target name="retrievelibs" description="Retrieve dependencies with Apache Ivy">
+-		<ivy:retrieve conf="compile, javaflow, test" pattern="dist/lib/[artifact](-[classifier])-[revision].[ext]"/>
+ 	</target>
+ </project>
diff --git a/debian/patches/commons-codec-Base64.patch b/debian/patches/commons-codec-Base64.patch
index e9e8fea..c671f53 100644
--- a/debian/patches/commons-codec-Base64.patch
+++ b/debian/patches/commons-codec-Base64.patch
@@ -1,8 +1,8 @@
 Description: Replace non-free W3C Base64 implementation with apache.commons.codec.binary.Base64
 Author: Markus Koschany <apo at gambaru.de>
 Forwarded: no
---- a/src/net/sf/jasperreports/engine/export/JRXmlExporter.java
-+++ b/src/net/sf/jasperreports/engine/export/JRXmlExporter.java
+--- a/jasperreports/src/net/sf/jasperreports/engine/export/JRXmlExporter.java
++++ b/jasperreports/src/net/sf/jasperreports/engine/export/JRXmlExporter.java
 @@ -40,7 +40,7 @@
  import java.util.Map;
  import java.util.Set;
@@ -12,7 +12,7 @@ Forwarded: no
  
  import net.sf.jasperreports.engine.DefaultJasperReportsContext;
  import net.sf.jasperreports.engine.JRAbstractExporter;
-@@ -877,15 +877,9 @@
+@@ -877,13 +877,7 @@
  							
  						try
  						{
@@ -22,15 +22,13 @@ Forwarded: no
 -							Base64Encoder encoder = new Base64Encoder(bais, baos);
 -							encoder.process();
 -							
- 							String encoding = getExporterOutput().getEncoding();
- 							
--							imageSource = new String(baos.toByteArray(), encoding);
-+							imageSource = new String(Base64.encodeBase64(dataRenderer.getData(jasperReportsContext)), encoding);
+-							imageSource = new String(baos.toByteArray(), "UTF-8"); // UTF-8 is fine as we just need an ASCII compatible encoding for the Base64 array
++							imageSource = new String(Base64.encodeBase64(dataRenderer.getData(jasperReportsContext)), "UTF-8");
  						}
  						catch (IOException e)
  						{
---- a/src/net/sf/jasperreports/engine/util/JRValueStringUtils.java
-+++ b/src/net/sf/jasperreports/engine/util/JRValueStringUtils.java
+--- a/jasperreports/src/net/sf/jasperreports/engine/util/JRValueStringUtils.java
++++ b/jasperreports/src/net/sf/jasperreports/engine/util/JRValueStringUtils.java
 @@ -34,10 +34,7 @@
  
  import net.sf.jasperreports.engine.JRRuntimeException;
@@ -86,8 +84,8 @@ Forwarded: no
  			}
  			catch (NotSerializableException e)
  			{
---- a/src/net/sf/jasperreports/engine/xml/JRPrintImageSourceObject.java
-+++ b/src/net/sf/jasperreports/engine/xml/JRPrintImageSourceObject.java
+--- a/jasperreports/src/net/sf/jasperreports/engine/xml/JRPrintImageSourceObject.java
++++ b/jasperreports/src/net/sf/jasperreports/engine/xml/JRPrintImageSourceObject.java
 @@ -26,7 +26,7 @@
  import java.io.ByteArrayInputStream;
  import java.io.ByteArrayOutputStream;
@@ -112,8 +110,8 @@ Forwarded: no
  				}
  				catch (Exception e)
  				{
---- a/src/net/sf/jasperreports/engine/export/JRXhtmlExporter.java
-+++ b/src/net/sf/jasperreports/engine/export/JRXhtmlExporter.java
+--- a/jasperreports/src/net/sf/jasperreports/engine/export/JRXhtmlExporter.java
++++ b/jasperreports/src/net/sf/jasperreports/engine/export/JRXhtmlExporter.java
 @@ -53,7 +53,7 @@
  
  import org.apache.commons.logging.Log;
@@ -123,7 +121,7 @@ Forwarded: no
  
  import net.sf.jasperreports.components.headertoolbar.HeaderToolbarElement;
  import net.sf.jasperreports.engine.DefaultJasperReportsContext;
-@@ -1712,15 +1712,9 @@
+@@ -1712,13 +1712,7 @@
  							? RendererUtil.SVG_MIME_TYPE
  							: JRTypeSniffer.getImageTypeValue(imageData).getMimeType();
  						
@@ -133,15 +131,13 @@ Forwarded: no
 -						Base64Encoder encoder = new Base64Encoder(bais, baos);
 -						encoder.process();
 -						
- 						String encoding = getExporterOutput().getEncoding();
- 						
--						imagePath = "data:" + imageMimeType + ";base64," + new String(baos.toByteArray(), encoding);
-+						imagePath = "data:" + imageMimeType + ";base64," + new String(Base64.encodeBase64(imageData), encoding);
+-						imagePath = "data:" + imageMimeType + ";base64," + new String(baos.toByteArray(), "UTF-8"); // UTF-8 is fine as we just need an ASCII compatible encoding for the Base64 array
++						imagePath = "data:" + imageMimeType + ";base64," + new String(Base64.encodeBase64(imageData), "UTF-8");
  						//don't cache the base64 encoded image as imagePath because they are too big
  					}
  					else
---- a/src/net/sf/jasperreports/engine/export/JRHtmlExporter.java
-+++ b/src/net/sf/jasperreports/engine/export/JRHtmlExporter.java
+--- a/jasperreports/src/net/sf/jasperreports/engine/export/JRHtmlExporter.java
++++ b/jasperreports/src/net/sf/jasperreports/engine/export/JRHtmlExporter.java
 @@ -53,7 +53,7 @@
  
  import org.apache.commons.logging.Log;
@@ -151,7 +147,7 @@ Forwarded: no
  
  import net.sf.jasperreports.crosstabs.JRCellContents;
  import net.sf.jasperreports.engine.DefaultJasperReportsContext;
-@@ -1775,15 +1775,9 @@
+@@ -1775,13 +1775,7 @@
  								? "image/svg+xml"
  								: JRTypeSniffer.getImageTypeValue(imageData).getMimeType();
  							
@@ -161,15 +157,13 @@ Forwarded: no
 -							Base64Encoder encoder = new Base64Encoder(bais, baos);
 -							encoder.process();
 -							
- 							String encoding = getExporterOutput().getEncoding();
- 							
--							imagePath = "data:" + imageMimeType + ";base64," + new String(baos.toByteArray(), encoding);
-+							imagePath = "data:" + imageMimeType + ";base64," + new String(Base64.encodeBase64(imageData), encoding);
+-							imagePath = "data:" + imageMimeType + ";base64," + new String(baos.toByteArray(), "UTF-8"); // UTF-8 is fine as we just need an ASCII compatible encoding for the Base64 array
++							imagePath = "data:" + imageMimeType + ";base64," + new String(Base64.encodeBase64(imageData), "UTF-8");
  							//don't cache the base64 encoded image as imagePath because they are too big
  						}
  						else
---- a/src/net/sf/jasperreports/engine/export/HtmlExporter.java
-+++ b/src/net/sf/jasperreports/engine/export/HtmlExporter.java
+--- a/jasperreports/src/net/sf/jasperreports/engine/export/HtmlExporter.java
++++ b/jasperreports/src/net/sf/jasperreports/engine/export/HtmlExporter.java
 @@ -47,7 +47,7 @@
  
  import org.apache.commons.logging.Log;
@@ -179,9 +173,9 @@ Forwarded: no
  
  import net.sf.jasperreports.components.headertoolbar.HeaderToolbarElement;
  import net.sf.jasperreports.crosstabs.interactive.CrosstabInteractiveJsonHandler;
-@@ -1412,15 +1412,9 @@
- 								? RendererUtil.SVG_MIME_TYPE
- 								: JRTypeSniffer.getImageTypeValue(imageData).getMimeType();
+@@ -1426,13 +1426,7 @@
+ 						{
+ 							String imageMimeType = JRTypeSniffer.getImageTypeValue(imageData).getMimeType();
  
 -							ByteArrayInputStream bais = new ByteArrayInputStream(imageData);
 -							ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -189,10 +183,8 @@ Forwarded: no
 -							Base64Encoder encoder = new Base64Encoder(bais, baos);
 -							encoder.process();
 -							
- 							String encoding = getExporterOutput().getEncoding();
- 							
--							imageSource = "data:" + imageMimeType + ";base64," + new String(baos.toByteArray(), encoding);
-+							imageSource = "data:" + imageMimeType + ";base64," + new String(Base64.encodeBase64(imageData), encoding);
+-							imageSource = "data:" + imageMimeType + ";base64," + new String(baos.toByteArray(), "UTF-8"); // UTF-8 is fine as we just need an ASCII compatible encoding for the Base64 array
++							imageSource = "data:" + imageMimeType + ";base64," + new String(Base64.encodeBase64(imageData), "UTF-8");
  						}
  						
  						//don't cache embedded imageSource as they are not image paths
diff --git a/debian/patches/exclude-barcode4j-and-barbecue.patch b/debian/patches/exclude-barcode4j-and-barbecue.patch
index 22524d5..a9b4923 100644
--- a/debian/patches/exclude-barcode4j-and-barbecue.patch
+++ b/debian/patches/exclude-barcode4j-and-barbecue.patch
@@ -1,8 +1,8 @@
 Description: Exclude all barcode4j and barbecue code. The build-dependencies are not available in Debian.
 Author: Markus Koschany <apo at gambaru.de>
 Forwarded: not-needed
---- a/src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java
-+++ b/src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java
+--- a/jasperreports/src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java
++++ b/jasperreports/src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java
 @@ -28,12 +28,6 @@
  import java.util.HashMap;
  import java.util.List;
@@ -39,9 +39,9 @@ Forwarded: not-needed
  		
  		ComponentsManager spiderChartManager = new ComponentsManager();
  		spiderChartManager.setDesignConverter(new SpiderChartDesignConverter());
---- a/src/net/sf/jasperreports/components/ComponentsXmlDigesterConfigurer.java
-+++ b/src/net/sf/jasperreports/components/ComponentsXmlDigesterConfigurer.java
-@@ -23,25 +23,6 @@
+--- a/jasperreports/src/net/sf/jasperreports/components/ComponentsXmlDigesterConfigurer.java
++++ b/jasperreports/src/net/sf/jasperreports/components/ComponentsXmlDigesterConfigurer.java
+@@ -23,26 +23,6 @@
   */
  package net.sf.jasperreports.components;
  
@@ -56,6 +56,7 @@ Forwarded: not-needed
 -import net.sf.jasperreports.components.barcode4j.ErrorCorrectionLevelEnum;
 -import net.sf.jasperreports.components.barcode4j.Interleaved2Of5Component;
 -import net.sf.jasperreports.components.barcode4j.OrientationEnum;
+-import net.sf.jasperreports.components.barcode4j.OrientationRule;
 -import net.sf.jasperreports.components.barcode4j.PDF417Component;
 -import net.sf.jasperreports.components.barcode4j.POSTNETComponent;
 -import net.sf.jasperreports.components.barcode4j.QRCodeComponent;
@@ -67,7 +68,7 @@ Forwarded: not-needed
  import net.sf.jasperreports.components.iconlabel.IconLabelComponentDigester;
  import net.sf.jasperreports.components.items.Item;
  import net.sf.jasperreports.components.items.ItemData;
-@@ -88,8 +69,6 @@
+@@ -99,8 +79,6 @@
  	public void configureDigester(Digester digester)
  	{
  		addListRules(digester);
@@ -76,11 +77,10 @@ Forwarded: not-needed
  		addTableRules(digester);
  		SpiderChartDigester.addSpiderChartRules(digester);
  		addMapRules(digester);
-@@ -114,159 +93,6 @@
- 		digester.addSetNext(listContentsPattern, "setContents");
+@@ -126,154 +104,6 @@
  	}
  
--	@SuppressWarnings("deprecation")
+ 	@SuppressWarnings("deprecation")
 -	protected void addBarbecueRules(Digester digester)
 -	{
 -		String barcodePattern = "*/componentElement/barbecue";
@@ -160,13 +160,11 @@ Forwarded: not-needed
 -	protected <T> void addBaseBarcode4jRules(Digester digester, 
 -			String barcodePattern, Class<T> barcodeComponentClass)
 -	{
--		addBarcodeRules(digester, barcodePattern, barcodeComponentClass);
+-		addBarcodeRules(digester, barcodePattern, barcodeComponentClass, BARCODE4J_IGNORED_PROPERTIES);
 -		addPatternExpressionRules(digester, barcodePattern);
 -		
 -		digester.addRule(barcodePattern, 
--				new XmlConstantPropertyRule(
--						"orientation", "orientationValue",
--						OrientationEnum.values()));
+-				new OrientationRule("orientation", "orientationValue"));
 -		digester.addRule(barcodePattern, 
 -				new XmlConstantPropertyRule(
 -						"textPosition", "textPositionValue",
@@ -186,17 +184,13 @@ Forwarded: not-needed
 -	
 -	@SuppressWarnings("deprecation")
 -	protected <T> void addBarcodeRules(Digester digester, 
--			String barcodePattern, Class<T> barcodeComponentClass)
+-			String barcodePattern, Class<T> barcodeComponentClass,
+-			String[] ignoredProperties)
 -	{
 -		digester.addObjectCreate(barcodePattern, barcodeComponentClass);
 -		digester.addSetProperties(barcodePattern,
 -				//properties to be ignored by this rule
--				new String[]{
--					JRXmlConstants.ATTRIBUTE_evaluationTime,
--					"orientation",
--					"textPosition",
--					"errorCorrectionLevel"
--					}, 
+-				ignoredProperties, 
 -				new String[0]);
 -		//rule to set evaluation time
 -		digester.addRule(barcodePattern, 
@@ -215,7 +209,7 @@ Forwarded: not-needed
 -	protected <T> void addQRCodeRules(Digester digester, 
 -			String barcodePattern, Class<T> barcodeComponentClass)
 -	{
--		addBarcodeRules(digester, barcodePattern, barcodeComponentClass);
+-		addBarcodeRules(digester, barcodePattern, barcodeComponentClass, QRCODE_IGNORED_PROPERTIES);
 -
 -		digester.addRule(barcodePattern, 
 -				new XmlConstantPropertyRule(
@@ -233,11 +227,13 @@ Forwarded: not-needed
 -		digester.addSetNext(templateExpressionPattern, "setTemplateExpression", 
 -				JRExpression.class.getName());
 -	}
- 
- 	@SuppressWarnings("deprecation")
+-
+-	@SuppressWarnings("deprecation")
  	protected void addMapRules(Digester digester)
---- a/src/net/sf/jasperreports/components/ComponentsXmlWriter.java
-+++ b/src/net/sf/jasperreports/components/ComponentsXmlWriter.java
+ 	{
+ 		String mapPattern = "*/componentElement/map";
+--- a/jasperreports/src/net/sf/jasperreports/components/ComponentsXmlWriter.java
++++ b/jasperreports/src/net/sf/jasperreports/components/ComponentsXmlWriter.java
 @@ -26,9 +26,6 @@
  import java.io.IOException;
  import java.util.List;
@@ -337,11 +333,11 @@ Forwarded: not-needed
 -		return false;
 -	}
  }
---- a/pom.xml
-+++ b/pom.xml
+--- a/jasperreports/pom.xml
++++ b/jasperreports/pom.xml
 @@ -112,6 +112,10 @@
- 					<source>1.6</source>
- 					<target>1.6</target>
+ 					<source>1.7</source>
+ 					<target>1.7</target>
  					<encoding>UTF-8</encoding>
 +					<excludes>
 +						<exclude>**/barcode4j/**</exclude>
diff --git a/debian/patches/no-commons-javaflow.patch b/debian/patches/no-commons-javaflow.patch
index d685553..3ea0df8 100644
--- a/debian/patches/no-commons-javaflow.patch
+++ b/debian/patches/no-commons-javaflow.patch
@@ -1,12 +1,12 @@
 Description: Drop commons-javaflow support
 Author: Markus Koschany <apo at debian.org>
 Forwarded: not-needed
---- a/src/net/sf/jasperreports/engine/fill/JRContinuationSubreportRunner.java
+--- a/jasperreports/src/net/sf/jasperreports/engine/fill/JRContinuationSubreportRunner.java
 +++ /dev/null
 @@ -1,81 +0,0 @@
 -/*
 - * JasperReports - Free Java Reporting Library.
-- * Copyright (C) 2001 - 2014 TIBCO Software Inc. All rights reserved.
+- * Copyright (C) 2001 - 2016 TIBCO Software Inc. All rights reserved.
 - * http://www.jaspersoft.com
 - *
 - * Unless you have purchased a commercial license agreement from Jaspersoft,
@@ -85,12 +85,12 @@ Forwarded: not-needed
 -		Continuation.suspend();
 -	}
 -}
---- a/src/net/sf/jasperreports/engine/fill/JRContinuationSubreportRunnerFactory.java
+--- a/jasperreports/src/net/sf/jasperreports/engine/fill/JRContinuationSubreportRunnerFactory.java
 +++ /dev/null
 @@ -1,42 +0,0 @@
 -/*
 - * JasperReports - Free Java Reporting Library.
-- * Copyright (C) 2001 - 2014 TIBCO Software Inc. All rights reserved.
+- * Copyright (C) 2001 - 2016 TIBCO Software Inc. All rights reserved.
 - * http://www.jaspersoft.com
 - *
 - * Unless you have purchased a commercial license agreement from Jaspersoft,
@@ -130,3 +130,59 @@ Forwarded: not-needed
 -	}
 -
 -}
+--- a/jasperreports/src/net/sf/jasperreports/ant/JavaflowRewriteTask.java
++++ /dev/null
+@@ -1,53 +0,0 @@
+-/*
+- * JasperReports - Free Java Reporting Library.
+- * Copyright (C) 2001 - 2016 TIBCO Software Inc. All rights reserved.
+- * http://www.jaspersoft.com
+- *
+- * Unless you have purchased a commercial license agreement from Jaspersoft,
+- * the following license terms apply:
+- *
+- * This program is part of JasperReports.
+- *
+- * JasperReports is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License as published by
+- * the Free Software Foundation, either version 3 of the License, or
+- * (at your option) any later version.
+- *
+- * JasperReports is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- * GNU Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+- */
+-package net.sf.jasperreports.ant;
+-
+-import org.apache.commons.javaflow.ant.AntRewriteTask;
+-import org.apache.tools.ant.BuildException;
+-
+-/**
+- * @author Lucian Chirita (lucianc at users.sourceforge.net)
+- */
+-public class JavaflowRewriteTask extends AntRewriteTask
+-{
+-
+-	@Override
+-	public void execute() throws BuildException
+-	{
+-		Thread thread = Thread.currentThread();
+-		ClassLoader originalClassLoader = thread.getContextClassLoader();
+-		try
+-		{
+-			//javaflow's ContinuationMethodAnalyzer uses the thread classloader to resolve classes
+-			thread.setContextClassLoader(getClass().getClassLoader());
+-			
+-			super.execute();
+-		}
+-		finally
+-		{
+-			thread.setContextClassLoader(originalClassLoader);
+-		}
+-	}
+-
+-}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jasperreports.git



More information about the pkg-java-commits mailing list