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

branch develop updated (efcf1a2 -> 38dcf19)
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 efcf1a2 Improve the perfomance on search duplicate cell (ref #8165) new 807db9a [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 22fb71d [jgitflow-maven-plugin]updating poms for 4.0-alpha-4 branch with snapshot versions new 2a08cea Fix license header new 8ccd467 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-4' with non-snapshot versions new b5e9529 [jgitflow-maven-plugin]merging 'release/4.0-alpha-4' into 'master' new 9ae86d8 [jgitflow-maven-plugin]merging 'master' into 'develop' new 38dcf19 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 38dcf19f4946c85c2c8b4132f9b298f0b3ec7e23 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Jun 29 13:32:30 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 9ae86d8b4d8a1b8783306ca8a9536b8b02460d17 Merge: 807db9a b5e9529 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Jun 29 13:32:29 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 807db9a9b3a7f840ff8fdd54152d777e836aec2e Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Jun 29 13:32:29 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit b5e9529de27af9097d41877d6cf4056fe1b4c4a3 Merge: 5ef97c9 8ccd467 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Jun 29 13:32:26 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.0-alpha-4' into 'master' commit 8ccd46740d1c4cf9029d85d23c4b6c7151bf9123 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Jun 29 13:29:07 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-4' with non-snapshot versions commit 2a08cea72f897b0e62c19d4fb3f4b76170831697 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Jun 29 13:28:49 2016 +0200 Fix license header Summary of changes: .../WorkingDbMigrationCallBackForVersion3_906.java | 21 +++++++++++++++++++++ .../migration/workingDb/3.906-0-add-indexes.sql | 20 ++++++++++++++++++++ 2 files changed, 41 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

annotated tag echobase-4.0-alpha-4 created (now 69b49fa)
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-4 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git at 69b49fa (tag) tagging b5e9529de27af9097d41877d6cf4056fe1b4c4a3 (commit) replaces echobase-4.0-alpha-3 tagged by Maven Release on Wed Jun 29 13:32:27 2016 +0200 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.0-alpha-4 ----------------------------------------------------------------------- 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/4.0-alpha-4 updated (22fb71d -> 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 from 22fb71d [jgitflow-maven-plugin]updating poms for 4.0-alpha-4 branch with snapshot versions adds 2a08cea Fix license header adds 8ccd467 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-4' with non-snapshot versions No new revisions were added by this update. Summary of changes: echobase-domain/pom.xml | 2 +- .../WorkingDbMigrationCallBackForVersion3_906.java | 21 +++++++++++++++++++++ .../migration/workingDb/3.906-0-add-indexes.sql | 20 ++++++++++++++++++++ echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 45 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 (5ef97c9 -> b5e9529)
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 5ef97c9 [jgitflow-maven-plugin]merging 'release/4.0-alpha-3' into 'master' adds fcc059d [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 53fec10 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 4d494c8 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 94a143d Update model image in site adds b9fb829 Rename legend in qgis adds 2ef6a93 Initalisation du referenciel adds 292e560 Test adds 46bfa10 Supression lock adds eabb0dd Fix error on Elementary cell when position is set at end adds ec1a8ab test2 adds 2a18b01 Merge branch 'develop' of https://gitlab.nuiton.org/codelutin/echobase into develop adds 569de80 From scmwebeditor -- e adds 01403aa From scmwebeditor -- dfg adds 38abb5d Improve the perfomance on search duplicate cell (ref #8165) adds c8c858c Improve the perfomance on search duplicate cell (ref #8165) adds efcf1a2 Improve the perfomance on search duplicate cell (ref #8165) adds 22fb71d [jgitflow-maven-plugin]updating poms for 4.0-alpha-4 branch with snapshot versions adds 2a08cea Fix license header adds 8ccd467 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-4' with non-snapshot versions adds b5e9529 [jgitflow-maven-plugin]merging 'release/4.0-alpha-4' into 'master' No new revisions were added by this update. Summary of changes: echobase-domain/pom.xml | 2 +- .../src/main/data/export-AgeCategory.csv | 5 + echobase-domain/src/main/data/export-Category.csv | 8 + echobase-domain/src/main/data/export-CellType.csv | 8 + .../src/main/data/export-DataMetadata.csv | 169 ++++++++++++++ echobase-domain/src/main/data/export-DataType.csv | 29 +++ .../src/main/data/export-DepthStratum.csv | 21 ++ echobase-domain/src/main/data/export-Gear.csv | 188 +++++++++++++++ .../src/main/data/export-GearMetadata.csv | 8 + .../src/main/data/export-SampleDataType.csv | 137 +++++++++++ .../src/main/data/export-SampleType.csv | 6 + .../src/main/data/export-SizeCategory.csv | 8 + echobase-domain/src/main/data/export-Species.csv | 256 +++++++++++++++++++++ echobase-domain/src/main/data/export-Strata.csv | 2 + .../src/main/data/export-TSParameters.csv | 134 +++++++++++ echobase-domain/src/main/data/export-Vessel.csv | 14 ++ .../src/main/data/export-VesselType.csv | 8 + .../echobase/entities/data/CellTopiaDao.java | 54 +++++ ...WorkingDbMigrationCallBackForVersion3_906.java} | 12 +- ...ory_lengthClass.sql => 3.906-0-add-indexes.sql} | 2 +- echobase-services/pom.xml | 2 +- .../services/service/UserDbPersistenceService.java | 2 +- .../actions/VoyageAcousticsImportAction.java | 2 +- .../gis/templates/EchoBaseQGisTemplate.qgs | 2 +- .../src/test/resources/log4j.properties | 1 + echobase-ui/pom.xml | 2 +- pom.xml | 2 +- src/site/en/rst/configure.rst.vm | 28 +-- src/site/en/rst/model.rst | 4 + src/site/en/rst/update.rst.vm | 2 +- src/site/resources/model/Transverse.png | Bin 5934 -> 9110 bytes src/site/resources/model/dataAcoustic.png | Bin 30243 -> 34954 bytes src/site/resources/model/dataCatches.png | Bin 22259 -> 22223 bytes src/site/resources/model/dataCategory.png | Bin 9107 -> 9122 bytes src/site/resources/model/dataCommon.png | Bin 29256 -> 34469 bytes src/site/resources/model/dataEchotype.png | Bin 6836 -> 6860 bytes src/site/resources/model/dataLengthAgeKey.png | Bin 6800 -> 6754 bytes src/site/resources/model/dataLengthWeightKey.png | Bin 6658 -> 5566 bytes src/site/resources/model/dataMooring.png | Bin 0 -> 14136 bytes .../model/referenceAcousticInstrument.png | Bin 8939 -> 11654 bytes src/site/resources/model/referenceAll.png | Bin 65068 -> 71173 bytes .../resources/model/referenceAreaOfOperation.png | Bin 2692 -> 2703 bytes src/site/resources/model/referenceCellType.png | Bin 3224 -> 3225 bytes src/site/resources/model/referenceDataMetadata.png | Bin 8701 -> 8723 bytes src/site/resources/model/referenceDataQuality.png | Bin 1808 -> 1817 bytes src/site/resources/model/referenceDepthStratum.png | Bin 1873 -> 1880 bytes src/site/resources/model/referenceGear.png | Bin 12657 -> 12676 bytes src/site/resources/model/referenceMission.png | Bin 7820 -> 7830 bytes src/site/resources/model/referenceOperation.png | Bin 5848 -> 5858 bytes src/site/resources/model/referencePort.png | Bin 0 -> 3465 bytes src/site/resources/model/referenceProtocole.png | Bin 6561 -> 6576 bytes .../resources/model/referenceReferenceDatum.png | Bin 3124 -> 3134 bytes src/site/resources/model/referenceSample.png | Bin 7617 -> 7631 bytes src/site/resources/model/referenceSpecies.png | Bin 14271 -> 14498 bytes src/site/resources/model/referenceStrata.png | Bin 7889 -> 7903 bytes src/site/resources/model/referenceTSParameter.png | Bin 9923 -> 9934 bytes src/site/resources/model/referenceVessel.png | Bin 6636 -> 7237 bytes src/site/rst/model.rst | 4 + 58 files changed, 1094 insertions(+), 28 deletions(-) create mode 100644 echobase-domain/src/main/data/export-AgeCategory.csv create mode 100644 echobase-domain/src/main/data/export-Category.csv create mode 100644 echobase-domain/src/main/data/export-CellType.csv create mode 100644 echobase-domain/src/main/data/export-DataMetadata.csv create mode 100644 echobase-domain/src/main/data/export-DataType.csv create mode 100644 echobase-domain/src/main/data/export-DepthStratum.csv create mode 100644 echobase-domain/src/main/data/export-Gear.csv create mode 100644 echobase-domain/src/main/data/export-GearMetadata.csv create mode 100644 echobase-domain/src/main/data/export-SampleDataType.csv create mode 100644 echobase-domain/src/main/data/export-SampleType.csv create mode 100644 echobase-domain/src/main/data/export-SizeCategory.csv create mode 100644 echobase-domain/src/main/data/export-Species.csv create mode 100644 echobase-domain/src/main/data/export-Strata.csv create mode 100644 echobase-domain/src/main/data/export-TSParameters.csv create mode 100644 echobase-domain/src/main/data/export-Vessel.csv create mode 100644 echobase-domain/src/main/data/export-VesselType.csv copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{WorkingDbMigrationCallBackForVersion3_902.java => WorkingDbMigrationCallBackForVersion3_906.java} (83%) copy echobase-domain/src/main/resources/migration/workingDb/{3.902-0-add-SpeciesCategory_lengthClass.sql => 3.906-0-add-indexes.sql} (93%) create mode 100644 src/site/resources/model/dataMooring.png create mode 100644 src/site/resources/model/referencePort.png -- 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-4 released
by codelutin.com Release Notification 29 Jun '16

29 Jun '16

The EchoBase team is pleased to announce the echobase-4.0-alpha-4 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 Import depuis le modèle Atlantlos Issue: 8172. Fixed Bugs: o LibreOffice 4 ou 5 ne charge plus le driver jdbc pour se connecter à Echobase Issue: 8008. 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-alpha-4.zip - https://forge.codelutin.com/attachments/download/3991 * echobase-referentiel-4.0-alpha-4.echobase - https://forge.codelutin.com/attachments/download/3992 * echobase-ui-4.0-alpha-4-full.war - https://forge.codelutin.com/attachments/download/3993 * echobase-ui-4.0-alpha-4-lizmap.zip - https://forge.codelutin.com/attachments/download/3994 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-4 created (now 22fb71d)
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 at 22fb71d [jgitflow-maven-plugin]updating poms for 4.0-alpha-4 branch with snapshot versions This branch includes the following new commits: new 22fb71d [jgitflow-maven-plugin]updating poms for 4.0-alpha-4 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 22fb71dff08d8e44591f2106e2fe4f7427a81e4b Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Jun 29 13:23:45 2016 +0200 [jgitflow-maven-plugin]updating poms for 4.0-alpha-4 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 feature/8180 updated (612b6a3 -> 33247f7)
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 612b6a3 Refactoring on echotype import to make place for mooring new 33247f7 Add DataAcousticProvider in the model to avoid cast 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 33247f7015982298a038eadbc5337d4fd40a1fa1 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 29 11:38:41 2016 +0200 Add DataAcousticProvider in the model to avoid cast Summary of changes: .../entities/{ => data}/DataAcousticProvider.java | 2 +- .../ifremer/echobase/entities/data/MooringImpl.java | 3 +-- .../echobase/entities/data/TransectImpl.java | 3 +-- .../ifremer/echobase/entities/data/VoyageImpl.java | 3 +-- echobase-domain/src/main/xmi/echobase.zargo | Bin 98213 -> 99350 bytes .../fr/ifremer/echobase/services/csv/CellAble.java | 4 ++-- .../ifremer/echobase/services/csv/ProviderAble.java | 2 +- .../DuplicatedElementaryCellException.java | 5 +++-- .../importdata/DuplicatedEsduCellException.java | 2 +- .../importdata/EsduCellNotFoundException.java | 2 +- ...xception.java => MismatchProviderException.java} | 6 +++--- .../actions/ImportAcousticsActionSupport.java | 2 +- .../actions/ImportResultsCellDataActionSupport.java | 2 +- .../actions/ImportResultsEchotypeActionSupport.java | 6 +++--- .../actions/MooringAcousticsImportAction.java | 2 +- .../actions/VoyageAcousticsImportAction.java | 4 ++-- .../VoyageResultsCellImportDataActionSupport.java | 4 ++-- ...AndSpeciesCategoryAndLengthCellImportAction.java | 4 ++-- ...yEchotypeAndSpeciesCategoryCellImportAction.java | 5 ++--- ...VoyageResultsEsduByEchotypeCellImportAction.java | 4 ++-- ...tsEsduSpeciesAndAgeCategoryCellImportAction.java | 5 ++--- .../VoyageResultsMapFishCellImportAction.java | 4 ++-- .../VoyageResultsMapOtherCellImportAction.java | 4 ++-- .../actions/VoyageResultsRegionImportAction.java | 4 ++-- .../VoyageResultsRegionResultsImportAction.java | 4 ++-- .../VoyageResultsVoyageEchotypeImportAction.java | 6 +++--- ...VoyageResultsVoyageLengthAgeKeyImportAction.java | 4 ++-- ...ageResultsVoyageLengthWeightKeyImportAction.java | 4 ++-- ...chotypeAndSpeciesCategoryAndLengthImportRow.java | 16 ++++++++-------- ...tsEsduByEchotypeAndSpeciesCategoryImportRow.java | 16 ++++++++-------- .../csv/VoyageResultsEsduByEchotypeImportRow.java | 16 ++++++++-------- ...ResultsEsduBySpeciesAndAgeCategoryImportRow.java | 16 ++++++++-------- .../csv/VoyageResultsRegionCellResultImportRow.java | 18 +++++++++--------- .../csv/VoyageResultsVoyageEchotypeImportRow.java | 6 +++--- .../importdb/strategy/AbstractImportDbStrategy.java | 2 +- .../importdb/strategy/FreeImportDbStrategy.java | 2 +- .../strategy/ReferentialImportDbStrategy.java | 2 +- .../service/removedata/RemoveDataService.java | 2 +- .../strategy/AbstractRemoveDataStrategy.java | 2 +- .../strategy/AcousticRemoveDataStrategy.java | 2 +- .../strategy/CatchesRemoveDataStrategy.java | 2 +- .../strategy/CommonAllRemoveDataStrategy.java | 2 +- .../strategy/CommonTransectRemoveDataStrategy.java | 2 +- .../strategy/CommonTransitRemoveDataStrategy.java | 2 +- .../strategy/CommonVoyageRemoveDataStrategy.java | 2 +- .../strategy/DummyMooringRemoveDataStrategy.java | 2 +- .../strategy/LegacyVoyageRemoveDataStrategy.java | 2 +- .../strategy/MooringAcousticRemoveDataStrategy.java | 2 +- .../strategy/MooringRemoveDataStrategy.java | 2 +- .../strategy/OperationRemoveDataStrategy.java | 2 +- .../strategy/ResultEsduRemoveDataStrategy.java | 2 +- .../strategy/ResultMapFishRemoveDataStrategy.java | 2 +- .../strategy/ResultMapOtherRemoveDataStrategy.java | 2 +- .../strategy/ResultRegionRemoveDataStrategy.java | 2 +- .../strategy/ResultVoyageRemoveDataStrategy.java | 2 +- .../i18n/echobase-services_en_GB.properties | 5 +++-- .../i18n/echobase-services_fr_FR.properties | 5 +++-- .../importdata/AbstractImportDataServiceIT.java | 3 --- pom.xml | 2 +- 59 files changed, 120 insertions(+), 125 deletions(-) rename echobase-domain/src/main/java/fr/ifremer/echobase/entities/{ => data}/DataAcousticProvider.java (97%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{MismatchVoyageException.java => MismatchProviderException.java} (80%) -- 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 (d3f6fb9 -> 612b6a3)
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 d3f6fb9 Fix delete import for mooring new cd4c7ee Refactoring on result import to make place for mooring new 612b6a3 Refactoring on echotype import to make place for mooring 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 612b6a3dcd3d18cf0a24af7bf4f2333d97dbad07 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 29 10:35:11 2016 +0200 Refactoring on echotype import to make place for mooring commit cd4c7ee532575e11d9158e771847051cdb19dbc4 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Jun 29 09:17:44 2016 +0200 Refactoring on result import to make place for mooring Summary of changes: .../echobase/entities/DataAcousticProvider.java | 12 +- .../echobase/entities/data/MooringImpl.java | 16 ++ .../echobase/entities/data/TransectImpl.java | 16 ++ .../fr/ifremer/echobase/services/csv/CellAble.java | 7 +- .../csv/{CellAble.java => ProviderAble.java} | 18 +- ...ava => ImportResultsCellDataActionSupport.java} | 43 ++--- ...rt.java => ImportResultsDataActionSupport.java} | 20 +- ...ava => ImportResultsEchotypeActionSupport.java} | 70 +++---- .../actions/MooringCommonsMooringImportAction.java | 2 - .../VoyageResultsCellImportDataActionSupport.java | 109 +---------- ...ndSpeciesCategoryAndLengthCellImportAction.java | 5 +- ...EchotypeAndSpeciesCategoryCellImportAction.java | 6 +- ...oyageResultsEsduByEchotypeCellImportAction.java | 5 +- ...sEsduSpeciesAndAgeCategoryCellImportAction.java | 6 +- .../VoyageResultsImportDataActionSupport.java | 52 +----- .../VoyageResultsRegionResultsImportAction.java | 147 +-------------- .../VoyageResultsVoyageEchotypeImportAction.java | 121 +----------- ...java => ImportResultsConfigurationSupport.java} | 35 ++-- .../VoyageResultsImportConfiguration.java | 32 ++-- ...aContext.java => ImportResultsDataContext.java} | 42 ++--- .../MooringAcousticsImportDataContext.java | 2 +- .../contexts/VoyageImportDataContextSupport.java | 19 -- .../contexts/VoyageResultsImportDataContext.java | 206 +++------------------ .../importdata/csv/AcousticImportExportModel.java | 1 - ...mportRow.java => ResultsEchotypeImportRow.java} | 34 +--- ...hotypeAndSpeciesCategoryAndLengthImportRow.java | 13 +- ...sEsduByEchotypeAndSpeciesCategoryImportRow.java | 13 +- .../csv/VoyageResultsEsduByEchotypeImportRow.java | 15 +- ...esultsEsduBySpeciesAndAgeCategoryImportRow.java | 13 +- .../VoyageResultsRegionCellResultImportRow.java | 13 +- .../csv/VoyageResultsVoyageEchotypeImportRow.java | 59 ++---- 31 files changed, 297 insertions(+), 855 deletions(-) copy echobase-services/src/main/java/fr/ifremer/echobase/services/csv/{CellAble.java => ProviderAble.java} (72%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{VoyageResultsCellImportDataActionSupport.java => ImportResultsCellDataActionSupport.java} (72%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{VoyageResultsImportDataActionSupport.java => ImportResultsDataActionSupport.java} (82%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{VoyageResultsVoyageEchotypeImportAction.java => ImportResultsEchotypeActionSupport.java} (63%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/{MooringCommonsImportConfiguration.java => ImportResultsConfigurationSupport.java} (57%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/{VoyageResultsImportDataContext.java => ImportResultsDataContext.java} (86%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{VoyageResultsVoyageEchotypeImportRow.java => ResultsEchotypeImportRow.java} (69%) -- 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 (150c7e6 -> d3f6fb9)
by codelutin.com scm 28 Jun '16

28 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 150c7e6 Fix delete import for mooring new d3f6fb9 Fix delete import 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 d3f6fb97f0aa645f40ce219b15d332f272f000ab Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jun 28 16:55:04 2016 +0200 Fix delete import for mooring Summary of changes: .../java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java | 2 -- echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties | 2 +- echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties | 2 +- 3 files changed, 2 insertions(+), 4 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 (316dc33 -> 150c7e6)
by codelutin.com scm 28 Jun '16

28 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 316dc33 Move migration to 3.907 version new c679de2 Update documentation for the mooring import new d9be6f1 Refactoring avoid copy/paste on acoustic import for voyage and mooring new 150c7e6 Fix delete import for mooring 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 150c7e63c7def9b070ac7344cbe07b38cae1049d Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jun 28 16:48:31 2016 +0200 Fix delete import for mooring commit d9be6f1937857d46ec774b0a1cba0f643adbc014 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jun 28 16:26:03 2016 +0200 Refactoring avoid copy/paste on acoustic import for voyage and mooring commit c679de263e647978b2ad41a0cfbc423dc7c266d2 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 27 17:37:47 2016 +0200 Update documentation for the mooring import Summary of changes: ...sticProvider.java => DataAcousticProvider.java} | 23 +- .../echobase/entities/data/MooringImpl.java | 16 +- .../echobase/entities/data/TransectImpl.java | 25 + .../ifremer/echobase/entities/data/VoyageImpl.java | 23 +- .../importdata/DuplicatedEsduCellException.java | 5 +- .../importdata/EsduCellNotFoundException.java | 12 +- ...tion.java => ImportAcousticsActionSupport.java} | 134 ++- .../actions/ImportDataActionSupport.java | 1 - .../actions/MooringAcousticsImportAction.java | 868 +------------------- .../MooringAcousticsImportDataActionSupport.java | 38 - .../actions/VoyageAcousticsImportAction.java | 901 +-------------------- ...tion.java => ImportAcousticsConfiguration.java} | 11 +- .../MooringAcousticsImportConfiguration.java | 188 +---- .../VoyageAcousticsImportConfiguration.java | 198 +---- .../contexts/ImportDataContextSupport.java | 13 +- .../MooringAcousticsImportDataContext.java | 7 +- .../contexts/MooringCommonsImportDataContext.java | 7 +- .../contexts/MooringImportDataContextSupport.java | 49 -- .../contexts/VoyageAcousticsImportDataContext.java | 30 +- .../contexts/VoyageImportDataContextSupport.java | 6 +- ...rtModel.java => AcousticImportExportModel.java} | 133 +-- ...ousticImportRow.java => AcousticImportRow.java} | 16 +- .../csv/VoyageAcousticImportExportModel.java | 225 ----- .../importdata/csv/VoyageAcousticImportRow.java | 485 ----------- .../strategy/AbstractImportDbStrategy.java | 13 +- .../importdb/strategy/FreeImportDbStrategy.java | 6 +- .../strategy/ReferentialImportDbStrategy.java | 5 +- .../service/removedata/RemoveDataService.java | 12 +- .../strategy/AbstractRemoveDataStrategy.java | 12 +- .../strategy/AcousticRemoveDataStrategy.java | 14 +- .../strategy/CatchesRemoveDataStrategy.java | 6 +- .../strategy/CommonAllRemoveDataStrategy.java | 8 +- .../strategy/CommonTransectRemoveDataStrategy.java | 10 +- .../strategy/CommonTransitRemoveDataStrategy.java | 10 +- .../strategy/CommonVoyageRemoveDataStrategy.java | 8 +- .../strategy/DummyMooringRemoveDataStrategy.java | 6 +- .../strategy/LegacyVoyageRemoveDataStrategy.java | 8 +- .../MooringAcousticRemoveDataStrategy.java | 16 +- .../strategy/MooringRemoveDataStrategy.java | 8 +- .../strategy/OperationRemoveDataStrategy.java | 6 +- .../strategy/ResultEsduRemoveDataStrategy.java | 6 +- .../strategy/ResultMapFishRemoveDataStrategy.java | 6 +- .../strategy/ResultMapOtherRemoveDataStrategy.java | 6 +- .../strategy/ResultRegionRemoveDataStrategy.java | 6 +- .../strategy/ResultVoyageRemoveDataStrategy.java | 8 +- .../ui/actions/removeData/ConfirmDelete.java | 15 +- src/site/en/rst/importData.rst | 67 +- src/site/rst/importData.rst | 68 +- 48 files changed, 566 insertions(+), 3178 deletions(-) rename echobase-domain/src/main/java/fr/ifremer/echobase/entities/{DataAccousticProvider.java => DataAcousticProvider.java} (68%) create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/TransectImpl.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{MooringAcousticsImportAction.java => ImportAcousticsActionSupport.java} (92%) delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/MooringAcousticsImportDataActionSupport.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/{MooringAcousticsImportConfiguration.java => ImportAcousticsConfiguration.java} (95%) delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/MooringImportDataContextSupport.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{MooringAcousticImportExportModel.java => AcousticImportExportModel.java} (63%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{MooringAcousticImportRow.java => AcousticImportRow.java} (96%) delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageAcousticImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageAcousticImportRow.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3