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

branch develop updated (8fd8e29 -> 3fd8d22)
by codelutin.com scm 08 Nov '16

08 Nov '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 8fd8e29 Merge branch 'develop' of gitlab.nuiton.org:codelutin/echobase into develop new 3fd8d22 #8756 Setup spicies handling 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 3fd8d225552409a69e2c178d07a331175ff4e7f5 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Nov 8 19:10:31 2016 +0100 #8756 Setup spicies handling Summary of changes: .../services/service/UserDbPersistenceService.java | 7 ++ .../VoyageResultsMapFishCellImportAction.java | 117 +++++++++++---------- .../csv/VoyageResultsMapFishCellImportRow.java | 7 +- .../import-data/result/map/mapsFish.csv.gz | Bin 3387 -> 3377 bytes 4 files changed, 74 insertions(+), 57 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (d195ca5 -> 8fd8e29)
by codelutin.com scm 08 Nov '16

08 Nov '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from d195ca5 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new aa9ba14 Remove useless files new 2bd5b1a #8755 Get dataQuality in right place new 8fd8e29 Merge branch 'develop' of gitlab.nuiton.org:codelutin/echobase into develop The 3 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 8fd8e29092af4b8d4313cae3aa7e6532ecd2fe71 Merge: 2bd5b1a d195ca5 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Nov 8 17:30:34 2016 +0100 Merge branch 'develop' of gitlab.nuiton.org:codelutin/echobase into develop commit 2bd5b1ab8cf4815b3b987eebdc8f69e252450e3c Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Nov 8 17:29:41 2016 +0100 #8755 Get dataQuality in right place commit aa9ba143c170f437e4a0366733312804ad6ffc38 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Nov 8 12:38:39 2016 +0100 Remove useless files Summary of changes: .../csv/VoyageResultsRegionCellImportRow.java | 25 +++--- echobase-services/src/main/resources/actual | 99 --------------------- echobase-services/src/main/resources/expected | 99 --------------------- .../import-data/result/region/regionResults.csv.gz | Bin 13249 -> 13099 bytes .../import-data/result/region/regions.csv.gz | Bin 4440 -> 4413 bytes 5 files changed, 12 insertions(+), 211 deletions(-) delete mode 100644 echobase-services/src/main/resources/actual delete mode 100644 echobase-services/src/main/resources/expected -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch release/4.0.2 deleted (was 958a07b)
by codelutin.com scm 08 Nov '16

08 Nov '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0.2 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git was 958a07b [jgitflow-maven-plugin]updating poms for branch'release/4.0.2' 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-4.0.2 created (now 11e1435)
by codelutin.com scm 08 Nov '16

08 Nov '16

This is an automated email from the git hooks/post-receive script. New change to annotated tag echobase-4.0.2 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git at 11e1435 (tag) tagging 66253ff1052f3c1ef8284b7b3c2057a31c845d09 (commit) replaces echobase-4.0.1 tagged by Maven Release on Tue Nov 8 12:33:32 2016 +0100 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.0.2 ----------------------------------------------------------------------- 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 develop updated (92002ca -> d195ca5)
by codelutin.com scm 08 Nov '16

08 Nov '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 92002ca [jgitflow-maven-plugin]updating poms for 4.0.3-SNAPSHOT development new b4f35b6 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 958a07b [jgitflow-maven-plugin]updating poms for branch'release/4.0.2' with non-snapshot versions new 66253ff [jgitflow-maven-plugin]merging 'release/4.0.2' into 'master' new f8c9a76 [jgitflow-maven-plugin]merging 'master' into 'develop' new d195ca5 [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 d195ca5b2c2483d54507be788e6473bcab8d74f4 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Nov 8 12:33:35 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit f8c9a76d8f5ba74e7f3d33ef5b3d4381d1f4d50d Merge: b4f35b6 66253ff Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Nov 8 12:33:34 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit b4f35b6af0a926a4b67b26d13dfdde6905f6b7cb Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Nov 8 12:33:34 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 66253ff1052f3c1ef8284b7b3c2057a31c845d09 Merge: bb692df 958a07b Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Nov 8 12:33:31 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.0.2' into 'master' commit 958a07b3f47ff21b3e6fe5e69ed3fe68f46f415b Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Nov 8 12:30:35 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.0.2' 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

branch release/4.0.2 updated (5124323 -> 958a07b)
by codelutin.com scm 08 Nov '16

08 Nov '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0.2 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 5124323 #8747 Modify SizeCategoryMeaning LengthClassMeaning adds 958a07b [jgitflow-maven-plugin]updating poms for branch'release/4.0.2' 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 (bb692df -> 66253ff)
by codelutin.com scm 08 Nov '16

08 Nov '16

This is an automated email from the git hooks/post-receive script. New change to branch master in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from bb692df [jgitflow-maven-plugin]merging 'release/4.0.1' into 'master' adds 2b9173a #8724 Modify latitude and longitude for hauling adds e577c87 [jgitflow-maven-plugin]updating poms for 4.0.2-SNAPSHOT development adds eb2bf63 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds c9c54ca [jgitflow-maven-plugin]merging 'master' into 'develop' adds b4ec43d [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 67e7379 From scmwebeditor -- fg adds f14ecbf Merge branch 'develop' of gitlab.nuiton.org:codelutin/echobase into develop adds 480ca85 Complete documentation adds df4a2de #8738 Remove ReferenceStationBiometry in documentation # adds 3d59cca Update documentation with right example on esdu cell name adds a3822b1 #8744 DataQuality wasn't copy in export row adds 44d2f2e #8743 Add export biology adds d4eec9d #8743 Fix on specie only to get individual sample adds cfa5f44 Fix error syntax adds 60f4d6c Fix error syntax adds a0738aa Fix title adds 5124323 #8747 Modify SizeCategoryMeaning LengthClassMeaning adds 958a07b [jgitflow-maven-plugin]updating poms for branch'release/4.0.2' with non-snapshot versions adds 66253ff [jgitflow-maven-plugin]merging 'release/4.0.2' into 'master' No new revisions were added by this update. Summary of changes: echobase-domain/pom.xml | 2 +- ...WorkingDbMigrationCallBackForVersion3_912.java} | 6 +- .../workingDb/h2/3.912-0-atlantos-operation.sql | 44 +++++++++ .../workingDb/pg/3.912-0-atlantos-operation.sql | 44 +++++++++ echobase-domain/src/main/xmi/echobase.properties | 2 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 100339 -> 100352 bytes echobase-services/pom.xml | 2 +- .../service/atlantos/ExportAtlantosService.java | 2 +- .../service/atlantos/xml/VocabularyExport.java | 30 +++++-- .../service/atlantos/xml/XmlAccousticExport.java | 4 +- .../service/atlantos/xml/XmlBioticExport.java | 82 ++++++++++++----- ...=> MismatchLengthCategoryMeaningException.java} | 8 +- .../service/importdata/SizeCategoryCache.java | 5 ++ ...ndSpeciesCategoryAndLengthCellImportAction.java | 23 +++-- ...sEsduByEchotypeAndSpeciesCategoryImportRow.java | 1 + .../csv/MooringResultsEsduByEchotypeImportRow.java | 1 + ...VoyageOperationsOperationImportExportModel.java | 8 +- .../csv/VoyageOperationsOperationImportRow.java | 16 ++-- ...dSpeciesCategoryAndLengthImportExportModel.java | 6 +- ...hotypeAndSpeciesCategoryAndLengthImportRow.java | 20 +++-- ...sEsduByEchotypeAndSpeciesCategoryImportRow.java | 1 + .../csv/VoyageResultsEsduByEchotypeImportRow.java | 1 + ...esultsEsduBySpeciesAndAgeCategoryImportRow.java | 1 + echobase-services/src/main/resources/actual | 99 +++++++++++++++++++++ echobase-services/src/main/resources/expected | 99 +++++++++++++++++++++ .../i18n/echobase-services_en_GB.properties | 2 +- .../i18n/echobase-services_fr_FR.properties | 2 +- .../import-data/operation/operation.csv.gz | Bin 6053 -> 6056 bytes .../import-data/result/esdu/byEchotype.csv.gz | Bin 73195 -> 72758 bytes ...chotypeAndSpeciesCategoryAndLength_small.csv.gz | Bin 2585 -> 2605 bytes .../result/esdu/byEchotype_small.csv.gz | Bin 2802 -> 2791 bytes echobase-ui/pom.xml | 2 +- pom.xml | 2 +- src/site/en/rst/importData.rst | 57 +++++++----- src/site/rst/importData.rst | 47 ++++++---- 35 files changed, 499 insertions(+), 120 deletions(-) copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{WorkingDbMigrationCallBackForVersion3_911.java => WorkingDbMigrationCallBackForVersion3_912.java} (89%) create mode 100644 echobase-domain/src/main/resources/migration/workingDb/h2/3.912-0-atlantos-operation.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/pg/3.912-0-atlantos-operation.sql rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{MismatchSizeCategoryMeaningException.java => MismatchLengthCategoryMeaningException.java} (74%) create mode 100644 echobase-services/src/main/resources/actual create mode 100644 echobase-services/src/main/resources/expected -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[ANN] - EchoBase 4.0.2 released
by codelutin.com Release Notification 08 Nov '16

08 Nov '16

The EchoBase team is pleased to announce the echobase-4.0.2 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: Fixed Bugs: o Impossible de cloner ma base test Issue: 8720. Thanks to Mathieu Doray. Resolved by jruchaud. o "Cellule ESDU sans cellule elementary cell" lors de l'import des données acoustiques PELGAS2015 Issue: 8727. Thanks to Mathieu Doray. Resolved by mdoray. o Erreur à l'import des résultats par ESDU / échotype Issue: 8738. Thanks to Mathieu Doray. Resolved by jruchaud. o Erreur à l'import des résultats par ESDU / échotype / catégorie sp Issue: 8744. Thanks to Mathieu Doray. Resolved by jruchaud. o Erreur à l'import des données d'opération Issue: 8725. Thanks to Mathieu Doray. Resolved by jruchaud. o Modification de l'import du fichier opérations pour compatibilité Atlantos Issue: 8724. Thanks to Mathieu Doray. Resolved by jruchaud. o Ajout du header "biology" dans l'export xml Atlantos Issue: 8743. Thanks to Mathieu Doray. Resolved by jruchaud. o Erreur à l'import des résultats par ESDU / échotype / catégorie sp /taille Issue: 8747. Thanks to Mathieu Doray. Resolved by jruchaud. Downloads --------- For a manual installation, you can download files here: https://forge.codelutin.com/projects/echobase/files * echobase-embedded-4.0.2.zip - https://forge.codelutin.com/attachments/download/4224 * echobase-referentiel-4.0.2.echobase - https://forge.codelutin.com/attachments/download/4225 * echobase-ui-4.0.2-full.war - https://forge.codelutin.com/attachments/download/4226 * echobase-ui-4.0.2-lizmap.zip - https://forge.codelutin.com/attachments/download/4227 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -EchoBase team

1 0

branch release/4.0.2 created (now 5124323)
by codelutin.com scm 08 Nov '16

08 Nov '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0.2 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git at 5124323 #8747 Modify SizeCategoryMeaning LengthClassMeaning 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 develop updated (5124323 -> 92002ca)
by codelutin.com scm 08 Nov '16

08 Nov '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 5124323 #8747 Modify SizeCategoryMeaning LengthClassMeaning new 92002ca [jgitflow-maven-plugin]updating poms for 4.0.3-SNAPSHOT development 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 92002cafaf322b00ca2d309c9bb05937cc5dc80a Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Nov 8 12:26:16 2016 +0100 [jgitflow-maven-plugin]updating poms for 4.0.3-SNAPSHOT development 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 1