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 3246591012df1f47b437499da427ee95546186f1 Merge: 291b19b d5c3f2d Author: Maven Release <maven-release@codelutin.com> Date: Mon Jun 12 10:54:55 2017 +0200 Merge branch 'develop' of https://gitlab.nuiton.org/codelutin/coselmar into develop .../coselmar/beans/DocumentSearchExample.java | 1 - .../coselmar/beans/QuestionSearchExample.java | 2 - .../fr/ifremer/coselmar/beans/SearchExample.java | 1 - .../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 | 16 ++++---- .../fr/ifremer/FakeCoselmarApplicationContext.java | 1 - .../fr/ifremer/coselmar/beans/AbstractMail.java | 4 +- .../fr/ifremer/coselmar/beans/DocumentBean.java | 1 - .../coselmar/beans/DocumentImportModel.java | 3 -- .../ifremer/coselmar/beans/LostPasswordMail.java | 4 +- .../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 | 17 +++----- .../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 | 16 ++++---- .../services/DefaultCoselmarServicesContext.java | 18 ++++----- .../services/filter/CoselmarRestRequestFilter.java | 7 ++-- .../filter/CoselmarTopiaTransactionFilter.java | 8 ++-- .../indexation/DocumentsIndexationService.java | 8 ---- .../coselmar/services/indexation/LuceneUtils.java | 6 +-- .../indexation/QuestionsIndexationService.java | 2 - .../CoselmarRestRequestContextInjector.java | 4 +- .../injector/CoselmarServicesInjector.java | 4 +- .../coselmar/services/v1/DocumentsWebService.java | 10 ++--- .../ifremer/coselmar/services/v1/ErrorAction.java | 4 +- .../coselmar/services/v1/GeneralWebService.java | 1 - .../coselmar/services/v1/HealthService.java | 1 - .../coselmar/services/v1/QuestionsWebService.java | 12 +++--- .../coselmar/services/v1/UsersWebService.java | 47 +++++----------------- .../services/AbstractCoselmarWebServiceTest.java | 8 ++-- .../services/FakeCoselmarServicesContext.java | 8 ++-- .../coselmar/services/QuestionsWebServiceTest.java | 15 ++++--- .../coselmar/services/UsersWebServiceTest.java | 6 +-- .../indexation/DocumentsIndexationServiceTest.java | 10 ++--- .../services/v1/DocumentsWebServiceTest.java | 3 -- coselmar-ui/src/main/webapp/i18n/en.js | 1 + coselmar-ui/src/main/webapp/i18n/fr.js | 1 + .../src/main/webapp/views/admin/admintools.html | 8 ++++ 53 files changed, 158 insertions(+), 219 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.