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

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

09 Jul '14

Author: echatellier Date: 2014-07-09 14:55:59 +0200 (Wed, 09 Jul 2014) New Revision: 374 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/374 Log: Test load config with application context (impossible in this application) Remove static code. Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java 2014-07-09 12:54:53 UTC (rev 373) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java 2014-07-09 12:55:59 UTC (rev 374) @@ -38,27 +38,23 @@ import java.io.File; +import javax.servlet.ServletContext; + public class FaxToMailApplicationContext { private static Log log = LogFactory.getLog(FaxToMailApplicationContext.class); public static final String APPLICATION_CONTEXT_PARAMETER = "faxToMailApplicationContext"; - protected static FaxToMailTopiaApplicationContext topiaApplicationContext; + protected FaxToMailTopiaApplicationContext topiaApplicationContext; - protected static FaxToMailConfiguration applicationConfig; - - public static FaxToMailConfiguration getApplicationConfig() { - if (applicationConfig == null) { - applicationConfig = new FaxToMailConfiguration("faxToMail.properties"); - } + protected FaxToMailConfiguration applicationConfig; + + public FaxToMailConfiguration getApplicationConfig() { return applicationConfig; } - public static FaxToMailTopiaApplicationContext getTopiaApplicationContext() { - if (topiaApplicationContext == null) { - topiaApplicationContext = new FaxToMailTopiaApplicationContext(getApplicationConfig().getTopiaProperties()); - } + public FaxToMailTopiaApplicationContext getTopiaApplicationContext() { return topiaApplicationContext; } @@ -96,8 +92,11 @@ } } - public void init() { + public void init(ServletContext servletContext) { + applicationConfig = new FaxToMailConfiguration("faxToMail.properties"); + topiaApplicationContext = new FaxToMailTopiaApplicationContext(applicationConfig.getTopiaProperties()); + if (getApplicationConfig().isLogConfigurationProvided()) { File log4jConfigurationFile = getApplicationConfig().getLogConfigurationFile(); Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java 2014-07-09 12:54:53 UTC (rev 373) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java 2014-07-09 12:55:59 UTC (rev 374) @@ -24,13 +24,10 @@ * #L% */ +import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import com.franciaflex.faxtomail.web.job.ClientUpdateJob; -import com.franciaflex.faxtomail.web.job.EDIManagementJob; -import com.franciaflex.faxtomail.web.job.MailFilterJob; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.quartz.CronScheduleBuilder; @@ -45,8 +42,9 @@ import com.franciaflex.faxtomail.FaxToMailApplicationContext; import com.franciaflex.faxtomail.FaxToMailConfiguration; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext; -import com.franciaflex.faxtomail.services.FaxToMailServiceContext; +import com.franciaflex.faxtomail.web.job.ClientUpdateJob; +import com.franciaflex.faxtomail.web.job.EDIManagementJob; +import com.franciaflex.faxtomail.web.job.MailFilterJob; public class FaxToMailApplicationListener implements ServletContextListener { @@ -65,15 +63,15 @@ log.debug("scheduler launched"); + ServletContext sc = sce.getServletContext(); applicationContext = new FaxToMailApplicationContext(); + applicationContext.init(sc); - applicationContext.init(); - sce.getServletContext().setAttribute( FaxToMailApplicationContext.APPLICATION_CONTEXT_PARAMETER, applicationContext); - FaxToMailConfiguration config = FaxToMailApplicationContext.getApplicationConfig(); + FaxToMailConfiguration config = applicationContext.getApplicationConfig(); JobDataMap data = new JobDataMap();

1 0

r373 - trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail
by echatellier＠users.forge.codelutin.com 09 Jul '14

09 Jul '14

Author: echatellier Date: 2014-07-09 14:54:53 +0200 (Wed, 09 Jul 2014) New Revision: 373 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/373 Log: Unused code Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java 2014-07-09 11:16:01 UTC (rev 372) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java 2014-07-09 12:54:53 UTC (rev 373) @@ -58,7 +58,7 @@ private static final Log log = LogFactory.getLog(FaxToMailConfiguration.class); - private static FaxToMailConfiguration instance; + /*private static FaxToMailConfiguration instance; public static FaxToMailConfiguration getInstance() { return instance; @@ -66,7 +66,7 @@ public static void setInstance(FaxToMailConfiguration instance) { FaxToMailConfiguration.instance = instance; - } + }*/ protected final String[] optionKeyToNotSave;

1 0

r372 - trunk
by echatellier＠users.forge.codelutin.com 09 Jul '14

09 Jul '14

Author: echatellier Date: 2014-07-09 13:16:01 +0200 (Wed, 09 Jul 2014) New Revision: 372 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/372 Log: Update to jquery-ui stable Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-09 09:24:14 UTC (rev 371) +++ trunk/pom.xml 2014-07-09 11:16:01 UTC (rev 372) @@ -560,7 +560,7 @@ <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-jquery-ui</artifactId> - <version>1.11.0-1-SNAPSHOT</version> + <version>1.11.0-1</version> <scope>runtime</scope> </dependency>

1 0

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

09 Jul '14

Author: echatellier Date: 2014-07-09 11:24:14 +0200 (Wed, 09 Jul 2014) New Revision: 371 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/371 Log: Comments 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/DemandeUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 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-09 09:23:09 UTC (rev 370) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-07-09 09:24:14 UTC (rev 371) @@ -284,6 +284,9 @@ @Override public void propertyChange(PropertyChangeEvent evt) { + // a new transaction has been opened by getContext().createNewTransaction(); + // 10 line upper + // reset pagination when folder change getModel().resetPaginationParameter(); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-07-09 09:23:09 UTC (rev 370) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-07-09 09:24:14 UTC (rev 371) @@ -37,7 +37,6 @@ import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; import com.franciaflex.faxtomail.ui.swing.util.CloseableUI; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; -import com.franciaflex.faxtomail.ui.swing.content.MainUIHandler; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUIModel; import jaxx.runtime.validator.swing.SwingValidator; @@ -93,13 +92,6 @@ protected BeanMonitor monitor; - /** - * Persistence service. - * - * - */ -// private final PersistenceService persistenceService; - @Override public void afterInit(DemandeUI ui) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-07-09 09:23:09 UTC (rev 370) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-07-09 09:24:14 UTC (rev 371) @@ -48,7 +48,6 @@ import com.google.common.collect.Collections2; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.io.Charsets; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -61,9 +60,7 @@ import javax.mail.Address; import javax.mail.BodyPart; import javax.mail.Message; -import javax.mail.MessagingException; import javax.mail.Part; -import javax.mail.internet.ContentType; import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMultipart;

1 0

r370 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util
by echatellier＠users.forge.codelutin.com 09 Jul '14

09 Jul '14

Author: echatellier Date: 2014-07-09 11:23:09 +0200 (Wed, 09 Jul 2014) New Revision: 370 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/370 Log: Comments Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-07-09 09:20:14 UTC (rev 369) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-07-09 09:23:09 UTC (rev 370) @@ -64,7 +64,6 @@ import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; -import com.google.common.base.Strings; import jaxx.runtime.JAXXObject; import jaxx.runtime.JAXXUtil; @@ -162,6 +161,7 @@ FolderTreeNode node = (FolderTreeNode) value; setEnabled(node.isCanSelect()); + // En italic si l'utilsateur n'a pas le droit de lecture (sur un parent par exemple) Font font = component.getFont(); if (node.isCanRead()) { font = font.deriveFont(Font.PLAIN); @@ -170,6 +170,8 @@ } component.setFont(font); + // Affichage en gris par defaut, mais en noir si le dossier est vraiment affecté + // à l'utilisateur Color foreground; if (!colorNotAffectedFolders || context.getCurrentUser().isAffectedFoldersEmpty() @@ -192,7 +194,8 @@ // expand nodes for (MailFolder folder : foldersToExpand) { DefaultMutableTreeNode node = nodesByFolder.get(folder); - navigationTree.expandPath(new TreePath(node.getPath())); + TreePath treePath = new TreePath(node.getPath()); + navigationTree.expandPath(treePath); } return nodesByFolder;

1 0

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

09 Jul '14

Author: echatellier Date: 2014-07-09 11:20:14 +0200 (Wed, 09 Jul 2014) New Revision: 369 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/369 Log: Comments Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java 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/ClientUpdateJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java 2014-07-09 09:06:30 UTC (rev 368) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java 2014-07-09 09:20:14 UTC (rev 369) @@ -50,7 +50,7 @@ applicationContext = getApplicationContext(jobExecutionContext); FaxToMailTopiaPersistenceContext persistenceContext = null; - + try { persistenceContext = applicationContext.newPersistenceContext(); FaxToMailServiceContext serviceContext = applicationContext.newServiceContext(persistenceContext); @@ -58,10 +58,10 @@ if (log.isDebugEnabled()) { log.debug("Running ClientUpdateJob at " + serviceContext.getNow()); } - + ClientService clientService = serviceContext.newService(ClientService.class); clientService.updateNewClients(); - + if (log.isDebugEnabled()) { log.debug("ClientUpdateJob ended at " + serviceContext.getNow()); } 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-09 09:06:30 UTC (rev 368) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-07-09 09:20:14 UTC (rev 369) @@ -312,6 +312,7 @@ sender = sender.replaceFirst("^.*<(.*)>$", "$1"); sender = sender.toLowerCase(); + // Identification du client en fonction du numéro de fax appelant ou de l'adresse e-mail émettrice Client client = clientService.getClientForEmailAddress(sender, email); modifiedProperties.add(Email.PROPERTY_SENDER); @@ -591,7 +592,11 @@ // copy file to temp file File file = File.createTempFile("faxtomail-" + basename, "." + extension); file.deleteOnExit(); - File outfile = File.createTempFile("faxtomail-" + basename, ".pdf"); + // on creer un nouveau nom de fichier ou seulement le nom de l'extension change + // cela permet de fonctionner avec openoffice par exemple où il n'est pas possible + // de specifier le nom du fichier de sortie + String fullname = StringUtils.removeEnd(file.getAbsolutePath(), "." + extension); + File outfile = new File(fullname + ".pdf"); outfile.deleteOnExit(); FileUtils.writeByteArrayToFile(file, attachment.getOriginalFile().getContent());

1 0

r368 - trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com 09 Jul '14

09 Jul '14

Author: echatellier Date: 2014-07-09 11:06:30 +0200 (Wed, 09 Jul 2014) New Revision: 368 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/368 Log: Commentaire Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-07-09 09:05:18 UTC (rev 367) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-07-09 09:06:30 UTC (rev 368) @@ -117,6 +117,8 @@ } } } + + // on doit faire l'affectation ici car emailAddress a pu etre remplacé par le numero de fax email.setSender(emailAddress); return client; }

1 0

r367 - trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com 09 Jul '14

09 Jul '14

Author: echatellier Date: 2014-07-09 11:05:18 +0200 (Wed, 09 Jul 2014) New Revision: 367 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/367 Log: Ajout de commentaire et de fixme, le code ne peut pas fonctionner ! Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-07-09 08:39:16 UTC (rev 366) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-07-09 09:05:18 UTC (rev 367) @@ -53,13 +53,23 @@ import com.google.common.collect.Multimaps; /** + * Service de gestion des clients. + * * @author Kevin Morin (Code Lutin) - * */ public class ClientService extends FaxToMailServiceSupport { private static final Log log = LogFactory.getLog(ClientService.class); + /** + * Recherche le client qui correspond à l'adresse email de l'expediteur du mail. + * + * This method is a getter, but modify input {@code email} ! + * + * @param emailAddress sender address + * @param email email + * @return client for emailAddress (can be {@code null}) + */ public Client getClientForEmailAddress(String emailAddress, Email email) { Preconditions.checkNotNull(email); Preconditions.checkNotNull(emailAddress); @@ -71,6 +81,7 @@ if (StringUtils.isNotBlank(emailAddress)) { clients = clientDao.forEmailAddressEquals(emailAddress).findAll(); + // on essaye de voir si on peut gérer l'adresse de l'expediteur comme un fax if (CollectionUtils.isEmpty(clients)) { String faxNumber = emailAddress.substring(0, emailAddress.indexOf('@')).replaceAll(" ", ""); if (NumberUtils.isNumber(faxNumber)) { @@ -84,7 +95,9 @@ MailFolder folder = email.getMailFolder(); if (clients.size() == 1) { client = clients.get(0); - + + // FIXME echatellier 20140709 : a revoir, folder == null dans tous les cas + // que fait ce code ? } else if (folder != null) { Multimap<String, Client> clientsByBrand = Multimaps.index(clients, new Function<Client, String>() { @Override @@ -94,6 +107,8 @@ }); Set<String> brands = clientsByBrand.keySet(); while (client == null && folder != null) { + // TODO echatellier 20140709 : il y a une relation particuliere entre les noms des dossiers + // et les marques ? if (brands.contains(folder.getName())) { client = new ArrayList<>(clientsByBrand.get(folder.getName())).get(0); } @@ -106,6 +121,14 @@ return client; } + /** + * Recherche un client par code. + * + * FIXME echatellier 20140709 cette methodé récupére un client au hazard car le code peut être dupliqué par société + * + * @param code client code + * @return un client au hasard + */ public Client getClientForCode(String code) { ClientTopiaDao clientDao = getPersistenceContext().getClientDao(); Client client = null;

1 0

r366 - trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com 09 Jul '14

09 Jul '14

Author: echatellier Date: 2014-07-09 10:39:16 +0200 (Wed, 09 Jul 2014) New Revision: 366 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/366 Log: Oubli d'affectation du charg?\195?\169 de clientelle Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-07-08 14:12:57 UTC (rev 365) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-07-09 08:39:16 UTC (rev 366) @@ -155,7 +155,7 @@ // update person in charge FaxToMailUser personInCharge = null; if (StringUtils.isNotBlank(newClient.getPersonInCharge())) { - faxToMailUserDao.forLoginEquals(newClient.getPersonInCharge()).findUniqueOrNull(); + personInCharge = faxToMailUserDao.forLoginEquals(newClient.getPersonInCharge()).findUniqueOrNull(); } client.setPersonInCharge(personInCharge);

1 0

r365 - trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports
by echatellier＠users.forge.codelutin.com 08 Jul '14

08 Jul '14

Author: echatellier Date: 2014-07-08 16:12:57 +0200 (Tue, 08 Jul 2014) New Revision: 365 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/365 Log: Readd old fields for old files Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportModel.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportModel.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportModel.java 2014-07-08 14:12:34 UTC (rev 364) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportModel.java 2014-07-08 14:12:57 UTC (rev 365) @@ -59,6 +59,9 @@ newMandatoryColumn("Adresse_Mail", Client.PROPERTY_EMAIL_ADDRESS, nullParser); newMandatoryColumn("Code_Client", Client.PROPERTY_CODE); + newIgnoredColumn("Client_Top"); + newIgnoredColumn("Objet_Message"); + newIgnoredColumn("Destination"); } @Override

1 0