This is an automated email from the git hooks/post-receive script. New change to branch master in repository coselmar. See http://git.codelutin.com/coselmar.git from d3b4e61 Merge branch 'release/0.3.1' adds 9509ebd Add phone number on user Add comment on document adds f2850dc [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 9c9e2fe Merge branch 'master' into develop adds 6de71e0 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 010bc96 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop adds d6e163c add completion on question.type, question.themes, document.type (plain and modal) and document.keywords(modal) adds 7e7e5b0 review document creation page adds 9839ff7 Merge branch 'feature/6166-add-suggestion-for-keywords' into develop adds 701d3f6 #6302 on question, clients could be anyone from system adds 2410946 review access on question adds 91242fb review question wiew and access to documents adds 010abb8 manage error from servers adds afc6184 use webjars instead of nuiton-js adds 65748fb fixes #6301 add a dialog to confirm delete adds d2cf910 fixes #6354 on user distinguish deletion and deactivation, and can enable user adds 993a5ee prepare document indexation with lucene adds d1d48e2 use indexation in document service for creation and search adds b9b1dc9 add way to update and delete index information for document. Link delete with service adds 81b2cdd add an indexation service for question : base on title, themes and summary adds 37c0bed use question indexation in webservice adds 7ed66eb Merge branch 'feature/lucene-indexation' into develop adds 7ca25de add an admin part to force a refresh on lucene index adds 34460c6 review DocumentTopiaDAO to search with keywords also on title, summary and authors adds 0675973 upgrade documation search by index to be able to search with several keywords adds 90632f5 fixes #6304 Merge branch 'feature/6304-improve-search-on-document' into develop adds 429d342 review user log error on document add adds bf95eed show only active user by default adds 51a0ca3 fix js adds 3363548 add way to add parents with questions creation adds f663f64 cannot set a question as parent of itself adds 2ac5fb9 add a Question search service adds 7c0480d add privacy and status as indexed property for question, and use QuestionSearchBean for lucene question search adds fbea684 integrate index search for question adds 84a0543 add search by keywords for questions adds 66e7792 fix dependencies adds 6385289 add question parents and children in ui adds 6a6e527 fixes #6285 : Merge branch 'feature/6285-manage-relation-between-questions' into develop adds a07d6d4 enable search on referential page adds f30110a prepare 0.4 release adds 259c352 [jgitflow-maven-plugin]updating poms for branch'release/0.4' with non-snapshot versions adds 498ec23 Merge branch 'release/0.4' No new revisions were added by this update. Summary of changes: 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} | 15 +- .../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 +- ...mar-constants.js => coselmar-admin-services.js} | 30 +- .../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 +++- .../modalQuestionSearch.html} | 37 +- .../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, 3425 insertions(+), 452 deletions(-) create mode 100644 coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/QuestionSearchBean.java create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/services/indexation/DocumentsIndexationService.java create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/services/indexation/LuceneUtils.java create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/services/indexation/QuestionsIndexationService.java create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/AdminWebService.java copy coselmar-rest/src/{main/java/fr/ifremer/coselmar/services/CoselmarService.java => test/java/fr/ifremer/coselmar/services/AbstractCoselmarServiceTest.java} (66%) create mode 100644 coselmar-rest/src/test/java/fr/ifremer/coselmar/services/QuestionsWebServiceTest.java create mode 100644 coselmar-rest/src/test/java/fr/ifremer/coselmar/services/indexation/DocumentsIndexationServiceTest.java create mode 100644 coselmar-rest/src/test/java/fr/ifremer/coselmar/services/indexation/QuestionsIndexationServiceTest.java copy coselmar-ui/src/main/webapp/js/{coselmar-constants.js => coselmar-admin-services.js} (54%) create mode 100644 coselmar-ui/src/main/webapp/views/admin/admintools.html copy coselmar-ui/src/main/webapp/views/{questions/viewRestrictedQuestion.html => errors/401.html} (69%) copy coselmar-ui/src/main/webapp/views/{questions/viewRestrictedQuestion.html => errors/403.html} (68%) copy coselmar-ui/src/main/webapp/views/{questions/viewRestrictedQuestion.html => errors/404.html} (68%) copy coselmar-ui/src/main/webapp/views/{documents/modalDocumentSearch.html => questions/modalQuestionSearch.html} (58%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.