July 2014 - Faxtomail-commits - mailman.cloud.codelutin.com

r346 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande
by kmorin＠users.forge.codelutin.com 04 Jul '14

04 Jul '14

Author: kmorin Date: 2014-07-04 13:20:25 +0200 (Fri, 04 Jul 2014) New Revision: 346 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/346 Log: ajout de l'icone d'archive Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.css Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css 2014-07-04 10:10:14 UTC (rev 345) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css 2014-07-04 11:20:25 UTC (rev 346) @@ -107,6 +107,7 @@ } #archiveMenu { + actionIcon: archive; text: "faxtomail.demandeList.action.archive"; toolTipText: "faxtomail.demandeList.action.archive.tip"; enabled: { model.isArchiveEnabled() }; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.css 2014-07-04 10:10:14 UTC (rev 345) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.css 2014-07-04 11:20:25 UTC (rev 346) @@ -52,6 +52,7 @@ } #archiveButton { + actionIcon: archive; text: "faxtomail.demande.archive.button.label"; enabled: { model.isArchiveEnabled() }; }

1 0

r345 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies
by echatellier＠users.forge.codelutin.com 04 Jul '14

04 Jul '14

Author: echatellier Date: 2014-07-04 12:10:14 +0200 (Fri, 04 Jul 2014) New Revision: 345 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/345 Log: Remove log debug Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java 2014-07-04 10:09:40 UTC (rev 344) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java 2014-07-04 10:10:14 UTC (rev 345) @@ -134,9 +134,6 @@ public int getRowCount() { DemandeUIModel model = getModel(); int count = model == null ? 0 : model.sizeReplies(); - if (log.isDebugEnabled()) { - log.debug("model " + model + " count " + count); - } return count; }

1 0

r344 - trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by echatellier＠users.forge.codelutin.com 04 Jul '14

04 Jul '14

Author: echatellier Date: 2014-07-04 12:09:40 +0200 (Fri, 04 Jul 2014) New Revision: 344 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/344 Log: Amelioration des log debug Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 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-04 09:56:34 UTC (rev 343) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-07-04 10:09:40 UTC (rev 344) @@ -256,7 +256,7 @@ List<String> modifiedProperties = new ArrayList<>(); if (log.isDebugEnabled()) { - log.debug("Object: " + message.getSubject()); + log.debug(String.format("Message %d/%d : %s", i, count, message.getSubject())); } // email.s(message.getSubject()); @@ -294,7 +294,7 @@ } if (filter == null) { if (log.isDebugEnabled()) { - log.debug("Can't place mail " + message.getSubject() + " in any folder"); + log.debug(" ==> No filter found for this message"); if (log.isTraceEnabled()) { for (Address address : recipients) { log.trace(" - for recipient " + address.toString()); @@ -434,7 +434,7 @@ modifiedProperties.toArray(new String[modifiedProperties.size()])); if (log.isDebugEnabled()) { - log.debug("Message:" +message.getSubject() + " placé dans le dossier " + email.getMailFolder().getName()); + log.debug(" ==> Message placé dans le dossier " + email.getMailFolder().getName()); } // suppression des mails sur le serveur distant (automatique par default) if (config.isMailDelete()) {

1 0

r343 - in trunk/faxtomail-ui-web/src/main: java/com/franciaflex/faxtomail/web/job resources/i18n
by echatellier＠users.forge.codelutin.com 04 Jul '14

04 Jul '14

Author: echatellier Date: 2014-07-04 11:56:34 +0200 (Fri, 04 Jul 2014) New Revision: 343 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/343 Log: Differenciation du nom des contenu html/plain Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties 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-04 08:28:12 UTC (rev 342) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-07-04 09:56:34 UTC (rev 343) @@ -408,23 +408,22 @@ List<Attachment> attachments = new ArrayList<>(); if (message.isMimeType("multipart/*")) { + + // manage boundary id String htmlContent = decomposeMultipartEmail(attachments, message, email, emailService); if (htmlContent != null) { if (log.isDebugEnabled()) { log.debug("Converting html content to pdf : " + message.getSubject()); } - Attachment attachment = convertHTMLToPdf(attachments, htmlContent, t("faxtomail.email.content.attachment.fileName")); + Attachment attachment = convertHTMLToPdf(attachments, htmlContent, t("faxtomail.email.content.attachment.htmlfileName")); if (attachment != null) { attachments.add(attachment); } } - } else { - // String content = IOUtils.toString(message.getInputStream(), charset); - // email.setPlainContent(content); -// Charset charset = FaxToMailServiceUtils.getCharset(bp); + // convertit le contenu texte en PDF String content = IOUtils.toString(message.getInputStream(), charset); - Attachment attachment = convertTextToPdf(content, t("faxtomail.email.content.attachment.fileName")); + Attachment attachment = convertTextToPdf(content, t("faxtomail.email.content.attachment.plainfileName")); attachments.add(0, attachment); } @@ -468,6 +467,7 @@ protected String decomposeMultipartEmail(List<Attachment> attachments, Part part, Email email, EmailService emailService) throws Exception { String result = null; + DataSource dataSource = part.getDataHandler().getDataSource(); MimeMultipart mimeMultipart = new MimeMultipart(dataSource); int multiPartCount = mimeMultipart.getCount(); @@ -478,11 +478,12 @@ // if it is a text part, then this is the email content String disposition = bp.getDisposition(); if (bp.isMimeType("text/*") && !Part.ATTACHMENT.equals(disposition)) { + Charset charset = FaxToMailServiceUtils.getCharset(bp); String content = IOUtils.toString(bp.getInputStream(), charset); if (bp.isMimeType("text/plain")) { - Attachment attachment = convertTextToPdf(content, t("faxtomail.email.content.attachment.fileName")); + Attachment attachment = convertTextToPdf(content, t("faxtomail.email.content.attachment.plainfileName")); attachments.add(attachment); } else { Modified: trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties =================================================================== --- trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties 2014-07-04 08:28:12 UTC (rev 342) +++ trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties 2014-07-04 09:56:34 UTC (rev 343) @@ -34,6 +34,7 @@ com.franciaflex.faxtomail.persistence.entities.MailField.SAV_NB=Quantité de SAV com.franciaflex.faxtomail.persistence.entities.MailField.SENDER=Émetteur com.franciaflex.faxtomail.persistence.entities.MailField.TAKEN_BY=Pris par -faxtomail.email.content.attachment.fileName=contenu du mail +faxtomail.email.content.attachment.htmlfileName=contenu html du mail +faxtomail.email.content.attachment.plainfileName=contenu texte du mail faxtomail.email.projectReference.default= faxtomail.email.subject.re=Re \: %s

1 0

r342 - in trunk: . faxtomail-ui-web faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by echatellier＠users.forge.codelutin.com 04 Jul '14

04 Jul '14

Author: echatellier Date: 2014-07-04 10:28:12 +0200 (Fri, 04 Jul 2014) New Revision: 342 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/342 Log: Conversion du contenu du mail en pdf Modified: trunk/faxtomail-ui-web/pom.xml trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java trunk/pom.xml Modified: trunk/faxtomail-ui-web/pom.xml =================================================================== --- trunk/faxtomail-ui-web/pom.xml 2014-07-04 08:25:56 UTC (rev 341) +++ trunk/faxtomail-ui-web/pom.xml 2014-07-04 08:28:12 UTC (rev 342) @@ -292,8 +292,14 @@ <groupId>com.itextpdf</groupId> <artifactId>itextpdf</artifactId> </dependency> - + <dependency> + <groupId>org.xhtmlrenderer</groupId> + <artifactId>flying-saucer-pdf-itext5</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>gui.ava</groupId> <artifactId>html2image</artifactId> <exclusions> @@ -303,13 +309,10 @@ </exclusion> </exclusions> </dependency> - -  + <dependency> - <groupId>org.xhtmlrenderer</groupId> - <artifactId>flying-saucer-core</artifactId> - <version>9.0.6</version> - <scope>runtime</scope> + <groupId>junit</groupId> + <artifactId>junit</artifactId> </dependency> </dependencies> 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-04 08:25:56 UTC (rev 341) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-07-04 08:28:12 UTC (rev 342) @@ -26,11 +26,9 @@ import static org.nuiton.i18n.I18n.t; import gui.ava.html.Html2Image; -import gui.ava.html.renderer.ImageRenderer; +import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.nio.charset.Charset; @@ -71,6 +69,7 @@ import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; +import org.xhtmlrenderer.pdf.ITextRenderer; import com.franciaflex.faxtomail.FaxToMailApplicationContext; import com.franciaflex.faxtomail.FaxToMailConfiguration; @@ -640,12 +639,13 @@ } protected Attachment convertTextToPdf(String content, String name) throws IOException, DocumentException { - File target = File.createTempFile("faxtomail-", ".tmp"); - target.deleteOnExit(); + //File target = File.createTempFile("faxtomail-", ".tmp"); + //target.deleteOnExit(); Document document = new Document(); - FileOutputStream fos = new FileOutputStream(target); - PdfWriter writer = PdfWriter.getInstance(document, fos); + //FileOutputStream fos = new FileOutputStream(target); + ByteArrayOutputStream os = new ByteArrayOutputStream(); + PdfWriter writer = PdfWriter.getInstance(document, os); writer.open(); document.setPageSize(PageSize.A4); @@ -657,15 +657,16 @@ writer.close(); // convert content to blob - AttachmentFile attachmentFileNew = emailService.getAttachmentFileFromStream(new FileInputStream(target)); + AttachmentFile attachmentFileNew = new AttachmentFileImpl(); + attachmentFileNew.setContent(os.toByteArray()); attachmentFileNew.setFilename(name + ".pdf"); Attachment attachment = new AttachmentImpl(); attachment.setOriginalFile(attachmentFileNew); - attachment.setOriginalFileName(name); + attachment.setOriginalFileName(name + ".pdf"); attachment.setAddedByUser(false); - target.delete(); + //target.delete(); return attachment; } @@ -681,21 +682,23 @@ */ protected Attachment convertHTMLToPdf(List<Attachment> attachments, String content, String name) throws IOException { - File target = File.createTempFile("faxtomail-", ".png"); - target.deleteOnExit(); Attachment result = null; + ByteArrayOutputStream os = new ByteArrayOutputStream(); + Collection<File> fileToDelete = new ArrayList<File>(); try { content = content.replaceAll("<meta (.*?)>(</meta>)?", ""); + for (Attachment attachment : attachments) { String key = attachment.getContentId(); if (key == null) { key = attachment.getOriginalFileName(); } - + // get file content AttachmentFile attachmentFile = attachment.getOriginalFile(); File file = attachmentFile.getFile(); + fileToDelete.add(file); // replace the inline attachments with the extracted attachment file url // match les patterns: @@ -710,26 +713,41 @@ } Html2Image image = Html2Image.fromHtml(content); - ImageRenderer imageRenderer = image.getImageRenderer(); - imageRenderer.saveImage(target); + //ImageRenderer imageRenderer = image.getImageRenderer(); + //imageRenderer.saveImage(os, true); + org.w3c.dom.Document doc = image.getParser().getDocument(); + + // convert to pdf + ITextRenderer renderer = new ITextRenderer(); + renderer.setDocument(doc, null); + renderer.layout(); + renderer.createPDF(os); // convert content to blob - AttachmentFile attachmentFileNew = emailService.getAttachmentFileFromStream(new FileInputStream(target)); - attachmentFileNew.setFilename(name + ".png"); + AttachmentFile attachmentFileNew = new AttachmentFileImpl(); + attachmentFileNew.setContent(os.toByteArray()); + attachmentFileNew.setFilename(name + ".pdf"); result = new AttachmentImpl(); result.setOriginalFile(attachmentFileNew); - result.setOriginalFileName(name); + result.setOriginalFileName(name + ".pdf"); result.setAddedByUser(false); } catch (OutOfMemoryError er) { // certains mails (spam) très compliqué ne peuvent pas être convertit en images if (log.isWarnEnabled()) { - log.warn("Can't convert html content to image", er); + log.warn("Can't convert html content to pdf", er); } + } catch (DocumentException ex) { + if (log.isWarnEnabled()) { + log.warn("Can't convert html content to pdf", ex); + } + } finally { + // on supprime les fichiers avant le delete on exit pour eviter que le disque ne se remplissent trop vite + for (File file : fileToDelete) { + file.delete(); + } } - target.delete(); - return result; } } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-04 08:25:56 UTC (rev 341) +++ trunk/pom.xml 2014-07-04 08:28:12 UTC (rev 342) @@ -630,7 +630,12 @@ <artifactId>html2image</artifactId> <version>2.0.1</version> </dependency> - + + <dependency> + <groupId>org.xhtmlrenderer</groupId> + <artifactId>flying-saucer-pdf-itext5</artifactId> + <version>9.0.6</version> + </dependency> </dependencies> </dependencyManagement>

1 0

r341 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies
by echatellier＠users.forge.codelutin.com 04 Jul '14

04 Jul '14

Author: echatellier Date: 2014-07-04 10:25:56 +0200 (Fri, 04 Jul 2014) New Revision: 341 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/341 Log: Move log to debug Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java 2014-07-04 07:10:13 UTC (rev 340) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java 2014-07-04 08:25:56 UTC (rev 341) @@ -134,7 +134,9 @@ public int getRowCount() { DemandeUIModel model = getModel(); int count = model == null ? 0 : model.sizeReplies(); - log.info("model " + model + " count " + count); + if (log.isDebugEnabled()) { + log.debug("model " + model + " count " + count); + } return count; }

1 0

r340 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies
by kmorin＠users.forge.codelutin.com 04 Jul '14

04 Jul '14

Author: kmorin Date: 2014-07-04 09:10:13 +0200 (Fri, 04 Jul 2014) New Revision: 340 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/340 Log: correction affichage r?\195?\169ponse Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java 2014-07-03 16:18:11 UTC (rev 339) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java 2014-07-04 07:10:13 UTC (rev 340) @@ -56,6 +56,7 @@ import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.persistence.entities.AttachmentImpl; import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyAttachmentModel; +import jaxx.runtime.JAXXUtil; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.io.IOUtils; @@ -100,6 +101,9 @@ @Override public void propertyChange(PropertyChangeEvent evt) { updateTable(); + JAXXUtil.processDataBinding(getUI(), + DemandRepliesUI.BINDING_NO_REPLY_LABEL_VISIBLE, + DemandRepliesUI.BINDING_REPLIES_VISIBLE); } }; getUI().addPropertyChangeListener(DemandRepliesUI.PROPERTY_MODEL, new PropertyChangeListener() { @@ -129,7 +133,9 @@ @Override public int getRowCount() { DemandeUIModel model = getModel(); - return model == null ? 0 : model.sizeReplies(); + int count = model == null ? 0 : model.sizeReplies(); + log.info("model " + model + " count " + count); + return count; } @Override

1 0

r339 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search faxtomail-ui-swing/src
by echatellier＠users.forge.codelutin.com 03 Jul '14

03 Jul '14

Author: echatellier Date: 2014-07-03 18:18:11 +0200 (Thu, 03 Jul 2014) New Revision: 339 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/339 Log: Ouverture d'une nouvelle transaction (pas tr?\195?\168s proprement) pour casser l'isolation des transactions Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceSupport.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceSupport.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceSupport.java 2014-07-03 16:17:04 UTC (rev 338) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceSupport.java 2014-07-03 16:18:11 UTC (rev 339) @@ -64,27 +64,27 @@ return serviceContext.newService(serviceClass); } - public DecoratorService getDecoratorService() { + protected DecoratorService getDecoratorService() { return newService(DecoratorService.class); } - public ConfigurationService getConfigurationService() { + protected ConfigurationService getConfigurationService() { return newService(ConfigurationService.class); } - public MailFolderService getMailFolderService() { + protected MailFolderService getMailFolderService() { return newService(MailFolderService.class); } - public EmailService getEmailService() { + protected EmailService getEmailService() { return newService(EmailService.class); } - public ReferentielService getReferentielService() { + protected ReferentielService getReferentielService() { return newService(ReferentielService.class); } - public ClientService getClientService() { + protected ClientService getClientService() { return newService(ClientService.class); } } Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-07-03 16:17:04 UTC (rev 338) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-07-03 16:18:11 UTC (rev 339) @@ -32,6 +32,7 @@ import java.util.Map; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; + import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -204,4 +205,10 @@ return result; } + public MailFolder getMailFolder(String topiaId) { + MailFolderTopiaDao dao = getPersistenceContext().getMailFolderDao(); + MailFolder result = dao.findByTopiaId(topiaId); + return result; + } + } Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java 2014-07-03 16:17:04 UTC (rev 338) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java 2014-07-03 16:18:11 UTC (rev 339) @@ -53,4 +53,10 @@ FaxToMailUserGroupTopiaDao dao = getPersistenceContext().getFaxToMailUserGroupDao(); return new ArrayList<>(dao.findAll()); } + + public FaxToMailUser getUser(String topiaId) { + FaxToMailUserTopiaDao dao = getPersistenceContext().getFaxToMailUserDao(); + FaxToMailUser user = dao.forTopiaIdEquals(topiaId).findUnique(); + return user; + } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-07-03 16:17:04 UTC (rev 338) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-07-03 16:18:11 UTC (rev 339) @@ -113,67 +113,61 @@ /** * Application context (only one for all the application). - * */ private static FaxToMailUIContext applicationContext; /** * Application global configuration. - * */ protected final FaxToMailConfiguration config; /** * ClassLoader ressource. - * */ protected final RessourceClassLoader resourceLoader; /** + * Topia application context. + */ + protected FaxToMailTopiaApplicationContext topiaApplicationContext; + + /** * Service context used by any service. - * */ protected final FaxToMailServiceContext serviceContext; /** * Swing session used to save ui states. - * */ protected final SwingSession swingSession; /** - * Erro helper. - * + * Error helper. */ protected final ApplicationErrorHelper errorHelper; /** * Current screen displayed in ui. - * */ protected FaxToMailScreen screen; /** * Current locale used in application. - * */ protected Locale locale; /** * Busy state ({@code true} when a blocking action is running). - * */ protected boolean busy; /** * Flag to hide (or not) the body of application. - * */ protected boolean hideBody; /** * Message notifiers. - * */ protected final Set<UIMessageNotifier> messageNotifiers; @@ -187,12 +181,22 @@ private final ApplicationActionEngine faxToMailActionEngine; - protected Configuration faxToMailConfiguration; - + /** + * @deprecated Ca pose problème de conserver des entités alors que le persistence contexte change (lazy). + */ + @Deprecated protected FaxToMailUser currentUser; + /** + * @deprecated Ca pose problème de conserver des entités alors que le persistence contexte change (lazy). + */ + @Deprecated protected MailFolder currentMailFolder; + /** + * @deprecated Ca pose problème de conserver des entités alors que le persistence contexte change (lazy). + */ + @Deprecated protected DemandeUIModel currentEmail; protected List<MailFolder> expandedFolders = new ArrayList<MailFolder>(); @@ -229,7 +233,7 @@ this.config = config; this.resourceLoader = new RessourceClassLoader(Thread.currentThread().getContextClassLoader()); this.serviceContext = new FaxToMailServiceContext(); - FaxToMailTopiaApplicationContext topiaApplicationContext = new FaxToMailTopiaApplicationContext(config.getTopiaProperties()); + topiaApplicationContext = new FaxToMailTopiaApplicationContext(config.getTopiaProperties()); FaxToMailTopiaPersistenceContext persistenceContext = topiaApplicationContext.newPersistenceContext(); serviceContext.setPersistenceContext(persistenceContext); serviceContext.setApplicationConfig(config); @@ -285,6 +289,17 @@ faxToMailActionEngine = new ApplicationActionEngine(faxToMailActionFactory); } + /** + * Ferme la transaction actuelle et en ouvre une nouvelle pour casser le problème d'isolation + * des données. Cela permet d'ouvrir une nouvelle transaction qui verra les modifications faites + * par le serveur hors de la transaction précédente. + */ + public void createNewTransaction() { + serviceContext.getPersistenceContext().close(); + FaxToMailTopiaPersistenceContext persistenceContext = topiaApplicationContext.newPersistenceContext(); + serviceContext.setPersistenceContext(persistenceContext); + } + @Override public ApplicationConfiguration getConfiguration() { return config; @@ -351,8 +366,8 @@ // try to autologin user from username of current X session autologinUser(); - Configuration config = getConfigurationService().getConfiguration(); - setFaxToMailConfiguration(config); + //Configuration config = getConfigurationService().getConfiguration(); + //setFaxToMailConfiguration(config); //--------------------------------------------------------------------// // init action UI @@ -656,15 +671,18 @@ } public Configuration getFaxToMailConfiguration() { - return faxToMailConfiguration; + // make sure configuration is loaded by current service context + return getConfigurationService().getConfiguration(); } - public void setFaxToMailConfiguration(Configuration faxToMailConfiguration) { - this.faxToMailConfiguration = faxToMailConfiguration; - } - public FaxToMailUser getCurrentUser() { - return currentUser; + FaxToMailUser user = currentUser; + if (user != null) { + // reload with current transaction + //FIXME topiaId + user = getUserService().getUser(currentUser.getTopiaId()); + } + return user; } public void setCurrentUser(FaxToMailUser currentUser) { @@ -672,7 +690,13 @@ } public MailFolder getCurrentMailFolder() { - return currentMailFolder; + MailFolder folder = currentMailFolder; + if (folder != null) { + // reload with current transaction + //FIXME topiaId + folder = getMailFolderService().getMailFolder(folder.getTopiaId()); + } + return folder; } public void setCurrentMailFolder(MailFolder currentMailFolder) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java 2014-07-03 16:17:04 UTC (rev 338) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java 2014-07-03 16:18:11 UTC (rev 339) @@ -71,12 +71,14 @@ MailFolder folder = model.getMailFolder(); MailFolder archiveChild = null; do { - archiveChild = Iterables.find(folder.getChildren(), new Predicate<MailFolder>() { - @Override - public boolean apply(MailFolder mailFolder) { - return mailFolder.isArchiveFolder(); - } - }); + if (folder.getChildren() != null) { + archiveChild = Iterables.find(folder.getChildren(), new Predicate<MailFolder>() { + @Override + public boolean apply(MailFolder mailFolder) { + return mailFolder.isArchiveFolder(); + } + }); + } folder = folder.getParent(); } while (archiveChild == null && folder != null); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-07-03 16:17:04 UTC (rev 338) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-07-03 16:18:11 UTC (rev 339) @@ -98,7 +98,6 @@ * Handler of UI {@link com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIHandler}. * * @author kmorin - morin(a)codelutin.com - * */ public class DemandeListUIHandler extends AbstractFaxToMailDemandListHandler<DemandeListUIModel, DemandeListUI> implements CloseableUI { @@ -133,6 +132,9 @@ super.beforeInit(ui); + // open new transaction for current folder + getContext().createNewTransaction(); + DemandeListUIModel model = new DemandeListUIModel(); Collection<MailFolder> folders = getContext().getMailFolderService().getRootMailFoldersWithReadingRights(getContext().getCurrentUser()); model.setFolders(new ArrayList<MailFolder>(folders)); @@ -259,6 +261,10 @@ if (folderNode.isCanSelect()) { MailFolder folder = folderNode.getMailFolder(); + // open new transaction for current folder + getContext().createNewTransaction(); + folder = getContext().getMailFolderService().getMailFolder(folder.getTopiaId()); // Fix lazy exception + getModel().setSelectedFolder(folder); getContext().setCurrentMailFolder(folder); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java 2014-07-03 16:17:04 UTC (rev 338) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java 2014-07-03 16:18:11 UTC (rev 339) @@ -180,6 +180,7 @@ } public void searchDemandes() { + getContext().createNewTransaction(); getModel().resetPaginationParameter(); try { SearchAction searchAction = getContext().getActionFactory().createLogicAction(this, SearchAction.class); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java 2014-07-03 16:17:04 UTC (rev 338) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java 2014-07-03 16:18:11 UTC (rev 339) @@ -303,7 +303,15 @@ } protected void openDemand(DemandeUIModel selectedEmail) { + FaxToMailUIContext context = getContext(); + + // reload transaction + context.createNewTransaction(); + // reload model with current transaction + Email email = context.getEmailService().getEmailById(selectedEmail.getTopiaId()); + selectedEmail.fromEntity(email); + context.setCurrentEmail(selectedEmail); context.getActionEngine().runAction(new ShowDemandeAction(context.getMainUI().getHandler())); }

1 0

r338 - trunk
by echatellier＠users.forge.codelutin.com 03 Jul '14

03 Jul '14

Author: echatellier Date: 2014-07-03 18:17:04 +0200 (Thu, 03 Jul 2014) New Revision: 338 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/338 Log: Remove shiro Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-03 16:16:54 UTC (rev 337) +++ trunk/pom.xml 2014-07-03 16:17:04 UTC (rev 338) @@ -117,7 +117,6 @@ <struts2Version>2.3.16.3</struts2Version> <jqueryPluginVersion>3.7.1</jqueryPluginVersion> <bootstrapPluginVersion>2.0.0</bootstrapPluginVersion> - <shiroVersion>1.2.3</shiroVersion> <slf4jVersion>1.7.7</slf4jVersion> <mockitoVersion>1.9.5</mockitoVersion> <postgresqlDriverVersion>9.3-1101-jdbc41</postgresqlDriverVersion>

1 0

r337 - trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by echatellier＠users.forge.codelutin.com 03 Jul '14

03 Jul '14

Author: echatellier Date: 2014-07-03 18:16:54 +0200 (Thu, 03 Jul 2014) New Revision: 337 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/337 Log: Misc fixes Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 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-03 13:14:43 UTC (rev 336) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-07-03 16:16:54 UTC (rev 337) @@ -196,7 +196,7 @@ Folder inbox = null; try { - store = session.getStore(/*new URLName("pop3://" + account.getHost())*/); + store = session.getStore(); store.connect(account.getLogin(), account.getPassword()); defaultFolder = store.getDefaultFolder(); inbox = defaultFolder.getFolder("INBOX"); @@ -246,7 +246,6 @@ } for (int i = 0 ; i < count ; i++) { - log.debug("### mail " + i); try { Email email = new EmailImpl();

1 0