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

r251 - in trunk: . faxtomail-ui-swing faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print faxtomail-ui-swing/src/main/resources
by dcosse＠users.forge.codelutin.com 23 Jun '14

23 Jun '14

Author: dcosse Date: 2014-06-23 14:27:25 +0200 (Mon, 23 Jun 2014) New Revision: 251 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/251 Log: refs #4656 ajout de l'impression des details d'une demande Added: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/odt/ trunk/faxtomail-ui-swing/src/main/resources/pdf/ Modified: trunk/faxtomail-ui-swing/pom.xml trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java trunk/pom.xml Modified: trunk/faxtomail-ui-swing/pom.xml =================================================================== --- trunk/faxtomail-ui-swing/pom.xml 2014-06-20 16:37:20 UTC (rev 250) +++ trunk/faxtomail-ui-swing/pom.xml 2014-06-23 12:27:25 UTC (rev 251) @@ -282,6 +282,12 @@ <groupId>javax.activation</groupId> <artifactId>activation</artifactId> </dependency> + + <dependency> + <groupId>org.apache.pdfbox</groupId> + <artifactId>pdfbox</artifactId> + </dependency> + </dependencies>  Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-06-20 16:37:20 UTC (rev 250) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-06-23 12:27:25 UTC (rev 251) @@ -26,17 +26,33 @@ import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; +import com.franciaflex.faxtomail.persistence.entities.AttachmentFileImpl; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; import com.franciaflex.faxtomail.ui.swing.util.Cancelable; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; +import com.google.common.base.Joiner; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.io.Closeables; import jaxx.runtime.validator.swing.SwingValidator; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.pdfbox.examples.fdf.PrintFields; +import org.apache.pdfbox.examples.fdf.SetField; +import org.apache.pdfbox.pdmodel.PDDocument; import javax.swing.*; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.List; +import java.util.Map; import static org.nuiton.i18n.I18n.t; @@ -49,6 +65,11 @@ private static final Log log = LogFactory.getLog(AttachmentToPrintChooserUIHandler.class); + protected Map<String, String> pdfFieldValues; + + protected DateFormat dayFormat = new SimpleDateFormat("dd/MM/yyyy"); + + @Override public void afterInit(AttachmentToPrintChooserUI attachmentToPrintChooserUI) { initUI(attachmentToPrintChooserUI); @@ -56,14 +77,32 @@ AttachmentToPrintChooserUIModel model = getModel(); DemandeUIModel demand = model.getDemand(); - JPanel attachmentPanel = ui.getAttachmentPanel(); JCheckBox checkBox = new JCheckBox(t("faxtomail.chooseMailFolder.element"), false); - attachmentPanel.add(checkBox); + ui.getAttachmentPanel().add(checkBox); + final AttachmentFile demandFile = new AttachmentFileImpl(); + demandFile.setFilename("demand_details"); + byte[] demandContent = getDocumentContent(); + demandFile.setContent(demandContent); + + checkBox.addItemListener(new ItemListener() { + @Override + public void itemStateChanged(ItemEvent e) { + log.info("state changed " + e.getStateChange()); + if (e.getStateChange() == ItemEvent.SELECTED) { + getModel().addAttachmentToPrint(demandFile); + } else { + getModel().removeAttachmentToPrint(demandFile); + } + } + }); + for (Attachment attachment : demand.getAttachment()) { - //TODO kmorin 20140617 check if not null - createCheckBox(attachment.getOriginalFile()); + if (attachment.getOriginalFile() != null) { + createCheckBox(attachment.getOriginalFile()); + } + final AttachmentFile file = attachment.getEditedFile(); if (file != null) { createCheckBox(file); @@ -72,7 +111,8 @@ } protected void createCheckBox(final AttachmentFile attachmentFile) { - JCheckBox checkBox = new JCheckBox(attachmentFile.getFilename(), true); + String attachmentName = attachmentFile != null ? attachmentFile.getFilename() : ""; + JCheckBox checkBox = new JCheckBox(attachmentName, true); ui.getAttachmentPanel().add(checkBox); getModel().addAttachmentToPrint(attachmentFile); @@ -110,7 +150,91 @@ public void print() { for (AttachmentFile attachmentFile : getModel().getAttachmentsToPrint()) { - FaxToMailUIUtil.print(attachmentFile, true); + if (StringUtils.isNotBlank(attachmentFile.getFilename())) { + FaxToMailUIUtil.print(attachmentFile, true); + } } } + + public byte[] getDocumentContent() { + pdfFieldValues = Maps.newHashMap(); + List<InputStream> streams = Lists.newArrayList(); + PDDocument resultDocument; + + byte[] result = null; + + try { + + InputStream emptyPage = getClass().getResourceAsStream("/pdf/demande.pdf"); + streams.add(emptyPage); + resultDocument = PDDocument.load(emptyPage); + SetField fields = new SetField(); + if (log.isTraceEnabled()) { + log.trace("fields in document are:"); + PrintFields printFields = new PrintFields(); + printFields.printFields(resultDocument); + } + + loadDocumentDedails(); + + + if (log.isDebugEnabled()) { + log.debug("will fill form document:\n" + pdfFieldValues); + } + + for (Map.Entry<String, String> field : pdfFieldValues.entrySet()) { + String fieldName = field.getKey(); + String fieldValue = field.getValue(); + fields.setField(resultDocument, fieldName, fieldValue); + } + + + ByteArrayOutputStream out = new ByteArrayOutputStream(); + resultDocument.save(out); + resultDocument.close(); + + result = out.toByteArray(); + + + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("", e); + } + } finally { + for (InputStream is : streams) { + try { + Closeables.close(is, false); + } catch (IOException e) { + if (log.isErrorEnabled()) { + log.error("An exception occurred", e); + } + } + } + } + return result; + } + + protected void loadDocumentDedails() { + DemandeUIModel demand = getModel().getDemand(); + setField("demand", demand.getObject()); + setField("receivedDate", dayFormat.format(demand.getReceptionDate())); + setField("sender", demand.getSender()); + setField("object", demand.getObject()); + setField("clientCode", demand.getClientCode()); + setField("demandType", (demand.getDemandType() == null) ? "" : demand.getDemandType().getLabel()); + setField("priority", (demand.getPriority() == null) ? "" : demand.getPriority().getLabel()); + setField("projectReference", demand.getProjectReference()); + setField("companyReference", demand.getCompanyReference()); + setField("etatAttente", (demand.getEtatAttente() == null) ? "" : demand.getEtatAttente().getLabel()); + setField("status", (demand.getDemandStatus() == null) ? "" : demand.getDemandStatus().getLabel()); + setField("takenBy", (demand.getTakenBy() == null) ? "" : (demand.getTakenBy().getLogin() + " " + demand.getTakenBy().getFirstName() + " " + demand.getTakenBy().getLastName())); + } + + protected void setField(String fieldName, String... value) { + if (value == null) { + pdfFieldValues.put(fieldName, ""); + } else { + pdfFieldValues.put(fieldName, Joiner.on(" ").skipNulls().join(value)); + } + } } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-20 16:37:20 UTC (rev 250) +++ trunk/pom.xml 2014-06-23 12:27:25 UTC (rev 251) @@ -135,6 +135,7 @@ <maven.compiler.target>1.7</maven.compiler.target> <signatureArtifactId>java17</signatureArtifactId> <signatureVersion>1.0</signatureVersion> + <pdfboxVersion>1.6.0</pdfboxVersion>  </properties> <repositories> @@ -624,6 +625,12 @@ <artifactId>unboundid-ldapsdk</artifactId> <version>2.3.6</version> </dependency> + + <dependency> + <groupId>org.apache.pdfbox</groupId> + <artifactId>pdfbox</artifactId> + <version>${pdfboxVersion}</version> + </dependency> </dependencies> </dependencyManagement>

1 0

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

20 Jun '14

Author: echatellier Date: 2014-06-20 18:37:20 +0200 (Fri, 20 Jun 2014) New Revision: 250 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/250 Log: Changement de la cardinalit?\195?\169 personInCharge Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo =================================================================== (Binary files differ)

1 0

r249 - in trunk/faxtomail-ui-web/src/main/webapp: WEB-INF/content/admin js
by echatellier＠users.forge.codelutin.com 20 Jun '14

20 Jun '14

Author: echatellier Date: 2014-06-20 18:36:21 +0200 (Fri, 20 Jun 2014) New Revision: 249 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/249 Log: Gestion de la configuration pour l'adresse mail de r?\195?\169ponde et le contenu des mails de rejets Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 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-20 16:23:59 UTC (rev 248) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-20 16:36:21 UTC (rev 249) @@ -377,6 +377,31 @@ Définir le domaine des fax :</label> <input type="text" class="form-control" ng-model="selectedMailFolder.faxDomain" ng-if="selectedMailFolder.useCurrentLevelFaxDomain || !selectedMailFolder.$parent"> </div> + + <hr /> + + <div class="form-group" ng-if="selectedMailFolder.$parent"> + <label><input type="radio" ng-model="selectedMailFolder.useCurrentLevelRejectResponseMailAddress" ng-value="false" /> + Hériter de l'adresse de réponse pour les rejets :</label> + <input type="text" class="form-control" disabled + ng-model="parentScopeValues.rejectResponseMailAddress" ng-if="!selectedMailFolder.useCurrentLevelRejectResponseMailAddress"> + </div> + <div class="form-group"> + <label><input type="radio" ng-model="selectedMailFolder.useCurrentLevelRejectResponseMailAddress" ng-value="true" ng-if="selectedMailFolder.$parent" /> + Définir l'adresse de réponse pour les rejets :</label> + <input type="text" class="form-control" ng-model="selectedMailFolder.rejectResponseMailAddress" ng-if="selectedMailFolder.useCurrentLevelRejectResponseMailAddress || !selectedMailFolder.$parent"> + </div> + <div class="form-group" ng-if="selectedMailFolder.$parent"> + <label><input type="radio" ng-model="selectedMailFolder.useCurrentLevelRejectResponseMessage" ng-value="false" /> + Hériter du message de réponse pour les rejets :</label> + <textarea type="text" class="form-control" disabled + ng-model="parentScopeValues.rejectResponseMessage" ng-if="!selectedMailFolder.useCurrentLevelRejectResponseMessage"></textarea> + </div> + <div class="form-group"> + <label><input type="radio" ng-model="selectedMailFolder.useCurrentLevelRejectResponseMessage" ng-value="true" ng-if="selectedMailFolder.$parent" /> + Définir le message de réponse pour les rejets :</label> + <textarea class="form-control" ng-model="selectedMailFolder.rejectResponseMessage" ng-if="selectedMailFolder.useCurrentLevelRejectResponseMessage || !selectedMailFolder.$parent"></textarea> + </div> </div> </div> </div> Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-20 16:23:59 UTC (rev 248) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-20 16:36:21 UTC (rev 249) @@ -350,7 +350,9 @@ useCurrentLevelEtatAttente: false, useCurrentLevelTableColumns: false, useCurrentLevelFaxDomain: false, - useCurrentLevelEdiFolder: false + useCurrentLevelEdiFolder: false, + useCurrentLevelRejectResponseMessage: false, + useCurrentLevelRejectResponseMailAddress: false }; // extend node (in faxtomail collapsed = extended) scope.collapse(); @@ -574,6 +576,12 @@ if (!$scope.parentScopeValues.ediFolder) { $scope.parentScopeValues.ediFolder = folder.ediFolder; } + if (angular.isUndefined($scope.parentScopeValues.rejectResponseMailAddress)) { + $scope.parentScopeValues.rejectResponseMailAddress = folder.rejectResponseMailAddress; + } + if (angular.isUndefined($scope.parentScopeValues.rejectResponseMessage)) { + $scope.parentScopeValues.rejectResponseMessage= folder.rejectResponseMessage; + } if ((!$scope.parentScopeValues.folderTableColumns || $scope.parentScopeValues.folderTableColumns.length == 0) && folder.folderTableColumns) { $scope.parentScopeValues.folderTableColumns = folder.folderTableColumns; }

1 0

r248 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by dcosse＠users.forge.codelutin.com 20 Jun '14

20 Jun '14

Author: dcosse Date: 2014-06-20 18:23:59 +0200 (Fri, 20 Jun 2014) New Revision: 248 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/248 Log: correction sur filtre reception mails Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-06-20 16:21:36 UTC (rev 247) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-06-20 16:23:59 UTC (rev 248) @@ -145,7 +145,7 @@ AttachmentFileTopiaDao attachementFileTopiaDao = getPersistenceContext().getAttachmentFileDao(); for (Attachment attachment : attachments) { - // get attchment BEFORE for flush + // get attachment BEFORE for flush AttachmentFile originalFile = null; AttachmentFile editedFile = null; if (attachment.isPersisted()) { 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-20 16:21:36 UTC (rev 247) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-20 16:23:59 UTC (rev 248) @@ -190,7 +190,9 @@ int count = folder.getMessageCount(); int unread = folder.getUnreadMessageCount(); - log.debug(count + " messages, " + unread + " unread"); + if (log.isDebugEnabled()) { + log.debug(count + " messages, " + unread + " unread"); + } EmailService emailService = serviceContext.newService(EmailService.class); MailFolderService mailFolderService = serviceContext.newService(MailFolderService.class); @@ -205,7 +207,10 @@ List<String> modifiedProperties = new ArrayList<>(); -// log.debug("Object: " + message.getSubject()); + if (log.isDebugEnabled()){ + log.debug("Object: " + message.getSubject()); + } + // email.s(message.getSubject()); // modifiedProperties.add(Email.PROPERTY_OBJECT); @@ -220,11 +225,19 @@ } for (Address address : recipients) { + String recipient = address.toString(); + + // some reciepient are like "toto tutu<toto.tutu73(a)gmail.com>" + // the regex is to extract email address from it + recipient = recipient.replaceFirst("^.*<(.*)>$", "$1"); + MailFolder mailFolder = mailFolderService.getFolderForRecipient(recipient); if (mailFolder != null) { - log.debug("\tTo : " + address + " -> " + (mailFolder != null ? mailFolder.getName() : "none")); + if (log.isDebugEnabled()){ + log.debug("\tTo : " + address + " -> " + (mailFolder != null ? mailFolder.getName() : "none")); + } email.setRecipient(recipient); email.setMailFolder(mailFolder); @@ -317,7 +330,9 @@ message.setFlag(Flags.Flag.DELETED, true); } } - log.debug("End of emails"); + if (log.isDebugEnabled()){ + log.debug("End of emails"); + } } catch (Exception e) { log.error("Error while reading the emails", e);

1 0

r247 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin faxtomail-ui-web/src/main/webapp/js
by echatellier＠users.forge.codelutin.com 20 Jun '14

20 Jun '14

Author: echatellier Date: 2014-06-20 18:21:36 +0200 (Fri, 20 Jun 2014) New Revision: 247 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/247 Log: Ajout de la priorite au charg?\195?\169 de clientelle Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-06-20 16:21:15 UTC (rev 246) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-06-20 16:21:36 UTC (rev 247) @@ -334,6 +334,7 @@ filter = filterById.remove(mailFilter.getTopiaId()); } filter.setExpression(mailFilter.getExpression()); + filter.setClientResponsiblePriority(mailFilter.isClientResponsiblePriority()); // mailFilter.getMailFolder().getTopiaId() can start with new_ MailFolder mailFolder = mailFolderCache.get(mailFilter.getMailFolder().getTopiaId()); 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-20 16:21:15 UTC (rev 246) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-20 16:21:36 UTC (rev 247) @@ -784,6 +784,7 @@ <tr> <th>Filtre</th> <th>Dossier</th> + <th>Priorité au chargé de clientelle</th> <th/> </tr> </thead> @@ -791,6 +792,7 @@ <tr ng-repeat="mailFilter in rootFolderMailFilters[mailFolder.topiaId]"> <td>{{mailFilter.expression}}</td> <td>{{mailFilter.mailFolder.$fullPath}}</td> + <td>{{mailFilter.clientResponsiblePriority ? 'Oui' : 'Non'}}</td> <td><a class="btn btn-danger btn-xs" ng-click="removeFilter(mailFolder, mailFilter)"> <span class="glyphicon glyphicon-remove"></span> </a></td> @@ -807,6 +809,17 @@ <label for="folderField">Dossier</label> <select class="form-control" ng-model="newFilter.mailFolder" ng-options="mailFolder.$fullPath for mailFolder in flatMailFolders[mailFolder.topiaId]"></select> </div> + <div class="form-group"> + <label for="clientResponsiblePriorityField">Utiliser le chargé de clientelle en priorité : </label> + <label class="radio-inline"> + <input type="radio" + ng-model="newFilter.clientResponsiblePriority" ng-value="true"> oui + </label> + <label class="radio-inline"> + <input type="radio" + ng-model="newFilter.clientResponsiblePriority" ng-value="false"> non + </label> + </div> </div> <button type="button" class="btn btn-success" ng-disabled="!newFilter.expression || !newFilter.mailFolder" ng-click="addNewFilter(mailFolder)"> <i class="glyphicon glyphicon-plus"></i> Ajouter Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-20 16:21:15 UTC (rev 246) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-20 16:21:36 UTC (rev 247) @@ -891,7 +891,7 @@ ConfigurationModule.controller('ConfigurationFilterController', ['$scope', '$window', 'ConfigurationData', function($scope, $window, ConfigurationData) { //{Object} New accout empty filter - $scope.newFilter = {}; + $scope.newFilter = {clientResponsiblePriority:false}; // option de la configuration 'sortable' $scope.sortableOptions = { @@ -912,7 +912,7 @@ } $scope.rootFolderMailFilters[rootMailFolder.topiaId].push($scope.newFilter); // clear form - $scope.newFilter = {}; + $scope.newFilter = {clientResponsiblePriority:false}; }; // remove filter

1 0

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

20 Jun '14

Author: echatellier Date: 2014-06-20 18:21:15 +0200 (Fri, 20 Jun 2014) New Revision: 246 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/246 Log: Add debug log 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-20 15:34:06 UTC (rev 245) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-20 16:21:15 UTC (rev 246) @@ -234,6 +234,14 @@ } } if (email.getMailFolder() == null) { + if (log.isDebugEnabled()) { + log.debug("Can't place mail " + message.getSubject() + " in any folder"); + if (log.isTraceEnabled()) { + for (Address address : recipients) { + log.trace(" - for recipient " + address.toString()); + } + } + } continue; }

1 0

r245 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail faxtomail-persistence/src/main/xmi faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job faxtomail-ui-web/src/main/webapp/js
by echatellier＠users.forge.codelutin.com 20 Jun '14

20 Jun '14

Author: echatellier Date: 2014-06-20 17:34:06 +0200 (Fri, 20 Jun 2014) New Revision: 245 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/245 Log: Gestion de tous les cas sp?\195?\169ciaux de sauvegarde compliqu?\195?\169 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java 2014-06-20 15:26:54 UTC (rev 244) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java 2014-06-20 15:34:06 UTC (rev 245) @@ -239,9 +239,13 @@ return applicationConfig.getOptionAsBoolean(FaxToMailConfigurationOption.SMTP_SSL.getKey()); } - public boolean isMailDeleteRemote() { - return applicationConfig.getOptionAsBoolean(FaxToMailConfigurationOption.MAIL_DELETE_REMOTE.getKey()); + public boolean isMailDelete() { + return applicationConfig.getOptionAsBoolean(FaxToMailConfigurationOption.MAIL_DELETE.getKey()); } + + public boolean isMailExpunge() { + return applicationConfig.getOptionAsBoolean(FaxToMailConfigurationOption.MAIL_EXPUNGE.getKey()); + } public String getLdapHost() { return applicationConfig.getOption(FaxToMailConfigurationOption.LDAP_HOST.getKey()); Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java 2014-06-20 15:26:54 UTC (rev 244) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java 2014-06-20 15:34:06 UTC (rev 245) @@ -72,10 +72,15 @@ "Utilisation on non du mode ssl pour le stmp", "false", Boolean.class), - MAIL_DELETE_REMOTE( - "faxtomail.mail.deleteremote", - "Suppression automatique des mails sur le serveur distant (default : true)", - "true", Boolean.class), + MAIL_DELETE( + "faxtomail.mail.delete", + "Marque les mails comme étant supprimé sur le serveur", + "false", Boolean.class), + + MAIL_EXPUNGE( + "faxtomail.mail.expunge", + "Supprime définitivement les mails marqués comme supprimés", + "false", Boolean.class), DEV_MODE( "faxtomail.devMode", Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo =================================================================== (Binary files differ) Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-06-20 15:26:54 UTC (rev 244) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-06-20 15:34:06 UTC (rev 245) @@ -132,13 +132,20 @@ public void save(Configuration configuration, List<DemandType> demandTypes, List<EtatAttente> etatAttentes, List<MailFolder> mailFolders, List<MailFilter> mailFilters, List<EmailAccount> emailAccounts) { + Collection<MailFolder> toDeleteMailFolder = new ArrayList<>(); + + // sauvegarde saveConfiguration(configuration); saveDemandTypes(demandTypes); - saveMailFolders(mailFolders); // save before etat d'attente to remove reference - saveEtatAttente(etatAttentes); - saveMailFilters(mailFilters); + Map<String, EtatAttente> etatAttenteCache = saveEtatAttente(etatAttentes); + Map<String, MailFolder> mailFolderCache = saveMailFolders(etatAttenteCache, mailFolders, toDeleteMailFolder); + saveMailFilters(mailFolderCache, mailFilters); saveEmailAccounts(emailAccounts); + // delete after loop + MailFolderTopiaDao mailFilterDao = getPersistenceContext().getMailFolderDao(); + mailFilterDao.deleteAll(toDeleteMailFolder); + // unique commit pour toute la conf getPersistenceContext().commit(); } @@ -172,9 +179,14 @@ } } } - - protected void saveEtatAttente(Collection<EtatAttente> etatAttentes) { + /** + * + * @param etatAttentes + */ + protected Map<String, EtatAttente> saveEtatAttente(Collection<EtatAttente> etatAttentes) { + + Map<String, EtatAttente> cache = new HashMap<>(); Binder<EtatAttente, EtatAttente> binderEtatAttente = BinderFactory.newBinder(EtatAttente.class); EtatAttenteTopiaDao etatAttenteDAO = getPersistenceContext().getEtatAttenteDao(); @@ -201,41 +213,53 @@ } else { etatAttenteDAO.create(currentEtatAttente); } + + // cache + cache.put(etatAttente.getTopiaId(), currentEtatAttente); } - // delete remaining + // delete remaining (not done here, done after reference cleaning) etatAttenteDAO.deleteAll(allEtatAttenteIndex.values()); + + return cache; } /** * Save mail folder without commit. * + * @param etatAttenteCache cache etat attente * @param newMailFolders mail folders + * @return mail folder cache with input ids */ - protected void saveMailFolders(Collection<MailFolder> newMailFolders) { + protected Map<String, MailFolder> saveMailFolders(Map<String, EtatAttente> etatAttenteCache, Collection<MailFolder> newMailFolders, Collection<MailFolder> toDeleteMailFolder) { // get current folders MailFolderTopiaDao dao = getPersistenceContext().getMailFolderDao(); List<MailFolder> mailFolders = dao.findAll(); Map<String, MailFolder> mailFolderMap = new HashMap<>(Maps.uniqueIndex(mailFolders, TopiaEntities.getTopiaIdFunction())); // recursive update - saveMailFolders(dao, mailFolderMap, null, newMailFolders); + Map<String, MailFolder> mailFolderCache = new HashMap<>(); + saveMailFolders(dao, etatAttenteCache, mailFolderMap, null, newMailFolders, mailFolderCache); // if map is not empty after recursive iteration, remaining folder must be deleted - dao.deleteAll(mailFolderMap.values()); + toDeleteMailFolder.addAll(mailFolderMap.values()); + + return mailFolderCache; } /** * Save mail folder without commit. * * @param dao + * @param etatAttenteCache * @param mailFolderMap * @param parent * @param mailFolders + * @param mailFolderCache * @return */ - protected Collection<MailFolder> saveMailFolders(MailFolderTopiaDao dao, Map<String, MailFolder> mailFolderMap, - MailFolder parent, Collection<MailFolder> mailFolders) { + protected Collection<MailFolder> saveMailFolders(MailFolderTopiaDao dao, Map<String, EtatAttente> etatAttenteCache, + Map<String, MailFolder> mailFolderMap, MailFolder parent, Collection<MailFolder> mailFolders, Map<String, MailFolder> mailFolderCache) { Collection<MailFolder> result = Lists.newArrayList(); if (mailFolders == null) { @@ -257,19 +281,32 @@ MailFolder.PROPERTY_TOPIA_CREATE_DATE, MailFolder.PROPERTY_TOPIA_VERSION, MailFolder.PROPERTY_CHILDREN, + MailFolder.PROPERTY_ETAT_ATTENTES, MailFolder.PROPERTY_PARENT); + // gestion des bonnes références des états d'attente (surtout le cas "new_") + currentMailFolder.clearEtatAttentes(); + if (mailFolder.getEtatAttentes() != null) { + for (EtatAttente etatAttente : mailFolder.getEtatAttentes()) { + // etatAttente.getTopiaId() peut retourner un id qui commence par new_ + currentMailFolder.addEtatAttentes(etatAttenteCache.get(etatAttente.getTopiaId())); + } + } + currentMailFolder.setParent(parent); if (!currentMailFolder.isPersisted()) { currentMailFolder = dao.create(currentMailFolder); } - Collection<MailFolder> children = saveMailFolders(dao, mailFolderMap, currentMailFolder, mailFolder.getChildren()); + Collection<MailFolder> children = saveMailFolders(dao, etatAttenteCache, mailFolderMap, currentMailFolder, mailFolder.getChildren(), mailFolderCache); currentMailFolder.setChildren(children); dao.update(currentMailFolder); result.add(currentMailFolder); + + // add in cache + mailFolderCache.put(mailFolder.getTopiaId(), currentMailFolder); } return result; @@ -278,9 +315,10 @@ /** * Save all mail filters without commit. * + * @param mailFolderCache mail folder cache (with corrects ids) * @param mailFilters mail filters to save */ - protected void saveMailFilters(List<MailFilter> mailFilters) { + protected void saveMailFilters(Map<String, MailFolder> mailFolderCache, List<MailFilter> mailFilters) { MailFilterTopiaDao dao = getPersistenceContext().getMailFilterDao(); int position = 0; @@ -296,7 +334,10 @@ filter = filterById.remove(mailFilter.getTopiaId()); } filter.setExpression(mailFilter.getExpression()); - filter.setMailFolder(mailFilter.getMailFolder()); + + // mailFilter.getMailFolder().getTopiaId() can start with new_ + MailFolder mailFolder = mailFolderCache.get(mailFilter.getMailFolder().getTopiaId()); + filter.setMailFolder(mailFolder); filter.setPosition(position); if (create) { @@ -304,10 +345,9 @@ } else { filter = dao.update(filter); } - position++; } - + dao.deleteAll(filterById.values()); } 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-20 15:26:54 UTC (rev 244) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-20 15:34:06 UTC (rev 245) @@ -64,7 +64,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; -import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.nuiton.util.StringUtil; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; @@ -172,9 +171,8 @@ protected void close(Folder folder) { if (folder != null && folder.isOpen()) { try { - // TODO 20140414 kmorin close(true) in production - folder.close(false); // false -> On n'efface pas les messages marqués DELETED - + boolean expunge = serviceContext.getApplicationConfig().isMailExpunge(); + folder.close(expunge); } catch (Exception e) { log.error("Error while closing the folder", e); } @@ -307,7 +305,7 @@ modifiedProperties.toArray(new String[modifiedProperties.size()])); // suppression des mails sur le serveur distant (automatique par default) - if (serviceContext.getApplicationConfig().isMailDeleteRemote()) { + if (serviceContext.getApplicationConfig().isMailDelete()) { message.setFlag(Flags.Flag.DELETED, true); } } Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-20 15:26:54 UTC (rev 244) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-20 15:34:06 UTC (rev 245) @@ -47,6 +47,10 @@ $scope.mailFoldersUsage = ConfigurationData.mailFoldersUsage; //{Map<MailFolder id, Array<MailFolder>>} liste des dossier (a plat, par dossier racine) $scope.flatMailFolders; + //{Array} Current mail filter list + $scope.mailFilters = ConfigurationData.mailFilters; + //{Map} Folder mail fiters + $scope.rootFolderMailFilters = {}; //{Array} All application users $scope.users = ConfigurationData.users; // {Array} All application groups @@ -95,6 +99,35 @@ }); }; $scope._updateFlatMailFolders(); + + + // replace filter instance with mailFolder filter instance to use same objects (filled with fullPathInfo) + var _updateMetaFilter = function() { + angular.forEach($scope.mailFilters, function(filter) { + // root folder + angular.forEach($scope.mailFolders, function(mailFolder) { + if (!$scope.rootFolderMailFilters.hasOwnProperty(mailFolder.topiaId)) { + $scope.rootFolderMailFilters[mailFolder.topiaId] = []; + } + angular.forEach($scope.flatMailFolders[mailFolder.topiaId], function(subFolder) { + if (subFolder.topiaId == filter.mailFolder.topiaId) { + filter.mailFolder = subFolder; + + $scope.rootFolderMailFilters[subFolder.$rootFolder.topiaId].push(filter); + } + }); + }); + }); + }; + + $scope.updateMetaFilter = function(news, olds) { + console.log("Udpate MetaFilter"); + $scope.rootFolderMailFilters = {}; + _updateMetaFilter(); + }; + + // update when root folder collection changes (and for init) + $scope.$watchCollection("mailFolders", $scope.updateMetaFilter); }]); /** @@ -177,11 +210,11 @@ $scope.deleteEtatAttente = function(etatAttente, index) { if ($window.confirm("Êtes-vous sûr de vouloir supprimer cet état d'attente ?")) { $scope.etatAttentes.splice(index, 1); + + // suppression de cet etat d'attente dans les mail folder (sinon, ca fait + // un resauvegarde d'un etat d'attente supprimé et donc un bug) + removeEtatAttenteFromMailFolder(etatAttente, $scope.mailFolders); } - - // suppression de cet etat d'attente dans les mail folder (sinon, ca fait - // un resauvegarde d'un etat d'attente supprimé et donc un bug) - removeEtatAttenteFromMailFolder(etatAttente, $scope.mailFolders); }; // suppression de cet etat d'attente dans les mail folder (sinon, ca fait @@ -326,14 +359,33 @@ // edition automatique $scope.editMailFolder(newNode); // update flat map - $scope._updateFlatMailFolders(); + $scope._updateFlatMailFolders(); } }; // suppression d'un dossier $scope.deleteFolder = function(scope) { if ($window.confirm("Êtes-vous sûr de vouloir supprimer ce dossier ?")) { + + var nodeData = scope.$modelValue; + + // suppression des filtres utilisant ce dossier comme cible + var index = -1; + var current = 0; + angular.forEach($scope.mailFilters, function(filter) { + if (filter.mailFolder.topiaId == nodeData.topiaId) { + index = current; + } + current++; + }); + if (index != -1) { + $scope.mailFilters.splice(index, 1); + } + + // remove current folder scope.remove(scope); + // update filter meta map + $scope.updateMetaFilter(); } }; @@ -838,38 +890,9 @@ */ ConfigurationModule.controller('ConfigurationFilterController', ['$scope', '$window', 'ConfigurationData', function($scope, $window, ConfigurationData) { - //{Array} Current mail filter list - $scope.mailFilters = ConfigurationData.mailFilters; - //{Map} Folder mail fiters - $scope.rootFolderMailFilters = {}; //{Object} New accout empty filter $scope.newFilter = {}; - // replace filter instance with mailFolder filter instance to use same objects (filled with fullPathInfo) - var updateMetaFilter = function() { - angular.forEach($scope.mailFilters, function(filter) { - // root folder - angular.forEach($scope.mailFolders, function(mailFolder) { - if (!$scope.rootFolderMailFilters.hasOwnProperty(mailFolder.topiaId)) { - $scope.rootFolderMailFilters[mailFolder.topiaId] = []; - } - angular.forEach($scope.flatMailFolders[mailFolder.topiaId], function(subFolder) { - if (subFolder.topiaId == filter.mailFolder.topiaId) { - filter.mailFolder = subFolder; - - $scope.rootFolderMailFilters[subFolder.$rootFolder.topiaId].push(filter); - } - }); - }); - }); - }; - // update when root folder collection changes (and for init) - $scope.$watchCollection("mailFolders", function(news, olds) { - console.log("Udpate MetaFilter"); - $scope.rootFolderMailFilters = {}; - updateMetaFilter(); - }); - // option de la configuration 'sortable' $scope.sortableOptions = { stop: function(e, ui) {

1 0

r244 - trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities
by echatellier＠users.forge.codelutin.com 20 Jun '14

20 Jun '14

Author: echatellier Date: 2014-06-20 17:26:54 +0200 (Fri, 20 Jun 2014) New Revision: 244 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/244 Log: Surcharge des delete() topia qui font n'importe quoi Added: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFilterTopiaDao.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderTopiaDao.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EtatAttenteTopiaDao.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EtatAttenteTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EtatAttenteTopiaDao.java 2014-06-20 14:29:53 UTC (rev 243) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EtatAttenteTopiaDao.java 2014-06-20 15:26:54 UTC (rev 244) @@ -34,6 +34,11 @@ @Override public void delete(EtatAttente entity) { + // code from AbstractTopiaDao + topiaJpaSupport.delete(entity); + entity.notifyDeleted(); + topiaFiresSupport.warnOnDeleteEntity(entity); + // do nothing just to disable strange topia code // org.postgresql.util.PSQLException: Le nom de colonne topiaVersion n'a pas été trouvé dans ce ResultSet. // org.postgresql.jdbc2.AbstractJdbc2ResultSet.findColumn(AbstractJdbc2ResultSet.java:2728) Added: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFilterTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFilterTopiaDao.java (rev 0) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFilterTopiaDao.java 2014-06-20 15:26:54 UTC (rev 244) @@ -0,0 +1,26 @@ +package com.franciaflex.faxtomail.persistence.entities; + +public class MailFilterTopiaDao extends AbstractMailFilterTopiaDao<MailFilter> { + + @Override + public void delete(MailFilter entity) { + + // code from AbstractTopiaDao + topiaJpaSupport.delete(entity); + entity.notifyDeleted(); + topiaFiresSupport.warnOnDeleteEntity(entity); + +// do nothing just to disable strange topia code +// org.hibernate.PropertyValueException: not-null property references a null or transient value : com.franciaflex.faxtomail.persistence.entities.MailFilterImpl.mailFolder +// org.hibernate.engine.internal.Nullability.checkNullability(Nullability.java:106) +// org.hibernate.event.internal.DefaultDeleteEventListener.deleteEntity(DefaultDeleteEventListener.java:279) +// org.hibernate.event.internal.DefaultDeleteEventListener.onDelete(DefaultDeleteEventListener.java:160) +// org.hibernate.event.internal.DefaultDeleteEventListener.onDelete(DefaultDeleteEventListener.java:73) +// org.hibernate.internal.SessionImpl.fireDelete(SessionImpl.java:920) +// org.hibernate.internal.SessionImpl.delete(SessionImpl.java:896) +// org.nuiton.topia.persistence.internal.support.HibernateTopiaJpaSupport.delete(HibernateTopiaJpaSupport.java:218) +// org.nuiton.topia.persistence.internal.AbstractTopiaDao.delete(AbstractTopiaDao.java:335) + + } + +} //MailFilterTopiaDao Property changes on: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFilterTopiaDao.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderTopiaDao.java (rev 0) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderTopiaDao.java 2014-06-20 15:26:54 UTC (rev 244) @@ -0,0 +1,28 @@ +package com.franciaflex.faxtomail.persistence.entities; + +public class MailFolderTopiaDao extends AbstractMailFolderTopiaDao<MailFolder> { + + @Override + public void delete(MailFolder entity) { + + // code from AbstractTopiaDao + topiaJpaSupport.delete(entity); + entity.notifyDeleted(); + topiaFiresSupport.warnOnDeleteEntity(entity); + +// do nothing just to disable strange topia code +// org.nuiton.topia.persistence.TopiaException: An error occurs during query operation: from com.franciaflex.faxtomail.persistence.entities.Email topiaEntity_ where topiaEntity_.mailFolder = :mailFolder0 : not-null property references a null or transient value : com.franciaflex.faxtomail.persistence.entities.MailFilterImpl.mailFolder +// org.nuiton.topia.persistence.internal.support.HibernateTopiaJpaSupport.findAll(HibernateTopiaJpaSupport.java:116) +// org.nuiton.topia.persistence.internal.AbstractTopiaDao.findAll(AbstractTopiaDao.java:540) +// org.nuiton.topia.persistence.internal.AbstractTopiaDao$InnerTopiaQueryBuilderRunQueryStep.findAll(AbstractTopiaDao.java:1084) +// org.nuiton.topia.persistence.internal.AbstractTopiaDao$InnerTopiaQueryBuilderAddCriteriaOrRunQueryStep.findAll(AbstractTopiaDao.java:944) +// com.franciaflex.faxtomail.persistence.entities.GeneratedMailFolderTopiaDao.delete(GeneratedMailFolderTopiaDao.java:59) +// com.franciaflex.faxtomail.persistence.entities.GeneratedMailFolderTopiaDao.delete(GeneratedMailFolderTopiaDao.java:1) +// org.nuiton.topia.persistence.internal.AbstractTopiaDao.deleteAll(AbstractTopiaDao.java:343) +// com.franciaflex.faxtomail.services.service.ConfigurationService.saveMailFolders(ConfigurationService.java:239) +// com.franciaflex.faxtomail.services.service.ConfigurationService.save(ConfigurationService.java:139) +// com.franciaflex.faxtomail.web.action.admin.ConfigurationAction.execute(ConfigurationAction.java:126) + + } + +} //MailFolderTopiaDao Property changes on: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderTopiaDao.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r243 - trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities
by echatellier＠users.forge.codelutin.com 20 Jun '14

20 Jun '14

Author: echatellier Date: 2014-06-20 16:29:53 +0200 (Fri, 20 Jun 2014) New Revision: 243 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/243 Log: Override ugly topia generated code Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EtatAttenteTopiaDao.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EtatAttenteTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EtatAttenteTopiaDao.java 2014-06-20 13:35:32 UTC (rev 242) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EtatAttenteTopiaDao.java 2014-06-20 14:29:53 UTC (rev 243) @@ -30,6 +30,42 @@ public class EtatAttenteTopiaDao extends AbstractEtatAttenteTopiaDao<EtatAttente> { + + @Override + public void delete(EtatAttente entity) { + +// do nothing just to disable strange topia code +// org.postgresql.util.PSQLException: Le nom de colonne topiaVersion n'a pas été trouvé dans ce ResultSet. +// org.postgresql.jdbc2.AbstractJdbc2ResultSet.findColumn(AbstractJdbc2ResultSet.java:2728) +// org.postgresql.jdbc2.AbstractJdbc2ResultSet.getLong(AbstractJdbc2ResultSet.java:2594) +// com.mchange.v2.c3p0.impl.NewProxyResultSet.getLong(NewProxyResultSet.java:2625) +// org.hibernate.type.descriptor.sql.BigIntTypeDescriptor$2.doExtract(BigIntTypeDescriptor.java:74) +// org.hibernate.type.descriptor.sql.BasicExtractor.extract(BasicExtractor.java:64) +// org.hibernate.type.AbstractStandardBasicType.nullSafeGet(AbstractStandardBasicType.java:267) +// org.hibernate.type.AbstractStandardBasicType.nullSafeGet(AbstractStandardBasicType.java:263) +// org.hibernate.type.AbstractStandardBasicType.nullSafeGet(AbstractStandardBasicType.java:253) +// org.hibernate.type.AbstractStandardBasicType.hydrate(AbstractStandardBasicType.java:338) +// org.hibernate.persister.entity.AbstractEntityPersister.hydrate(AbstractEntityPersister.java:2969) +// org.hibernate.loader.Loader.loadFromResultSet(Loader.java:1695) +// org.hibernate.loader.Loader.instanceNotYetLoaded(Loader.java:1627) +// org.hibernate.loader.Loader.getRow(Loader.java:1514) +// org.hibernate.loader.Loader.getRowFromResultSet(Loader.java:725) +// org.hibernate.loader.Loader.processResultSet(Loader.java:952) +// org.hibernate.loader.Loader.doQuery(Loader.java:920) +// org.hibernate.loader.Loader.doQueryAndInitializeNonLazyCollections(Loader.java:354) +// org.hibernate.loader.Loader.doList(Loader.java:2553) +// org.hibernate.loader.Loader.doList(Loader.java:2539) +// org.hibernate.loader.Loader.listIgnoreQueryCache(Loader.java:2369) +// org.hibernate.loader.Loader.list(Loader.java:2364) +// org.hibernate.loader.custom.CustomLoader.list(CustomLoader.java:353) +// org.hibernate.internal.SessionImpl.listCustomQuery(SessionImpl.java:1873) +// org.hibernate.internal.AbstractSessionImpl.list(AbstractSessionImpl.java:311) +// org.hibernate.internal.SQLQueryImpl.list(SQLQueryImpl.java:141) +// com.franciaflex.faxtomail.persistence.entities.GeneratedEtatAttenteTopiaDao.delete(GeneratedEtatAttenteTopiaDao.java:65) +// com.franciaflex.faxtomail.persistence.entities.GeneratedEtatAttenteTopiaDao.delete(GeneratedEtatAttenteTopiaDao.java:1) + + } + public Map<String, Long> getEtatAttenteCountByFolder() { String query = "SELECT etatAttente.topiaId, count(*) FROM " + Email.class.getName() + " group by etatAttente.topiaId";

1 0

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

20 Jun '14

Author: echatellier Date: 2014-06-20 15:35:32 +0200 (Fri, 20 Jun 2014) New Revision: 242 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/242 Log: Fix NPE Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java 2014-06-20 09:44:35 UTC (rev 241) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java 2014-06-20 13:35:32 UTC (rev 242) @@ -139,12 +139,13 @@ protected void populateUser(FaxToMailSession faxToMailSession, FaxToMailServiceContext serviceContext) { if (StringUtils.isNotBlank(faxToMailSession.getAuthenticatedUserId())) { LdapService ldapService = serviceContext.newService(LdapService.class); + // return can be null FaxToMailUser user = ldapService.getUserBean(faxToMailSession.getAuthenticatedUserId()); faxToMailSession.setAuthenticatedFaxToMailUser(user); // test si l'utilisateur est admin List<String> adminGroups = serviceContext.getApplicationConfig().getLdapAdminGroups(); - if (CollectionUtils.isNotEmpty(adminGroups) && user.getUserGroups() != null) { + if (user != null && CollectionUtils.isNotEmpty(adminGroups) && user.getUserGroups() != null) { for (FaxToMailUserGroup group : user.getUserGroups()) { if (adminGroups.contains(group.getFullPath())) { faxToMailSession.setAdmin(true);

1 0