branch develop updated (302268a -> 5c90a17)
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 302268a [jgitflow-maven-plugin]updating poms for 1.2-SNAPSHOT development new 616f6a7 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 88ffa05 fix i18n file header new 1ce116e [jgitflow-maven-plugin]updating poms for branch'release/1.1' with non-snapshot versions new 6f653f6 [jgitflow-maven-plugin]merging 'release/1.1' into 'master' new e079f5d [jgitflow-maven-plugin]merging 'master' into 'develop' new 5c90a17 [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 5c90a179c812855988ba9f6641355367ce9260c1 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 17 16:43:28 2015 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit e079f5da46f853ffabdf8f20343a0f2374305f90 Merge: 616f6a7 6f653f6 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 17 16:43:28 2015 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 616f6a7add4f65e2c6682801a25578a86fb202e0 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 17 16:43:27 2015 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 6f653f6325ba96a8f7af96d888555028fd56f29b Merge: 2a426c4 1ce116e Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 17 16:43:24 2015 +0100 [jgitflow-maven-plugin]merging 'release/1.1' into 'master' commit 1ce116e708107f3e58847dc485a24c85d1cb3be7 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 17 16:40:43 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.1' with non-snapshot versions commit 88ffa051761dbfaa9e44f4e2b6c1c5fbdc98dbfa Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 17 16:40:00 2015 +0100 fix i18n file header Summary of changes: .../i18n/coselmar-persistence_en_GB.properties | 21 --------------------- .../i18n/coselmar-persistence_fr_FR.properties | 21 --------------------- 2 files changed, 42 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 88ffa051761dbfaa9e44f4e2b6c1c5fbdc98dbfa Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 17 16:40:00 2015 +0100 fix i18n file header --- .../i18n/coselmar-persistence_en_GB.properties | 21 --------------------- .../i18n/coselmar-persistence_fr_FR.properties | 21 --------------------- 2 files changed, 42 deletions(-) diff --git a/coselmar-persistence/src/main/resources/i18n/coselmar-persistence_en_GB.properties b/coselmar-persistence/src/main/resources/i18n/coselmar-persistence_en_GB.properties index 5d77ecd..4710e08 100644 --- a/coselmar-persistence/src/main/resources/i18n/coselmar-persistence_en_GB.properties +++ b/coselmar-persistence/src/main/resources/i18n/coselmar-persistence_en_GB.properties @@ -1,23 +1,2 @@ -### -# #%L -# Coselmar :: Persistence -# %% -# 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% -### coselmar.configuration.data.directory= coselmar.configuration.index.directory= diff --git a/coselmar-persistence/src/main/resources/i18n/coselmar-persistence_fr_FR.properties b/coselmar-persistence/src/main/resources/i18n/coselmar-persistence_fr_FR.properties index 5d77ecd..4710e08 100644 --- a/coselmar-persistence/src/main/resources/i18n/coselmar-persistence_fr_FR.properties +++ b/coselmar-persistence/src/main/resources/i18n/coselmar-persistence_fr_FR.properties @@ -1,23 +1,2 @@ -### -# #%L -# Coselmar :: Persistence -# %% -# 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% -### coselmar.configuration.data.directory= coselmar.configuration.index.directory= -- 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 1ce116e708107f3e58847dc485a24c85d1cb3be7 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 17 16:40:43 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.1' 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 5946140..efdfb9c 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index adb35b0..e76e705 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 0c3c03c..14fa1ac 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index b607e1b..b113b82 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 96549a7..4bdd927 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</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 6f653f6325ba96a8f7af96d888555028fd56f29b Merge: 2a426c4 1ce116e Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 17 16:43:24 2015 +0100 [jgitflow-maven-plugin]merging 'release/1.1' into 'master' coselmar-bundle/pom.xml | 3 +- coselmar-bundle/src/license/THIRD-PARTY.properties | 21 +++ coselmar-persistence/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 21 +++ .../coselmar/beans/DocumentSearchExample.java | 91 ++++++++++++ .../ifremer/coselmar/beans/QuestionSearchBean.java | 30 +--- .../SearchExample.java} | 58 ++++---- .../fr/ifremer/coselmar/persistence/DaoUtils.java | 34 +++++ .../coselmar/persistence/FixedH2Dialect.java | 42 ++++++ .../coselmar/persistence/SearchRequestBean.java | 14 +- .../persistence/entity/DocumentTopiaDao.java | 137 +++++++++++++++++ .../persistence/entity/QuestionTopiaDao.java | 2 +- .../fr/ifremer/FakeCoselmarApplicationContext.java | 64 ++------ coselmar-rest/pom.xml | 14 +- coselmar-rest/src/license/THIRD-PARTY.properties | 21 +++ .../java/fr/ifremer/coselmar/beans/CloudWord.java | 55 +++++++ .../ifremer/coselmar/beans/DocumentSearchBean.java | 95 ++++++++++++ .../fr/ifremer/coselmar/beans/QuestionBean.java | 10 ++ .../coselmar/beans/QuestionExportModel.java | 77 ++++++++++ .../coselmar/converter/BeanEntityConverter.java | 60 ++++++++ .../services/CoselmarRestApplicationListener.java | 4 +- .../CoselmarServicesApplicationContext.java | 2 + .../indexation/DocumentsIndexationService.java | 9 +- .../coselmar/services/indexation/LuceneUtils.java | 5 +- .../indexation/QuestionsIndexationService.java | 156 +++++++++++++++----- .../indexation/TransverseIndexationService.java | 116 +++++++++++++++ .../coselmar/services/v1/DocumentsWebService.java | 48 ++++-- .../coselmar/services/v1/GeneralWebService.java | 74 ++++++++++ .../coselmar/services/v1/QuestionsWebService.java | 57 ++++++++ .../coselmar/services/v1/UsersWebService.java | 2 +- .../lucene/misc/HighFreqTermsMultiFields.java | 97 ++++++++++++ .../i18n/coselmar-services_en_GB.properties | 32 +++- .../i18n/coselmar-services_fr_FR.properties | 32 +++- coselmar-rest/src/main/resources/mapping | 11 +- .../services/FakeCoselmarApplicationContext.java | 69 ++++++--- .../coselmar/services/QuestionsWebServiceTest.java | 14 +- .../indexation/QuestionsIndexationServiceTest.java | 156 ++++++++++++++++---- coselmar-ui/pom.xml | 14 +- coselmar-ui/src/main/webapp/css/jqcloud-2.0.0.css | 59 ++++++++ coselmar-ui/src/main/webapp/i18n/en.js | 6 +- coselmar-ui/src/main/webapp/i18n/fr.js | 6 +- coselmar-ui/src/main/webapp/index.html | 38 +++-- .../src/main/webapp/js/coselmar-controllers.js | 83 +++++++++-- .../main/webapp/js/coselmar-general-services.js | 43 ++++++ .../main/webapp/js/coselmar-questions-services.js | 37 ++++- .../src/main/webapp/js/coselmar-services.js | 9 +- coselmar-ui/src/main/webapp/js/coselmar.js | 2 +- .../src/main/webapp/views/documents/documents.html | 17 +-- .../main/webapp/views/documents/editDocument.html | 2 +- .../main/webapp/views/documents/newdocument.html | 2 +- .../src/main/webapp/views/documents/toolsPart.html | 162 +++++++++++++++++++++ coselmar-ui/src/main/webapp/views/home.html | 49 ++++++- .../src/main/webapp/views/questions/questions.html | 6 +- .../src/main/webapp/views/users/newPassword.html | 2 +- .../src/main/webapp/views/users/searchPart.html | 6 +- pom.xml | 106 ++++++++++---- 56 files changed, 2071 insertions(+), 313 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 616f6a7add4f65e2c6682801a25578a86fb202e0 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 17 16:43:27 2015 +0100 [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 1338680..efdfb9c 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index fd7e59a..e76e705 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 5f3b3f3..14fa1ac 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 59d45c4..b113b82 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 3b8d330..4bdd927 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.1</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 e079f5da46f853ffabdf8f20343a0f2374305f90 Merge: 616f6a7 6f653f6 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 17 16:43:28 2015 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' .../i18n/coselmar-persistence_en_GB.properties | 21 --------------------- .../i18n/coselmar-persistence_fr_FR.properties | 21 --------------------- 2 files changed, 42 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 5c90a179c812855988ba9f6641355367ce9260c1 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 17 16:43:28 2015 +0100 [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 efdfb9c..1338680 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.1</version> + <version>1.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index e76e705..fd7e59a 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.1</version> + <version>1.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 14fa1ac..5f3b3f3 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.1</version> + <version>1.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index b113b82..59d45c4 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.1</version> + <version>1.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 4bdd927..3b8d330 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.1</version> + <version>1.2-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