branch develop updated (69bbf29 -> 334943b)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git from 69bbf29 [jgitflow-maven-plugin]updating poms for 1.3-SNAPSHOT development new cef9cf3 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 3e7a2b4 [jgitflow-maven-plugin]updating poms for branch'release/1.2' with non-snapshot versions new dd7b442 Merge branch 'release/1.2' new 75e53d6 Merge branch 'master' into develop new 334943b [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 334943bfbd3a11c60c683c2fadda1aaabd1ca39f Author: Maven Release <maven-release@codelutin.com> Date: Wed May 6 10:02:00 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 75e53d617869de863dc2ca6ef27690c3ccf1b6c3 Merge: cef9cf3 dd7b442 Author: Maven Release <maven-release@codelutin.com> Date: Wed May 6 10:01:59 2015 +0000 Merge branch 'master' into develop commit cef9cf312edbde980bc32b81c1e61102aba8ae58 Author: Maven Release <maven-release@codelutin.com> Date: Wed May 6 10:01:59 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit dd7b44204ac1b3e8a37ecab604feba0b24608868 Merge: ddb6775 3e7a2b4 Author: Maven Release <maven-release@codelutin.com> Date: Wed May 6 10:01:57 2015 +0000 Merge branch 'release/1.2' commit 3e7a2b4653e8fffd10425db332886cbc43dbb7f7 Author: Maven Release <maven-release@codelutin.com> Date: Wed May 6 09:58:50 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/1.2' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 3e7a2b4653e8fffd10425db332886cbc43dbb7f7 Author: Maven Release <maven-release@codelutin.com> Date: Wed May 6 09:58:50 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/1.2' with non-snapshot versions --- faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/faxtomail-persistence/pom.xml b/faxtomail-persistence/pom.xml index 4ff9b14..7bef99a 100644 --- a/faxtomail-persistence/pom.xml +++ b/faxtomail-persistence/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index bb03f89..907cd36 100644 --- a/faxtomail-service/pom.xml +++ b/faxtomail-service/pom.xml @@ -27,7 +27,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 3e9383c..f44b982 100644 --- a/faxtomail-ui-swing/pom.xml +++ b/faxtomail-ui-swing/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index d150e62..f0dd9fa 100644 --- a/faxtomail-ui-web/pom.xml +++ b/faxtomail-ui-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index a0b6808..19141ec 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> <packaging>pom</packaging> <name>FaxToMail</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 dd7b44204ac1b3e8a37ecab604feba0b24608868 Merge: ddb6775 3e7a2b4 Author: Maven Release <maven-release@codelutin.com> Date: Wed May 6 10:01:57 2015 +0000 Merge branch 'release/1.2' .gitignore | 1 + faxtomail-persistence/pom.xml | 2 +- .../persistence/entities/BrandsForDomainImpl.java | 35 +- .../src/main/resources/faxToMail.properties | 2 +- .../src/main/xmi/faxtomail.properties | 10 +- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 30153 -> 31055 bytes faxtomail-service/pom.xml | 2 +- .../faxtomail/services/DecoratorServiceImpl.java | 2 + .../services/FaxToMailServiceSupport.java | 1 + .../faxtomail/services/service/ClientService.java | 4 +- .../services/service/ClientServiceImpl.java | 34 +- .../services/service/ConfigurationService.java | 8 +- .../services/service/ConfigurationServiceImpl.java | 48 +- .../services/service/EmailServiceImpl.java | 1 + .../services/service/InitFaxToMailServiceImpl.java | 25 +- ...s_for_domain_and_matching_clients_in_emails.sql | 29 + ...s_for_domain_and_matching_clients_in_emails.sql | 32 + .../services/service/ClientServiceTest.java | 37 +- faxtomail-ui-swing/pom.xml | 2 +- .../ui/swing/content/demande/DemandeUI.css | 5 + .../ui/swing/content/demande/DemandeUI.jaxx | 25 +- .../ui/swing/content/demande/DemandeUIHandler.java | 25 +- .../ui/swing/content/demande/DemandeUIModel.java | 14 +- .../src/main/resources/icons/action-warning.png | Bin 0 -> 666 bytes faxtomail-ui-web/pom.xml | 2 +- .../web/action/admin/ConfigurationAction.java | 17 +- .../faxtomail/web/job/MailFilterJob.java | 17 +- .../WEB-INF/content/admin/configuration-input.jsp | 53 + .../src/main/webapp/js/configuration.js | 32 + pom.xml | 4 +- trunk/LICENSE.txt | 674 --------- trunk/README.txt | 0 trunk/faxtomail-persistence/LICENSE.txt | 674 --------- trunk/faxtomail-persistence/README.txt | 0 trunk/faxtomail-persistence/pom.xml | 165 --- .../src/license/THIRD-PARTY.properties | 53 - .../faxtomail/FaxToMailConfiguration.java | 426 ------ .../faxtomail/FaxToMailConfigurationOption.java | 385 ----- .../faxtomail/FaxToMailConfigurationProvider.java | 62 - .../faxtomail/persistence/ProgressionModel.java | 48 - .../persistence/RessourceClassLoader.java | 189 --- .../entities/AbstractFaxToMailTopiaDao.java | 61 - .../persistence/entities/AttachmentFileImpl.java | 115 -- .../faxtomail/persistence/entities/ClientImpl.java | 65 - .../persistence/entities/ClientTopiaDao.java | 58 - .../persistence/entities/DemandStatus.java | 62 - .../faxtomail/persistence/entities/EdiReturn.java | 38 - .../persistence/entities/EmailFilter.java | 303 ---- .../faxtomail/persistence/entities/EmailImpl.java | 201 --- .../persistence/entities/EmailProtocol.java | 44 - .../persistence/entities/EmailTopiaDao.java | 1027 ------------- .../entities/ExtensionCommandTopiaDao.java | 42 - .../persistence/entities/HistoryImpl.java | 52 - .../persistence/entities/HistoryType.java | 63 - .../faxtomail/persistence/entities/MailAction.java | 37 - .../faxtomail/persistence/entities/MailField.java | 100 -- .../persistence/entities/MailFilterTopiaDao.java | 50 - .../persistence/entities/MailFolderImpl.java | 66 - .../persistence/entities/MailFolderTopiaDao.java | 75 - .../faxtomail/persistence/entities/NewClient.java | 45 - .../persistence/entities/SearchFilter.java | 461 ------ .../persistence/entities/WaitingStateTopiaDao.java | 87 -- .../persistence/hibernate/EnumListUserType.java | 155 -- .../persistence/hibernate/EnumSetUserType.java | 161 -- .../hibernate/MailActionEnumSetUserType.java | 35 - .../hibernate/MailFieldEnumListUserType.java | 35 - .../hibernate/MailFieldEnumSetUserType.java | 35 - .../org.nuiton.config.ApplicationConfigProvider | 1 - .../src/main/resources/faxToMail.properties | 43 - .../i18n/faxtomail-persistence_fr_FR.properties | 46 - .../src/main/xmi/faxtomail.properties | 130 -- .../src/main/xmi/faxtomail.zargo | Bin 29652 -> 0 bytes trunk/faxtomail-service/LICENSE.txt | 674 --------- trunk/faxtomail-service/README.txt | 0 trunk/faxtomail-service/pom.xml | 234 --- .../src/license/THIRD-PARTY.properties | 37 - .../faxtomail/services/DecoratorService.java | 46 - .../faxtomail/services/DecoratorServiceImpl.java | 143 -- .../faxtomail/services/FaxToMailDecorator.java | 285 ---- .../faxtomail/services/FaxToMailService.java | 30 - .../services/FaxToMailServiceContext.java | 260 ---- .../services/FaxToMailServiceFactory.java | 36 - .../FaxToMailServiceInvocationHandler.java | 58 - .../services/FaxToMailServiceSupport.java | 85 -- .../faxtomail/services/FaxToMailServiceUtils.java | 77 - .../faxtomail/services/service/ClientService.java | 40 - .../services/service/ClientServiceImpl.java | 284 ---- .../services/service/ConfigurationService.java | 71 - .../services/service/ConfigurationServiceImpl.java | 606 -------- .../faxtomail/services/service/EmailService.java | 139 -- .../services/service/EmailServiceImpl.java | 1532 -------------------- .../services/service/InitFaxToMailService.java | 34 - .../services/service/InitFaxToMailServiceImpl.java | 465 ------ .../faxtomail/services/service/LdapService.java | 42 - .../services/service/LdapServiceImpl.java | 395 ----- .../services/service/MailFolderService.java | 65 - .../services/service/MailFolderServiceImpl.java | 328 ----- .../services/service/ReferentielService.java | 68 - .../services/service/ReferentielServiceImpl.java | 373 ----- .../faxtomail/services/service/UserService.java | 56 - .../services/service/UserServiceImpl.java | 95 -- .../services/service/ValidationService.java | 36 - .../services/service/ValidationServiceImpl.java | 48 - .../exceptions/AlreadyLockedMailException.java | 49 - .../exceptions/FolderNotReadableException.java | 44 - .../service/exceptions/InvalidClientException.java | 41 - .../service/imports/ArchiveImportBean.java | 73 - .../service/imports/ArchiveImportModel.java | 129 -- .../services/service/imports/ClientImportBean.java | 56 - .../service/imports/ClientImportModel.java | 92 -- .../service/imports/DemandTypeImportModel.java | 47 - .../service/imports/EmailAccountImportModel.java | 72 - .../service/imports/EmailFilterImportModel.java | 64 - .../service/imports/PriorityImportModel.java | 47 - .../services/service/imports/RangeImportModel.java | 47 - .../service/imports/WaitingStateImportModel.java | 47 - .../service/ldap/AuthenticationException.java | 36 - .../services/service/ldap/LdapServiceMock.java | 115 -- .../migration/FaxtomailFlywayMigrationService.java | 57 - .../validators/FaxToMailEmailValidator.java | 42 - .../entities/Email-error-validation.xml | 51 - ..._0_442__move_object_to_folder_configuration.sql | 60 - ..._0_448__add_mail_folder_level_configuration.sql | 6 - .../migration/h2/V1_0_0_454__add_ldap_config.sql | 6 - ...omailusergroup_loop_association_and_add_idx.sql | 39 - .../h2/V1_0_0_520__add_performance_indexes.sql | 18 - .../h2/V1_0_0_580__transform_enum_set_to_lists.sql | 25 - .../V1_0_0_583__readd_editranfer_on_demandtype.sql | 4 - .../h2/V1_0_0_597__mise_a_jour_performances.sql | 81 -- ...1_0_0_620__modification_newclient_edireturn.sql | 43 - .../h2/V1_0_0_662__add_company_in_mailfolder.sql | 5 - ..._0_442__move_object_to_folder_configuration.sql | 60 - ..._0_448__add_mail_folder_level_configuration.sql | 6 - .../postgres/V1_0_0_454__add_ldap_config.sql | 6 - ...omailusergroup_loop_association_and_add_idx.sql | 39 - .../V1_0_0_520__add_performance_indexes.sql | 18 - .../V1_0_0_580__transform_enum_set_to_lists.sql | 25 - .../V1_0_0_583__readd_editranfer_on_demandtype.sql | 4 - .../V1_0_0_597__mise_a_jour_performances.sql | 81 -- ...1_0_0_620__modification_newclient_edireturn.sql | 43 - .../V1_0_0_662__add_company_in_mailfolder.sql | 5 - ..._0_442__move_object_to_folder_configuration.sql | 66 - ..._0_448__add_mail_folder_level_configuration.sql | 7 - .../sqlserver/V1_0_0_454__add_ldap_config.sql | 7 - ...omailusergroup_loop_association_and_add_idx.sql | 47 - .../V1_0_0_520__add_performance_indexes.sql | 18 - .../V1_0_0_580__transform_enum_set_to_lists.sql | 33 - .../V1_0_0_583__readd_editranfer_on_demandtype.sql | 5 - .../V1_0_0_597__mise_a_jour_performances.sql | 90 -- ...1_0_0_620__modification_newclient_edireturn.sql | 50 - .../V1_0_0_662__add_company_in_mailfolder.sql | 6 - .../i18n/faxtomail-service_fr_FR.properties | 6 - .../src/main/resources/pdf/demande.mustache | 124 -- .../src/main/resources/validators.xml | 51 - .../service/AbstractFaxToMailServiceTest.java | 253 ---- .../services/service/ClientServiceTest.java | 123 -- .../services/service/EmailServiceTest.java | 217 --- .../faxtomail/services/service/InitTestData.java | 38 - .../services/service/InitTestDataImpl.java | 354 ----- .../services/service/MailFolderServiceTest.java | 82 -- .../faxtomail/services/service/MiscTest.java | 83 -- .../service/migration/FlywayMigrationTest.java | 117 -- .../src/test/resources/archives/archives.csv | 2 - .../src/test/resources/archives/att1.txt | 1 - .../src/test/resources/archives/att2.txt | 1 - .../src/test/resources/csv/clients.csv | 5 - .../src/test/resources/csv/demandtypes.csv | 4 - .../src/test/resources/csv/email_accounts.csv | 2 - .../src/test/resources/csv/email_filters.csv | 8 - .../src/test/resources/csv/etatattentes.csv | 6 - .../src/test/resources/csv/fx_clients.csv | 5 - .../src/test/resources/csv/priorities.csv | 5 - .../src/test/resources/csv/ranges.csv | 6 - .../src/test/resources/db/h2data-1_0_0_rc2.h2.db | Bin 509952 -> 0 bytes .../src/test/resources/log4j2.xml | 42 - trunk/faxtomail-ui-swing/LICENSE.txt | 674 --------- trunk/faxtomail-ui-swing/README.txt | 0 trunk/faxtomail-ui-swing/pom.xml | 764 ---------- .../src/license/THIRD-PARTY.properties | 69 - .../src/main/assembly/faxtomail-full-component.xml | 108 -- .../src/main/assembly/full-linux-i586.xml | 53 - .../src/main/assembly/full-linux-x64.xml | 53 - .../src/main/assembly/full-windows-i586.xml | 53 - .../src/main/assembly/full-windows-x64.xml | 52 - .../src/main/assembly/full/faxtomail.bat | 27 - .../src/main/assembly/full/faxtomail.sh | 51 - .../faxtomail-ui-swing/src/main/assembly/i18n.xml | 53 - .../src/main/assembly/min/README.txt | 0 .../src/main/assembly/min/launch.bat | 10 - .../src/main/assembly/min/launch.sh | 35 - .../src/main/assembly/standalone.xml | 74 - .../main/filtered-resources/faxToMail.properties | 25 - .../faxtomail/ui/swing/FaxToMailActionFactory.java | 58 - .../faxtomail/ui/swing/FaxToMailScreen.java | 37 - .../faxtomail/ui/swing/FaxToMailUIContext.java | 768 ---------- .../faxtomail/ui/swing/RunFaxToMail.java | 181 --- .../swing/actions/AbstractChangeScreenAction.java | 121 -- .../ui/swing/actions/AbstractFaxToMailAction.java | 80 - .../actions/AbstractMainUIFaxToMailAction.java | 38 - .../ui/swing/actions/AddAttachmentAction.java | 72 - .../swing/actions/AddAttachmentToReplyAction.java | 70 - .../faxtomail/ui/swing/actions/ArchiveAction.java | 106 -- .../ui/swing/actions/ArchiveFromListAction.java | 152 -- .../ui/swing/actions/CloseApplicationAction.java | 55 - .../actions/ComputeQuantitiesByRangeAction.java | 94 -- .../ui/swing/actions/EditAttachmentAction.java | 99 -- .../actions/GenerateAnnotatedAttachmentAction.java | 337 ----- .../ui/swing/actions/GoToPreviousScreenAction.java | 43 - .../faxtomail/ui/swing/actions/GroupAction.java | 94 -- .../ui/swing/actions/LoadFolderEmailsAction.java | 187 --- .../ui/swing/actions/OpenAttachmentAction.java | 61 - .../ui/swing/actions/OpenGroupedDemandAction.java | 176 --- .../OpenMailFolderChooserFromListAction.java | 109 -- .../swing/actions/PrintOnDefaultPrinterAction.java | 187 --- .../ui/swing/actions/ReloadFaxToMailAction.java | 49 - .../faxtomail/ui/swing/actions/ReplyAction.java | 92 -- .../SaveAndOpenChooseAttachmentToPrintAction.java | 68 - .../SaveAndOpenMailFolderChooserAction.java | 68 - .../swing/actions/SaveAndOpenModalFrameAction.java | 66 - .../swing/actions/SaveAndOpenReplyFormAction.java | 76 - .../actions/SaveAndOpenSearchToGroupAction.java | 59 - .../ui/swing/actions/SaveDemandeAction.java | 151 -- .../ui/swing/actions/SaveDemandeAndExitAction.java | 44 - .../swing/actions/SaveDemandeFromListAction.java | 72 - .../faxtomail/ui/swing/actions/SearchAction.java | 109 -- .../ui/swing/actions/SearchToGroupAction.java | 120 -- .../ui/swing/actions/ShowAboutAction.java | 91 -- .../ui/swing/actions/ShowDemandeAction.java | 170 --- .../ui/swing/actions/ShowDemandeListAction.java | 52 - .../ui/swing/actions/ShowRechercheAction.java | 47 - .../faxtomail/ui/swing/actions/TransmitAction.java | 140 -- .../faxtomail/ui/swing/content/Common.css | 26 - .../faxtomail/ui/swing/content/MainUI.css | 86 -- .../faxtomail/ui/swing/content/MainUI.jaxx | 68 - .../faxtomail/ui/swing/content/MainUIHandler.java | 391 ----- .../content/attachment/AttachmentCellEditor.java | 190 --- .../content/attachment/AttachmentCellRenderer.java | 120 -- .../content/attachment/AttachmentEditorUI.css | 59 - .../content/attachment/AttachmentEditorUI.jaxx | 72 - .../attachment/AttachmentEditorUIHandler.java | 262 ---- .../attachment/AttachmentEditorUIModel.java | 135 -- .../ui/swing/content/attachment/AttachmentItem.css | 61 - .../swing/content/attachment/AttachmentItem.jaxx | 51 - .../content/attachment/AttachmentModelAware.java | 49 - .../swing/content/attachment/ButtonAttachment.java | 112 -- .../content/demande/DemandeListTableFilter.java | 302 ---- .../ui/swing/content/demande/DemandeListUI.css | 156 -- .../ui/swing/content/demande/DemandeListUI.jaxx | 120 -- .../content/demande/DemandeListUIHandler.java | 636 -------- .../swing/content/demande/DemandeListUIModel.java | 290 ---- .../ui/swing/content/demande/DemandeUI.css | 342 ----- .../ui/swing/content/demande/DemandeUI.jaxx | 336 ----- .../ui/swing/content/demande/DemandeUIHandler.java | 535 ------- .../ui/swing/content/demande/DemandeUIModel.java | 969 ------------- .../ui/swing/content/demande/DemandesUI.css | 71 - .../ui/swing/content/demande/DemandesUI.jaxx | 66 - .../swing/content/demande/DemandesUIHandler.java | 346 ----- .../ui/swing/content/demande/DemandesUIModel.java | 176 --- .../swing/content/demande/QuantitiesByRangeUI.css | 30 - .../swing/content/demande/QuantitiesByRangeUI.jaxx | 53 - .../demande/QuantitiesByRangeUIHandler.java | 119 -- .../content/demande/QuantitiesByRangeUIModel.java | 66 - .../ui/swing/content/demande/RangeRowModel.java | 127 -- .../ui/swing/content/demande/RangeTableModel.java | 79 - .../demande/demandgroup/ButtonEmailGroup.java | 71 - .../demandgroup/DemandGroupCellRenderer.java | 106 -- .../demande/demandgroup/DemandGroupItem.css | 40 - .../demande/demandgroup/DemandGroupItem.jaxx | 50 - .../content/demande/demandgroup/DemandGroupUI.css | 34 - .../content/demande/demandgroup/DemandGroupUI.jaxx | 46 - .../demande/demandgroup/DemandGroupUIHandler.java | 181 --- .../content/demande/history/ButtonHistory.java | 86 -- .../swing/content/demande/history/HistoryItem.css | 63 - .../swing/content/demande/history/HistoryItem.jaxx | 60 - .../content/demande/history/HistoryItemModel.java | 103 -- .../content/demande/history/HistoryListUI.css | 30 - .../content/demande/history/HistoryListUI.jaxx | 44 - .../demande/history/HistoryListUIHandler.java | 233 --- .../demande/replies/ButtonDemandReplies.java | 102 -- .../content/demande/replies/DemandRepliesUI.css | 42 - .../content/demande/replies/DemandRepliesUI.jaxx | 49 - .../demande/replies/DemandRepliesUIHandler.java | 373 ----- .../content/demande/replies/DemandReplyItem.css | 51 - .../content/demande/replies/DemandReplyItem.jaxx | 58 - .../content/demande/replies/RepliesCellEditor.java | 133 -- .../demande/replies/RepliesCellRenderer.java | 108 -- .../swing/content/pdfeditor/PDFEditorCrossUI.css | 39 - .../swing/content/pdfeditor/PDFEditorCrossUI.jaxx | 63 - .../content/pdfeditor/PDFEditorHighlighterUI.css | 38 - .../content/pdfeditor/PDFEditorHighlighterUI.jaxx | 51 - .../ui/swing/content/pdfeditor/PDFEditorLineUI.css | 38 - .../swing/content/pdfeditor/PDFEditorLineUI.jaxx | 69 - .../ui/swing/content/pdfeditor/PDFEditorNoteUI.css | 56 - .../swing/content/pdfeditor/PDFEditorNoteUI.jaxx | 84 -- .../ui/swing/content/pdfeditor/PDFEditorUI.css | 128 -- .../ui/swing/content/pdfeditor/PDFEditorUI.jaxx | 104 -- .../content/pdfeditor/PDFEditorUIHandler.java | 584 -------- .../swing/content/pdfeditor/PDFEditorUIModel.java | 273 ---- .../content/print/AttachmentToPrintChooserUI.css | 40 - .../content/print/AttachmentToPrintChooserUI.jaxx | 62 - .../print/AttachmentToPrintChooserUIHandler.java | 177 --- .../print/AttachmentToPrintChooserUIModel.java | 76 - .../ui/swing/content/reply/AttachmentItem.css | 49 - .../ui/swing/content/reply/AttachmentItem.jaxx | 50 - .../swing/content/reply/ReplyAttachmentModel.java | 82 -- .../ui/swing/content/reply/ReplyFormUI.css | 150 -- .../ui/swing/content/reply/ReplyFormUI.jaxx | 171 --- .../ui/swing/content/reply/ReplyFormUIHandler.java | 440 ------ .../ui/swing/content/reply/ReplyFormUIModel.java | 357 ----- .../ui/swing/content/search/SearchToGroupUI.css | 333 ----- .../ui/swing/content/search/SearchToGroupUI.jaxx | 399 ----- .../content/search/SearchToGroupUIHandler.java | 383 ----- .../faxtomail/ui/swing/content/search/SearchUI.css | 332 ----- .../ui/swing/content/search/SearchUI.jaxx | 413 ------ .../ui/swing/content/search/SearchUIHandler.java | 354 ----- .../ui/swing/content/search/SearchUIModel.java | 471 ------ .../swing/content/transmit/MailFolderChooserUI.css | 47 - .../content/transmit/MailFolderChooserUI.jaxx | 54 - .../transmit/MailFolderChooserUIHandler.java | 144 -- .../content/transmit/MailFolderChooserUIModel.java | 68 - .../swing/util/AbstractFaxToMailBeanUIModel.java | 155 -- .../util/AbstractFaxToMailDemandListHandler.java | 349 ----- .../ui/swing/util/AbstractFaxToMailUIHandler.java | 489 ------- .../ui/swing/util/AbstractToolbarPopupButton.java | 116 -- .../ui/swing/util/AbstractToolbarPopupHandler.java | 150 -- .../ui/swing/util/AbstractToolbarPopupUI.css | 27 - .../ui/swing/util/AbstractToolbarPopupUI.jaxx | 56 - .../ui/swing/util/CheckBoxComboBoxModel.java | 81 -- .../ui/swing/util/CheckBoxListCellRenderer.java | 526 ------- .../faxtomail/ui/swing/util/DemandeTableModel.java | 199 --- .../ui/swing/util/FaxToMailExceptionHandler.java | 87 -- .../faxtomail/ui/swing/util/FaxToMailUI.java | 35 - .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 720 --------- .../faxtomail/ui/swing/util/FolderTreeNode.java | 67 - .../faxtomail/ui/swing/util/JImagePanel.java | 171 --- .../ui/swing/util/PaginationComboModel.java | 40 - .../util/RemoveablePropertyChangeListener.java | 33 - .../faxtomail/ui/swing/util/UIMessageNotifier.java | 33 - .../src/main/resources/PoetsenOne-Regular.ttf | Bin 172456 -> 0 bytes .../demande/DemandeUIModel-error-validation.xml | 111 -- .../reply/ReplyFormUIModel-error-validation.xml | 74 - .../i18n/faxtomail-ui-swing_fr_FR.properties | 332 ----- .../src/main/resources/icons/action-about.png | Bin 936 -> 0 bytes .../src/main/resources/icons/action-archive.png | Bin 766 -> 0 bytes .../src/main/resources/icons/action-attachment.png | Bin 391 -> 0 bytes .../src/main/resources/icons/action-cancel.png | Bin 587 -> 0 bytes .../src/main/resources/icons/action-collapse.png | Bin 372 -> 0 bytes .../src/main/resources/icons/action-compute.png | Bin 543 -> 0 bytes .../src/main/resources/icons/action-config.png | Bin 611 -> 0 bytes .../src/main/resources/icons/action-cross.png | Bin 626 -> 0 bytes .../src/main/resources/icons/action-delete.png | Bin 715 -> 0 bytes .../src/main/resources/icons/action-edit.png | Bin 450 -> 0 bytes .../main/resources/icons/action-email-group.png | Bin 821 -> 0 bytes .../src/main/resources/icons/action-email.png | Bin 783 -> 0 bytes .../src/main/resources/icons/action-exit.png | Bin 830 -> 0 bytes .../src/main/resources/icons/action-expand.png | Bin 371 -> 0 bytes .../main/resources/icons/action-folder_edit.png | Bin 733 -> 0 bytes .../src/main/resources/icons/action-group.png | Bin 343 -> 0 bytes .../main/resources/icons/action-highlighter.png | Bin 155 -> 0 bytes .../src/main/resources/icons/action-hline.png | Bin 344 -> 0 bytes .../src/main/resources/icons/action-import.png | Bin 532 -> 0 bytes .../src/main/resources/icons/action-left.png | Bin 345 -> 0 bytes .../src/main/resources/icons/action-line.png | Bin 344 -> 0 bytes .../src/main/resources/icons/action-list.png | Bin 675 -> 0 bytes .../src/main/resources/icons/action-new-demand.png | Bin 512 -> 0 bytes .../src/main/resources/icons/action-note.png | Bin 500 -> 0 bytes .../src/main/resources/icons/action-open-file.png | Bin 537 -> 0 bytes .../src/main/resources/icons/action-open.png | Bin 688 -> 0 bytes .../src/main/resources/icons/action-print.png | Bin 731 -> 0 bytes .../resources/icons/action-reload-application.png | Bin 525 -> 0 bytes .../resources/icons/action-reload-shortcut.png | Bin 570 -> 0 bytes .../src/main/resources/icons/action-reload-ui.png | Bin 795 -> 0 bytes .../src/main/resources/icons/action-reply.png | Bin 754 -> 0 bytes .../src/main/resources/icons/action-right.png | Bin 349 -> 0 bytes .../icons/action-rotate-anticlockwise.png | Bin 608 -> 0 bytes .../resources/icons/action-rotate-clockwise.png | Bin 602 -> 0 bytes .../src/main/resources/icons/action-save.png | Bin 620 -> 0 bytes .../src/main/resources/icons/action-search.png | Bin 692 -> 0 bytes .../src/main/resources/icons/action-transmit.png | Bin 694 -> 0 bytes .../src/main/resources/icons/action-user.png | Bin 741 -> 0 bytes .../src/main/resources/icons/action-validate.png | Bin 537 -> 0 bytes .../main/resources/icons/action-view-history.png | Bin 711 -> 0 bytes .../src/main/resources/icons/action-vline.png | Bin 370 -> 0 bytes .../src/main/resources/icons/action-zoom-in.png | Bin 680 -> 0 bytes .../src/main/resources/icons/action-zoom-out.png | Bin 657 -> 0 bytes .../src/main/resources/icons/add.png | Bin 733 -> 0 bytes .../src/main/resources/icons/application_home.png | Bin 685 -> 0 bytes .../src/main/resources/icons/cross_blue.png | Bin 2745 -> 0 bytes .../src/main/resources/icons/cross_red.png | Bin 1743 -> 0 bytes .../src/main/resources/icons/email.png | Bin 641 -> 0 bytes .../src/main/resources/icons/house.png | Bin 806 -> 0 bytes .../src/main/resources/log4j2.xml | 55 - .../src/main/resources/splashscreen.png | Bin 25809 -> 0 bytes trunk/faxtomail-ui-web/LICENSE.txt | 674 --------- trunk/faxtomail-ui-web/README.txt | 0 trunk/faxtomail-ui-web/pom.xml | 403 ----- .../src/license/THIRD-PARTY.properties | 70 - .../faxtomail/FaxToMailApplicationContext.java | 160 -- .../faxtomail/web/FaxToMailActionSupport.java | 170 --- .../web/FaxToMailApplicationListener.java | 163 --- .../faxtomail/web/FaxToMailInterceptor.java | 219 --- .../faxtomail/web/FaxToMailJsonAction.java | 52 - .../faxtomail/web/FaxToMailJsonResultSupport.java | 80 - .../faxtomail/web/FaxToMailLoginInterceptor.java | 66 - .../faxtomail/web/FaxToMailSession.java | 97 -- .../faxtomail/web/action/IndexAction.java | 44 - .../faxtomail/web/action/LoginAction.java | 76 - .../faxtomail/web/action/LogoutAction.java | 41 - .../web/action/admin/ConfigurationAction.java | 241 --- .../web/action/admin/ConfigurationJsonAction.java | 73 - .../faxtomail/web/action/admin/ImportAction.java | 149 -- .../web/action/admin/ImportArchiveAction.java | 137 -- .../faxtomail/web/action/admin/LdapAction.java | 109 -- .../faxtomail/web/action/admin/LockAction.java | 87 -- .../web/action/admin/UserFolderAction.java | 110 -- .../faxtomail/web/job/AbstractFaxToMailJob.java | 40 - .../faxtomail/web/job/ClientUpdateJob.java | 74 - .../faxtomail/web/job/EDIManagementJob.java | 79 - .../faxtomail/web/job/MailFilterJob.java | 846 ----------- .../web/json/HibernateProxyTypeAdapter.java | 82 -- .../faxtomail/web/json/TopiaEntityAdapter.java | 62 - .../i18n/faxtomail-ui-web_fr_FR.properties | 42 - .../faxtomail-ui-web/src/main/resources/log4j2.xml | 59 - .../src/main/resources/nuiton-js.properties | 34 - .../src/main/resources/quartz.properties | 28 - .../src/main/resources/struts.properties | 40 - .../faxtomail-ui-web/src/main/resources/struts.xml | 66 - .../src/main/resources/validators.xml | 74 - .../src/main/resources/xwork-conversion.properties | 25 - .../WEB-INF/content/admin/configuration-input.jsp | 1249 ---------------- .../WEB-INF/content/admin/import-archive-input.jsp | 66 - .../webapp/WEB-INF/content/admin/import-input.jsp | 91 -- .../webapp/WEB-INF/content/admin/ldap-input.jsp | 56 - .../webapp/WEB-INF/content/admin/ldap-wait.jsp | 44 - .../webapp/WEB-INF/content/admin/lock-input.jsp | 80 - .../WEB-INF/content/admin/user-folder-input.jsp | 93 -- .../src/main/webapp/WEB-INF/content/index.jsp | 51 - .../main/webapp/WEB-INF/content/login-input.jsp | 69 - .../src/main/webapp/WEB-INF/decorators.xml | 34 - .../src/main/webapp/WEB-INF/decorators/layout.jsp | 90 -- .../src/main/webapp/WEB-INF/web.xml | 70 - .../src/main/webapp/WEB-INF/wro.xml | 94 -- .../src/main/webapp/css/faxtomail.css | 94 -- .../src/main/webapp/js/configuration.js | 1330 ----------------- .../src/main/webapp/js/faxtomail.js | 94 -- .../faxtomail-ui-web/src/main/webapp/js/select2.js | 193 --- .../src/main/webapp/js/select2sortable.js | 254 ---- .../src/main/webapp/js/user-folder.js | 116 -- trunk/pom.xml | 875 ----------- trunk/src/site/resources/img/notepad.png | Bin 25930 -> 0 bytes trunk/src/site/resources/img/txt-to-csv.png | Bin 37447 -> 0 bytes trunk/src/site/rst/import.rst | 98 -- trunk/src/site/rst/index.rst | 29 - trunk/src/site/rst/install.rst | 98 -- trunk/src/site/rst/mssql.rst | 41 - trunk/src/site/site_fr.xml | 65 - 456 files changed, 389 insertions(+), 52133 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 cef9cf312edbde980bc32b81c1e61102aba8ae58 Author: Maven Release <maven-release@codelutin.com> Date: Wed May 6 10:01:59 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/faxtomail-persistence/pom.xml b/faxtomail-persistence/pom.xml index dcc8c26..7bef99a 100644 --- a/faxtomail-persistence/pom.xml +++ b/faxtomail-persistence/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.3-SNAPSHOT</version> + <version>1.2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 29ce877..907cd36 100644 --- a/faxtomail-service/pom.xml +++ b/faxtomail-service/pom.xml @@ -27,7 +27,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.3-SNAPSHOT</version> + <version>1.2</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index ae7571b..f44b982 100644 --- a/faxtomail-ui-swing/pom.xml +++ b/faxtomail-ui-swing/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.2</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index d47a870..f0dd9fa 100644 --- a/faxtomail-ui-web/pom.xml +++ b/faxtomail-ui-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.2</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 5f0c151..19141ec 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.2</version> <packaging>pom</packaging> <name>FaxToMail</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 75e53d617869de863dc2ca6ef27690c3ccf1b6c3 Merge: cef9cf3 dd7b442 Author: Maven Release <maven-release@codelutin.com> Date: Wed May 6 10:01:59 2015 +0000 Merge branch 'master' into develop -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 334943bfbd3a11c60c683c2fadda1aaabd1ca39f Author: Maven Release <maven-release@codelutin.com> Date: Wed May 6 10:02:00 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/faxtomail-persistence/pom.xml b/faxtomail-persistence/pom.xml index 7bef99a..dcc8c26 100644 --- a/faxtomail-persistence/pom.xml +++ b/faxtomail-persistence/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.2</version> + <version>1.3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 907cd36..29ce877 100644 --- a/faxtomail-service/pom.xml +++ b/faxtomail-service/pom.xml @@ -27,7 +27,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.2</version> + <version>1.3-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index f44b982..ae7571b 100644 --- a/faxtomail-ui-swing/pom.xml +++ b/faxtomail-ui-swing/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.2</version> + <version>1.3-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index f0dd9fa..d47a870 100644 --- a/faxtomail-ui-web/pom.xml +++ b/faxtomail-ui-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.2</version> + <version>1.3-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 19141ec..5f0c151 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.2</version> + <version>1.3-SNAPSHOT</version> <packaging>pom</packaging> <name>FaxToMail</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm