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 2a426c4 Merge branch 'release/1.0.1' adds 9415723 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 2c8fbe1 Merge branch 'master' into develop adds 44ea8af [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 8818e58 Quelques upgrade de libs adds 8cac082 Remove james.bond@mi6.org from placeholders adds 1965ef8 Upgrade de librairies côté front adds bd44409 Ajout d'une classe pour fixer le dialect H2 plantant avec les varchar adds 3da9a3c refs #6742 #7775 Add list of public project in homepage without connexion adds 51cb31a refs-90 #6742 #7775 Add 2 last closed projects in connected users home page list adds 989a415 refs-40 #7648 First draft for projects export adds 0bbe39e fixes #7648 finish projects export adds 5555369 refs-10 #7778 Prepare la recherche avancée sur les documents adds 4eca421 refs-20 #7778 Premier jet pour l'ecran de recherche avancée sur les documents et preparation côté service adds fe40b40 refs-30 #7778 Revue de la couche DAO pour la recherche de documents adds cc162cf refs-90 #7778 Revue avancée de documents adds baed38f refs-90 #7778 Ajout d'un filtre de recherche sur la date de dépot d'un document adds 70270ab refs-10 #7776 Prepare la recherche des mots les plus pertinents sur les projets adds d50fb02 refs-20 #7776 Recherche lucene des mots les plus fréquents dans l'ensemble des projets adds 19f5785 refs-40 #7776 mise en place d'un service rest renvoyant les mots les plus courrant de l'application adds 3f4d90b refs-80 #7776 mise en plac du nuage de mot sur l'ui adds dd7d23a fixes #7776 Utilisation de webjars pour jqcloud et angular-jqcloud adds 5f143e7 Merge branch 'feature/R7776-cloudTags-in-homepage' into develop adds ac39b3f bascule sur la derniere version rc de nuiton-csv adds b785358 update file headers adds 15d923e Upgrade to pom-4 parent adds 88ffa05 fix i18n file header adds 1ce116e [jgitflow-maven-plugin]updating poms for branch'release/1.1' with non-snapshot versions adds 6f653f6 [jgitflow-maven-plugin]merging 'release/1.1' into 'master' No new revisions were added by this update. Summary of changes: 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 +++++ ...PersistenceContext.java => FixedH2Dialect.java} | 24 +-- .../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 +++ .../CloudWord.java} | 32 +++- ...UserSearchBean.java => DocumentSearchBean.java} | 35 ++++- .../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 +++++++++-- ...r-constants.js => coselmar-general-services.js} | 24 ++- .../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, 1923 insertions(+), 341 deletions(-) create mode 100644 coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/DocumentSearchExample.java copy coselmar-persistence/src/main/java/fr/ifremer/coselmar/{persistence/SearchRequestBean.java => beans/SearchExample.java} (62%) copy coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/{CoselmarPersistenceContext.java => FixedH2Dialect.java} (65%) copy coselmar-rest/src/main/java/fr/ifremer/coselmar/{services/errors/NoResultException.java => beans/CloudWord.java} (60%) copy coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/{UserSearchBean.java => DocumentSearchBean.java} (55%) create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionExportModel.java create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/services/indexation/TransverseIndexationService.java create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/GeneralWebService.java create mode 100644 coselmar-rest/src/main/java/org/apache/lucene/misc/HighFreqTermsMultiFields.java create mode 100644 coselmar-ui/src/main/webapp/css/jqcloud-2.0.0.css copy coselmar-ui/src/main/webapp/js/{coselmar-constants.js => coselmar-general-services.js} (63%) create mode 100644 coselmar-ui/src/main/webapp/views/documents/toolsPart.html -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.