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 22b6b6a3d45c31b9669561fcb9cc7ec660b4b45f Merge: 12c71d0 03ab385 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 09:33:19 2015 +0000 Merge branch 'release/0.6' coselmar-bundle/pom.xml | 2 +- .../src/main/webapp/js/coselmar-constants.js | 3 +- coselmar-persistence/pom.xml | 40 ++- .../coselmar}/config/CoselmarServicesConfig.java | 4 +- .../config/CoselmarServicesConfigOption.java | 2 +- .../exceptions}/CoselmarTechnicalException.java | 2 +- .../persistence/entity/CoselmarUserTopiaDao.java | 8 +- .../i18n/coselmar-persistence_en_GB.properties | 2 + .../i18n/coselmar-persistence_fr_FR.properties | 2 + .../src/main/xmi/coselmar-model.zargo | Bin 10322 -> 10390 bytes .../java/fr/ifremer/AbstractCoselmarDaoTest.java | 19 +- .../src/test/java/fr/ifremer/DocumentDaoTest.java | 99 ++++++++ .../ifremer}/FakeCoselmarApplicationContext.java | 141 ++--------- .../resources/coselmar-persistence-test.properties | 0 coselmar-rest/pom.xml | 6 +- .../fr/ifremer/coselmar/beans/DocumentBean.java | 49 +++- .../fr/ifremer/coselmar/beans/UserSearchBean.java | 10 +- .../coselmar/converter/BeanEntityConverter.java | 17 +- .../services/CoselmarApplicationContext.java | 2 +- .../CoselmarServicesApplicationContext.java | 2 +- .../coselmar/services/CoselmarServicesContext.java | 2 +- .../services/CoselmarSimpleServiceSupport.java | 2 +- .../services/CoselmarWebServiceSupport.java | 3 +- .../services/DefaultCoselmarServicesContext.java | 3 +- .../indexation/DocumentsIndexationService.java | 9 +- .../coselmar/services/indexation/LuceneUtils.java | 2 +- .../indexation/QuestionsIndexationService.java | 11 +- .../coselmar/services/v1/AdminWebService.java | 4 +- .../coselmar/services/v1/DocumentsWebService.java | 166 ++++++++++-- .../coselmar/services/v1/QuestionsWebService.java | 2 +- .../coselmar/services/v1/UsersWebService.java | 80 ++++-- .../main/resources/coselmar-services.properties | 2 + coselmar-rest/src/main/resources/mapping | 7 +- .../services/FakeCoselmarApplicationContext.java | 4 +- .../services/FakeCoselmarServicesContext.java | 2 +- .../coselmar/services/UsersWebServiceTest.java | 54 +++- .../indexation/DocumentsIndexationServiceTest.java | 32 +-- .../indexation/QuestionsIndexationServiceTest.java | 12 + coselmar-ui/pom.xml | 8 +- coselmar-ui/src/main/webapp/css/coselmar.css | 6 + coselmar-ui/src/main/webapp/i18n/en.js | 233 +++++++++++++++++ coselmar-ui/src/main/webapp/i18n/fr.js | 233 +++++++++++++++++ coselmar-ui/src/main/webapp/img/en.png | Bin 0 -> 599 bytes coselmar-ui/src/main/webapp/img/fr.png | Bin 0 -> 545 bytes coselmar-ui/src/main/webapp/index.html | 64 +++-- .../src/main/webapp/js/coselmar-constants.js | 5 +- .../src/main/webapp/js/coselmar-controllers.js | 280 ++++++++++++++++----- .../main/webapp/js/coselmar-questions-services.js | 14 +- .../src/main/webapp/js/coselmar-services.js | 52 +++- .../src/main/webapp/js/coselmar-user-services.js | 39 +-- coselmar-ui/src/main/webapp/js/coselmar.js | 16 +- .../src/main/webapp/views/admin/admintools.html | 12 +- .../src/main/webapp/views/documents/document.html | 78 +----- .../src/main/webapp/views/documents/documents.html | 28 +-- .../{newdocument.html => editDocument.html} | 106 ++++---- .../webapp/views/documents/modalDocumentEdit.html | 66 ++--- .../views/documents/modalDocumentSearch.html | 16 +- .../main/webapp/views/documents/newdocument.html | 73 +++--- .../documents/{document.html => viewDocument.html} | 58 +++-- .../main/webapp/views/questions/closeQuestion.html | 14 +- .../main/webapp/views/questions/editquestion.html | 60 ++--- .../views/questions/modalQuestionSearch.html | 14 +- .../webapp/views/questions/newDocumentsPart.html | 12 +- .../main/webapp/views/questions/newquestion.html | 4 +- .../src/main/webapp/views/questions/question.html | 16 +- .../src/main/webapp/views/questions/questions.html | 26 +- .../views/questions/viewRestrictedQuestion.html | 6 +- .../main/webapp/views/questions/viewquestion.html | 52 ++-- .../main/webapp/views/referential/referential.html | 35 +-- .../src/main/webapp/views/users/adminUsers.html | 122 +++++++++ .../src/main/webapp/views/users/edituser.html | 98 ++++++-- .../src/main/webapp/views/users/newuser.html | 15 +- .../main/webapp/views/users/supervisorUsers.html | 123 +++++++++ coselmar-ui/src/main/webapp/views/users/user.html | 26 +- coselmar-ui/src/main/webapp/views/users/users.html | 61 +---- pom.xml | 28 ++- 76 files changed, 2045 insertions(+), 861 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.