This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit ddb677556cbd14ae87f97e51edcb91123612f782 Merge: 1afbc97 6f9b069 Author: Maven Release <maven-release@codelutin.com> Date: Mon May 4 09:13:29 2015 +0000 Merge branch 'release/1.1' .gitignore | 158 +++ faxtomail-persistence/pom.xml | 2 +- .../faxtomail/FaxToMailConfiguration.java | 39 +- .../faxtomail/FaxToMailConfigurationOption.java | 20 +- .../entities/AbstractFaxToMailTopiaDao.java | 35 +- .../persistence/entities/AttachmentFileImpl.java | 15 +- .../faxtomail/persistence/entities/ClientImpl.java | 4 +- .../persistence/entities/ClientTopiaDao.java | 7 +- .../persistence/entities/EmailFilter.java | 15 +- .../faxtomail/persistence/entities/EmailImpl.java | 13 +- .../persistence/entities/EmailTopiaDao.java | 221 +++- .../persistence/entities/HistoryImpl.java | 4 +- .../persistence/entities/HistoryType.java | 3 + .../faxtomail/persistence/entities/MailField.java | 1 + .../persistence/entities/MailFolderTopiaDao.java | 4 +- .../persistence/entities/SearchFilter.java | 4 +- .../persistence/hibernate/EnumListUserType.java | 8 +- .../persistence/hibernate/EnumSetUserType.java | 8 +- .../src/main/resources/faxToMail.properties | 7 +- .../i18n/faxtomail-persistence_fr_FR.properties | 3 + .../src/main/xmi/faxtomail.properties | 6 +- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 29652 -> 30153 bytes faxtomail-service/pom.xml | 27 +- .../src/license/THIRD-PARTY.properties | 8 +- .../faxtomail/services/DecoratorServiceImpl.java | 15 +- .../services/FaxToMailServiceContext.java | 24 +- .../faxtomail/services/FaxToMailServiceUtils.java | 36 +- .../faxtomail/services/service/ClientService.java | 2 +- .../services/service/ClientServiceImpl.java | 40 +- .../services/service/ConfigurationService.java | 10 +- .../services/service/ConfigurationServiceImpl.java | 40 +- .../faxtomail/services/service/EmailService.java | 87 +- .../services/service/EmailServiceImpl.java | 1180 ++++++++++++++++---- .../services/service/InitFaxToMailServiceImpl.java | 47 +- .../faxtomail/services/service/LdapService.java | 5 + .../services/service/LdapServiceImpl.java | 75 +- .../services/service/MailFolderService.java | 16 +- .../services/service/MailFolderServiceImpl.java | 63 +- .../services/service/ReferentielService.java | 8 +- .../services/service/ReferentielServiceImpl.java | 40 +- .../services/service/UserServiceImpl.java | 7 +- .../services/service/ValidationServiceImpl.java | 5 +- ...mportBean.java => ArchiveImportExportBean.java} | 37 +- .../service/imports/ArchiveImportExportModel.java | 146 +++ .../service/imports/ArchiveImportModel.java | 129 --- ...tyImportModel.java => ArchiveImportResult.java} | 43 +- .../service/imports/ClientImportModel.java | 1 - .../service/imports/DemandTypeImportModel.java | 3 +- .../service/imports/EmailAccountImportModel.java | 5 +- .../InvalidArchiveImportBeanException.java} | 26 +- .../service/imports/PriorityImportModel.java | 3 +- .../services/service/imports/RangeImportModel.java | 3 +- .../service/imports/WaitingStateImportModel.java | 3 +- .../faxtomail/services/service/ldap/Contact.java | 65 ++ .../services/service/ldap/LdapServiceMock.java | 9 +- .../validators/FaxToMailEmailsValidator.java | 47 + .../h2/V1_1_0_733__extract_originalemail.sql | 24 + .../V1_1_0_733__extract_originalemail.sql | 29 + .../i18n/faxtomail-service_fr_FR.properties | 7 + .../src/main/resources/validators.xml | 1 + .../service/AbstractFaxToMailServiceTest.java | 35 +- .../services/service/ClientServiceTest.java | 56 +- .../services/service/EmailServiceTest.java | 123 +- .../faxtomail/services/service/InitTestData.java | 4 +- .../services/service/InitTestDataImpl.java | 62 +- .../services/service/MailFolderServiceTest.java | 41 +- .../faxtomail/services/service/MiscTest.java | 7 +- .../service/migration/FlywayMigrationTest.java | 23 +- faxtomail-ui-swing/pom.xml | 63 +- .../src/license/THIRD-PARTY.properties | 37 +- .../faxtomail/ui/swing/FaxToMailUIContext.java | 208 +++- .../faxtomail/ui/swing/RunFaxToMail.java | 4 - .../swing/actions/AbstractChangeScreenAction.java | 1 - .../ui/swing/actions/AddAttachmentAction.java | 48 +- .../faxtomail/ui/swing/actions/ArchiveAction.java | 55 +- .../ui/swing/actions/ArchiveFromListAction.java | 7 +- .../ui/swing/actions/EditAttachmentAction.java | 25 +- .../actions/GenerateAnnotatedAttachmentAction.java | 57 +- .../ui/swing/actions/LoadFolderEmailsAction.java | 109 +- .../ui/swing/actions/OpenGroupedDemandAction.java | 6 + .../OpenMailFolderChooserFromListAction.java | 13 +- .../ui/swing/actions/OpenReplyAction.java | 132 +++ .../ui/swing/actions/OpenReplyFormAction.java | 104 ++ .../swing/actions/PrintOnDefaultPrinterAction.java | 3 - .../faxtomail/ui/swing/actions/ReplyAction.java | 2 - .../SaveAndOpenMailFolderChooserAction.java | 2 +- .../swing/actions/SaveAndOpenModalFrameAction.java | 16 +- .../swing/actions/SaveAndOpenReplyFormAction.java | 5 +- .../ui/swing/actions/SaveDemandeAction.java | 52 +- .../faxtomail/ui/swing/actions/SearchAction.java | 40 +- .../ui/swing/actions/SearchToGroupAction.java | 41 +- .../ui/swing/actions/ShowAboutAction.java | 1 + .../ui/swing/actions/ShowDemandeAction.java | 5 +- .../ui/swing/actions/ShowDemandeListAction.java | 3 - .../faxtomail/ui/swing/actions/TransmitAction.java | 23 +- .../faxtomail/ui/swing/content/MainUI.css | 2 +- .../faxtomail/ui/swing/content/MainUIHandler.java | 57 +- .../content/attachment/AttachmentCellEditor.java | 10 +- .../content/attachment/AttachmentEditorUI.css | 5 + .../attachment/AttachmentEditorUIHandler.java | 30 +- .../attachment/AttachmentEditorUIModel.java | 7 - .../content/attachment/AttachmentListener.java | 25 +- .../swing/content/attachment/ButtonAttachment.java | 11 +- .../content/demande/DemandeListTableFilter.java | 19 +- .../ui/swing/content/demande/DemandeListUI.css | 3 + .../ui/swing/content/demande/DemandeListUI.jaxx | 9 +- .../content/demande/DemandeListUIHandler.java | 423 ++++--- .../swing/content/demande/DemandeListUIModel.java | 11 +- .../ui/swing/content/demande/DemandeUI.css | 4 - .../ui/swing/content/demande/DemandeUIHandler.java | 302 ++--- .../ui/swing/content/demande/DemandeUIModel.java | 146 ++- .../swing/content/demande/DemandesUIHandler.java | 68 +- .../ui/swing/content/demande/DemandesUIModel.java | 14 +- .../ui/swing/content/demande/DemandsListener.java | 23 +- .../content/demande/QuantitiesByRangeUIModel.java | 7 +- .../ui/swing/content/demande/RangeTableModel.java | 1 + .../demande/demandgroup/ButtonEmailGroup.java | 29 +- .../demandgroup/DemandGroupCellRenderer.java | 2 - .../demande/demandgroup/DemandGroupUIHandler.java | 20 +- .../content/demande/history/ButtonHistory.java | 7 + .../demande/history/HistoryListUIHandler.java | 5 +- .../demande/replies/ButtonDemandReplies.java | 10 +- .../demande/replies/DemandRepliesUIHandler.java | 142 +-- .../content/demande/replies/RepliesCellEditor.java | 6 +- .../ui/swing/content/pdfeditor/PDFEditorUI.css | 6 +- .../content/pdfeditor/PDFEditorUIHandler.java | 146 ++- .../swing/content/pdfeditor/PDFEditorUIModel.java | 27 +- .../print/AttachmentToPrintChooserUIHandler.java | 28 +- .../ui/swing/content/reply/ReplyFormUI.css | 37 + .../ui/swing/content/reply/ReplyFormUI.jaxx | 40 +- .../ui/swing/content/reply/ReplyFormUIHandler.java | 134 ++- .../ui/swing/content/reply/ReplyFormUIModel.java | 30 +- .../content/search/SearchToGroupUIHandler.java | 96 +- .../ui/swing/content/search/SearchUIHandler.java | 70 +- .../ui/swing/content/search/SearchUIModel.java | 19 +- .../transmit/MailFolderChooserUIHandler.java | 35 +- .../content/transmit/MailFolderChooserUIModel.java | 7 +- .../util/AbstractFaxToMailDemandListHandler.java | 109 +- .../ui/swing/util/AbstractFaxToMailUIHandler.java | 132 ++- .../ui/swing/util/CheckBoxListCellRenderer.java | 13 +- .../faxtomail/ui/swing/util/DemandeTableModel.java | 314 +++++- .../ui/swing/util/FaxToMailExceptionHandler.java | 43 +- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 279 +++-- .../ui/swing/util/PaginationComboModel.java | 2 +- .../reply/ReplyFormUIModel-error-validation.xml | 6 +- .../i18n/faxtomail-ui-swing_fr_FR.properties | 13 +- faxtomail-ui-swing/src/main/resources/log4j2.xml | 7 +- faxtomail-ui-web/pom.xml | 27 +- .../src/license/THIRD-PARTY.properties | 24 +- .../faxtomail/FaxToMailApplicationContext.java | 16 +- .../faxtomail/web/FaxToMailActionSupport.java | 17 +- .../web/FaxToMailApplicationListener.java | 19 +- .../web/FaxToMailExecuteAndWaitInterceptor.java | 83 ++ .../faxtomail/web/FaxToMailInterceptor.java | 28 +- .../faxtomail/web/FaxToMailJsonAction.java | 3 +- .../faxtomail/web/FaxToMailJsonResultSupport.java | 16 +- .../franciaflex/faxtomail/web/HasUploadedFile.java | 20 +- .../faxtomail/web/action/DemandDetailAction.java | 529 +++++++++ .../faxtomail/web/action/IndexAction.java | 1 - .../faxtomail/web/action/LoginAction.java | 5 +- .../faxtomail/web/action/LogoutAction.java | 3 +- .../faxtomail/web/action/SearchAction.java | 393 +++++++ .../web/action/admin/ConfigurationAction.java | 21 +- .../web/action/admin/ConfigurationJsonAction.java | 3 +- .../faxtomail/web/action/admin/ImportAction.java | 13 +- .../web/action/admin/ImportArchiveAction.java | 196 +++- .../faxtomail/web/action/admin/LdapAction.java | 11 +- .../faxtomail/web/action/admin/LockAction.java | 11 +- .../web/action/admin/UserFolderAction.java | 25 +- .../faxtomail/web/job/AbstractFaxToMailJob.java | 3 +- .../faxtomail/web/job/ClientUpdateJob.java | 9 +- .../faxtomail/web/job/EDIManagementJob.java | 1 - .../faxtomail/web/job/MailFilterJob.java | 547 +++------ .../web/json/HibernateProxyTypeAdapter.java | 9 +- .../faxtomail/web/json/TopiaEntityAdapter.java | 7 +- .../i18n/faxtomail-ui-web_fr_FR.properties | 12 +- faxtomail-ui-web/src/main/resources/log4j2.xml | 9 +- .../src/main/resources/struts.properties | 3 + faxtomail-ui-web/src/main/resources/struts.xml | 1 + .../WEB-INF/content/admin/configuration-input.jsp | 18 + .../WEB-INF/content/admin/import-archive-input.jsp | 63 +- .../WEB-INF/content/admin/import-archive-wait.jsp | 44 + .../webapp/WEB-INF/content/admin/lock-input.jsp | 2 +- .../WEB-INF/content/admin/user-folder-input.jsp | 2 +- .../main/webapp/WEB-INF/content/demand-detail.jsp | 308 +++++ .../main/webapp/WEB-INF/content/search-input.jsp | 93 ++ .../src/main/webapp/WEB-INF/decorators/layout.jsp | 49 +- faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml | 14 +- .../css/demand-detail.css} | 62 +- faxtomail-ui-web/src/main/webapp/css/faxtomail.css | 7 + .../src/main/webapp/js/demand-detail.js | 30 +- faxtomail-ui-web/src/main/webapp/js/faxtomail.js | 8 + pom.xml | 158 ++- 193 files changed, 7244 insertions(+), 2976 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.