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

branch feature/8180 updated (59af2e0 -> bb9d454)
by codelutin.com scm 21 Jun '16

21 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 59af2e0 Introduce entityId in importLog (not working in UI) new f754e8b Add remove strategies for mooring (not tested) new bb9d454 Fix UI after modification on remove strategies 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 bb9d4544190854a78502bdeb89e263181c5b567a Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jun 21 17:51:58 2016 +0200 Fix UI after modification on remove strategies for mooring commit f754e8b3503e988bfa2ac9e6ea26ff142361ffc5 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jun 21 17:19:40 2016 +0200 Add remove strategies for mooring (not tested) Summary of changes: .../echobase/entities/data/CellTopiaDao.java | 89 +++++++++++++++++++++- .../i18n/echobase-domain_en_GB.properties | 4 + .../i18n/echobase-domain_fr_FR.properties | 4 + .../services/service/UserDbPersistenceService.java | 20 ++++- .../service/removedata/RemoveDataService.java | 9 ++- .../strategy/AbstractRemoveDataStrategy.java | 80 ++++--------------- .../strategy/AcousticRemoveDataStrategy.java | 1 - .../strategy/CommonAllRemoveDataStrategy.java | 1 - .../strategy/CommonTransectRemoveDataStrategy.java | 1 - .../strategy/CommonTransitRemoveDataStrategy.java | 1 - .../strategy/DummyMooringRemoveDataStrategy.java | 60 +++++++++++++++ .../strategy/LegacyVoyageRemoveDataStrategy.java | 1 - ...java => MooringAcousticRemoveDataStrategy.java} | 50 +++++------- ...trategy.java => MooringRemoveDataStrategy.java} | 50 ++++++------ .../echobase/ui/actions/dbeditor/GetEntities.java | 30 ++++---- .../ui/actions/removeData/ConfirmDelete.java | 5 +- .../echobase/ui/actions/workingDb/DashBoard.java | 2 - .../ui/actions/workingDb/GetImportLogDetail.java | 6 +- echobase-ui/src/main/resources/echobase.properties | 2 + 19 files changed, 257 insertions(+), 159 deletions(-) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/DummyMooringRemoveDataStrategy.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/{AcousticRemoveDataStrategy.java => MooringAcousticRemoveDataStrategy.java} (67%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/{ResultEsduRemoveDataStrategy.java => MooringRemoveDataStrategy.java} (53%) -- 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 (ce6f852 -> 59af2e0)
by codelutin.com scm 21 Jun '16

21 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 ce6f852 Add translation new 3a36842 Create mooring import service new 59af2e0 Introduce entityId in importLog (not working in UI) 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 59af2e00db8da4026e70caee758118dac54e39cd Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Tue Jun 21 16:23:06 2016 +0200 Introduce entityId in importLog (not working in UI) commit 3a36842921147bdd918f043fbf4a6fa8e1308310 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Fri Jun 17 16:33:48 2016 +0200 Create mooring import service Summary of changes: .../Ports.java => DataAccousticProvider.java} | 28 +++--- .../fr/ifremer/echobase/entities/ImportLogs.java | 4 +- .../fr/ifremer/echobase/entities/ImportType.java | 20 +++- ...WorkingDbMigrationCallBackForVersion3_906.java} | 16 +-- .../i18n/echobase-domain_en_GB.properties | 2 + .../i18n/echobase-domain_fr_FR.properties | 2 + .../h2/3.906-0-update-importLog-entityId.sql | 1 + .../pg/3.906-0-update-importLog-entityId.sql | 1 + echobase-domain/src/main/xmi/echobase.properties | 2 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 98231 -> 98213 bytes .../echobase/services/csv/EchoBaseCsvUtil.java | 10 ++ .../services/service/UserDbPersistenceService.java | 14 ++- ...eption.java => DuplicatedMooringException.java} | 8 +- .../service/importdata/ImportDataService.java | 15 ++- .../actions/ImportDataActionSupport.java | 3 + ... => MooringCommonsImportDataActionSupport.java} | 11 ++- .../actions/MooringCommonsMooringImportAction.java | 109 +++++++++++++++++++++ .../actions/VoyageCommonsVoyageImportAction.java | 2 +- .../MooringAcousticsImportConfiguration.java | 14 +-- ...java => MooringCommonsImportConfiguration.java} | 31 +++--- ... => MooringImportDataConfigurationSupport.java} | 20 ++-- .../contexts/ImportDataContextSupport.java | 10 ++ .../MooringAcousticsImportDataContext.java | 2 +- ...t.java => MooringCommonsImportDataContext.java} | 13 ++- ...t.java => MooringImportDataContextSupport.java} | 24 +++-- .../contexts/VoyageImportDataContextSupport.java | 2 +- .../MooringCommonsMooringImportExportModel.java | 93 ++++++++++++++++++ .../strategy/AbstractImportDbStrategy.java | 37 +++---- .../importdb/strategy/FreeImportDbStrategy.java | 22 ++++- .../strategy/ReferentialImportDbStrategy.java | 3 +- .../service/removedata/RemoveDataService.java | 42 ++++---- .../strategy/AbstractRemoveDataStrategy.java | 20 ++-- .../strategy/AcousticRemoveDataStrategy.java | 13 ++- .../strategy/CatchesRemoveDataStrategy.java | 7 +- .../strategy/CommonAllRemoveDataStrategy.java | 10 +- .../strategy/CommonTransectRemoveDataStrategy.java | 13 ++- .../strategy/CommonTransitRemoveDataStrategy.java | 14 ++- .../strategy/CommonVoyageRemoveDataStrategy.java | 11 ++- .../strategy/LegacyVoyageRemoveDataStrategy.java | 10 +- .../strategy/OperationRemoveDataStrategy.java | 7 +- .../strategy/ResultEsduRemoveDataStrategy.java | 7 +- .../strategy/ResultMapFishRemoveDataStrategy.java | 8 +- .../strategy/ResultMapOtherRemoveDataStrategy.java | 8 +- .../strategy/ResultRegionRemoveDataStrategy.java | 8 +- .../strategy/ResultVoyageRemoveDataStrategy.java | 13 ++- .../i18n/echobase-services_en_GB.properties | 2 + .../i18n/echobase-services_fr_FR.properties | 2 + .../removedata/AbstractRemoveDataServiceTest.java | 2 +- ...sticImport.java => ConfigureMooringImport.java} | 39 +++++--- .../ui/actions/importData/ImportMooringMode.java | 5 +- .../ui/actions/importData/SelectImportType.java | 2 +- .../resources/i18n/echobase-ui_en_GB.properties | 1 + .../resources/i18n/echobase-ui_fr_FR.properties | 1 + ...atchesImport.jsp => configureMooringImport.jsp} | 32 ++---- 54 files changed, 558 insertions(+), 238 deletions(-) copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/{references/Ports.java => DataAccousticProvider.java} (70%) copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{WorkingDbMigrationCallBackForVersion3_905.java => WorkingDbMigrationCallBackForVersion3_906.java} (62%) create mode 100644 echobase-domain/src/main/resources/migration/workingDb/h2/3.906-0-update-importLog-entityId.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/pg/3.906-0-update-importLog-entityId.sql copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{DuplicatedVoyageException.java => DuplicatedMooringException.java} (77%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{MooringAcousticsImportDataActionSupport.java => MooringCommonsImportDataActionSupport.java} (73%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/MooringCommonsMooringImportAction.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/{VoyageImportDataConfigurationSupport.java => MooringCommonsImportConfiguration.java} (55%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/{VoyageImportDataConfigurationSupport.java => MooringImportDataConfigurationSupport.java} (67%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/{VoyageCommonsImportDataContext.java => MooringCommonsImportDataContext.java} (72%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/{MooringAcousticsImportDataContext.java => MooringImportDataContextSupport.java} (64%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringCommonsMooringImportExportModel.java copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/{LaunchMooringAcousticImport.java => ConfigureMooringImport.java} (52%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{configureCatchesImport.jsp => configureMooringImport.jsp} (65%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (292e560 -> 46bfa10)
by codelutin.com scm 20 Jun '16

20 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 292e560 Test new 46bfa10 Supression lock 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 46bfa10fca619e5f6a889395fa0d22b32f6641b8 Author: mathieu doray <mathieu@mathinux> Date: Mon Jun 20 17:59:55 2016 +0200 Supression lock Summary of changes: echobase-domain/src/main/data/.~lock.export-DataMetadata.csv# | 1 - 1 file changed, 1 deletion(-) delete mode 100644 echobase-domain/src/main/data/.~lock.export-DataMetadata.csv# -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (2ef6a93 -> 292e560)
by codelutin.com scm 20 Jun '16

20 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 2ef6a93 Initalisation du referenciel new 292e560 Test 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 292e560f81441e8032071cd4c24bd0f5f8685a3a Author: mathieu doray <mathieu@mathinux> Date: Mon Jun 20 17:57:19 2016 +0200 Test Summary of changes: echobase-domain/src/main/data/.~lock.export-DataMetadata.csv# | 1 + echobase-domain/src/main/data/export-DataMetadata.csv | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 echobase-domain/src/main/data/.~lock.export-DataMetadata.csv# -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (b9fb829 -> 2ef6a93)
by codelutin.com scm 20 Jun '16

20 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 b9fb829 Rename legend in qgis new 2ef6a93 Initalisation du referenciel 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 2ef6a9373e14454af065f5dab7f84b25f24c1595 Author: mathieu doray <mathieu@mathinux> Date: Mon Jun 20 17:51:00 2016 +0200 Initalisation du referenciel Summary of changes: .../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 | 168 ++++++++++++++ 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 + 16 files changed, 1000 insertions(+) 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 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (94a143d -> b9fb829)
by codelutin.com scm 20 Jun '16

20 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 94a143d Update model image in site new b9fb829 Rename legend in qgis 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 b9fb829137545f243bf076e7e9e27d2625c4c7f9 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 20 17:09:12 2016 +0200 Rename legend in qgis Summary of changes: .../src/main/resources/gis/templates/EchoBaseQGisTemplate.qgs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (4d494c8 -> 94a143d)
by codelutin.com scm 20 Jun '16

20 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 4d494c8 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 94a143d Update model image in site 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 94a143df20196c3ebc5485915304fc4146e94208 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 20 16:46:37 2016 +0200 Update model image in site Summary of changes: 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 -> 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 .../resources/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 ++++ 29 files changed, 8 insertions(+) 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 1

branch release/4.0-alpha-3 deleted (was 468e955)
by codelutin.com scm 20 Jun '16

20 Jun '16

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

20 Jun '16

This is an automated email from the git hooks/post-receive script. New change to annotated tag echobase-4.0-alpha-3 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git at 3234525 (tag) tagging 5ef97c9beb75580af6ae76958619fe89297fe760 (commit) replaces echobase-4.0-alpha-2 tagged by Maven Release on Mon Jun 20 13:36:21 2016 +0200 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.0-alpha-3 ----------------------------------------------------------------------- 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 (4de4f43 -> 4d494c8)
by codelutin.com scm 20 Jun '16

20 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 4de4f43 Add forget callback for migration refs #8353 new fcc059d [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 907cfc4 [jgitflow-maven-plugin]updating poms for 4.0-alpha-3 branch with snapshot versions new 468e955 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-3' with non-snapshot versions new 5ef97c9 [jgitflow-maven-plugin]merging 'release/4.0-alpha-3' into 'master' new 53fec10 [jgitflow-maven-plugin]merging 'master' into 'develop' new 4d494c8 [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 4d494c8bb62bf6278b5c79ea1106b49663950e24 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jun 20 13:36:24 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 53fec10ed8d5af805afc8cabc2914a826ab79f14 Merge: fcc059d 5ef97c9 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jun 20 13:36:23 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit fcc059dc89191a613ddea49338ea06248bcf544f Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jun 20 13:36:23 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 5ef97c9beb75580af6ae76958619fe89297fe760 Merge: 09f06f6 468e955 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jun 20 13:36:20 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.0-alpha-3' into 'master' commit 468e9550401fcd4c90e8c5d307608424db7aae40 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jun 20 13:33:49 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-3' 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