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

branch develop updated (963538e -> a456593)
by codelutin.com scm May 13, 2016

May 13, 2016

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 963538e [jgitflow-maven-plugin]updating poms for 4.0-SNAPSHOT development new c76022d [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 18dcbff [jgitflow-maven-plugin]updating poms for 4.0-alpha-1 branch with snapshot versions new 2aa41ea [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-1' with non-snapshot versions new fae7167 Add missing license header new 1e14261 [jgitflow-maven-plugin]merging 'release/4.0-alpha-1' into 'master' new 442f0fd [jgitflow-maven-plugin]merging 'master' into 'develop' new a456593 [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 a456593d37bc95df4962b729211dda76e157a47d Author: Maven Release <maven-release(a)codelutin.com> Date: Fri May 13 09:11:28 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 442f0fd61dedcc91a7466250a3c018a8dc5b43bd Merge: c76022d 1e14261 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri May 13 09:11:27 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit c76022d26838627512f704e6ed211dff92f5e3ae Author: Maven Release <maven-release(a)codelutin.com> Date: Fri May 13 09:11:27 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 1e14261aa0f9d49e704b49dbfa6565f5401d6653 Merge: 21f7034 fae7167 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri May 13 09:11:24 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.0-alpha-1' into 'master' commit fae716762de64170e14655e68eecc8c0a7d9303f Author: Maven Release <maven-release(a)codelutin.com> Date: Fri May 13 09:11:07 2016 +0200 Add missing license header commit 2aa41ea8111d33fad366a1426393791acacad81a Author: Maven Release <maven-release(a)codelutin.com> Date: Fri May 13 09:08:06 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-1' with non-snapshot versions Summary of changes: .../fr/ifremer/echobase/entities/DriverType.java | 4 ++-- .../EchoBaseInternalTopiaApplicationContext.java | 21 +++++++++++++++++++++ .../echobase/entities/ImportFileIdTopiaDao.java | 21 +++++++++++++++++++++ .../echobase/entities/ImportFileTopiaDao.java | 21 +++++++++++++++++++++ .../echobase/entities/ImportLogTopiaDao.java | 21 +++++++++++++++++++++ .../fr/ifremer/echobase/entities/ImportedCell.java | 21 +++++++++++++++++++++ .../echobase/entities/ImportedCellResult.java | 21 +++++++++++++++++++++ .../echobase/entities/ImportedSampleDataResult.java | 21 +++++++++++++++++++++ .../fr/ifremer/echobase/entities/data/DataImpl.java | 21 +++++++++++++++++++++ .../fr/ifremer/echobase/entities/data/Datas.java | 21 +++++++++++++++++++++ .../entities/data/GearMetadataValueImpl.java | 21 +++++++++++++++++++++ .../entities/data/OperationMetadataValueImpl.java | 21 +++++++++++++++++++++ .../echobase/entities/data/SampleDataImpl.java | 21 +++++++++++++++++++++ .../ifremer/echobase/entities/data/SampleDatas.java | 21 +++++++++++++++++++++ .../ifremer/echobase/entities/data/SampleImpl.java | 21 +++++++++++++++++++++ .../echobase/entities/references/GearImpl.java | 21 +++++++++++++++++++++ .../echobase/persistence/EchoBaseEntityHelper.java | 4 ++-- .../MigrationCallBackForVersionSupport.java | 21 +++++++++++++++++++++ .../migration/MigrationCallbackSupport.java | 21 +++++++++++++++++++++ .../InternalDbMigrationCallBackForVersion2_2.java | 4 ++-- .../internalDb/InternalDbMigrationCallback.java | 4 ++-- .../WorkingDbMigrationCallBackForVersion3_901.java | 21 +++++++++++++++++++++ .../WorkingDbMigrationCallBackForVersion3_902.java | 21 +++++++++++++++++++++ .../WorkingDbMigrationCallBackForVersion3_903.java | 21 +++++++++++++++++++++ .../workingDb/3.901-0-clean-importLog-table.sql | 20 ++++++++++++++++++++ .../3.902-0-add-SpeciesCategory_lengthClass.sql | 20 ++++++++++++++++++++ .../migration/workingDb/h2/3.900-0-fix-types.sql | 20 ++++++++++++++++++++ .../h2/3.901-1-upgrade-importFile-table.sql | 20 ++++++++++++++++++++ .../workingDb/h2/3.903-0-add-naturalIds.sql | 20 ++++++++++++++++++++ .../migration/workingDb/pg/3.900-0-fix-types.sql | 20 ++++++++++++++++++++ .../workingDb/pg/3.903-0-add-naturalIds.sql | 20 ++++++++++++++++++++ .../echobase/services/csv/BatchCsvExport.java | 21 +++++++++++++++++++++ .../fr/ifremer/echobase/services/csv/CellAble.java | 21 +++++++++++++++++++++ .../ifremer/echobase/services/csv/ResultAble.java | 21 +++++++++++++++++++++ .../echobase/services/csv/ResultValueGetter.java | 21 +++++++++++++++++++++ .../echobase/services/csv/ResultValueSetter.java | 21 +++++++++++++++++++++ .../services/csv/ValueFormatterByFunction.java | 21 +++++++++++++++++++++ .../service/importdata/AgeCategoryCache.java | 21 +++++++++++++++++++++ .../service/importdata/CheckFileException.java | 21 +++++++++++++++++++++ .../DuplicatedEchotypeAssociationException.java | 21 +++++++++++++++++++++ ...uplicatedResultsVoyageLengthAgeKeyException.java | 21 +++++++++++++++++++++ ...icatedResultsVoyageLengthWeightKeyException.java | 21 +++++++++++++++++++++ .../service/importdata/ImportDataFileResult.java | 21 +++++++++++++++++++++ .../service/importdata/ImportDataResult.java | 21 +++++++++++++++++++++ .../service/importdata/ImportDataService.java | 21 +++++++++++++++++++++ .../MismatchAgeCategoryMeaningException.java | 21 +++++++++++++++++++++ .../MismatchSizeCategoryMeaningException.java | 21 +++++++++++++++++++++ .../service/importdata/MismatchVoyageException.java | 21 +++++++++++++++++++++ .../service/importdata/ResultCategoryCache.java | 21 +++++++++++++++++++++ .../service/importdata/SizeCategoryCache.java | 21 +++++++++++++++++++++ .../service/importdata/SpeciesCategoryCache.java | 21 +++++++++++++++++++++ .../importdata/actions/ImportDataActionSupport.java | 21 +++++++++++++++++++++ .../actions/VoyageAcousticsImportAction.java | 21 +++++++++++++++++++++ .../VoyageAcousticsImportDataActionSupport.java | 21 +++++++++++++++++++++ .../VoyageCatchesBiometrySampleImportAction.java | 21 +++++++++++++++++++++ .../VoyageCatchesImportDataActionSupport.java | 21 +++++++++++++++++++++ .../actions/VoyageCatchesSubSampleImportAction.java | 21 +++++++++++++++++++++ .../VoyageCatchesTotalSampleImportAction.java | 21 +++++++++++++++++++++ .../VoyageCommonsImportDataActionSupport.java | 21 +++++++++++++++++++++ .../actions/VoyageCommonsTransectImportAction.java | 21 +++++++++++++++++++++ .../actions/VoyageCommonsTransitImportAction.java | 21 +++++++++++++++++++++ .../actions/VoyageCommonsVoyageImportAction.java | 21 +++++++++++++++++++++ .../VoyageOperationsGearMetadataImportAction.java | 21 +++++++++++++++++++++ .../VoyageOperationsImportDataActionSupport.java | 21 +++++++++++++++++++++ .../VoyageOperationsOperationImportAction.java | 21 +++++++++++++++++++++ ...yageOperationsOperationMetadataImportAction.java | 21 +++++++++++++++++++++ .../VoyageResultsCellImportDataActionSupport.java | 21 +++++++++++++++++++++ ...AndSpeciesCategoryAndLengthCellImportAction.java | 21 +++++++++++++++++++++ ...yEchotypeAndSpeciesCategoryCellImportAction.java | 21 +++++++++++++++++++++ ...VoyageResultsEsduByEchotypeCellImportAction.java | 21 +++++++++++++++++++++ ...tsEsduSpeciesAndAgeCategoryCellImportAction.java | 21 +++++++++++++++++++++ .../VoyageResultsImportDataActionSupport.java | 21 +++++++++++++++++++++ .../VoyageResultsMapFishCellImportAction.java | 21 +++++++++++++++++++++ .../VoyageResultsMapOtherCellImportAction.java | 21 +++++++++++++++++++++ .../VoyageResultsRegionAssociationImportAction.java | 21 +++++++++++++++++++++ .../actions/VoyageResultsRegionImportAction.java | 21 +++++++++++++++++++++ .../VoyageResultsRegionResultsImportAction.java | 21 +++++++++++++++++++++ .../VoyageResultsVoyageEchotypeImportAction.java | 21 +++++++++++++++++++++ ...VoyageResultsVoyageLengthAgeKeyImportAction.java | 21 +++++++++++++++++++++ ...ageResultsVoyageLengthWeightKeyImportAction.java | 21 +++++++++++++++++++++ .../contexts/ImportDataContextSupport.java | 21 +++++++++++++++++++++ .../contexts/VoyageAcousticsImportDataContext.java | 21 +++++++++++++++++++++ .../contexts/VoyageCatchesImportDataContext.java | 21 +++++++++++++++++++++ .../contexts/VoyageCommonsImportDataContext.java | 21 +++++++++++++++++++++ .../contexts/VoyageImportDataContextSupport.java | 21 +++++++++++++++++++++ .../contexts/VoyageOperationsImportDataContext.java | 21 +++++++++++++++++++++ .../contexts/VoyageResultsImportDataContext.java | 21 +++++++++++++++++++++ .../csv/EchoBaseImportExportModelSupport.java | 21 +++++++++++++++++++++ .../i18n/echobase-services_en_GB.properties | 8 ++++---- .../i18n/echobase-services_fr_FR.properties | 10 +++++----- .../echobase/services/ImportDataFixtures.java | 21 +++++++++++++++++++++ 91 files changed, 1795 insertions(+), 17 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

[ANN] - EchoBase 4.0-alpha-1 released
by codelutin.com Release Notification May 13, 2016

May 13, 2016

The EchoBase team is pleased to announce the echobase-4.0-alpha-1 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 Mise à jour des librairies Issue: 8168. Thanks to Tony Chemit. Resolved by tchemit. o Passage en java 8 Issue: 8169. Thanks to Tony Chemit. Resolved by tchemit. o Vérification des données importées Issue: 8170. Thanks to Tony Chemit. Resolved by tchemit. o Migrate to ToPIA 3.0 Issue: 8089. Thanks to Tony Chemit. Resolved by tchemit. o Modification de l'import SubSample Issue: 8294. Thanks to Tony Chemit. Resolved by tchemit. o Modification de l'import biometry sample Issue: 8295. Thanks to Tony Chemit. Resolved by tchemit. o Import résultat esdu (validation) Issue: 8296. Thanks to Tony Chemit. Resolved by tchemit. o Import résultat esdu / espèces / taille (modification) Issue: 8297. Thanks to Tony Chemit. Resolved by tchemit. o Import données acoustiques (modifications) Issue: 8298. Thanks to Tony Chemit. Resolved by tchemit. Fixed Bugs: o Vérifier que les échantillons hors-vrac sont tous importés Issue: 1659. Thanks to Tony Chemit. Resolved by tchemit. Changes: o Vérifier le formattage de la documentation Issue: 8178. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: https://forge.codelutin.com/projects/echobase/files * echobase-embedded-4.0-alpha-1.zip - https://forge.codelutin.com/attachments/download/3924 * echobase-referentiel-4.0-alpha-1.echobase - https://forge.codelutin.com/attachments/download/3925 * echobase-ui-4.0-alpha-1-full.war - https://forge.codelutin.com/attachments/download/3926 * echobase-ui-4.0-alpha-1-lizmap.zip - https://forge.codelutin.com/attachments/download/3927 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-1 created (now 18dcbff)
by codelutin.com scm May 13, 2016

May 13, 2016

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0-alpha-1 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git at 18dcbff [jgitflow-maven-plugin]updating poms for 4.0-alpha-1 branch with snapshot versions This branch includes the following new commits: new dcddba9 Add missing license header new 18dcbff [jgitflow-maven-plugin]updating poms for 4.0-alpha-1 branch with snapshot versions 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 18dcbfff63c190d67b11a7e1e0daa50a3b99eee3 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri May 13 09:07:33 2016 +0200 [jgitflow-maven-plugin]updating poms for 4.0-alpha-1 branch with snapshot versions commit dcddba9f75d0ac198d015152cdc9382997e28f73 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri May 13 09:07:15 2016 +0200 Add missing license header -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (5ea3948 -> 963538e)
by codelutin.com scm May 13, 2016

May 13, 2016

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 5ea3948 Fix missing i18n new dcddba9 Add missing license header new 963538e [jgitflow-maven-plugin]updating poms for 4.0-SNAPSHOT development 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 963538e64e7221bcdd4eb4b1f1766f01462b44b4 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri May 13 09:07:39 2016 +0200 [jgitflow-maven-plugin]updating poms for 4.0-SNAPSHOT development commit dcddba9f75d0ac198d015152cdc9382997e28f73 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri May 13 09:07:15 2016 +0200 Add missing license header Summary of changes: .../ui/actions/importData/DownloadInputFile.java | 21 +++++++++++++++++++++ pom.xml | 3 +-- 2 files changed, 22 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (7d765dd -> 5ea3948)
by codelutin.com scm May 13, 2016

May 13, 2016

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 7d765dd Livrable #8169 new 5ea3948 Fix missing i18n 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 5ea394895e959d6ce6e27c2eaabd8dd7095db7e5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 13 09:04:47 2016 +0200 Fix missing i18n Summary of changes: echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (7272ca2 -> 7d765dd)
by codelutin.com scm May 13, 2016

May 13, 2016

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 7272ca2 Mise à jour des bases de test new 7d765dd Livrable #8169 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 7d765dd2452f853c34429ec9d47dff67b326abd9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 13 08:58:28 2016 +0200 Livrable #8169 Summary of changes: pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (e9095b6 -> 7272ca2)
by codelutin.com scm May 13, 2016

May 13, 2016

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 e9095b6 Livrable #8170 Merge branch 'feature/8170' into develop new 1541342 Ne pas autorisé un import d'un voyage déjà existant (clef unique name) (See #2246) new 2d6139e Ajout bidirection sur le modèle (A reverter quand import branche Atlantos) new 262c51e Début ajout migration pour les clef naturelles + traitement pour import transit (See #2246) new cda7281 Typo sur le nom d'une méthode new 73ff899 Ne pas autoriser de réimporter des transits déjà existants (See #2246) new 31e9b45 Ne pas autoriser de réimporter des transects déjà existants (See #2246) new b3b3fac Ne pas pouvoir éditer les entitées transverses new 3209872 Ne pas autoriser de réimporter des opérations déjà existantes (See #2246) new dec2182 Renommage i18n new e847db7 Ajout toString new fa0d99e Bine utiliser la bonne page de résultat new 045c9fc Gérer la nullité d'erreur sur un import new 8690ac9 Meilleure gestion de la suppression d'un ImportLog new 91a2107 Ajout toString new 7a78dc1 Nom de Zeus... ne jamais utiliser id comme nom de colonne car en hql ici c'est égale au TopiaId... new 42d9dbb Tester avant de supprimer lors de la suppression d'un import new 9f72d77 Ne pas autoriser de réimporter des meta sur les opérations et engins déjà existantes (See #2246) new 883d892 Ne pas pouvoir effectuer plusieurs imports du même type new ea54a1e Début de check pour les Sub-Sample mais il me manque des confirmations, à revoir avec Mathieu new 0896dd7 Catch more exception while importing + ajout meilleur TODO new 6bcfd28 i18n new a23905d Ne pas autoriser de réimporter les données acoustiques déjà existantes (See #2246) new 0b1e7ee Ajout du numéro de ligne dans les messages d'erreurs (See #2246) new 9867f8f Ne pas autoriser de réimporter les résultats sur les voyages déjà existants (See #2246) new 8cf674f Ne pas autoriser de réimporter les résultats sur les voyages déjà existants (See #2246) new 3800f29 Refs-60 #2246, il reste encore quelques petits ajustements à faire. Merge branch 'feature/2246' into develop new 7272ca2 Mise à jour des bases de test The 27 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 7272ca2e7f0f6f3a1e2181ab26a330e1bab559ce Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 13 08:50:11 2016 +0200 Mise à jour des bases de test commit 3800f292fed0f97dbd270cf1c80ae39e66434f77 Merge: e9095b6 8cf674f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 13 08:45:01 2016 +0200 Refs-60 #2246, il reste encore quelques petits ajustements à faire. Merge branch 'feature/2246' into develop commit 8cf674f1b633a46ba7f6006fedfbd14a3c173fe2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 13 08:43:10 2016 +0200 Ne pas autoriser de réimporter les résultats sur les voyages déjà existants (See #2246) commit 9867f8f7a6cca1411711b3e7debb5b26d9dba16b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu May 12 16:28:46 2016 +0200 Ne pas autoriser de réimporter les résultats sur les voyages déjà existants (See #2246) commit 0b1e7eef684a101f9c325a898721ae91aadae88a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu May 12 15:49:30 2016 +0200 Ajout du numéro de ligne dans les messages d'erreurs (See #2246) commit a23905dde41b2fbd383cb388072f791e13eedc01 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu May 12 15:39:59 2016 +0200 Ne pas autoriser de réimporter les données acoustiques déjà existantes (See #2246) commit 6bcfd28ac5a7a8547b4881f45a94f8015143e0d3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu May 12 09:10:22 2016 +0200 i18n commit 0896dd7e73ceaab18a32924bbe995f719a7d4956 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu May 12 09:09:06 2016 +0200 Catch more exception while importing + ajout meilleur TODO commit ea54a1e9f532ce63c96c8b723871a609649c4e9a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue May 10 10:50:51 2016 +0200 Début de check pour les Sub-Sample mais il me manque des confirmations, à revoir avec Mathieu commit 883d89247f05706f7705b3d865dea461a9780ca1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue May 10 10:03:34 2016 +0200 Ne pas pouvoir effectuer plusieurs imports du même type commit 9f72d77b3ef53ef5a390f1f9c790b541c3ae5e4b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue May 10 09:46:46 2016 +0200 Ne pas autoriser de réimporter des meta sur les opérations et engins déjà existantes (See #2246) commit 42d9dbba9a49a41ab7d08a151dfbecf0b1053ca6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue May 10 08:56:15 2016 +0200 Tester avant de supprimer lors de la suppression d'un import commit 7a78dc116fad15df2eb723e922cfb9cec2b216e2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue May 10 08:55:34 2016 +0200 Nom de Zeus... ne jamais utiliser id comme nom de colonne car en hql ici c'est égale au TopiaId... commit 91a2107e04ad9955ce6cde17e8efa332d36fa8c9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue May 10 08:54:44 2016 +0200 Ajout toString commit 8690ac9d3c8e864dbb6e13d085f1dcd9f246612f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 19:20:48 2016 +0200 Meilleure gestion de la suppression d'un ImportLog commit 045c9fc487758a476e73a9a9a4fae09f070d1640 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 19:20:14 2016 +0200 Gérer la nullité d'erreur sur un import commit fa0d99e448c1bd5ecfb5b26b105f755c90db949c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 19:19:51 2016 +0200 Bine utiliser la bonne page de résultat commit e847db717f176fcec2da21cf4c64be64cf77c712 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 18:38:36 2016 +0200 Ajout toString commit dec218226fafb44f80dcc85e11ba2324f4c79119 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 18:37:56 2016 +0200 Renommage i18n commit 32098723e5d9346217d1be59713a9630832fe5c3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 18:37:39 2016 +0200 Ne pas autoriser de réimporter des opérations déjà existantes (See #2246) commit b3b3fac2a9ecde1f843db04c7e9a2ecca76c7d0f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 18:36:32 2016 +0200 Ne pas pouvoir éditer les entitées transverses commit 31e9b4548532e513bc3563f6f9e283f526d5e091 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 15:08:46 2016 +0200 Ne pas autoriser de réimporter des transects déjà existants (See #2246) commit 73ff8998bbea1e78b5e9f802361b1289bb973868 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 14:49:36 2016 +0200 Ne pas autoriser de réimporter des transits déjà existants (See #2246) commit cda728120f5ebdb2c5e0cacecd3aa7a1077966e3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 14:49:09 2016 +0200 Typo sur le nom d'une méthode commit 262c51e3583f2b496b87c78615a1f8cd4ba0c252 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 14:14:33 2016 +0200 Début ajout migration pour les clef naturelles + traitement pour import transit (See #2246) commit 2d6139eea45b74df2404f6f025c1b334cf57066c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 14:12:27 2016 +0200 Ajout bidirection sur le modèle (A reverter quand import branche Atlantos) commit 1541342e799e303c66794950deca07c828e724f0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 9 13:01:12 2016 +0200 Ne pas autorisé un import d'un voyage déjà existant (clef unique name) (See #2246) Summary of changes: .../echobase/entities/ImportFileIdTopiaDao.java | 2 +- .../echobase/entities/ImportFileTopiaDao.java | 15 +++- .../echobase/entities/ImportLogTopiaDao.java | 6 +- .../{DataImpl.java => GearMetadataValueImpl.java} | 8 +- ...taImpl.java => OperationMetadataValueImpl.java} | 9 +- .../java/fr/ifremer/echobase/io/InputFile.java | 20 +++++ .../echobase/persistence/EchoBaseDbMeta.java | 5 ++ ...WorkingDbMigrationCallBackForVersion3_903.java} | 10 +-- .../workingDb/h2/3.903-0-add-naturalIds.sql | 2 + .../workingDb/pg/3.903-0-add-naturalIds.sql | 2 + echobase-domain/src/main/xmi/echobase.properties | 10 ++- echobase-domain/src/main/xmi/echobase.zargo | Bin 90458 -> 90445 bytes .../services/service/UserDbPersistenceService.java | 93 +++++++++++++++++++++ .../DuplicatedEchotypeAssociationException.java | 20 +++++ ...java => DuplicatedElementaryCellException.java} | 8 +- ...ption.java => DuplicatedEsduCellException.java} | 8 +- ...a => DuplicatedGearMetadataValueException.java} | 19 +++-- ...eption.java => DuplicatedMapCellException.java} | 8 +- ...tion.java => DuplicatedOperationException.java} | 10 +-- ...DuplicatedOperationMetadataValueException.java} | 11 +-- ...ion.java => DuplicatedRegionCellException.java} | 9 +- ...plicatedResultsVoyageLengthAgeKeyException.java | 20 +++++ ...catedResultsVoyageLengthWeightKeyException.java | 20 +++++ .../importdata/DuplicatedSampleException.java | 4 +- ...tion.java => DuplicatedSubSampleException.java} | 15 ++-- ...ption.java => DuplicatedTransectException.java} | 10 +-- ...eption.java => DuplicatedTransitException.java} | 11 ++- ...ception.java => DuplicatedVoyageException.java} | 10 +-- .../importdata/MismatchVoyageException.java | 21 +++++ .../actions/ImportDataActionSupport.java | 8 +- .../actions/VoyageAcousticsImportAction.java | 18 +++- .../VoyageCatchesSubSampleImportAction.java | 12 +++ .../VoyageCatchesTotalSampleImportAction.java | 2 +- .../actions/VoyageCommonsTransectImportAction.java | 6 ++ .../actions/VoyageCommonsTransitImportAction.java | 8 +- .../actions/VoyageCommonsVoyageImportAction.java | 13 ++- .../VoyageOperationsGearMetadataImportAction.java | 24 ++++++ .../VoyageOperationsOperationImportAction.java | 6 ++ ...ageOperationsOperationMetadataImportAction.java | 13 ++- .../VoyageResultsMapFishCellImportAction.java | 15 +++- .../VoyageResultsMapOtherCellImportAction.java | 15 +++- .../actions/VoyageResultsRegionImportAction.java | 21 ++++- .../VoyageResultsVoyageEchotypeImportAction.java | 19 +++-- ...oyageResultsVoyageLengthAgeKeyImportAction.java | 31 +++++++ ...geResultsVoyageLengthWeightKeyImportAction.java | 38 ++++++++- .../service/removedata/RemoveDataService.java | 6 +- .../strategy/AbstractRemoveDataStrategy.java | 15 ++-- .../strategy/OperationRemoveDataStrategy.java | 25 +++++- .../i18n/echobase-services_en_GB.properties | 17 +++- .../i18n/echobase-services_fr_FR.properties | 15 ++++ .../removedata/AbstractRemoveDataServiceTest.java | 6 ++ .../echobase-catches-and-voyage-result.h2.db.gz | Bin 826644 -> 825254 bytes .../import-data/echobase-catches.h2.db.gz | Bin 754845 -> 755094 bytes .../import-data/echobase-commonData.h2.db.gz | Bin 184388 -> 184645 bytes .../resources/import-data/echobase-nodata.h2.db.gz | Bin 137434 -> 137582 bytes .../echobase-operation-total-samples.h2.db.gz | Bin 601307 -> 601537 bytes .../import-data/echobase-operation.h2.db.gz | Bin 327903 -> 328156 bytes .../actions/importData/ConfigureCommonImport.java | 2 +- .../jsp/importData/importDataActionResult.jsp | 2 +- .../jsp/importData/resultAcousticImport.jsp | 2 +- .../WEB-INF/jsp/importData/resultCatchesImport.jsp | 2 +- .../jsp/importData/resultOperationImport.jsp | 2 +- .../WEB-INF/jsp/importData/resultResultsImport.jsp | 2 +- 63 files changed, 615 insertions(+), 116 deletions(-) copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/{DataImpl.java => GearMetadataValueImpl.java} (61%) copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/{DataImpl.java => OperationMetadataValueImpl.java} (60%) copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{WorkingDbMigrationCallBackForVersion3_902.java => WorkingDbMigrationCallBackForVersion3_903.java} (73%) create mode 100644 echobase-domain/src/main/resources/migration/workingDb/h2/3.903-0-add-naturalIds.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/pg/3.903-0-add-naturalIds.sql create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/DuplicatedEchotypeAssociationException.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{NoVoyageToImportException.java => DuplicatedElementaryCellException.java} (77%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{NoVoyageToImportException.java => DuplicatedEsduCellException.java} (78%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{DataMetadataNotFoundException.java => DuplicatedGearMetadataValueException.java} (55%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{NoVoyageToImportException.java => DuplicatedMapCellException.java} (78%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{MoreThanOnceVoyageToImportException.java => DuplicatedOperationException.java} (72%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{MoreThanOnceVoyageToImportException.java => DuplicatedOperationMetadataValueException.java} (67%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{DataMetadataNotFoundException.java => DuplicatedRegionCellException.java} (77%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/DuplicatedResultsVoyageLengthAgeKeyException.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/DuplicatedResultsVoyageLengthWeightKeyException.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{MoreThanOnceVoyageToImportException.java => DuplicatedSubSampleException.java} (67%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{NoVoyageToImportException.java => DuplicatedTransectException.java} (77%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{TransitNotFoundException.java => DuplicatedTransitException.java} (74%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{NoVoyageToImportException.java => DuplicatedVoyageException.java} (79%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MismatchVoyageException.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 11

branch feature/2246 deleted (was 8cf674f)
by codelutin.com scm May 13, 2016

May 13, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/2246 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git was 8cf674f Ne pas autoriser de réimporter les résultats sur les voyages déjà existants (See #2246) This change permanently discards the following revisions: discards 8cf674f Ne pas autoriser de réimporter les résultats sur les voyages déjà existants (See #2246) discards 9867f8f Ne pas autoriser de réimporter les résultats sur les voyages déjà existants (See #2246) discards 0b1e7ee Ajout du numéro de ligne dans les messages d'erreurs (See #2246) discards a23905d Ne pas autoriser de réimporter les données acoustiques déjà existantes (See #2246) discards 6bcfd28 i18n discards 0896dd7 Catch more exception while importing + ajout meilleur TODO discards ea54a1e Début de check pour les Sub-Sample mais il me manque des confirmations, à revoir avec Mathieu discards 883d892 Ne pas pouvoir effectuer plusieurs imports du même type discards 9f72d77 Ne pas autoriser de réimporter des meta sur les opérations et engins déjà existantes (See #2246) discards 42d9dbb Tester avant de supprimer lors de la suppression d'un import discards 7a78dc1 Nom de Zeus... ne jamais utiliser id comme nom de colonne car en hql ici c'est égale au TopiaId... discards 91a2107 Ajout toString discards 8690ac9 Meilleure gestion de la suppression d'un ImportLog discards 045c9fc Gérer la nullité d'erreur sur un import discards fa0d99e Bine utiliser la bonne page de résultat discards e847db7 Ajout toString discards dec2182 Renommage i18n discards 3209872 Ne pas autoriser de réimporter des opérations déjà existantes (See #2246) discards b3b3fac Ne pas pouvoir éditer les entitées transverses discards 31e9b45 Ne pas autoriser de réimporter des transects déjà existants (See #2246) discards 73ff899 Ne pas autoriser de réimporter des transits déjà existants (See #2246) discards cda7281 Typo sur le nom d'une méthode discards 262c51e Début ajout migration pour les clef naturelles + traitement pour import transit (See #2246) discards 2d6139e Ajout bidirection sur le modèle (A reverter quand import branche Atlantos) discards 1541342 Ne pas autorisé un import d'un voyage déjà existant (clef unique name) (See #2246) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/2246 updated (a23905d -> 8cf674f)
by codelutin.com scm May 13, 2016

May 13, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/2246 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from a23905d Ne pas autoriser de réimporter les données acoustiques déjà existantes (See #2246) new 0b1e7ee Ajout du numéro de ligne dans les messages d'erreurs (See #2246) new 9867f8f Ne pas autoriser de réimporter les résultats sur les voyages déjà existants (See #2246) new 8cf674f Ne pas autoriser de réimporter les résultats sur les voyages déjà existants (See #2246) 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 8cf674f1b633a46ba7f6006fedfbd14a3c173fe2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 13 08:43:10 2016 +0200 Ne pas autoriser de réimporter les résultats sur les voyages déjà existants (See #2246) commit 9867f8f7a6cca1411711b3e7debb5b26d9dba16b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu May 12 16:28:46 2016 +0200 Ne pas autoriser de réimporter les résultats sur les voyages déjà existants (See #2246) commit 0b1e7eef684a101f9c325a898721ae91aadae88a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu May 12 15:49:30 2016 +0200 Ajout du numéro de ligne dans les messages d'erreurs (See #2246) Summary of changes: .../services/service/UserDbPersistenceService.java | 15 +++++++++ .../DuplicatedEchotypeAssociationException.java | 20 ++++++++++++ .../DuplicatedElementaryCellException.java | 4 +-- .../importdata/DuplicatedEsduCellException.java | 4 +-- .../DuplicatedGearMetadataValueException.java | 3 +- ...eption.java => DuplicatedMapCellException.java} | 6 ++-- .../importdata/DuplicatedOperationException.java | 4 +-- .../DuplicatedOperationMetadataValueException.java | 4 +-- ...ion.java => DuplicatedRegionCellException.java} | 6 ++-- ...plicatedResultsVoyageLengthAgeKeyException.java | 20 ++++++++++++ ...catedResultsVoyageLengthWeightKeyException.java | 20 ++++++++++++ .../importdata/DuplicatedSampleException.java | 4 +-- .../importdata/DuplicatedSubSampleException.java | 3 +- .../importdata/DuplicatedTransectException.java | 4 +-- .../importdata/DuplicatedTransitException.java | 4 +-- .../importdata/DuplicatedVoyageException.java | 4 +-- .../importdata/MismatchVoyageException.java | 21 ++++++++++++ .../actions/VoyageAcousticsImportAction.java | 4 +-- .../VoyageCatchesSubSampleImportAction.java | 1 + .../VoyageCatchesTotalSampleImportAction.java | 2 +- .../actions/VoyageCommonsTransectImportAction.java | 2 +- .../actions/VoyageCommonsTransitImportAction.java | 2 +- .../actions/VoyageCommonsVoyageImportAction.java | 2 +- .../VoyageOperationsGearMetadataImportAction.java | 1 + .../VoyageOperationsOperationImportAction.java | 2 +- ...ageOperationsOperationMetadataImportAction.java | 2 +- .../VoyageResultsMapFishCellImportAction.java | 15 ++++++++- .../VoyageResultsMapOtherCellImportAction.java | 15 ++++++++- .../actions/VoyageResultsRegionImportAction.java | 21 ++++++++++-- .../VoyageResultsVoyageEchotypeImportAction.java | 19 ++++++++--- ...oyageResultsVoyageLengthAgeKeyImportAction.java | 31 ++++++++++++++++++ ...geResultsVoyageLengthWeightKeyImportAction.java | 38 ++++++++++++++++++++-- .../i18n/echobase-services_en_GB.properties | 26 +++++++++------ .../i18n/echobase-services_fr_FR.properties | 24 +++++++++----- 34 files changed, 290 insertions(+), 63 deletions(-) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/DuplicatedEchotypeAssociationException.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{DuplicatedEsduCellException.java => DuplicatedMapCellException.java} (79%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{DuplicatedElementaryCellException.java => DuplicatedRegionCellException.java} (77%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/DuplicatedResultsVoyageLengthAgeKeyException.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/DuplicatedResultsVoyageLengthWeightKeyException.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MismatchVoyageException.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch feature/#8171 updated (3df68fd -> 64a73f6)
by codelutin.com scm May 12, 2016

May 12, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/#8171 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 3df68fd Fix import for the voyage entity new 64a73f6 Fix NPE during 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 64a73f68f6092fbe04d0dec4c84236ad27149fd3 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu May 12 17:36:13 2016 +0200 Fix NPE during import Summary of changes: .../services/service/importdb/strategy/EchoBaseImportStrategy.java | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1