Author: echatellier Date: 2014-09-29 14:34:02 +0200 (Mon, 29 Sep 2014) New Revision: 754 Url: http://forge.nuiton.org/projects/jrst/repository/revisions/754 Log: refs #3522: Update itext & flyingsaucer Modified: trunk/jrst/pom.xml trunk/jrst/src/main/java/org/nuiton/jrst/JRSTUserAgent.java trunk/jrst/src/test/java/org/nuiton/jrst/JRSTGeneratorTest.java trunk/pom.xml Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2014-09-29 12:24:13 UTC (rev 753) +++ trunk/jrst/pom.xml 2014-09-29 12:34:02 UTC (rev 754) @@ -168,14 +168,12 @@ <!-- itext --> <dependency> <groupId>org.xhtmlrenderer</groupId> - <artifactId>core-renderer</artifactId> - <version>R8</version> + <artifactId>flying-saucer-pdf-itext5</artifactId> </dependency> <dependency> - <groupId>com.lowagie</groupId> - <artifactId>itext</artifactId> - <version>2.0.8</version> + <groupId>com.itextpdf</groupId> + <artifactId>itextpdf</artifactId> </dependency> <!-- Test librairies --> Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTUserAgent.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTUserAgent.java 2014-09-29 12:24:13 UTC (rev 753) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTUserAgent.java 2014-09-29 12:34:02 UTC (rev 754) @@ -24,11 +24,11 @@ */ package org.nuiton.jrst; -import com.lowagie.text.Image; import java.io.File; import java.net.MalformedURLException; import java.net.URI; import java.net.URL; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.xhtmlrenderer.extend.UserAgentCallback; @@ -39,6 +39,8 @@ import org.xhtmlrenderer.resource.XMLResource; import org.xhtmlrenderer.swing.NaiveUserAgent; +import com.itextpdf.text.Image; + /** * Class used to resolv images path for JRST documents for itext PDF generation * @@ -87,7 +89,7 @@ // Creation of the image for IText ITextFSImage iTextFSImage = new ITextFSImage(image); - imageResource = new ImageResource(iTextFSImage); + imageResource = new ImageResource(uri, iTextFSImage); } catch (Exception eee) { log.error("Failed to create image resource", eee); } Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTGeneratorTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTGeneratorTest.java 2014-09-29 12:24:13 UTC (rev 753) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTGeneratorTest.java 2014-09-29 12:34:02 UTC (rev 754) @@ -168,7 +168,7 @@ } String test1 = getOutputTestPath("jrst-RstToPDF.pdf"); - new JRSTTestGenerator("xdoc", getResourcesTestPath(), new File(test1), JRST.Overwrite.ALLTIME); + new JRSTTestGenerator("pdf", getResourcesTestPath(), new File(test1), JRST.Overwrite.ALLTIME); } @Test @@ -179,6 +179,6 @@ } String test1 = getOutputTestPath("jrst-RstToPDF2.pdf"); - new JRSTTestGenerator("xdoc", getTestFile("docDeveloppeur.rst"), new File(test1), JRST.Overwrite.ALLTIME); + new JRSTTestGenerator("pdf", getTestFile("docDeveloppeur.rst"), new File(test1), JRST.Overwrite.ALLTIME); } } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-09-29 12:24:13 UTC (rev 753) +++ trunk/pom.xml 2014-09-29 12:34:02 UTC (rev 754) @@ -356,14 +356,14 @@ <!-- itext --> <dependency> <groupId>org.xhtmlrenderer</groupId> - <artifactId>core-renderer</artifactId> - <version>R8</version> + <artifactId>flying-saucer-pdf-itext5</artifactId> + <version>9.0.6</version> </dependency> <dependency> - <groupId>com.lowagie</groupId> - <artifactId>itext</artifactId> - <version>2.1.7</version> + <groupId>com.itextpdf</groupId> + <artifactId>itextpdf</artifactId> + <version>5.5.2</version> </dependency>