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

r221 - trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by echatellier＠users.forge.codelutin.com 18 Jun '14

18 Jun '14

Author: echatellier Date: 2014-06-18 17:23:25 +0200 (Wed, 18 Jun 2014) New Revision: 221 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/221 Log: Fix email saved twice 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-06-18 14:01:08 UTC (rev 220) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-18 15:23:25 UTC (rev 221) @@ -188,6 +188,7 @@ log.debug(count + " messages, " + unread + " unread"); EmailService emailService = serviceContext.newService(EmailService.class); + MailFolderService mailFolderService = serviceContext.newService(MailFolderService.class); for (int i = 0 ; i < count ; i++) { Email email = new EmailImpl(); @@ -215,7 +216,7 @@ for (Address address : recipients) { String recipient = address.toString(); - MailFolder mailFolder = serviceContext.newService(MailFolderService.class).getFolderForRecipient(recipient); + MailFolder mailFolder = mailFolderService.getFolderForRecipient(recipient); if (mailFolder != null) { log.debug("\tTo : " + address + " -> " + (mailFolder != null ? mailFolder.getName() : "none")); @@ -230,7 +231,6 @@ if (email.getMailFolder() == null) { continue; } - emailService.saveEmail(email, null); Address[] addresses = message.getFrom(); if (addresses != null && addresses.length > 0) { @@ -365,15 +365,7 @@ } } - File dir = new File(FileUtils.getTempDirectory(), email.getTopiaId()); - if (!dir.exists()) { - dir.mkdir(); - } - File file = new File(dir, fileName); - FileOutputStream fos = new FileOutputStream(file); - DataHandler dh = bp.getDataHandler(); - dh.writeTo(fos); Attachment attachment = new AttachmentImpl(); attachment.setAddedByUser(false);

1 0

r220 - trunk/faxtomail-persistence/src/main/xmi
by echatellier＠users.forge.codelutin.com 18 Jun '14

18 Jun '14

Author: echatellier Date: 2014-06-18 16:01:08 +0200 (Wed, 18 Jun 2014) New Revision: 220 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/220 Log: Fix attachement mapping Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties =================================================================== --- trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-06-18 13:04:09 UTC (rev 219) +++ trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-06-18 14:01:08 UTC (rev 220) @@ -24,6 +24,7 @@ model.tagValue.notGenerateToString=true model.tagValue.constantPrefix=PROPERTY_ model.tagValue.hibernateAttributeType.java.lang.String=text +model.tagValue.hibernateAttributeType.byte[]=binary model.tagValue.useEnumerationName=true model.tagValue.doNotGenerateBooleanGetMethods=true

1 0

r219 - trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content
by echatellier＠users.forge.codelutin.com 18 Jun '14

18 Jun '14

Author: echatellier Date: 2014-06-18 15:04:09 +0200 (Wed, 18 Jun 2014) New Revision: 219 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/219 Log: Remove ng-app Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/index.jsp Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/index.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/index.jsp 2014-06-18 13:03:42 UTC (rev 218) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/index.jsp 2014-06-18 13:04:09 UTC (rev 219) @@ -29,7 +29,7 @@ <title>Accueil</title> </head> <body> - <div id="main-container" class="container" ng-app="ConfigurationModule"> + <div id="main-container" class="container"> <h1 class="page-header">Administration FaxToMail</h1> <ul>

1 0

r218 - trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content
by echatellier＠users.forge.codelutin.com 18 Jun '14

18 Jun '14

Author: echatellier Date: 2014-06-18 15:03:42 +0200 (Wed, 18 Jun 2014) New Revision: 218 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/218 Log: Add missing link Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/index.jsp Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/index.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/index.jsp 2014-06-18 13:01:19 UTC (rev 217) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/index.jsp 2014-06-18 13:03:42 UTC (rev 218) @@ -40,6 +40,8 @@ <span class="fa fa-cog"></span> Configuration</a></li> <li><a href="<s:url action='import-input' namespace="/admin" />"> <span class="fa fa-upload"></span> Import</a></li> + <li><a href="<s:url action='lock-input' namespace="/admin" />"> + <span class="fa fa-unlock-alt"></span> Vérrouillages</a></li> </s:if> <li><a href="<s:url action='user-folder-input' namespace="/admin" />"> <span class="fa fa-folder-open"></span> Dossiers utilisateur</a></li>

1 0

r217 - trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin
by echatellier＠users.forge.codelutin.com 18 Jun '14

18 Jun '14

Author: echatellier Date: 2014-06-18 15:01:19 +0200 (Wed, 18 Jun 2014) New Revision: 217 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/217 Log: Fote Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-18 13:00:49 UTC (rev 216) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-18 13:01:19 UTC (rev 217) @@ -91,7 +91,7 @@ </div> <div class="form-group"> - Actions autorisées lorsque la demande n'a pas d'état d'attente est <strong>invalide</strong> : + Actions autorisées lorsque la demande n'a pas d'état d'attente et est <strong>invalide</strong> : <label class="checkbox" ng-repeat="(mailAction,label) in mailActions"> <input type="checkbox" ng-checked="configuration.invalidFormDisabledActions.indexOf(mailAction) == -1" ng-click="changeInvalidAction(mailAction)"> {{label}}

1 0

r216 - in trunk/faxtomail-ui-web/src/main: java/com/franciaflex/faxtomail/web java/com/franciaflex/faxtomail/web/job resources
by echatellier＠users.forge.codelutin.com 18 Jun '14

18 Jun '14

Author: echatellier Date: 2014-06-18 15:00:49 +0200 (Wed, 18 Jun 2014) New Revision: 216 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/216 Log: Set quartz thread count to 1 to prevent shares objects 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/job/EDIManagementJob.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java trunk/faxtomail-ui-web/src/main/resources/quartz.properties 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-06-18 12:57:41 UTC (rev 215) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java 2014-06-18 13:00:49 UTC (rev 216) @@ -44,7 +44,6 @@ import com.franciaflex.faxtomail.FaxToMailApplicationContext; import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; -import com.franciaflex.faxtomail.services.service.InitFaxToMailService; public class FaxToMailApplicationListener implements ServletContextListener { @@ -76,8 +75,6 @@ FaxToMailTopiaPersistenceContext persistenceContext = applicationContext.newPersistenceContext(); FaxToMailServiceContext serviceContext = applicationContext.newServiceContext(persistenceContext); - serviceContext.newService(InitFaxToMailService.class).init(); - data.put(MailFilterJob.SERVICE_CONTEXT, serviceContext); JobDetail mailFilteringJob = JobBuilder.newJob(MailFilterJob.class) @@ -91,7 +88,9 @@ .build(); try { - + + Scheduler scheduler = new StdSchedulerFactory().getScheduler(); + // schedule mail job (toutes les 5 minutes) Trigger trigger = TriggerBuilder .newTrigger() @@ -99,8 +98,6 @@ .withSchedule(CronScheduleBuilder.cronSchedule("0 */5 * * * ?")) .build(); - Scheduler scheduler = new StdSchedulerFactory().getScheduler(); - scheduler.start(); scheduler.scheduleJob(mailFilteringJob, trigger); // schedule EDI job (toutes les 5 minutes) @@ -109,11 +106,10 @@ .withIdentity("ediManagement", "ediManagementTrigger") .withSchedule(CronScheduleBuilder.cronSchedule("0 */5 * * * ?")) .build(); - - scheduler = new StdSchedulerFactory().getScheduler(); - scheduler.start(); + scheduler.scheduleJob(ediManagementJob, trigger); + scheduler.start(); log.debug("schedulers launched"); } catch (SchedulerException e) { Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java 2014-06-18 12:57:41 UTC (rev 215) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java 2014-06-18 13:00:49 UTC (rev 216) @@ -45,6 +45,10 @@ public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { serviceContext = getServiceContext(jobExecutionContext); + if (log.isDebugEnabled()) { + log.debug("Running EDIManagementJob at " + serviceContext.getNow()); + } + EmailService emailService = serviceContext.newService(EmailService.class); emailService.transmitPendingDemandsToEdi(); 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-06-18 12:57:41 UTC (rev 215) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-18 13:00:49 UTC (rev 216) @@ -50,7 +50,6 @@ import javax.mail.Part; import javax.mail.Session; import javax.mail.Store; -import javax.mail.URLName; import javax.mail.internet.ContentType; import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMultipart; @@ -75,7 +74,6 @@ import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.EmailAccount; import com.franciaflex.faxtomail.persistence.entities.EmailImpl; -import com.franciaflex.faxtomail.persistence.entities.EmailProtocol; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.services.DecoratorService; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; @@ -93,18 +91,19 @@ protected FaxToMailServiceContext serviceContext; - //TODO kmorin 20140414 handle imap protocol @Override public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { serviceContext = getServiceContext(jobExecutionContext); + + if (log.isDebugEnabled()) { + log.debug("Running MailFilterJob at " + serviceContext.getNow()); + } ConfigurationService configurationService = serviceContext.newService(ConfigurationService.class); Collection<EmailAccount> emailAccounts = configurationService.getEmailAccounts(); for (EmailAccount account : emailAccounts) { - //if (account.getProtocol() == EmailProtocol.POP3) { - checkEmails(account); - //} + checkEmails(account); } } Modified: trunk/faxtomail-ui-web/src/main/resources/quartz.properties =================================================================== --- trunk/faxtomail-ui-web/src/main/resources/quartz.properties 2014-06-18 12:57:41 UTC (rev 215) +++ trunk/faxtomail-ui-web/src/main/resources/quartz.properties 2014-06-18 13:00:49 UTC (rev 216) @@ -22,5 +22,9 @@ # #L% ### org.quartz.scheduler.instanceName = FaxToMailScheduler -org.quartz.threadPool.threadCount = 3 + +# Set job count to 1 to avoid two job to run at the same time and avoid +# org.hibernate.HibernateException: Found shared references to a collection: com.franciaflex.faxtomail.persistence.entities.MailFolderImpl.replyAddresses +org.quartz.threadPool.threadCount = 1 + org.quartz.jobStore.class = org.quartz.simpl.RAMJobStore \ No newline at end of file

1 0

r215 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment
by echatellier＠users.forge.codelutin.com 18 Jun '14

18 Jun '14

Author: echatellier Date: 2014-06-18 14:57:41 +0200 (Wed, 18 Jun 2014) New Revision: 215 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/215 Log: Remove useless buffer Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java 2014-06-18 11:50:20 UTC (rev 214) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java 2014-06-18 12:57:41 UTC (rev 215) @@ -81,7 +81,7 @@ // be sure that "is" is not closed because is can be a local fileinputstream // that hibernate must read to put in database InputStream is = new ByteArrayInputStream(content); - OutputStream fos = new BufferedOutputStream(new FileOutputStream(tmpLocalFile)); + OutputStream fos = new FileOutputStream(tmpLocalFile); IOUtils.copy(is, fos); fos.close(); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java 2014-06-18 11:50:20 UTC (rev 214) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java 2014-06-18 12:57:41 UTC (rev 215) @@ -173,7 +173,7 @@ if (file != null) { try { // warning, this not NOT be closed (will be by blob on commit) - InputStream is = new BufferedInputStream(new FileInputStream(file)); + InputStream is = new FileInputStream(file); AttachmentFile attachmentFile = getContext().getEmailService().getAttachmentFileFromStream(is); attachmentFile.setFilename(file.getName()); attachment.setOriginalFile(attachmentFile);

1 0

r214 - trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin
by echatellier＠users.forge.codelutin.com 18 Jun '14

18 Jun '14

Author: echatellier Date: 2014-06-18 13:50:20 +0200 (Wed, 18 Jun 2014) New Revision: 214 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/214 Log: bit > octets Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-18 11:47:03 UTC (rev 213) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-18 11:50:20 UTC (rev 214) @@ -86,7 +86,7 @@ <div id="tabs-general" class="tab-pane active">  <div class="form-group"> - <label class="control-label" for="configurationEmailMaxSizeField">Taille maximale des email (en bits)</label> + <label class="control-label" for="configurationEmailMaxSizeField">Taille maximale des email (en octets)</label> <input type="text" id="configurationEmailMaxSizeField" class="form-control" ng-model="configuration.emailMaxSize" /> </div>

1 0

r213 - in trunk: faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util faxtomail-ui-swing/src/main/resources/i18n faxtomail-ui-web/src/main/resources/i18n
by echatellier＠users.forge.codelutin.com 18 Jun '14

18 Jun '14

Author: echatellier Date: 2014-06-18 13:47:03 +0200 (Wed, 18 Jun 2014) New Revision: 213 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/213 Log: Correction des traductions Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java 2014-06-18 10:38:34 UTC (rev 212) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java 2014-06-18 11:47:03 UTC (rev 213) @@ -177,8 +177,8 @@ put(MailField.COMMENT, ColumnIdentifier.<Email>newId( Email.PROPERTY_COMMENT, - n("faxtomail.demandeList.table.header.commen"), - n("faxtomail.demandeList.table.header.commen.tip"))); + n("faxtomail.demandeList.table.header.comment"), + n("faxtomail.demandeList.table.header.comment.tip"))); }}; Modified: trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-06-18 10:38:34 UTC (rev 212) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-06-18 11:47:03 UTC (rev 213) @@ -161,8 +161,8 @@ faxtomail.demandeList.table.header.brand.tip=Marque faxtomail.demandeList.table.header.client=Client faxtomail.demandeList.table.header.client.tip=Client -faxtomail.demandeList.table.header.commen= -faxtomail.demandeList.table.header.commen.tip= +faxtomail.demandeList.table.header.comment=Commentaire +faxtomail.demandeList.table.header.comment.tip=Commentaire faxtomail.demandeList.table.header.companyReference=Notre ref faxtomail.demandeList.table.header.companyReference.tip=Notre référence faxtomail.demandeList.table.header.ediCodeNumber=Code EDI 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-06-18 10:38:34 UTC (rev 212) +++ trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties 2014-06-18 11:47:03 UTC (rev 213) @@ -12,7 +12,7 @@ com.franciaflex.faxtomail.persistence.entities.MailField.CLIENT_BRAND=Marque com.franciaflex.faxtomail.persistence.entities.MailField.CLIENT_CODE=Code client com.franciaflex.faxtomail.persistence.entities.MailField.COMMENT=Commentaire -com.franciaflex.faxtomail.persistence.entities.MailField.COMPANY_REFERENCE=Référence +com.franciaflex.faxtomail.persistence.entities.MailField.COMPANY_REFERENCE=Notre référence com.franciaflex.faxtomail.persistence.entities.MailField.DEMAND_STATUS=Statut de demande com.franciaflex.faxtomail.persistence.entities.MailField.DEMAND_TYPE=Type de demande com.franciaflex.faxtomail.persistence.entities.MailField.EDI_RETURN=Retour EDI @@ -24,7 +24,7 @@ com.franciaflex.faxtomail.persistence.entities.MailField.ORIGINAL_EMAIL=Email original com.franciaflex.faxtomail.persistence.entities.MailField.PF_NB=Quantité de produits com.franciaflex.faxtomail.persistence.entities.MailField.PRIORITY=Priorité -com.franciaflex.faxtomail.persistence.entities.MailField.PROJECT_REFERENCE=Réference projet +com.franciaflex.faxtomail.persistence.entities.MailField.PROJECT_REFERENCE=Référence chantier com.franciaflex.faxtomail.persistence.entities.MailField.QUOTATION_NB=Quantité de devis com.franciaflex.faxtomail.persistence.entities.MailField.RANGE_ROW=Gamme com.franciaflex.faxtomail.persistence.entities.MailField.RECEPTION_DATE=Date de réception @@ -32,6 +32,6 @@ com.franciaflex.faxtomail.persistence.entities.MailField.REFERENCE=Référence com.franciaflex.faxtomail.persistence.entities.MailField.REPLIES=Réponses com.franciaflex.faxtomail.persistence.entities.MailField.SAV_NB=Quantité de SAV -com.franciaflex.faxtomail.persistence.entities.MailField.SENDER=Expéditeur +com.franciaflex.faxtomail.persistence.entities.MailField.SENDER=Émetteur com.franciaflex.faxtomail.persistence.entities.MailField.TAKEN_BY=Pris par faxtomail.email.projectReference.default=

1 0

r212 - in trunk/faxtomail-service: . src/main/java/com/franciaflex/faxtomail/services/service
by dcosse＠users.forge.codelutin.com 18 Jun '14

18 Jun '14

Author: dcosse Date: 2014-06-18 12:38:34 +0200 (Wed, 18 Jun 2014) New Revision: 212 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/212 Log: ajout d'une dependance a postgresql + ajout d'un retour d'exception si la connexion au LDAP echoue a cause d'un utilisateur inconnu Modified: trunk/faxtomail-service/pom.xml trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java Modified: trunk/faxtomail-service/pom.xml =================================================================== --- trunk/faxtomail-service/pom.xml 2014-06-18 08:26:11 UTC (rev 211) +++ trunk/faxtomail-service/pom.xml 2014-06-18 10:38:34 UTC (rev 212) @@ -155,6 +155,11 @@ <groupId>com.unboundid</groupId> <artifactId>unboundid-ldapsdk</artifactId> </dependency> + + <dependency> + <groupId>org.postgresql</groupId> + <artifactId>postgresql</artifactId> + </dependency> </dependencies> <build> Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java 2014-06-18 08:26:11 UTC (rev 211) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java 2014-06-18 10:38:34 UTC (rev 212) @@ -24,8 +24,6 @@ * #L% */ -import java.util.ArrayList; -import java.util.Collection; import java.util.List; import org.apache.commons.lang3.ArrayUtils; @@ -154,7 +152,7 @@ */ public FaxToMailUser authenticateUser(String login, String password) throws AuthenticationException { - FaxToMailUser result = null; + FaxToMailUser result; try { // first connexion to get full user login @@ -220,7 +218,7 @@ */ public FaxToMailUser getUserFromPrincipal(String principal) throws AuthenticationException { - FaxToMailUser result = null; + FaxToMailUser result; try { // first connexion to get full user login @@ -246,15 +244,18 @@ throw new AuthenticationException("Utilisateur inconnu : " + principal); } - // update in database - FaxToMailUser user = updateUserFormLdap(searchEntry, login); - getPersistenceContext().commit(); + if( searchEntry != null ) { + // update in database + FaxToMailUser user = updateUserFormLdap(searchEntry, login); + getPersistenceContext().commit(); - // return copy without sensible informations - Binder<FaxToMailUser, FaxToMailUser> faxToMailUserBinder = BinderFactory.newBinder(FaxToMailUser.class); - result = new FaxToMailUserImpl(); - faxToMailUserBinder.copyExcluding(user, result); - + // return copy without sensible informations + Binder<FaxToMailUser, FaxToMailUser> faxToMailUserBinder = BinderFactory.newBinder(FaxToMailUser.class); + result = new FaxToMailUserImpl(); + faxToMailUserBinder.copyExcluding(user, result); + } else { + throw new AuthenticationException("Utilisateur inconnu : " + principal); + } } catch (LDAPException ex) { if (log.isWarnEnabled()) { log.warn("Can't login to ldap", ex); @@ -274,7 +275,7 @@ */ protected FaxToMailUser updateUserFormLdap(SearchResultEntry searchEntry, String login) throws LDAPSearchException { - FaxToMailUser user = null; + FaxToMailUser user; // create or FaxToMailUserTopiaDao faxtomailUserDao = getPersistenceContext().getFaxToMailUserDao();

1 0