Author: echatellier Date: 2014-07-02 12:10:11 +0200 (Wed, 02 Jul 2014) New Revision: 310 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/310 Log: Update html2image Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java trunk/pom.xml Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-07-02 09:05:42 UTC (rev 309) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-07-02 10:10:11 UTC (rev 310) @@ -25,7 +25,8 @@ */ import static org.nuiton.i18n.I18n.t; -import gui.ava.html.image.generator.HtmlImageGenerator; +import gui.ava.html.Html2Image; +import gui.ava.html.renderer.ImageRenderer; import java.io.File; import java.io.FileInputStream; @@ -57,7 +58,6 @@ import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMultipart; import javax.mail.internet.MimeUtility; -import javax.xml.parsers.ParserConfigurationException; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.FileUtils; @@ -70,7 +70,6 @@ import org.nuiton.util.StringUtil; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; -import org.xml.sax.SAXException; import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; @@ -674,11 +673,11 @@ log.debug("Mapping attachment id " + key + " to file " + file.getAbsolutePath()); } } - - HtmlImageGenerator imageGenerator = new HtmlImageGenerator(); - imageGenerator.loadHtml(content); - imageGenerator.saveAsImage(target); - + + Html2Image image = Html2Image.fromHtml(content); + ImageRenderer imageRenderer = image.getImageRenderer(); + imageRenderer.saveImage(target); + // convert content to blob EmailService emailService = serviceContext.newService(EmailService.class); AttachmentFile attachmentFileNew = emailService.getAttachmentFileFromStream(new FileInputStream(target)); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-02 09:05:42 UTC (rev 309) +++ trunk/pom.xml 2014-07-02 10:10:11 UTC (rev 310) @@ -629,7 +629,7 @@ <dependency> <groupId>gui.ava</groupId> <artifactId>html2image</artifactId> - <version>0.9</version> + <version>2.0.1</version> </dependency> </dependencies>