January 2015 - Coselmar-commits - mailman.cloud.codelutin.com

branch master updated (d3b4e61 -> 498ec23)
by codelutin.com scm 09 Jan '15

09 Jan '15

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(a)codelutin.com>.

1 0

01/06: prepare 0.4 release
by codelutin.com scm 09 Jan '15

09 Jan '15

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 f30110a534f98aff9b873a6536902d6ffce52c0a Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Jan 9 10:50:20 2015 +0000 prepare 0.4 release --- .../ifremer/coselmar/beans/QuestionSearchBean.java | 24 ++++++++++++++++++++++ .../indexation/DocumentsIndexationService.java | 24 ++++++++++++++++++++++ .../coselmar/services/indexation/LuceneUtils.java | 24 ++++++++++++++++++++++ .../indexation/QuestionsIndexationService.java | 24 ++++++++++++++++++++++ .../coselmar/services/v1/AdminWebService.java | 24 ++++++++++++++++++++++ .../indexation/DocumentsIndexationServiceTest.java | 24 ++++++++++++++++++++++ .../indexation/QuestionsIndexationServiceTest.java | 24 ++++++++++++++++++++++ coselmar-ui/src/main/webapp/views/errors/401.html | 23 +++++++++++++++++++++ coselmar-ui/src/main/webapp/views/errors/403.html | 23 +++++++++++++++++++++ coselmar-ui/src/main/webapp/views/errors/404.html | 23 +++++++++++++++++++++ .../views/questions/modalQuestionSearch.html | 23 +++++++++++++++++++++ 11 files changed, 260 insertions(+) diff --git a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/QuestionSearchBean.java b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/QuestionSearchBean.java index 7e29a07..1e909bf 100644 --- a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/QuestionSearchBean.java +++ b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/QuestionSearchBean.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.beans; +/* + * #%L + * Coselmar :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2015 Ifremer, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.io.Serializable; import java.util.List; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/indexation/DocumentsIndexationService.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/indexation/DocumentsIndexationService.java index 0d1cb15..b7e7975 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/indexation/DocumentsIndexationService.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/indexation/DocumentsIndexationService.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.services.indexation; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2015 Ifremer, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/indexation/LuceneUtils.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/indexation/LuceneUtils.java index 19f762e..c1ab995 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/indexation/LuceneUtils.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/indexation/LuceneUtils.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.services.indexation; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2015 Ifremer, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.io.File; import java.io.IOException; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/indexation/QuestionsIndexationService.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/indexation/QuestionsIndexationService.java index 475559c..d534f9e 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/indexation/QuestionsIndexationService.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/indexation/QuestionsIndexationService.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.services.indexation; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2015 Ifremer, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/AdminWebService.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/AdminWebService.java index 57f606e..6a158ba 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/AdminWebService.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/AdminWebService.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.services.v1; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2015 Ifremer, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.io.IOException; import java.util.List; diff --git a/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/indexation/DocumentsIndexationServiceTest.java b/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/indexation/DocumentsIndexationServiceTest.java index a7320a8..dfef9de 100644 --- a/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/indexation/DocumentsIndexationServiceTest.java +++ b/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/indexation/DocumentsIndexationServiceTest.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.services.indexation; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2015 Ifremer, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.util.Arrays; import java.util.Date; import java.util.List; diff --git a/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/indexation/QuestionsIndexationServiceTest.java b/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/indexation/QuestionsIndexationServiceTest.java index 9f486bc..3de962e 100644 --- a/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/indexation/QuestionsIndexationServiceTest.java +++ b/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/indexation/QuestionsIndexationServiceTest.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.services.indexation; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2015 Ifremer, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.util.Arrays; import java.util.Date; import java.util.List; diff --git a/coselmar-ui/src/main/webapp/views/errors/401.html b/coselmar-ui/src/main/webapp/views/errors/401.html index dcdb0e8..e03a8d1 100644 --- a/coselmar-ui/src/main/webapp/views/errors/401.html +++ b/coselmar-ui/src/main/webapp/views/errors/401.html @@ -1,3 +1,26 @@ + <div> <div> <h1>Authentication Error</h1> diff --git a/coselmar-ui/src/main/webapp/views/errors/403.html b/coselmar-ui/src/main/webapp/views/errors/403.html index b807ec9..1caf1bd 100644 --- a/coselmar-ui/src/main/webapp/views/errors/403.html +++ b/coselmar-ui/src/main/webapp/views/errors/403.html @@ -1,3 +1,26 @@ + <div> <h1>Not Authorized</h1> <p>You are not authorized to access this page.</p> diff --git a/coselmar-ui/src/main/webapp/views/errors/404.html b/coselmar-ui/src/main/webapp/views/errors/404.html index 03041fc..f9ec037 100644 --- a/coselmar-ui/src/main/webapp/views/errors/404.html +++ b/coselmar-ui/src/main/webapp/views/errors/404.html @@ -1,3 +1,26 @@ + <div> <h1>Nothing Here</h1> <p>The page you try to access does not exist.</p> diff --git a/coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html b/coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html index ba1a24b..8c39815 100644 --- a/coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html +++ b/coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html @@ -1,3 +1,26 @@ + <div style="padding: 0px 0px 0px 30px"> <div class="page-header"> <h1> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[ANN] - Coselmar 0.4 released
by codelutin.com Release Notification 09 Jan '15

09 Jan '15

The Coselmar team is pleased to announce the coselmar-0.4 release! Documentation of the project can be found here: https://coselmar.codelutin.com Changes ------- Changes in this version include: New features: o Referential Search Page Issue: 6211. Thanks to Yannick Martel. Resolved by ymartel. o Manage relations between question Issue: 6285. Thanks to Yannick Martel. Resolved by ymartel. o Show active users by default Issue: 6203. Thanks to Yannick Martel. Resolved by ymartel. o Improve search on documents Issue: 6304. Thanks to Yannick Martel. Resolved by ymartel. o Add comment field on document Issue: 6209. Thanks to Yannick Martel. Resolved by ymartel. o Better show of question with user filter Issue: 6303. Thanks to Yannick Martel. Resolved by ymartel. o On question, a client could be anyone from system Issue: 6302. Thanks to Yannick Martel. Resolved by ymartel. o Add confirm box before delete Issue: 6301. Thanks to Yannick Martel. Resolved by ymartel. o Review User deletion / deactivation Issue: 6354. Thanks to Yannick Martel. Resolved by ymartel. o Add suggestion in Keywords Issue: 6166. Thanks to Yannick Martel. Resolved by ymartel. o Manage Error from server properly Issue: 6170. Thanks to Yannick Martel. Resolved by ymartel. o Add Phone number on user Issue: 6204. Thanks to Yannick Martel. Resolved by ymartel. Fixed Bugs: o Member can access to question Issue: 6300. Thanks to Yannick Martel. Resolved by ymartel. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/coselmar/files * coselmar-bundle-0.4.war - http://forge.codelutin.com/attachments/download/2696 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Coselmar team

1 0

branch release/0.4 created (now a07d6d4)
by codelutin.com scm 09 Jan '15

09 Jan '15

This is an automated email from the git hooks/post-receive script. New change to branch release/0.4 in repository coselmar. See http://git.codelutin.com/coselmar.git at a07d6d4 enable search on referential page No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (a07d6d4 -> 591756d)
by codelutin.com scm 09 Jan '15

09 Jan '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from a07d6d4 enable search on referential page new 591756d [jgitflow-maven-plugin]updating poms for 0.5-SNAPSHOT development The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 591756d7735cd4aa8b2cecb7e5c4f6a72d4018bb Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Jan 9 10:48:33 2015 +0000 [jgitflow-maven-plugin]updating poms for 0.5-SNAPSHOT development Summary of changes: coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (6a6e527 -> a07d6d4)
by codelutin.com scm 09 Jan '15

09 Jan '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from 6a6e527 fixes #6285 : Merge branch 'feature/6285-manage-relation-between-questions' into develop new a07d6d4 enable search on referential page The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit a07d6d4bef75f896c25e9a76e89a94938f9c548b Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Fri Jan 9 11:45:41 2015 +0100 enable search on referential page Summary of changes: .../src/main/webapp/js/coselmar-controllers.js | 50 +++++++++++-------- .../src/main/webapp/js/coselmar-services.js | 15 ++---- .../main/webapp/views/referential/referential.html | 57 +++++++++++++++++----- 3 files changed, 78 insertions(+), 44 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (bf95eed -> 6a6e527)
by codelutin.com scm 08 Jan '15

08 Jan '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from bf95eed show only active user by default new 51a0ca3 fix js new 3363548 add way to add parents with questions creation new f663f64 cannot set a question as parent of itself new 2ac5fb9 add a Question search service new 7c0480d add privacy and status as indexed property for question, and use QuestionSearchBean for lucene question search new fbea684 integrate index search for question new 84a0543 add search by keywords for questions new 66e7792 fix dependencies new 6385289 add question parents and children in ui new 6a6e527 fixes #6285 : Merge branch 'feature/6285-manage-relation-between-questions' into develop The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 6a6e52797ce0a96db09d42b9894d3f7eb7983c28 Merge: 51a0ca3 6385289 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Jan 8 18:31:52 2015 +0100 fixes #6285 : Merge branch 'feature/6285-manage-relation-between-questions' into develop commit 63852895497e96511ebb1eb13b01e7c967fe0a03 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Jan 8 18:31:43 2015 +0100 add question parents and children in ui commit 66e7792a49e881b7ba34af2b216a096895512379 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Jan 8 17:34:35 2015 +0100 fix dependencies commit 84a054359d6e29d3b48b116b56393e17f0772629 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Jan 8 17:10:50 2015 +0100 add search by keywords for questions commit fbea68405a181f596388b98595791a540c166d62 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Jan 8 14:50:19 2015 +0100 integrate index search for question commit 7c0480d6a3a56791c1888aec0a67049bd6f2b50a Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Jan 8 11:36:47 2015 +0100 add privacy and status as indexed property for question, and use QuestionSearchBean for lucene question search commit 2ac5fb9653ee6e40a552724e6f9e768bb080e37f Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Tue Jan 6 17:22:05 2015 +0100 add a Question search service commit f663f640569e86d88df89ceb2e9148cd304edc25 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Mon Jan 5 16:42:50 2015 +0100 cannot set a question as parent of itself commit 3363548872e4b6e443b09abcdc0ed9e762c7fbbc Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Mon Jan 5 16:03:04 2015 +0100 add way to add parents with questions creation commit 51a0ca377f196dd6740b714a7c24e192716b1bf8 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Mon Jan 5 14:07:37 2015 +0100 fix js Summary of changes: coselmar-persistence/pom.xml | 16 -- .../ifremer/coselmar/beans/QuestionSearchBean.java | 40 +++ .../fr/ifremer/coselmar/persistence/DaoUtils.java | 15 ++ .../persistence/entity/QuestionTopiaDao.java | 162 ++++++++++- coselmar-rest/pom.xml | 4 - .../coselmar/converter/BeanEntityConverter.java | 2 +- .../services/CoselmarRestApplicationListener.java | 4 +- .../indexation/QuestionsIndexationService.java | 77 ++++-- .../services/v1/InitialisationService.java | 13 + .../coselmar/services/v1/QuestionsWebService.java | 189 +++++++++++-- .../services/FakeCoselmarApplicationContext.java | 8 + .../coselmar/services/QuestionsWebServiceTest.java | 299 +++++++++++++++++++++ .../indexation/QuestionsIndexationServiceTest.java | 106 ++++++-- .../src/main/webapp/js/coselmar-controllers.js | 82 +++++- .../main/webapp/js/coselmar-questions-services.js | 14 +- coselmar-ui/src/main/webapp/js/coselmar.js | 3 - .../main/webapp/views/questions/editquestion.html | 37 +++ .../views/questions/modalQuestionSearch.html | 48 ++++ .../src/main/webapp/views/questions/questions.html | 8 + .../views/questions/viewRestrictedQuestion.html | 32 ++- .../main/webapp/views/questions/viewquestion.html | 28 +- 21 files changed, 1087 insertions(+), 100 deletions(-) create mode 100644 coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/QuestionSearchBean.java create mode 100644 coselmar-rest/src/test/java/fr/ifremer/coselmar/services/QuestionsWebServiceTest.java create mode 100644 coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 10

branch develop updated (429d342 -> bf95eed)
by codelutin.com scm 05 Jan '15

05 Jan '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from 429d342 review user log error on document add new bf95eed show only active user by default The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit bf95eedb671d81b69b86a81f6d955949db9b4503 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Mon Jan 5 11:34:57 2015 +0100 show only active user by default Summary of changes: .../src/main/webapp/js/coselmar-controllers.js | 19 ++++++++++++------- .../src/main/webapp/js/coselmar-user-services.js | 15 +++------------ coselmar-ui/src/main/webapp/views/users/users.html | 4 ++-- 3 files changed, 17 insertions(+), 21 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (90632f5 -> 429d342)
by codelutin.com scm 05 Jan '15

05 Jan '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from 90632f5 fixes #6304 Merge branch 'feature/6304-improve-search-on-document' into develop new 429d342 review user log error on document add The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 429d342a7821880b4de9c9ab23b0edbd3bee85b4 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Mon Jan 5 10:34:57 2015 +0100 review user log error on document add Summary of changes: .../java/fr/ifremer/coselmar/services/v1/DocumentsWebService.java | 2 +- coselmar-ui/src/main/webapp/js/coselmar.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (7ca25de -> 90632f5)
by codelutin.com scm 02 Jan '15

02 Jan '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from 7ca25de add an admin part to force a refresh on lucene index new 34460c6 review DocumentTopiaDAO to search with keywords also on title, summary and authors new 0675973 upgrade documation search by index to be able to search with several keywords new 90632f5 fixes #6304 Merge branch 'feature/6304-improve-search-on-document' into develop The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 90632f5a22cbf0e9a9bd4f47d3b2e1b5cfc99e62 Merge: 7ca25de 0675973 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Fri Jan 2 17:33:30 2015 +0100 fixes #6304 Merge branch 'feature/6304-improve-search-on-document' into develop commit 06759735d46becf778abec041890efa344c8b6a1 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Fri Jan 2 17:33:20 2015 +0100 upgrade documation search by index to be able to search with several keywords commit 34460c6a07609162fac117d0e01c29bfba263f2f Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Fri Jan 2 17:00:07 2015 +0100 review DocumentTopiaDAO to search with keywords also on title, summary and authors Summary of changes: .../fr/ifremer/coselmar/persistence/DaoUtils.java | 5 ++ .../persistence/entity/DocumentTopiaDao.java | 37 ++++++++++++--- .../indexation/DocumentsIndexationService.java | 53 ++++++++++++++++++++++ .../coselmar/services/v1/DocumentsWebService.java | 4 +- .../indexation/DocumentsIndexationServiceTest.java | 47 +++++++++++++++++++ 5 files changed, 137 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3