This is an automated email from the git hooks/post-receive script. New change to branch master in repository coselmar. See https://gitlab.nuiton.org/codelutin/coselmar.git from cb513c3 [jgitflow-maven-plugin]merging 'release/2.0' into 'master' adds 4e06101 [jgitflow-maven-plugin]updating poms for 2.1-SNAPSHOT development adds 7a2a058 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 733e82a [jgitflow-maven-plugin]merging 'master' into 'develop' adds b25dc5e [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 8517e8f refs #9197 Utilisation de Apache Tika pour indexer les documents adds f90edbe Upgrade lucene + revue de l'indexation des données de Question adds c616ba1 refs #9197 use vectors on document fields indexation adds 1e43d56 refs #9197 use lucene to make cloud tag on question page : data from question and its documents including file content adds c4e9b3e Merge branch 'feature/9197-Indexation_documents' into develop adds 00feca5 prevent NPE adds ea698e5 prevent NPE adds d86c724 just simply put javax.servlet:javax.servlet-api as provided adds e760938 Merge branch 'develop' of https://gitlab.nuiton.org/codelutin/coselmar into develop adds f432be6 Exclusion de bcprov-jdk15on de la dépendance apache tika (conflit avec la version de webmotion?) adds b72ef3c Merge branch 'develop' of https://gitlab.nuiton.org/codelutin/coselmar into develop adds a763b05 Ajout du fileContent dans la table Document et comparatif de recherche entre lucene et pg pour les topterms adds 56f5389 Rest-Expose lucene and pg versions of question topterms methods adds 0dd6ace Review cloudtag request from postgresql and fix indexation from lucene adds ba59165 Remove ExperimentationService adds f37fe4f refs #9197 review way to use Tika, filter file content indexation for pdf, opendocument text/presentation and ms word/powerpoint adds 458b1e6 fix pdf mimetype in TikaUtils adds a8fd38a Merge branch 'develop' of https://gitlab.nuiton.org/codelutin/coselmar into develop adds 4cd2f7d change version to 3.0-SNAPSHOT adds a76244a Merge branch 'develop' of https://gitlab.nuiton.org/codelutin/coselmar into develop adds 24f863d Dude, remember there is document with no file during index refresh adds 40a82e9 Merge branch 'develop' of https://gitlab.nuiton.org/codelutin/coselmar into develop adds e9a5d00 Remove 3 chars words from cloud in homepage adds 789d3c9 Merge branch 'develop' of https://gitlab.nuiton.org/codelutin/coselmar into develop adds dc2afeb Prepare import massif de document adds d5a986f refs-30 #9206 First draft for Documents Zip management adds fdce731 refs-50 #9206 First draft for error management in Documents Zip import adds 1f29db5 refs #9206 technical error management during zip import adds 64faa45 refs-65 #9206 Start UI for documents zip file adds 01fdb54 refs-75 #9206 Add some details/infos in admin page about actions adds 008c802 Merge branch 'feature/9206-upload-validation-zip-documents' into develop adds 617618b Merge branch 'develop' of https://gitlab.nuiton.org/codelutin/coselmar into develop adds 3de0177 refs #9206 Fix indexation revert when failure on documents mass import adds 49a982d Merge branch 'develop' of https://gitlab.nuiton.org/codelutin/coselmar into develop adds 8f84168 third party licenses and tika deps fix adds 22d2645 Merge branch 'develop' of https://gitlab.nuiton.org/codelutin/coselmar into develop adds e5eac8c refs #9206 So Tika-parsers is not an option, fix shame mistake on FileInfos attribtues, be able to manage temporary dir for file with FileInfos adds b9e41ed Merge branch 'develop' of https://gitlab.nuiton.org/codelutin/coselmar into develop adds 88a3288 refs #9206 Fix NPE when CSV file is not found in zip + review tool description adds bcc9a8b Merge branch 'develop' of https://gitlab.nuiton.org/codelutin/coselmar into develop adds 51ff2fd refs #9206 Review file mangement adds 5902810 refs #9206 Add language column description adds 1902046 Merge branch 'develop' of https://gitlab.nuiton.org/codelutin/coselmar into develop adds 54c521e refs #9206 Add externalUrl management adds 291b19b Merge branch 'develop' of https://gitlab.nuiton.org/codelutin/coselmar into develop adds 5e98e08 code cleanup adds d5c3f2d refs #9206 MAnage new errors with externalURL adds 3246591 Merge branch 'develop' of https://gitlab.nuiton.org/codelutin/coselmar into develop adds a0c8e88 refs #9206 some precision about language column adds d879662 Merge branch 'develop' of https://gitlab.nuiton.org/codelutin/coselmar into develop adds 6ea25c9 refs #9206 fix date format from csv adds 52c08b1 Merge branch 'develop' of https://gitlab.nuiton.org/codelutin/coselmar into develop adds 092b48d fix third party licenses adds 8ade892 fixes #9197 add way to exclude http from cloud words adds 2893cbd Merge branch 'develop' of https://gitlab.nuiton.org/codelutin/coselmar into develop adds 43c5e86 License headers adds fee29c5 [jgitflow-maven-plugin]updating poms for branch'release/3.0' with non-snapshot versions adds 741b2b7 [jgitflow-maven-plugin]merging 'release/3.0' into 'master' No new revisions were added by this update. Summary of changes: coselmar-bundle/pom.xml | 2 +- coselmar-bundle/src/main/webapp/WEB-INF/web.xml | 2 +- coselmar-persistence/pom.xml | 2 +- .../java/fr/ifremer/coselmar/beans/CloudWord.java | 5 + .../coselmar/beans/DocumentSearchExample.java | 1 - .../coselmar/beans/QuestionSearchExample.java | 2 - .../fr/ifremer/coselmar/beans/SearchExample.java | 1 - .../fr/ifremer/coselmar/config/CloudWordUtils.java | 49 +-- .../coselmar/config/CoselmarServicesConfig.java | 12 +- .../config/CoselmarServicesConfigOption.java | 4 +- .../fr/ifremer/coselmar/persistence/DaoUtils.java | 4 +- .../coselmar/persistence/FixedH2Dialect.java | 2 - .../persistence/entity/CoselmarUserTopiaDao.java | 8 +- .../persistence/entity/DocumentTopiaDao.java | 9 +- .../persistence/entity/QuestionTopiaDao.java | 60 +-- ...2_1_0_1__9197_add_fileContent_in_documents.sql} | 2 +- .../src/main/xmi/coselmar-model.properties | 1 + .../src/main/xmi/coselmar-model.zargo | Bin 11007 -> 11150 bytes .../fr/ifremer/FakeCoselmarApplicationContext.java | 1 - coselmar-rest/pom.xml | 18 +- coselmar-rest/src/license/THIRD-PARTY.properties | 61 +-- .../fr/ifremer/coselmar/beans/AbstractMail.java | 4 +- .../fr/ifremer/coselmar/beans/DocumentBean.java | 10 +- .../coselmar/beans/DocumentImportModel.java | 72 +++ .../beans/{HealthBean.java => FileInfos.java} | 49 +-- .../ifremer/coselmar/beans/LostPasswordMail.java | 4 +- .../beans/MassiveDocumentsImportResult.java | 95 ++++ .../ifremer/coselmar/beans/QuestionSearchBean.java | 1 - .../coselmar/beans/UserAccountCreatedMail.java | 4 +- .../fr/ifremer/coselmar/beans/UserExportModel.java | 2 - .../coselmar/beans/UserPasswordChangedMail.java | 4 +- .../coselmar/converter/BeanEntityConverter.java | 21 +- .../ifremer/coselmar/converter/DateConverter.java | 4 +- .../fr/ifremer/coselmar/converter/JsonHelper.java | 6 +- .../services/CoselmarApplicationContext.java | 8 +- .../ifremer/coselmar/services/CoselmarRender.java | 11 +- .../services/CoselmarRestApplicationListener.java | 6 +- .../coselmar/services/CoselmarRestUtil.java | 4 +- .../CoselmarServicesApplicationContext.java | 20 +- .../coselmar/services/CoselmarServicesContext.java | 8 +- .../services/CoselmarSimpleServiceSupport.java | 2 +- .../services/CoselmarWebServiceSupport.java | 24 +- .../services/DefaultCoselmarServicesContext.java | 18 +- .../services/filter/CoselmarRestRequestFilter.java | 7 +- .../filter/CoselmarTopiaTransactionFilter.java | 8 +- .../indexation/DocumentsIndexationService.java | 201 ++++++--- .../coselmar/services/indexation/LuceneUtils.java | 28 +- .../indexation/QuestionsIndexationService.java | 89 ++-- .../coselmar/services/indexation/TikaUtils.java | 83 ++++ .../indexation/TransverseIndexationService.java | 14 +- .../CoselmarRestRequestContextInjector.java | 4 +- .../injector/CoselmarServicesInjector.java | 4 +- .../coselmar/services/v1/AdminWebService.java | 37 +- .../coselmar/services/v1/DocumentsWebService.java | 490 ++++++++++++++++----- .../ifremer/coselmar/services/v1/ErrorAction.java | 4 +- .../coselmar/services/v1/GeneralWebService.java | 1 - .../coselmar/services/v1/HealthService.java | 1 - .../coselmar/services/v1/QuestionsWebService.java | 90 +++- .../coselmar/services/v1/UsersWebService.java | 47 +- coselmar-rest/src/main/resources/mapping | 1 + .../services/AbstractCoselmarWebServiceTest.java | 8 +- .../services/FakeCoselmarServicesContext.java | 8 +- .../coselmar/services/QuestionsWebServiceTest.java | 15 +- .../coselmar/services/UsersWebServiceTest.java | 6 +- .../indexation/DocumentsIndexationServiceTest.java | 26 +- .../indexation/QuestionsIndexationServiceTest.java | 22 +- .../services/v1/DocumentsWebServiceTest.java | 124 ++++++ coselmar-rest/src/test/resources/documents.zip | Bin 0 -> 188296 bytes .../src/test/resources/documents_errors.zip | Bin 0 -> 87833 bytes coselmar-ui/pom.xml | 2 +- coselmar-ui/src/main/webapp/i18n/en.js | 58 +++ coselmar-ui/src/main/webapp/i18n/fr.js | 60 +++ .../src/main/webapp/js/coselmar-admin-services.js | 18 + .../src/main/webapp/js/coselmar-controllers.js | 20 +- .../src/main/webapp/views/admin/admintools.html | 82 +++- pom.xml | 33 +- 76 files changed, 1613 insertions(+), 601 deletions(-) copy coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/LinkBean.java => coselmar-persistence/src/main/java/fr/ifremer/coselmar/config/CloudWordUtils.java (50%) copy coselmar-persistence/src/main/resources/db/migration/{V1_4_0_1__7911_add_citation_in_documents.sql => V2_1_0_1__9197_add_fileContent_in_documents.sql} (94%) create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/DocumentImportModel.java copy coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/{HealthBean.java => FileInfos.java} (51%) create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/MassiveDocumentsImportResult.java create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/services/indexation/TikaUtils.java create mode 100644 coselmar-rest/src/test/java/fr/ifremer/coselmar/services/v1/DocumentsWebServiceTest.java create mode 100644 coselmar-rest/src/test/resources/documents.zip create mode 100644 coselmar-rest/src/test/resources/documents_errors.zip -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.