branch develop updated (591756d -> d1ef702)
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 591756d [jgitflow-maven-plugin]updating poms for 0.5-SNAPSHOT development new 5d8e733 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new f30110a prepare 0.4 release new 259c352 [jgitflow-maven-plugin]updating poms for branch'release/0.4' with non-snapshot versions new 498ec23 Merge branch 'release/0.4' new db334d9 Merge branch 'master' into develop new d1ef702 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 d1ef702f626c66816b52c3a162312565374a67ec Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 9 10:52:06 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit db334d952495808cd44a9cb3d975722e438e1590 Merge: 5d8e733 498ec23 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 9 10:52:06 2015 +0000 Merge branch 'master' into develop commit 5d8e73384de2b32d762ff97d008f2a24582a8fa9 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 9 10:52:06 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts 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' commit 259c352b77dda555925619fb609d136ee340f73e Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 9 10:50:37 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/0.4' with non-snapshot versions commit f30110a534f98aff9b873a6536902d6ffce52c0a Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 9 10:50:20 2015 +0000 prepare 0.4 release Summary of changes: .../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(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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@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 @@ +<!-- + #%L + Coselmar :: UI + $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% + --> <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 @@ +<!-- + #%L + Coselmar :: UI + $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% + --> <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 @@ +<!-- + #%L + Coselmar :: UI + $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% + --> <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 @@ +<!-- + #%L + Coselmar :: UI + $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% + --> <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@codelutin.com>.
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 259c352b77dda555925619fb609d136ee340f73e Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 9 10:50:37 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/0.4' with non-snapshot versions --- 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(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index a214705..168c2fc 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.4</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index c19d4cd..63cb103 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.4</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index e9cc316..429b2f1 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.4</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 5c72446..e1d414a 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.4</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 5f6a966..73058f9 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.4</version> <packaging>pom</packaging> <name>Coselmar</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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>.
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 5d8e73384de2b32d762ff97d008f2a24582a8fa9 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 9 10:52:06 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- 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(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index 4b1cf61..168c2fc 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.4</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index d5094fe..63cb103 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.4</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index c54358e..429b2f1 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.4</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 7d1f199..e1d414a 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.4</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index cb154b9..73058f9 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.4</version> <packaging>pom</packaging> <name>Coselmar</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 db334d952495808cd44a9cb3d975722e438e1590 Merge: 5d8e733 498ec23 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 9 10:52:06 2015 +0000 Merge branch 'master' into develop .../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(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 d1ef702f626c66816b52c3a162312565374a67ec Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 9 10:52:06 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- 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(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index 168c2fc..4b1cf61 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4</version> + <version>0.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 63cb103..d5094fe 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4</version> + <version>0.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 429b2f1..c54358e 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4</version> + <version>0.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index e1d414a..7d1f199 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4</version> + <version>0.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 73058f9..cb154b9 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4</version> + <version>0.5-SNAPSHOT</version> <packaging>pom</packaging> <name>Coselmar</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm