Author: dcosse Date: 2014-06-23 16:35:43 +0200 (Mon, 23 Jun 2014) New Revision: 254 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/254 Log: refs #4656 traitement des PJ non imprim?\195?\169es, en cours Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentImpl.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailField.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java trunk/faxtomail-service/src/test/resources/csv/clients.csv trunk/faxtomail-service/src/test/resources/csv/demandtypes.csv trunk/faxtomail-service/src/test/resources/csv/email_accounts.csv trunk/faxtomail-service/src/test/resources/csv/email_filters.csv trunk/faxtomail-service/src/test/resources/csv/etatattentes.csv trunk/faxtomail-service/src/test/resources/csv/fx_clients.csv trunk/faxtomail-service/src/test/resources/csv/priorities.csv trunk/faxtomail-service/src/test/resources/csv/ranges.csv trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenAttachmentAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIModel.java 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/AttachmentToPrintChooserUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/odt/demande.odt trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxComboBoxModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxListCellRenderer.java trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties trunk/faxtomail-ui-swing/src/main/resources/icons/action-edit.png trunk/faxtomail-ui-swing/src/main/resources/icons/action-email-group.png trunk/faxtomail-ui-swing/src/main/resources/icons/action-highlighter.png trunk/faxtomail-ui-swing/src/main/resources/icons/action-line.png trunk/faxtomail-ui-swing/src/main/resources/icons/action-rotate-anticlockwise.png trunk/faxtomail-ui-swing/src/main/resources/icons/action-rotate-clockwise.png trunk/faxtomail-ui-swing/src/main/resources/icons/action-zoom-in.png trunk/faxtomail-ui-swing/src/main/resources/icons/action-zoom-out.png trunk/faxtomail-ui-swing/src/main/resources/pdf/demande.pdf trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp trunk/faxtomail-ui-web/src/main/webapp/css/spinner.gif trunk/faxtomail-ui-web/src/main/webapp/js/chosen.js trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.js trunk/faxtomail-ui-web/src/main/webapp/js/select2sortable.js trunk/faxtomail-ui-web/src/main/webapp/js/user-folder.js Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentImpl.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentImpl.java 2014-06-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentImpl.java 2014-06-23 14:35:43 UTC (rev 254) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: Persistence - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailField.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailField.java 2014-06-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailField.java 2014-06-23 14:35:43 UTC (rev 254) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: Persistence - * $Id: MailField.java 145 2014-06-06 16:25:02Z echatellier $ - * $HeadURL: https://svn.codelutin.com/faxtomail/trunk/faxtomail-persistence/src/main/jav... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailField.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL 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-06-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-06-23 14:35:43 UTC (rev 254) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: Service - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-service/src/test/resources/csv/clients.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-service/src/test/resources/csv/demandtypes.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-service/src/test/resources/csv/email_accounts.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-service/src/test/resources/csv/email_filters.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-service/src/test/resources/csv/etatattentes.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-service/src/test/resources/csv/fx_clients.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-service/src/test/resources/csv/priorities.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-service/src/test/resources/csv/ranges.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java 2014-06-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java 2014-06-23 14:35:43 UTC (rev 254) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: UI - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-06-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-06-23 14:35:43 UTC (rev 254) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: UI - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenAttachmentAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.css 2014-06-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.css 2014-06-23 14:35:43 UTC (rev 254) @@ -1,8 +1,8 @@ /* * #%L * FaxToMail :: UI - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.jaxx 2014-06-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.jaxx 2014-06-23 14:35:43 UTC (rev 254) @@ -1,8 +1,8 @@ <!-- #%L FaxToMail :: UI - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2014 Franciaflex, Code Lutin %% Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.jaxx ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java 2014-06-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java 2014-06-23 14:35:43 UTC (rev 254) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: UI - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIModel.java 2014-06-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIModel.java 2014-06-23 14:35:43 UTC (rev 254) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: UI - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL 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-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-06-23 14:35:43 UTC (rev 254) @@ -77,7 +77,7 @@ AttachmentToPrintChooserUIModel model = getModel(); DemandeUIModel demand = model.getDemand(); - JCheckBox checkBox = new JCheckBox(t("faxtomail.chooseMailFolder.element"), false); + JCheckBox checkBox = new JCheckBox(t("faxtomail.chooseMailFolder.element"), true); ui.getAttachmentPanel().add(checkBox); // add demand details @@ -85,6 +85,7 @@ demandFile.setFilename("demand_details"); byte[] demandContent = getDocumentContent(); demandFile.setContent(demandContent); + getModel().addAttachmentToPrint(demandFile); // add attached files checkBox.addItemListener(new ItemListener() { @@ -153,11 +154,34 @@ } public void print() { + List<AttachmentFile> attachmentsToPrint = Lists.newArrayList(getModel().getAttachmentsToPrint()); + for (AttachmentFile attachmentFile : getModel().getAttachmentsToPrint()) { - if (StringUtils.isNotBlank(attachmentFile.getFilename())) { - FaxToMailUIUtil.print(attachmentFile, true); + try { + if (StringUtils.isNotBlank(attachmentFile.getFilename())) { + FaxToMailUIUtil.print(attachmentFile, true); + } + attachmentsToPrint.remove(attachmentFile); + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("Could not print attachement.", e); + } } } + // TODO DCossé 23/06/14 gérer les exceptions +// if (!attachmentsToPrint.isEmpty()) { + +// for (int i = 1; i < attachmentsToPrint.size(); i++) { +// AttachmentFile f = attachmentsToPrint.get(i); +// +// } +// t("faxtomail.demande.print.error.message",""); +// JOptionPane.showMessageDialog( +// getTopestUI(), +// "errorMessage", +// "errorMessageTitle", +// JOptionPane.ERROR_MESSAGE); +// } } public byte[] getDocumentContent() { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIModel.java 2014-06-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIModel.java 2014-06-23 14:35:43 UTC (rev 254) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: UI - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/odt/demande.odt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxComboBoxModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxComboBoxModel.java 2014-06-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxComboBoxModel.java 2014-06-23 14:35:43 UTC (rev 254) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: UI - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxComboBoxModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxListCellRenderer.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxListCellRenderer.java 2014-06-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxListCellRenderer.java 2014-06-23 14:35:43 UTC (rev 254) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: UI - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxListCellRenderer.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL 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-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-06-23 14:35:43 UTC (rev 254) @@ -121,6 +121,7 @@ faxtomail.demande.mailFolder.label=Dossier faxtomail.demande.object.label=Objet faxtomail.demande.print.button.label=Imprimer +faxtomail.demande.print.error.message=Les documents suivant n'ont pu être imprimé\: %s faxtomail.demande.printedBy.label=Imprimé par faxtomail.demande.priority.label=Priorité faxtomail.demande.projectReference.label=Référence chantier Property changes on: trunk/faxtomail-ui-swing/src/main/resources/icons/action-edit.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-ui-swing/src/main/resources/icons/action-email-group.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-ui-swing/src/main/resources/icons/action-highlighter.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-ui-swing/src/main/resources/icons/action-line.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-ui-swing/src/main/resources/icons/action-rotate-anticlockwise.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-ui-swing/src/main/resources/icons/action-rotate-clockwise.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-ui-swing/src/main/resources/icons/action-zoom-in.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-ui-swing/src/main/resources/icons/action-zoom-out.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-ui-swing/src/main/resources/pdf/demande.pdf ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java 2014-06-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java 2014-06-23 14:35:43 UTC (rev 254) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: Web - * $Id: UserFolderAction.java 121 2014-06-02 15:45:55Z echatellier $ - * $HeadURL: https://svn.codelutin.com/faxtomail/trunk/faxtomail-ui-web/src/main/java/com... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL 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-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java 2014-06-23 14:35:43 UTC (rev 254) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: Web - * $Id: MailFilterJob.java 82 2014-05-20 14:25:32Z echatellier $ - * $HeadURL: https://svn.codelutin.com/faxtomail/trunk/faxtomail-ui-web/src/main/java/com... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp 2014-06-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp 2014-06-23 14:35:43 UTC (rev 254) @@ -1,8 +1,8 @@ <%-- #%L FaxToMail :: Web - $Id: user-folder-input.jsp 121 2014-06-02 15:45:55Z echatellier $ - $HeadURL: https://svn.codelutin.com/faxtomail/trunk/faxtomail-ui-web/src/main/webapp/W... $ + $Id$ + $HeadURL$ %% Copyright (C) 2014 Franciaflex, Code Lutin %% Property changes on: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-ui-web/src/main/webapp/css/spinner.gif ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-ui-web/src/main/webapp/js/chosen.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.js 2014-06-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.js 2014-06-23 14:35:43 UTC (rev 254) @@ -1,8 +1,8 @@ /* * #%L * FaxToMail :: Web - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-ui-web/src/main/webapp/js/select2sortable.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-ui-web/src/main/webapp/js/user-folder.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/user-folder.js 2014-06-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-web/src/main/webapp/js/user-folder.js 2014-06-23 14:35:43 UTC (rev 254) @@ -1,8 +1,8 @@ /* * #%L * FaxToMail :: Web - * $Id: configuration.js 107 2014-05-30 08:55:55Z echatellier $ - * $HeadURL: https://svn.codelutin.com/faxtomail/trunk/faxtomail-ui-web/src/main/webapp/j... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-ui-web/src/main/webapp/js/user-folder.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL