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

branch feature/8180 updated (bcee297 -> cd9fa27)
by codelutin.com scm 04 Jul '16

04 Jul '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 bcee297 Create service for echotype import for mooring new 2b736c0 Create service for esdu results import for mooring new e81e229 Create remove strategy for esdu results import for mooring new cd9fa27 Migrate database to introduce echotype for the 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 cd9fa2708c04a16365c869f2c679e4a3068a70d8 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 17:14:17 2016 +0200 Migrate database to introduce echotype for the mooring commit e81e229cc4769cdd4e3b812bad0dd72140a14b2f Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 17:11:36 2016 +0200 Create remove strategy for esdu results import for mooring commit 2b736c089116319e8f1345c25b9e99b75779c23e Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 16:55:07 2016 +0200 Create service for esdu results import for mooring Summary of changes: .../services/service/UserDbPersistenceService.java | 4 +- .../service/importdata/ImportDataService.java | 66 ++++++++++----- ...ava => ResultsImportAlreadyExistException.java} | 6 +- ...MooringResultsCellImportDataActionSupport.java} | 18 ++-- ...chotypeAndSpeciesCategoryCellImportAction.java} | 33 ++++---- ...ringResultsEsduByEchotypeCellImportAction.java} | 31 +++---- ...oyageResultsEsduByEchotypeCellImportAction.java | 1 - ...chotypeAndSpeciesCategoryImportExportModel.java | 94 +++++++++++++++++++++ ...EsduByEchotypeAndSpeciesCategoryImportRow.java} | 27 +++--- ...ringResultsEsduByEchotypeImportExportModel.java | 83 ++++++++++++++++++ ... => MooringResultsEsduByEchotypeImportRow.java} | 31 +++---- .../service/removedata/RemoveDataService.java | 4 +- ...va => MooringResultEsduRemoveDataStrategy.java} | 17 ++-- .../i18n/echobase-services_en_GB.properties | 1 + .../i18n/echobase-services_fr_FR.properties | 1 + .../echobase/services/ImportDataFixtures.java | 12 +++ .../services/MigrateImportDataDatabasesIT.java | 5 ++ .../importdata/AbstractImportDataServiceIT.java | 30 +++++-- ...EchotypeAndSpeciesCategoryImportServiceIT.java} | 35 ++++---- ...esultsEsduCellOnlyEchotypeImportServiceIT.java} | 33 +++++--- ...AndSpeciesCategoryAndLengthImportServiceIT.java | 2 +- ...ciesCategoryAndLength_SmallImportServiceIT.java | 2 +- ...yEchotypeAndSpeciesCategoryImportServiceIT.java | 2 +- ...ResultsEsduCellOnlyEchotypeImportServiceIT.java | 2 +- ...llOnlySpeciesAndAgeCategoryImportServiceIT.java | 2 +- .../VoyageResultsRegionCellImportServiceIT.java | 2 +- ...VoyageResultsRegionCell_AllImportServiceIT.java | 2 +- .../removedata/AbstractRemoveDataServiceTest.java | 33 +++++++- .../MooringAcousticRemoveDataServiceTest.java | 4 +- .../removedata/MooringRemoveDataServiceTest.java | 4 +- ...=> MooringResultEsduRemoveDataServiceTest.java} | 15 ++-- .../MooringResultsRemoveDataServiceTest.java | 4 +- .../echobase-catches-and-voyage-result.h2.db.gz | Bin 990799 -> 991130 bytes .../import-data/echobase-catches.h2.db.gz | Bin 924599 -> 924955 bytes .../import-data/echobase-commonData.h2.db.gz | Bin 369853 -> 370149 bytes .../import-data/echobase-mooring-results.h2.db.gz | Bin 0 -> 930474 bytes .../import-data/echobase-mooring.h2.db.gz | Bin 925009 -> 925371 bytes .../resources/import-data/echobase-nodata.h2.db.gz | Bin 318391 -> 318631 bytes .../echobase-operation-total-samples.h2.db.gz | Bin 784879 -> 785190 bytes .../import-data/echobase-operation.h2.db.gz | Bin 507688 -> 508067 bytes .../byEchotypeAndSpeciesCategory_small.csv.gz | Bin 0 -> 2038 bytes .../result/mooring-esdu/byEchotype_small.csv.gz | Bin 0 -> 2798 bytes 42 files changed, 439 insertions(+), 167 deletions(-) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => ResultsImportAlreadyExistException.java} (82%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{VoyageResultsCellImportDataActionSupport.java => MooringResultsCellImportDataActionSupport.java} (64%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{VoyageResultsRegionResultsImportAction.java => MooringResultsEsduByEchotypeAndSpeciesCategoryCellImportAction.java} (53%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{VoyageResultsEsduByEchotypeCellImportAction.java => MooringResultsEsduByEchotypeCellImportAction.java} (51%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringResultsEsduByEchotypeAndSpeciesCategoryImportExportModel.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow.java => MooringResultsEsduByEchotypeAndSpeciesCategoryImportRow.java} (80%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringResultsEsduByEchotypeImportExportModel.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{VoyageResultsEsduByEchotypeImportRow.java => MooringResultsEsduByEchotypeImportRow.java} (74%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/{ResultEsduRemoveDataStrategy.java => MooringResultEsduRemoveDataStrategy.java} (79%) copy echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryImportServiceIT.java => MooringResultsEsduCellOnlyEchotypeAndSpeciesCategoryImportServiceIT.java} (65%) copy echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsEsduCellOnlyEchotypeImportServiceIT.java => MooringResultsEsduCellOnlyEchotypeImportServiceIT.java} (63%) copy echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/{MooringResultsRemoveDataServiceTest.java => MooringResultEsduRemoveDataServiceTest.java} (76%) create mode 100644 echobase-services/src/test/resources/import-data/echobase-mooring-results.h2.db.gz create mode 100644 echobase-services/src/test/resources/import-data/result/mooring-esdu/byEchotypeAndSpeciesCategory_small.csv.gz create mode 100644 echobase-services/src/test/resources/import-data/result/mooring-esdu/byEchotype_small.csv.gz -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch feature/8180 updated (edc70c3 -> bcee297)
by codelutin.com scm 04 Jul '16

04 Jul '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 edc70c3 Complete documentation on Ancillary instrumentation import new 0285289 Add echotype on mooring new b4c446f Add echotype on mooring new bcee297 Create service for echotype 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 bcee297b5fc53471266b1e913697baae16edaebb Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 15:19:17 2016 +0200 Create service for echotype import for mooring commit b4c446f940d74f791d79fcae8f4117d85b07873a Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 14:04:47 2016 +0200 Add echotype on mooring commit 0285289910217c42df27de383c34cd091f9058e0 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 14:03:59 2016 +0200 Add echotype on mooring Summary of changes: .../echobase/entities/data/MooringImpl.java | 15 ---- ...WorkingDbMigrationCallBackForVersion3_909.java} | 6 +- .../migration/workingDb/3.905-1-insert-ports.sql | 20 +++++ .../migration/workingDb/3.906-0-add-indexes.sql | 20 +++++ .../migration/workingDb/3.908-0-drop-indexes.sql | 20 +++++ ...engthClass.sql => 3.909-0-mooring-echotype.sql} | 3 +- .../workingDb/h2/3.905-0-update-model.sql | 21 +++++ .../workingDb/h2/3.905-2-migrate-voyage-ports.sql | 21 +++++ .../h2/3.907-0-update-importLog-entityId.sql | 20 +++++ .../workingDb/pg/3.905-0-update-model.sql | 21 +++++ .../workingDb/pg/3.905-2-migrate-voyage-ports.sql | 21 +++++ .../pg/3.907-0-update-importLog-entityId.sql | 21 +++++ echobase-domain/src/main/xmi/echobase.properties | 2 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 99350 -> 99818 bytes .../service/importdata/ImportDataService.java | 22 ++++- .../MooringResultsEchotypeImportAction.java | 67 +++++++++++++++ .../VoyageResultsVoyageEchotypeImportAction.java | 2 +- .../MooringResultsImportConfiguration.java | 91 +++++++++++++++++++++ ...t.java => MooringResultsImportDataContext.java} | 24 ++++-- ...> MooringResultsEchotypeImportExportModel.java} | 36 ++++---- ...w.java => MooringResultsEchotypeImportRow.java} | 30 +++++-- .../importdata/csv/ResultsEchotypeImportRow.java | 4 +- ...yageResultsVoyageEchotypeImportExportModel.java | 5 +- .../service/removedata/RemoveDataService.java | 3 +- ....java => MooringResultsRemoveDataStrategy.java} | 61 ++++++++------ ...eIT.java => MooringResultsImportServiceIT.java} | 28 ++++--- .../removedata/AbstractRemoveDataServiceTest.java | 27 +++++- .../removedata/MooringRemoveDataServiceTest.java | 2 + ...va => MooringResultsRemoveDataServiceTest.java} | 18 ++-- .../import-data/result/mooring/echotype.csv.gz | Bin 0 -> 593 bytes src/site/en/resources/model/Transverse.png | Bin 7038 -> 9110 bytes src/site/en/resources/model/dataAcoustic.png | Bin 28647 -> 34954 bytes src/site/en/resources/model/dataCatches.png | Bin 22230 -> 22223 bytes src/site/en/resources/model/dataCategory.png | Bin 9109 -> 9122 bytes src/site/en/resources/model/dataCommon.png | Bin 29204 -> 35480 bytes src/site/en/resources/model/dataEchotype.png | Bin 6838 -> 6860 bytes src/site/en/resources/model/dataLengthAgeKey.png | Bin 6799 -> 6754 bytes .../en/resources/model/dataLengthWeightKey.png | Bin 6655 -> 5566 bytes src/site/en/resources/model/dataMooring.png | Bin 0 -> 11778 bytes .../model/referenceAcousticInstrument.png | Bin 8939 -> 11654 bytes src/site/en/resources/model/referenceAll.png | Bin 65060 -> 71173 bytes .../resources/model/referenceAreaOfOperation.png | Bin 2692 -> 2703 bytes src/site/en/resources/model/referenceCellType.png | Bin 3224 -> 3225 bytes .../en/resources/model/referenceDataMetadata.png | Bin 8701 -> 8723 bytes .../en/resources/model/referenceDataQuality.png | Bin 1808 -> 1817 bytes .../en/resources/model/referenceDepthStratum.png | Bin 1873 -> 1880 bytes src/site/en/resources/model/referenceGear.png | Bin 12643 -> 12676 bytes src/site/en/resources/model/referenceMission.png | Bin 7820 -> 7830 bytes src/site/en/resources/model/referenceOperation.png | Bin 5851 -> 5858 bytes src/site/en/resources/model/referencePort.png | Bin 0 -> 3465 bytes src/site/en/resources/model/referenceProtocole.png | Bin 6551 -> 6576 bytes .../en/resources/model/referenceReferenceDatum.png | Bin 3127 -> 3134 bytes src/site/en/resources/model/referenceSample.png | Bin 7617 -> 7631 bytes src/site/en/resources/model/referenceSpecies.png | Bin 14230 -> 14498 bytes src/site/en/resources/model/referenceStrata.png | Bin 7890 -> 7903 bytes .../en/resources/model/referenceTSParameter.png | Bin 9923 -> 9934 bytes src/site/en/resources/model/referenceVessel.png | Bin 6636 -> 7237 bytes src/site/en/rst/model.rst | 4 + 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 -> 35480 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 -> 11778 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 + 86 files changed, 534 insertions(+), 105 deletions(-) copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{WorkingDbMigrationCallBackForVersion3_908.java => WorkingDbMigrationCallBackForVersion3_909.java} (83%) copy echobase-domain/src/main/resources/migration/workingDb/{3.902-0-add-SpeciesCategory_lengthClass.sql => 3.909-0-mooring-echotype.sql} (84%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/MooringResultsEchotypeImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/MooringResultsImportConfiguration.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/{MooringCommonsAncillaryInstrumentationImportDataContext.java => MooringResultsImportDataContext.java} (67%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{VoyageResultsVoyageEchotypeImportExportModel.java => MooringResultsEchotypeImportExportModel.java} (55%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{MooringCommonsAncillaryInstrumentationImportRow.java => MooringResultsEchotypeImportRow.java} (59%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/{MooringRemoveDataStrategy.java => MooringResultsRemoveDataStrategy.java} (54%) copy echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsVoyageOnlyEchotypeImportServiceIT.java => MooringResultsImportServiceIT.java} (63%) copy echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/{ResultMapRemoveOtherDataServiceTest.java => MooringResultsRemoveDataServiceTest.java} (73%) create mode 100644 echobase-services/src/test/resources/import-data/result/mooring/echotype.csv.gz create mode 100644 src/site/en/resources/model/dataMooring.png create mode 100644 src/site/en/resources/model/referencePort.png 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 3

branch feature/8180 updated (499517a -> edc70c3)
by codelutin.com scm 04 Jul '16

04 Jul '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 499517a Migrate database and add ancillary instrumentation new edc70c3 Complete documentation on Ancillary instrumentation import 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 edc70c38e076ce437e327c22383bca9c0d8ba264 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 12:00:48 2016 +0200 Complete documentation on Ancillary instrumentation import Summary of changes: src/site/en/rst/importData.rst | 63 ++++++++++++++++++++++++++++++++++++++++++ src/site/rst/importData.rst | 63 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 125 insertions(+), 1 deletion(-) -- 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 (9f0f94f -> 499517a)
by codelutin.com scm 04 Jul '16

04 Jul '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 9f0f94f Create ancillary intrumentation import for the voyage new 4dc5610 Handle remove ancillary instrumentation import new 499517a Migrate database and add ancillary instrumentation 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 499517a5cd0a296a49b3184ad347dbf1ff4e2e78 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 11:47:06 2016 +0200 Migrate database and add ancillary instrumentation commit 4dc5610b9ddfd829a1f30ddf8e452ff83be2e71e Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jul 4 11:23:24 2016 +0200 Handle remove ancillary instrumentation import Summary of changes: ...WorkingDbMigrationCallBackForVersion3_908.java} | 6 +-- .../migration/workingDb/3.908-0-drop-indexes.sql | 1 + echobase-domain/src/main/xmi/echobase.properties | 2 +- .../service/importdata/ImportDataFileResult.java | 10 ++-- ...mportAncillaryInstrumentationActionSupport.java | 12 ++++- .../actions/ImportDataActionSupport.java | 11 +++++ ...ommonsAncillaryInstrumentationImportAction.java | 2 + .../service/removedata/RemoveDataService.java | 9 ++-- .../strategy/CommonAllRemoveDataStrategy.java | 3 +- ...ncillaryInstrumentationRemoveDataStrategy.java} | 46 ++++++++----------- .../strategy/CommonTransectRemoveDataStrategy.java | 3 +- .../strategy/CommonVoyageRemoveDataStrategy.java | 3 +- ...ncillaryInstrumentationRemoveDataStrategy.java} | 41 ++++++----------- .../strategy/MooringRemoveDataStrategy.java | 4 +- .../removedata/AbstractRemoveDataServiceTest.java | 51 +++++++++++++++++++-- ...llaryInstrumentationRemoveDataServiceTest.java} | 26 +++++++---- .../removedata/CommonAllRemoveDataServiceTest.java | 1 + .../CommonTransectRemoveDataServiceTest.java | 1 + .../CommonVoyageRemoveDataServiceTest.java | 1 + .../removedata/MooringRemoveDataServiceTest.java | 3 +- .../echobase-catches-and-voyage-result.h2.db.gz | Bin 1006743 -> 990799 bytes .../import-data/echobase-catches.h2.db.gz | Bin 936475 -> 924599 bytes .../import-data/echobase-commonData.h2.db.gz | Bin 370212 -> 369853 bytes .../import-data/echobase-mooring.h2.db.gz | Bin 938590 -> 925009 bytes .../resources/import-data/echobase-nodata.h2.db.gz | Bin 318448 -> 318391 bytes .../echobase-operation-total-samples.h2.db.gz | Bin 784803 -> 784879 bytes .../import-data/echobase-operation.h2.db.gz | Bin 507627 -> 507688 bytes 27 files changed, 149 insertions(+), 87 deletions(-) copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{WorkingDbMigrationCallBackForVersion3_906.java => WorkingDbMigrationCallBackForVersion3_908.java} (83%) create mode 100644 echobase-domain/src/main/resources/migration/workingDb/3.908-0-drop-indexes.sql copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/{ResultMapOtherRemoveDataStrategy.java => CommonAncillaryInstrumentationRemoveDataStrategy.java} (63%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/{MooringRemoveDataStrategy.java => MooringAncillaryInstrumentationRemoveDataStrategy.java} (64%) copy echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/{MooringAcousticRemoveDataServiceTest.java => AncillaryInstrumentationRemoveDataServiceTest.java} (60%) -- 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 (0b01f5f -> 9f0f94f)
by codelutin.com scm 01 Jul '16

01 Jul '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 0b01f5f Handle duplication on elementary cell (refs #2246) new 9f0f94f Create ancillary intrumentation import for the voyage 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 9f0f94f7ac1397be5d716feb6f3fc25d5c519a16 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Fri Jul 1 11:21:52 2016 +0200 Create ancillary intrumentation import for the voyage Summary of changes: .../services/service/UserDbPersistenceService.java | 7 ++ .../service/importdata/ImportDataService.java | 21 +++++- ...mportAncillaryInstrumentationActionSupport.java | 57 ++++++++------- ...ommonsAncillaryInstrumentationImportAction.java | 15 +++- ...ommonsAncillaryInstrumentationImportAction.java | 79 +++++++++++++++++++++ ...cillaryInstrumentationImportConfiguration.java} | 6 +- ...AncillaryInstrumentationImportDataContext.java} | 35 +++++---- .../csv/AncillaryInstrumentationImportRow.java | 4 +- ...ngCommonsAncillaryInstrumentationImportRow.java | 16 +---- ...sAncillaryInstrumentationImportExportModel.java | 9 ++- ...geCommonsAncillaryInstrumentationImportRow.java | 23 +++--- .../echobase/services/EchoBaseServiceFixtures.java | 6 +- .../echobase/services/ImportDataFixtures.java | 1 + ...onsAncillaryInstrumentationImportServiceIT.java | 3 +- ...nsAncillaryInstrumentationImportServiceIT.java} | 25 ++++--- .../common/ancillaryInstrumentation.csv.gz | Bin 0 -> 131 bytes .../import-data/echobase-commonData.h2.db.gz | Bin 369793 -> 370212 bytes 17 files changed, 217 insertions(+), 90 deletions(-) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCommonsAncillaryInstrumentationImportAction.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/{MooringCommonsAncillaryInstrumentationImportConfiguration.java => VoyageCommonsAncillaryInstrumentationImportConfiguration.java} (85%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/{VoyageAcousticsImportDataContext.java => VoyageCommonsAncillaryInstrumentationImportDataContext.java} (61%) copy echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{MooringCommonsAncillaryInstrumentationImportServiceIT.java => VoyageCommonsAncillaryInstrumentationImportServiceIT.java} (60%) create mode 100644 echobase-services/src/test/resources/import-data/common/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-6 deleted (was 50565e6)
by codelutin.com scm 30 Jun '16

30 Jun '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0-alpha-6 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git was 50565e6 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-6' 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-alpha-6 created (now 8c42b79)
by codelutin.com scm 30 Jun '16

30 Jun '16

This is an automated email from the git hooks/post-receive script. New change to annotated tag echobase-4.0-alpha-6 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git at 8c42b79 (tag) tagging 311cdf9b040f42780e68c9202886817a717751c0 (commit) replaces echobase-4.0-alpha-5 tagged by Maven Release on Thu Jun 30 18:27:02 2016 +0200 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.0-alpha-6 ----------------------------------------------------------------------- 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 (eb5d1aa -> acde695)
by codelutin.com scm 30 Jun '16

30 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 eb5d1aa Handle duplication on elementary cell (refs #2246) new 4f6c5de [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds b7df710 [jgitflow-maven-plugin]updating poms for 4.0-alpha-6 branch with snapshot versions new 50565e6 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-6' with non-snapshot versions new 311cdf9 [jgitflow-maven-plugin]merging 'release/4.0-alpha-6' into 'master' new db707d7 [jgitflow-maven-plugin]merging 'master' into 'develop' new acde695 [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 acde695bc68d5805d1196f388456b9278f28e4a8 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Jun 30 18:27:05 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit db707d7965e70159f44a1374d89aa44163c31392 Merge: 4f6c5de 311cdf9 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Jun 30 18:27:04 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 4f6c5de53fb8b9e0bf73eab1b5898d7fc727f34d Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Jun 30 18:27:04 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 311cdf9b040f42780e68c9202886817a717751c0 Merge: d15d38e 50565e6 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Jun 30 18:27:01 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.0-alpha-6' into 'master' commit 50565e6b6d0265043fce47a9756a8e1a938ea2bd Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Jun 30 18:23:47 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-6' 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-6 updated (b7df710 -> 50565e6)
by codelutin.com scm 30 Jun '16

30 Jun '16

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

30 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 d15d38e [jgitflow-maven-plugin]merging 'release/4.0-alpha-5' into 'master' adds 73d35e8 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 33941c3 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 1c9d999 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds eb5d1aa Handle duplication on elementary cell (refs #2246) adds b7df710 [jgitflow-maven-plugin]updating poms for 4.0-alpha-6 branch with snapshot versions adds 50565e6 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-6' with non-snapshot versions adds 311cdf9 [jgitflow-maven-plugin]merging 'release/4.0-alpha-6' 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 | 61 +++------------------ .../importdata/csv/VoyageAcousticImportRow.java | 19 +++++-- .../strategy/AcousticRemoveDataStrategy.java | 4 +- .../import-data/acoustic/movies_small.csv.gz | Bin 7963 -> 7963 bytes echobase-ui/pom.xml | 2 +- .../resources/i18n/echobase-ui_en_GB.properties | 2 +- .../resources/i18n/echobase-ui_fr_FR.properties | 2 +- .../src/main/webapp/WEB-INF/includes/footer.jsp | 2 +- pom.xml | 2 +- 11 files changed, 31 insertions(+), 67 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0