[Echobase-commits] branch master updated (b9ffba5 -> f326335)

This is an automated email from the git hooks/post-receive script. New change to branch master in repository echobase. See http://git.codelutin.com/echobase.git from b9ffba5 [jgitflow-maven-plugin]merging 'release/2.11' into 'master' adds a0e54ae [jgitflow-maven-plugin]updating poms for 3.0-SNAPSHOT development adds d3717ad [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 381c6ea [jgitflow-maven-plugin]merging 'master' into 'develop' adds e004221 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 87cbc54 Passage sur la dernière version de codelutinpom adds 47365c8 Utilisation de struts.properties pour y stoquer la taille max autorisé pour un upload (See #7900) adds e5a8cc1 Chargement dans le context applicatif de la taille max d'un upload et propagation dans les actions concernées adds 3fe440f Mise en place du contrôle de la taille côté client adds 1751642 Amélioration de la validation du formulaire d'import common adds 26ae9d2 Fixes #7900. Merge branch 'feature/7900' into develop adds fb0c0e5 From scmwebeditor -- adds 683ef59 From scmwebeditor -- adds e0f4346 From scmwebeditor -- adds 7282365 From scmwebeditor -- adds 06a38ed From scmwebeditor -- adds 1217932 From scmwebeditor -- tj adds 4b5eeb1 From scmwebeditor -- fx adds 0cb4279 From scmwebeditor -- fx adds f49b5d5 From scmwebeditor -- fx adds feb2c33 From scmwebeditor -- fx adds 577c6f2 From scmwebeditor -- fg adds 00128f9 From scmwebeditor -- df adds 9e4c3a4 From scmwebeditor -- df adds 9c92634 From scmwebeditor -- df adds cfaa443 From scmwebeditor -- trfyh adds 2b86b48 From scmwebeditor -- df adds 08aaa09 From scmwebeditor -- df adds 3f2df1e From scmwebeditor -- dfh adds 590c501 From scmwebeditor -- dfh adds 6a7ce47 From scmwebeditor -- dfh adds 87dbb33 From scmwebeditor -- dfh adds f6bc568 From scmwebeditor -- dfsg adds ce32afd passage sur codelutinpom 6 (pour gérer redmine en https) adds e14a73d Correction des dépendences et ajout entete de license adds be6a38d From scmwebeditor -- dfg adds 5480a20 From scmwebeditor -- dfg adds 2f53951 From scmwebeditor -- dfg adds d0ac4da From scmwebeditor -- dfg adds 3048271 From scmwebeditor -- dfg adds f74c0c3 From scmwebeditor -- fg adds 6a6c48a From scmwebeditor -- fgh adds ca12193 From scmwebeditor -- fgh adds 2636d2b From scmwebeditor -- fgh adds 613fa8e From scmwebeditor -- ghf adds 1bfdda2 From scmwebeditor -- h adds 44003a0 From scmwebeditor -- h adds f3ae792 From scmwebeditor -- h adds af0f84b From scmwebeditor -- fhg adds 7074ca8 From scmwebeditor -- fhg adds 2bb1e8d From scmwebeditor -- fhg adds 47a6767 From scmwebeditor -- dfsg adds baee916 From scmwebeditor -- fhd adds f0f1a4c From scmwebeditor -- fhd adds 8c71429 From scmwebeditor -- fhd adds 493087f From scmwebeditor -- fhd adds 6ae9fae From scmwebeditor -- fgh adds a8217b2 From scmwebeditor -- fgh adds b0df26f From scmwebeditor -- fg adds 1c7c43d From scmwebeditor -- fg adds 2c80eef From scmwebeditor -- fg adds 36c75f4 From scmwebeditor -- fg adds 3b5b577 From scmwebeditor -- fg adds 5e1f685 From scmwebeditor -- fg adds 2890136 From scmwebeditor -- fg adds 5722b59 From scmwebeditor -- fg adds ef9a9ed From scmwebeditor -- fg adds a6b5013 From scmwebeditor -- fg adds 2ba971e From scmwebeditor -- fg adds fecda7d From scmwebeditor -- fg adds b0ffedc From scmwebeditor -- gfh adds 7e74945 From scmwebeditor -- gfh adds 1b03c10 From scmwebeditor -- gfh adds 161f1e7 From scmwebeditor -- gfh adds 12717e3 From scmwebeditor -- fg adds 895c82d Correction de l'url du projet adds badce5e Utiliser un optional quand on veut récupérer un ImportLog (il se peut qu'il n'existe plus suite à des suppressions en cascade d'autres imports) (See #8000) adds 269b335 Fixes #8000 Merge branch 'feature/8000' into develop adds 903c941 Use java 8 now adds f43a5d3 Passage sur codelutinpom 7 adds 95b59d9 Suppression de javaVersion du pom (embarqué par codelutinpom) adds 987f2a8 Correction des assembly adds 1ae388a [jgitflow-maven-plugin]updating poms for 2.12 branch with snapshot versions adds 1b4af50 [jgitflow-maven-plugin]updating poms for branch'release/2.12' with non-snapshot versions adds f326335 [jgitflow-maven-plugin]merging 'release/2.12' into 'master' No new revisions were added by this update. Summary of changes: echobase-ui/README.txt => README.md | 0 .../README.txt => echobase-domain/README.md | 0 echobase-domain/pom.xml | 2 +- .../README.txt => echobase-services/README.md | 0 echobase-services/pom.xml | 2 +- .../services/service/UserDbPersistenceService.java | 5 +- .../service/removedata/RemoveDataService.java | 40 +- README.txt => echobase-ui/README.md | 0 echobase-ui/pom.xml | 9 +- echobase-ui/src/main/assembly/embedded-zip.xml | 4 +- echobase-ui/src/main/assembly/full-war.xml | 2 +- .../echobase/ui/EchoBaseApplicationContext.java | 36 +- .../importData/AbstractConfigureImport.java | 4 + .../actions/importData/ConfigureCommonImport.java | 84 ++++- .../echobase/ui/actions/importDb/Configure.java | 4 + .../ui/actions/removeData/ConfirmDelete.java | 25 +- ...onImport-configureCommon-modeAll-validation.xml | 28 +- ...ort-configureCommon-modeTransect-validation.xml | 14 +- ...port-configureCommon-modeTransit-validation.xml | 8 +- ...mport-configureCommon-modeVoyage-validation.xml | 14 +- .../src/main/resources/struts.properties | 7 +- echobase-ui/src/main/resources/struts.xml | 1 - .../src/main/webapp/WEB-INF/includes/metas.jsp | 28 +- .../jsp/importData/configureAcousticImport.jsp | 1 + .../jsp/importData/configureCatchesImport.jsp | 2 +- .../jsp/importData/configureCommonImport.jsp | 67 ++-- .../jsp/importData/configureOperationImport.jsp | 7 + .../jsp/importData/configureResultsImport.jsp | 2 + .../main/webapp/WEB-INF/jsp/importDb/configure.jsp | 7 + pom.xml | 16 +- src/site/en/rst/db.rst | 97 ++--- src/site/en/rst/exportData.rst | 41 +- src/site/en/rst/exportDb.rst | 43 +-- src/site/en/rst/importData.rst | 418 ++++++++++----------- src/site/en/rst/importDb.rst | 20 +- src/site/en/rst/index.rst | 9 +- src/site/en/rst/install.rst.vm | 124 +++--- src/site/en/rst/usage.rst.vm | 133 +++---- 38 files changed, 707 insertions(+), 597 deletions(-) rename echobase-ui/README.txt => README.md (100%) rename echobase-services/README.txt => echobase-domain/README.md (100%) rename echobase-domain/README.txt => echobase-services/README.md (100%) rename README.txt => echobase-ui/README.md (100%) copy echobase-services/src/test/resources/echobase-services-test.properties => echobase-ui/src/main/resources/struts.properties (78%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.