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

annotated tag echobase-4.0-alpha-5 created (now 8b7ce44)
by codelutin.com scm 29 Jun '16

29 Jun '16

This is an automated email from the git hooks/post-receive script. New change to annotated tag echobase-4.0-alpha-5 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git at 8b7ce44 (tag) tagging d15d38e6caee4b43b05dcbd3a1d6616ed1dcebdd (commit) replaces echobase-4.0-alpha-4 tagged by Maven Release on Wed Jun 29 19:18:52 2016 +0200 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.0-alpha-5 ----------------------------------------------------------------------- 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 (260dd19 -> 1c9d999)
by codelutin.com scm 29 Jun '16

29 Jun '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 260dd19 Add forgotten columns (refs #8370) new 73d35e8 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 3eb5830 [jgitflow-maven-plugin]updating poms for 4.0-alpha-5 branch with snapshot versions new 1180b01 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-5' with non-snapshot versions new d15d38e [jgitflow-maven-plugin]merging 'release/4.0-alpha-5' into 'master' new 33941c3 [jgitflow-maven-plugin]merging 'master' into 'develop' new 1c9d999 [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 1c9d99908323fd89527aa7f6b96cef416312a051 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Jun 29 19:18:56 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 33941c31a7fa19a37d8a9b16d57c8174474d7981 Merge: 73d35e8 d15d38e Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Jun 29 19:18:55 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 73d35e83647bc80ac7a1e4615416504def59d541 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Jun 29 19:18:55 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit d15d38e6caee4b43b05dcbd3a1d6616ed1dcebdd Merge: b5e9529 1180b01 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Jun 29 19:18:51 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.0-alpha-5' into 'master' commit 1180b016d5f83a6c225a78030396a6d0ce9105f9 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Jun 29 19:15:21 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-5' 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-alpha-5 updated (3eb5830 -> 1180b01)
by codelutin.com scm 29 Jun '16

29 Jun '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0-alpha-5 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 3eb5830 [jgitflow-maven-plugin]updating poms for 4.0-alpha-5 branch with snapshot versions adds 1180b01 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-5' 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 (b5e9529 -> d15d38e)
by codelutin.com scm 29 Jun '16

29 Jun '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 b5e9529 [jgitflow-maven-plugin]merging 'release/4.0-alpha-4' into 'master' adds 807db9a [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 9ae86d8 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 38dcf19 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 5d3377b Add forgotten columns (refs #8370) adds 260dd19 Add forgotten columns (refs #8370) adds 3eb5830 [jgitflow-maven-plugin]updating poms for 4.0-alpha-5 branch with snapshot versions adds 1180b01 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-5' with non-snapshot versions adds d15d38e [jgitflow-maven-plugin]merging 'release/4.0-alpha-5' into 'master' No new revisions were added by this update. Summary of changes: echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- .../actions/VoyageAcousticsImportAction.java | 25 ++++++++++++++------- .../importdata/VoyageAcousticImportServiceIT.java | 2 +- .../import-data/acoustic/movies_small.csv.gz | Bin 6972 -> 7963 bytes echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 7 files changed, 22 insertions(+), 13 deletions(-) -- 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-alpha-5 released
by codelutin.com Release Notification 29 Jun '16

29 Jun '16

The EchoBase team is pleased to announce the echobase-4.0-alpha-5 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 Erreur de vérification durant l'import accoustique Issue: 8370. Thanks to Julien Ruchaud. Resolved by jruchaud. Downloads --------- For a manual installation, you can download files here: https://forge.codelutin.com/projects/echobase/files * echobase-embedded-4.0-alpha-5.zip - https://forge.codelutin.com/attachments/download/3996 * echobase-referentiel-4.0-alpha-5.echobase - https://forge.codelutin.com/attachments/download/3997 * echobase-ui-4.0-alpha-5-full.war - https://forge.codelutin.com/attachments/download/3998 * echobase-ui-4.0-alpha-5-lizmap.zip - https://forge.codelutin.com/attachments/download/3999 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-alpha-5 created (now 3eb5830)
by codelutin.com scm 29 Jun '16

29 Jun '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0-alpha-5 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git at 3eb5830 [jgitflow-maven-plugin]updating poms for 4.0-alpha-5 branch with snapshot versions This branch includes the following new commits: new 3eb5830 [jgitflow-maven-plugin]updating poms for 4.0-alpha-5 branch with snapshot versions 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 3eb58305b875e802616a06bdc848a25f5573d623 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Jun 29 19:10:39 2016 +0200 [jgitflow-maven-plugin]updating poms for 4.0-alpha-5 branch with snapshot versions -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (38dcf19 -> 260dd19)
by codelutin.com scm 29 Jun '16

29 Jun '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 38dcf19 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 5d3377b Add forgotten columns (refs #8370) new 260dd19 Add forgotten columns (refs #8370) The 2 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 260dd19d3f7e533d186daa3499f31d2566d8d8bd Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 29 19:07:47 2016 +0200 Add forgotten columns (refs #8370) commit 5d3377b0a44edc7fe3d62c7ad722e176d49a89fa Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 29 18:37:43 2016 +0200 Add forgotten columns (refs #8370) Summary of changes: .../actions/VoyageAcousticsImportAction.java | 25 ++++++++++++++------- .../importdata/VoyageAcousticImportServiceIT.java | 2 +- .../import-data/acoustic/movies_small.csv.gz | Bin 6972 -> 7963 bytes 3 files changed, 18 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch feature/8180 updated (4b96b1f -> b47af30)
by codelutin.com scm 29 Jun '16

29 Jun '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 4b96b1f Create basic import AncillaryInstrumentation for Mooring new b47af30 Add forgotten columns (refs #8370) 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 b47af301a055796ef3a6d9d3715a35508006a419 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 29 19:00:08 2016 +0200 Add forgotten columns (refs #8370) Summary of changes: .../actions/ImportAcousticsActionSupport.java | 24 ++++++++++++++------- .../importdata/MooringAcousticImportServiceIT.java | 2 +- .../importdata/VoyageAcousticImportServiceIT.java | 2 +- .../import-data/acoustic/movies_small.csv.gz | Bin 6972 -> 7963 bytes 4 files changed, 18 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8180 updated (33247f7 -> 4b96b1f)
by codelutin.com scm 29 Jun '16

29 Jun '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 33247f7 Add DataAcousticProvider in the model to avoid cast new 4b96b1f Create basic import AncillaryInstrumentation for Mooring 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 4b96b1f11ca71f2727bde6e93619542fc85d2f62 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 29 15:32:43 2016 +0200 Create basic import AncillaryInstrumentation for Mooring Summary of changes: .../echobase/entities/ImportFileIdTopiaDao.java | 9 -- .../fr/ifremer/echobase/entities/ImportType.java | 14 +++ .../entities/data/DataAcousticProvider.java | 18 ++-- .../{references/Ports.java => data/Moorings.java} | 12 +-- .../ifremer/echobase/entities/data/VoyageImpl.java | 11 ++ .../{Ports.java => AncillaryInstrumentations.java} | 12 +-- .../i18n/echobase-domain_en_GB.properties | 4 + .../i18n/echobase-domain_fr_FR.properties | 4 + .../echobase/services/csv/EchoBaseCsvUtil.java | 22 ++++ .../services/service/UserDbPersistenceService.java | 9 ++ ...illaryInstrumentationAssociationException.java} | 10 +- .../service/importdata/ImportDataService.java | 38 +++++-- ...mportAncillaryInstrumentationActionSupport.java | 113 +++++++++++++++++++++ .../actions/ImportDataActionSupport.java | 6 -- ...ommonsAncillaryInstrumentationImportAction.java | 66 ++++++++++++ .../MooringCommonsImportDataActionSupport.java | 8 +- .../actions/MooringCommonsMooringImportAction.java | 18 ++-- ...VoyageResultsRegionAssociationImportAction.java | 4 - ...cillaryInstrumentationImportConfiguration.java} | 18 ++-- ... MooringCommonsMooringImportConfiguration.java} | 6 +- .../MooringImportDataConfigurationSupport.java | 2 +- .../VoyageCommonsImportConfiguration.java | 9 +- .../contexts/ImportDataContextSupport.java | 11 ++ ...AncillaryInstrumentationImportDataContext.java} | 19 +++- ...=> MooringCommonsMooringImportDataContext.java} | 8 +- .../contexts/VoyageImportDataContextSupport.java | 4 - .../importdata/csv/AcousticImportExportModel.java | 2 +- .../csv/AncillaryInstrumentationImportRow.java | 57 +++++++++++ ...sAncillaryInstrumentationImportExportModel.java | 60 +++++++++++ ...ngCommonsAncillaryInstrumentationImportRow.java | 69 +++++++++++++ ...=> MooringCommonsMooringImportExportModel.java} | 14 +-- ...sAncillaryInstrumentationImportExportModel.java | 60 +++++++++++ ...eCommonsAncillaryInstrumentationImportRow.java} | 23 ++--- .../service/removedata/RemoveDataService.java | 8 +- ...aStrategy.java => DummyRemoveDataStrategy.java} | 9 +- .../i18n/echobase-services_en_GB.properties | 2 + .../i18n/echobase-services_fr_FR.properties | 2 + .../echobase/services/EchoBaseServiceFixtures.java | 8 ++ .../echobase/services/ImportDataFixtures.java | 2 + ...nsAncillaryInstrumentationImportServiceIT.java} | 28 ++--- ...a => MooringCommonsMooringImportServiceIT.java} | 16 +-- .../removedata/AbstractRemoveDataServiceTest.java | 5 +- .../import-data/echobase-mooring.h2.db.gz | Bin 936865 -> 938590 bytes .../mooring/ancillaryInstrumentation.csv.gz | Bin 0 -> 96 bytes .../importData/ConfigureMooringCommonsImport.java | 10 +- .../importData/LaunchMooringCommonsImport.java | 10 +- 46 files changed, 684 insertions(+), 156 deletions(-) copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/{references/Ports.java => data/Moorings.java} (79%) copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/{Ports.java => AncillaryInstrumentations.java} (75%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{DuplicatedEchotypeAssociationException.java => DuplicatedAncillaryInstrumentationAssociationException.java} (71%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportAncillaryInstrumentationActionSupport.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/MooringCommonsAncillaryInstrumentationImportAction.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/{MooringCommonsImportConfiguration.java => MooringCommonsAncillaryInstrumentationImportConfiguration.java} (66%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/{MooringCommonsImportConfiguration.java => MooringCommonsMooringImportConfiguration.java} (89%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/{MooringAcousticsImportDataContext.java => MooringCommonsAncillaryInstrumentationImportDataContext.java} (63%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/{MooringCommonsImportDataContext.java => MooringCommonsMooringImportDataContext.java} (75%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AncillaryInstrumentationImportRow.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringCommonsAncillaryInstrumentationImportExportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringCommonsAncillaryInstrumentationImportRow.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{MooringCommonsImportExportModel.java => MooringCommonsMooringImportExportModel.java} (85%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCommonsAncillaryInstrumentationImportExportModel.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{VoyageResultsVoyageEchotypeImportRow.java => VoyageCommonsAncillaryInstrumentationImportRow.java} (67%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/{DummyMooringRemoveDataStrategy.java => DummyRemoveDataStrategy.java} (77%) copy echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{MooringCommonsImportServiceIT.java => MooringCommonsAncillaryInstrumentationImportServiceIT.java} (53%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{MooringCommonsImportServiceIT.java => MooringCommonsMooringImportServiceIT.java} (74%) create mode 100644 echobase-services/src/test/resources/import-data/mooring/ancillaryInstrumentation.csv.gz -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch release/4.0-alpha-4 deleted (was 8ccd467)
by codelutin.com scm 29 Jun '16

29 Jun '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0-alpha-4 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git was 8ccd467 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-4' 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