This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See https://gitlab.nuiton.org/codelutin/coselmar.git commit 741b2b76149acb1e24eabc7227796826d5136883 Merge: cb513c3 fee29c5 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jun 13 13:47:38 2017 +0200 [jgitflow-maven-plugin]merging 'release/3.0' into 'master' 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 | 50 +++ .../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 +-- ...V2_1_0_1__9197_add_fileContent_in_documents.sql | 23 + .../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 +++ .../java/fr/ifremer/coselmar/beans/FileInfos.java | 68 +++ .../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, 1713 insertions(+), 542 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.