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 498ec233bd181908f30543cec6640748bfd1a442 Merge: d3b4e61 259c352 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 9 10:52:04 2015 +0000 Merge branch 'release/0.4' coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 18 +- .../ifremer/coselmar/beans/QuestionSearchBean.java | 64 ++++ .../fr/ifremer/coselmar/persistence/DaoUtils.java | 20 ++ .../persistence/entity/DocumentTopiaDao.java | 60 +++- .../persistence/entity/QuestionTopiaDao.java | 162 ++++++++- .../src/main/xmi/coselmar-model.properties | 2 + .../src/main/xmi/coselmar-model.zargo | Bin 10090 -> 10252 bytes coselmar-rest/pom.xml | 16 +- .../fr/ifremer/coselmar/beans/DocumentBean.java | 24 +- .../java/fr/ifremer/coselmar/beans/UserBean.java | 14 +- .../fr/ifremer/coselmar/beans/UserSearchBean.java | 4 +- .../coselmar/converter/BeanEntityConverter.java | 14 +- .../services/CoselmarRestApplicationListener.java | 4 +- .../coselmar/services/CoselmarServicesContext.java | 3 + .../services/CoselmarSimpleServiceSupport.java | 5 + .../services/DefaultCoselmarServicesContext.java | 11 + .../services/config/CoselmarServicesConfig.java | 9 + .../config/CoselmarServicesConfigOption.java | 6 + .../indexation/DocumentsIndexationService.java | 242 +++++++++++++ .../coselmar/services/indexation/LuceneUtils.java | 80 +++++ .../indexation/QuestionsIndexationService.java | 224 ++++++++++++ .../coselmar/services/v1/AdminWebService.java | 103 ++++++ .../coselmar/services/v1/DocumentsWebService.java | 85 ++++- .../ifremer/coselmar/services/v1/ErrorAction.java | 27 ++ .../services/v1/InitialisationService.java | 13 + .../coselmar/services/v1/QuestionsWebService.java | 257 ++++++++++++-- .../coselmar/services/v1/UsersWebService.java | 44 ++- coselmar-rest/src/main/resources/mapping | 14 +- .../services/AbstractCoselmarServiceTest.java} | 21 +- .../services/FakeCoselmarApplicationContext.java | 8 + .../coselmar/services/QuestionsWebServiceTest.java | 299 ++++++++++++++++ .../indexation/DocumentsIndexationServiceTest.java | 279 +++++++++++++++ .../indexation/QuestionsIndexationServiceTest.java | 360 ++++++++++++++++++++ coselmar-ui/pom.xml | 39 +-- coselmar-ui/src/main/webapp/index.html | 24 +- .../src/main/webapp/js/coselmar-admin-services.js | 39 ++- .../src/main/webapp/js/coselmar-controllers.js | 376 ++++++++++++++++++--- .../main/webapp/js/coselmar-questions-services.js | 33 +- .../src/main/webapp/js/coselmar-services.js | 36 +- .../src/main/webapp/js/coselmar-user-services.js | 15 +- coselmar-ui/src/main/webapp/js/coselmar.js | 46 ++- .../src/main/webapp/views/admin/admintools.html | 55 +++ .../src/main/webapp/views/documents/document.html | 10 +- .../src/main/webapp/views/documents/documents.html | 4 +- .../webapp/views/documents/modalDocumentEdit.html | 92 +++-- .../main/webapp/views/documents/newdocument.html | 253 ++++++++------ .../401.html} | 16 +- .../403.html} | 17 +- .../404.html} | 17 +- .../main/webapp/views/questions/editquestion.html | 57 +++- .../views/questions/modalQuestionSearch.html | 71 ++++ .../src/main/webapp/views/questions/question.html | 4 +- .../src/main/webapp/views/questions/questions.html | 41 ++- .../views/questions/viewRestrictedQuestion.html | 32 +- .../main/webapp/views/questions/viewquestion.html | 30 +- .../main/webapp/views/referential/referential.html | 57 +++- .../src/main/webapp/views/users/edituser.html | 10 + coselmar-ui/src/main/webapp/views/users/user.html | 17 +- coselmar-ui/src/main/webapp/views/users/users.html | 12 +- pom.xml | 29 +- 61 files changed, 3466 insertions(+), 460 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.