This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit 6f653f6325ba96a8f7af96d888555028fd56f29b Merge: 2a426c4 1ce116e Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 17 16:43:24 2015 +0100 [jgitflow-maven-plugin]merging 'release/1.1' into 'master' coselmar-bundle/pom.xml | 3 +- coselmar-bundle/src/license/THIRD-PARTY.properties | 21 +++ coselmar-persistence/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 21 +++ .../coselmar/beans/DocumentSearchExample.java | 91 ++++++++++++ .../ifremer/coselmar/beans/QuestionSearchBean.java | 30 +--- .../SearchExample.java} | 58 ++++---- .../fr/ifremer/coselmar/persistence/DaoUtils.java | 34 +++++ .../coselmar/persistence/FixedH2Dialect.java | 42 ++++++ .../coselmar/persistence/SearchRequestBean.java | 14 +- .../persistence/entity/DocumentTopiaDao.java | 137 +++++++++++++++++ .../persistence/entity/QuestionTopiaDao.java | 2 +- .../fr/ifremer/FakeCoselmarApplicationContext.java | 64 ++------ coselmar-rest/pom.xml | 14 +- coselmar-rest/src/license/THIRD-PARTY.properties | 21 +++ .../java/fr/ifremer/coselmar/beans/CloudWord.java | 55 +++++++ .../ifremer/coselmar/beans/DocumentSearchBean.java | 95 ++++++++++++ .../fr/ifremer/coselmar/beans/QuestionBean.java | 10 ++ .../coselmar/beans/QuestionExportModel.java | 77 ++++++++++ .../coselmar/converter/BeanEntityConverter.java | 60 ++++++++ .../services/CoselmarRestApplicationListener.java | 4 +- .../CoselmarServicesApplicationContext.java | 2 + .../indexation/DocumentsIndexationService.java | 9 +- .../coselmar/services/indexation/LuceneUtils.java | 5 +- .../indexation/QuestionsIndexationService.java | 156 +++++++++++++++----- .../indexation/TransverseIndexationService.java | 116 +++++++++++++++ .../coselmar/services/v1/DocumentsWebService.java | 48 ++++-- .../coselmar/services/v1/GeneralWebService.java | 74 ++++++++++ .../coselmar/services/v1/QuestionsWebService.java | 57 ++++++++ .../coselmar/services/v1/UsersWebService.java | 2 +- .../lucene/misc/HighFreqTermsMultiFields.java | 97 ++++++++++++ .../i18n/coselmar-services_en_GB.properties | 32 +++- .../i18n/coselmar-services_fr_FR.properties | 32 +++- coselmar-rest/src/main/resources/mapping | 11 +- .../services/FakeCoselmarApplicationContext.java | 69 ++++++--- .../coselmar/services/QuestionsWebServiceTest.java | 14 +- .../indexation/QuestionsIndexationServiceTest.java | 156 ++++++++++++++++---- coselmar-ui/pom.xml | 14 +- coselmar-ui/src/main/webapp/css/jqcloud-2.0.0.css | 59 ++++++++ coselmar-ui/src/main/webapp/i18n/en.js | 6 +- coselmar-ui/src/main/webapp/i18n/fr.js | 6 +- coselmar-ui/src/main/webapp/index.html | 38 +++-- .../src/main/webapp/js/coselmar-controllers.js | 83 +++++++++-- .../main/webapp/js/coselmar-general-services.js | 43 ++++++ .../main/webapp/js/coselmar-questions-services.js | 37 ++++- .../src/main/webapp/js/coselmar-services.js | 9 +- coselmar-ui/src/main/webapp/js/coselmar.js | 2 +- .../src/main/webapp/views/documents/documents.html | 17 +-- .../main/webapp/views/documents/editDocument.html | 2 +- .../main/webapp/views/documents/newdocument.html | 2 +- .../src/main/webapp/views/documents/toolsPart.html | 162 +++++++++++++++++++++ coselmar-ui/src/main/webapp/views/home.html | 49 ++++++- .../src/main/webapp/views/questions/questions.html | 6 +- .../src/main/webapp/views/users/newPassword.html | 2 +- .../src/main/webapp/views/users/searchPart.html | 6 +- pom.xml | 106 ++++++++++---- 56 files changed, 2071 insertions(+), 313 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.