- Echobase-commits - mailman.cloud.codelutin.com

branch feature/8089-topia3-migration updated (9aa9e26 -> 17f78c1)
by codelutin.com scm March 9, 2016

March 9, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8089-topia3-migration in repository echobase. See http://git.codelutin.com/echobase.git from 9aa9e26 refs: #8089: Migrate to ToPIA 3.0 new 17f78c1 refs #8089: Migrate to ToPIA 3.0 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 17f78c1585d6afae88784fc9e1cc28dfd9fcad66 Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Wed Mar 9 15:31:08 2016 +0100 refs #8089: Migrate to ToPIA 3.0 Summary of changes: .../fr/ifremer/echobase/entities/DriverType.java | 12 ++++--- .../EchoBaseUserTopiaPersistenceContext.java | 4 --- .../EchobaseTopiaApplicationContexts.java | 8 +++++ .../workingDb/MigrationCallBackForVersion.java | 42 +++++++++++++++++++--- .../workingDb/MigrationCallBackForVersion2_2.java | 21 +++++------ .../MigrationCallBackForVersion2_5_1.java | 3 +- .../workingDb/MigrationCallBackForVersion2_6.java | 6 ++-- .../MigrationCallBackForVersion2_6_1.java | 3 +- .../MigrationCallBackForVersion2_7_2.java | 10 +++--- .../MigrationCallBackForVersionPostgresql.java} | 13 ++++--- .../main/resources/echobase-workingdb.properties | 2 +- 11 files changed, 77 insertions(+), 47 deletions(-) copy echobase-domain/src/main/java/fr/ifremer/echobase/{I18nAble.java => persistence/migration/workingDb/MigrationCallBackForVersionPostgresql.java} (74%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8089-topia3-migration created (now 9aa9e26)
by codelutin.com scm March 9, 2016

March 9, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8089-topia3-migration in repository echobase. See http://git.codelutin.com/echobase.git at 9aa9e26 refs: #8089: Migrate to ToPIA 3.0 This branch includes the following new commits: new 9aa9e26 refs: #8089: Migrate to ToPIA 3.0 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 9aa9e26e8cf1752f40c8087f545062ad1d8b3e0a Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Wed Mar 9 13:46:51 2016 +0100 refs: #8089: Migrate to ToPIA 3.0 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (8508aa6 -> 45a0a20)
by codelutin.com scm March 9, 2016

March 9, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from 8508aa6 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 45a0a20 Use codelutinpom 9 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 45a0a20c33753e17687ef14fb7d3214dc77fdc3d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 9 12:02:31 2016 +0100 Use codelutinpom 9 Summary of changes: pom.xml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch release/2.12 deleted (was 1b4af50)
by codelutin.com scm Feb. 25, 2016

Feb. 25, 2016

This is an automated email from the git hooks/post-receive script. New change to branch release/2.12 in repository echobase. See http://git.codelutin.com/echobase.git was 1b4af50 [jgitflow-maven-plugin]updating poms for branch'release/2.12' with non-snapshot versions The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

annotated tag echobase-2.9.1 created (now 5382509)
by codelutin.com scm Feb. 25, 2016

Feb. 25, 2016

This is an automated email from the git hooks/post-receive script. New change to annotated tag echobase-2.9.1 in repository echobase. See http://git.codelutin.com/echobase.git at 5382509 (tag) tagging ca9ca02a3e21b7847eedabe46725274ea36a8c2b (commit) replaces echobase-2.10 tagged by Maven Release on Tue Jan 12 16:29:04 2016 +0100 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 2.9.1 ----------------------------------------------------------------------- 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

annotated tag echobase-2.12 created (now 6a20894)
by codelutin.com scm Feb. 25, 2016

Feb. 25, 2016

This is an automated email from the git hooks/post-receive script. New change to annotated tag echobase-2.12 in repository echobase. See http://git.codelutin.com/echobase.git at 6a20894 (tag) tagging f3263357785de4fbcc07ac9f2f39ec92ed9f91d6 (commit) replaces echobase-2.11 tagged by Maven Release on Thu Feb 25 08:29:53 2016 +0100 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 2.12 ----------------------------------------------------------------------- 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 release/2.12 updated (1ae388a -> 1b4af50)
by codelutin.com scm Feb. 25, 2016

Feb. 25, 2016

This is an automated email from the git hooks/post-receive script. New change to branch release/2.12 in repository echobase. See http://git.codelutin.com/echobase.git from 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 No new revisions were added by this update. Summary of changes: echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch master updated (b9ffba5 -> f326335)
by codelutin.com scm Feb. 25, 2016

Feb. 25, 2016

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

1 0

branch develop updated (c605cda -> 8508aa6)
by codelutin.com scm Feb. 25, 2016

Feb. 25, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from c605cda [jgitflow-maven-plugin]updating poms for 2.13-SNAPSHOT development new 144b255 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 1ae388a [jgitflow-maven-plugin]updating poms for 2.12 branch with snapshot versions new 1b4af50 [jgitflow-maven-plugin]updating poms for branch'release/2.12' with non-snapshot versions new f326335 [jgitflow-maven-plugin]merging 'release/2.12' into 'master' new 3ab50c6 [jgitflow-maven-plugin]merging 'master' into 'develop' new 8508aa6 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 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 8508aa64641d03e4aa5b825fb56a9acea7da1126 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 25 08:29:55 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 3ab50c60364c237168ad3cb40ea131ef95fbfd9a Merge: 144b255 f326335 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 25 08:29:55 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 144b255feaddb1945aa341f90346df2f37989a11 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 25 08:29:55 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit f3263357785de4fbcc07ac9f2f39ec92ed9f91d6 Merge: b9ffba5 1b4af50 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 25 08:29:53 2016 +0100 [jgitflow-maven-plugin]merging 'release/2.12' into 'master' commit 1b4af505c1062ab6f7f1e31706b354847cd2288a Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 25 08:27:33 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.12' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

[ANN] - EchoBase 2.12 released
by codelutin.com Release Notification Feb. 25, 2016

Feb. 25, 2016

The EchoBase team is pleased to announce the echobase-2.12 release! The French Institute for the Exploitation of the Sea (Ifremer) has designed an open software suite for storing fisheries acoustic data and computing acoustic indicators for survey-based ecosystem monitoring. It comprises a postgreSQL database designed to store acoustic, navigation and fishing data from ecosystemic surveys (EchoBase) and a suite of R codes (EchoR) for computing fish population indicators based on Echobase data. Documentation of the project can be found here: http://echobase.codelutin.com Changes ------- Changes in this version include: New features: o Ne pas autoriser l'utilisateur a envoyer dans le chaos binaire d'EchoBase des fichiers trop gros. Issue: 7900. Thanks to Tony Chemit. Resolved by tchemit. Fixed Bugs: o Pb modification référentiel depth stratum Issue: 7908. Thanks to Mathieu Doray. Resolved by tchemit. o L'édition en ligne de la doc d'Echobase ne (re)fonctionne plus Issue: 8003. Thanks to Mathieu Doray. Resolved by tchemit. o Erreur lors de la suppression d'opérations et de données de pêche PELGAS2015 Issue: 8000. Thanks to Mathieu Doray. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: https://forge.codelutin.com/projects/echobase/files * echobase-embedded-2.12.zip - https://forge.codelutin.com/attachments/download/3717 * echobase-referentiel-2.12.echobase - https://forge.codelutin.com/attachments/download/3718 * echobase-ui-2.12-full.war - https://forge.codelutin.com/attachments/download/3719 * echobase-ui-2.12-lizmap.zip - https://forge.codelutin.com/attachments/download/3720 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -EchoBase team

1 0