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

branch feature/8170 updated (d75bed0 -> 5df9496)
by codelutin.com scm April 8, 2016

April 8, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git discards d75bed0 Fix import files discards b298df1 i18n discards cf25124 Add some check on ageCategory/sizeCategory meaning while importing them discards 3fb0038 Suppression classe de teste inutile discards 7a059c1 Review tests again and again discards ef3e745 Voyage acoustic import ok \o/ (See #8170) discards 04532ec Revue des bases acoustiques à importer discards eea6b20 Improve toString on entities discards 6ad6b5b Plus le meme nombre de resultats importés sur les regions :() discards cab394c Ne pas importer deux fois les esdu manquantes discards 4d6b37a Renommage classes d'imports de résultats d'esdu discards 23c0ed2 Revue des l'import des résultats discards 3e840ed Voyage result esdu import ok (except for some categories meaning) \o/ (See #8170) discards 130fa02 Revue de l'api pour les imports de résults + début des imports de résultats esdu discards 29a4316 Ajout d'un cache AgeCategory et SizeCategory discards 822754f Correction de la clef du cache de category discards 26c5a8e Ajout colonne voyage sur import esdu echotype + fichier plus petit pour les tests discards c93fc68 Voyage map import ok \o/ (See #8170) discards f806dc1 Add method to get Category from his id discards 634557a Add a ageCategory formatter (can be null) discards c573872 Voyage result import ok \o/ (See #8170) discards c9211b0 Pouvoir récupérer une espèces discards 3055fcc Rename voyage region import data classes discards 81dec8c Can collect ids when creatin data cell discards 47649ae Region import ok \o/ (See #8170) discards 6ead589 Prise en compte de la nullité de la qualité d'un résultat lors de l'export discards c16fdde Prise en compte de la nullité d'un résultat lors de l'export discards 8af3bd6 Fix i18n discards bff9d9b Add predicate to filter cell data discards 309f240 Add more toString on entities discards 10975a5 Normalize test names + readd ITs :) discards c621df7 fix test results discards 3f175c7 Upgrade test import databases discards 4435be2 Fix voyage commons bootstrap dbs discards c29f78d Operations import ok \o/ (See #8170) discards 7ed45de rename commons csv java classes discards 3748750 rename catches csv java classes discards 09d93ed Biometry sample import ok \o/ (See #8170) discards 6256a3a Improve import data tests discards 5edc41d Sub sample import ok \o/ (See #8170) discards 8055fa7 Add test import database with total sample inside it discards 73511a8 Remove units column from subsample import in import data discards d65efd0 Can collect imported sample data discards 5455012 Add toString on some entities discards 30740d9 Import Catches total sample works discards d4e6f56 Utilisation des bons contrats discards 4e57363 Amélioration des tests d'import discards ffccaad Les imports commons voyage passent \o/ discards 48ac1c9 Début de revue des tests pour intégrer les exports discards 3480f7e Début d'implantation de l'export discards 832ab3f Ajout du répertoire temporaire dans la configuration discards 520575f Renommages, mise en place context d'import (impacts dans les actions d'ui) discards de077c8 Renommages, mise en place context d'import discards 13653b7 Optimisation des dépendances discards de7958c Suppression du domaine de tout ce qui concerne les csv (on retrouve ça partie service) discards cec5c70 Debut de mise en place d'un export lors de l'import discards d4471e6 Suppression des anciens services et code d'import de données + ajout de nouveaux tests d'import discards a6987a6 Utilisation du nouveu service d'import de données dans les actions d'ui discards a65f2e7 Mise en place d'une nouvelle API d'action d'import (pour traiter chaque import de fichier unitairement et non plus via des méthodes de services), du coup on ne va plus utiliser qu'un seul service d'import (grosse simplification) discards a736122 Ajout d'un checkFile pour chaque importFile discards 355c51f Revue des import (utilisation java 7 API + reformat code) adds b84da67 Ajout CR réunion 24 mars 2016 adds 6727083 Ajout CR réunion 5 avril 2016 adds 460d743 refs: #8089: Migrate to ToPIA 3.0 adds 8631fc2 refs #8089: Migrate to ToPIA 3.0 adds 6dccdf9 fixes #8089: Migrate to ToPIA 3.0 adds af8380e refs #8089: Update hibernate adds 298fe49 Utilisation du mode strict et correction des problèmes de tag values adds 8083eb1 on reste sur java 7 adds 2fda67c on repasse sur develop pour avancer même si le point n'est pas complètement traité :(. Merge branch 'feature/8089' into develop adds 9d7bc43 Revue des import (utilisation java 7 API + reformat code) adds 180efed Ajout d'un checkFile pour chaque importFile adds 4bee302 Mise en place d'une nouvelle API d'action d'import (pour traiter chaque import de fichier unitairement et non plus via des méthodes de services), du coup on ne va plus utiliser qu'un seul service d'import (grosse simplification) adds 7ae11a6 Utilisation du nouveu service d'import de données dans les actions d'ui adds bd5e973 Suppression des anciens services et code d'import de données + ajout de nouveaux tests d'import adds dabf6f2 Debut de mise en place d'un export lors de l'import adds fa7d5ee Suppression du domaine de tout ce qui concerne les csv (on retrouve ça partie service) adds f3e7527 Optimisation des dépendances adds e8afecd Renommages, mise en place context d'import adds 7a14695 Renommages, mise en place context d'import (impacts dans les actions d'ui) adds 1419ef0 Ajout du répertoire temporaire dans la configuration adds 7c656ce Début d'implantation de l'export adds 93c294d Début de revue des tests pour intégrer les exports adds a7b1555 Les imports commons voyage passent \o/ adds 66bf442 Amélioration des tests d'import adds 69acea5 Utilisation des bons contrats adds 0f4984b Import Catches total sample works adds ce6c788 Add toString on some entities adds eb33334 Can collect imported sample data adds 36cf27f Remove units column from subsample import in import data adds 9058bd7 Add test import database with total sample inside it adds 6f20743 Sub sample import ok \o/ (See #8170) adds 1bb6729 Improve import data tests adds 4ecf78f Biometry sample import ok \o/ (See #8170) adds 3f18980 rename catches csv java classes adds 8f50973 rename commons csv java classes adds 7556b75 Operations import ok \o/ (See #8170) adds 7e4b605 Fix voyage commons bootstrap dbs adds c3a5fa4 Upgrade test import databases adds 34e6272 fix test results adds cb7b7bf Normalize test names + readd ITs :) adds e217345 Add more toString on entities adds 0b3c385 Add predicate to filter cell data adds 70be163 Fix i18n adds 7a80a3b Prise en compte de la nullité d'un résultat lors de l'export adds 8853358 Prise en compte de la nullité de la qualité d'un résultat lors de l'export adds 0be21ef Region import ok \o/ (See #8170) adds b83fd76 Can collect ids when creatin data cell adds 4c6cb1e Rename voyage region import data classes adds f0a5293 Pouvoir récupérer une espèces adds a50e450 Voyage result import ok \o/ (See #8170) adds 6dfb6f7 Add a ageCategory formatter (can be null) adds 701e59e Add method to get Category from his id adds f6d1265 Voyage map import ok \o/ (See #8170) adds 4a24404 Ajout colonne voyage sur import esdu echotype + fichier plus petit pour les tests adds cc92359 Correction de la clef du cache de category adds e745628 Ajout d'un cache AgeCategory et SizeCategory adds 67b20c4 Revue de l'api pour les imports de résults + début des imports de résultats esdu adds 54e7e16 Voyage result esdu import ok (except for some categories meaning) \o/ (See #8170) adds d149ffb Revue des l'import des résultats adds 068e186 Renommage classes d'imports de résultats d'esdu adds 8196c52 Ne pas importer deux fois les esdu manquantes adds 61958bc Plus le meme nombre de resultats importés sur les regions :() adds d94f407 Improve toString on entities adds c4142af Revue des bases acoustiques à importer adds 7ef2203 Voyage acoustic import ok \o/ (See #8170) adds 2ed230f Review tests again and again adds fcd8746 Suppression classe de teste inutile adds dc5b98f Add some check on ageCategory/sizeCategory meaning while importing them adds 00414e4 i18n adds d283902 Fix import files adds c491979 Nettoyage des tag values + migration topia 3.0 adds 5df9496 Amélioration du site technique This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d75bed0) \ N -- N -- N refs/heads/feature/8170 (5df9496) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. Summary of changes: echobase-domain/pom.xml | 1 + .../java/fr/ifremer/echobase/FixedH2Dialect.java | 48 ++++++++ .../echobase/entities/AbstractEchoBaseDao.java | 5 +- .../fr/ifremer/echobase/entities/DriverType.java | 14 ++- .../EchoBaseUserTopiaApplicationContext.java | 2 +- .../echobase/entities/EchoBaseUserTopiaDao.java | 10 +- .../EchoBaseUserTopiaPersistenceContext.java | 9 +- .../echobase/entities/data/EchotypeTopiaDao.java | 1 - .../echobase/persistence/EchoBaseEntityHelper.java | 31 +++--- .../persistence/EchoBasePersistenceHelper.java | 18 +-- .../EchobaseTopiaApplicationContexts.java | 8 ++ .../echobase/persistence/JdbcConfiguration.java | 20 ++-- .../EchoBaseMigrationCallBackResolver.java | 8 +- .../internalDb/MigrationCallBackForVersion.java | 3 +- .../internalDb/MigrationCallBackForVersion2_2.java | 29 +++-- .../migration/internalDb/MigrationCallback.java | 18 +-- .../workingDb/MigrationCallBackForVersion.java | 44 +++++++- .../workingDb/MigrationCallBackForVersion2_2.java | 33 +++--- .../MigrationCallBackForVersion2_5_1.java | 11 +- .../workingDb/MigrationCallBackForVersion2_6.java | 39 +++---- .../MigrationCallBackForVersion2_6_1.java | 18 +-- .../MigrationCallBackForVersion2_7_2.java | 25 +++-- .../MigrationCallBackForVersion3_900.java | 11 +- .../MigrationCallBackForVersionPostgresql.java} | 13 ++- .../migration/workingDb/MigrationCallback.java | 11 +- .../main/resources/echobase-internaldb.properties | 5 +- .../main/resources/echobase-workingdb.properties | 5 +- .../src/main/xmi/echobase-internal.properties | 10 +- echobase-domain/src/main/xmi/echobase.properties | 19 ++-- .../echobase/services/service/DbEditorService.java | 15 ++- .../echobase/services/service/UserService.java | 15 ++- .../EmbeddedApplicationService.java | 2 +- .../services/service/exportdb/ExportDbService.java | 41 +++---- .../services/FakeEchoBaseServiceContext.java | 4 +- .../services/MigrateImportDataDatabasesIT.java | 2 +- .../removedata/AbstractRemoveDataServiceTest.java | 3 +- pom.xml | 8 +- src/doc/reunions/reunion_2016-03-24.txt | 122 ++++++++++++++++++++ src/doc/reunions/reunion_2016-04-05.md | 124 +++++++++++++++++++++ src/site/site_fr.xml | 6 + 40 files changed, 574 insertions(+), 237 deletions(-) create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/FixedH2Dialect.java copy echobase-domain/src/main/java/fr/ifremer/echobase/{I18nAble.java => persistence/migration/workingDb/MigrationCallBackForVersionPostgresql.java} (74%) create mode 100644 src/doc/reunions/reunion_2016-03-24.txt create mode 100644 src/doc/reunions/reunion_2016-04-05.md -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (6727083 -> 2fda67c)
by codelutin.com scm April 7, 2016

April 7, 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 6727083 Ajout CR réunion 5 avril 2016 new 460d743 refs: #8089: Migrate to ToPIA 3.0 new 8631fc2 refs #8089: Migrate to ToPIA 3.0 new 6dccdf9 fixes #8089: Migrate to ToPIA 3.0 new af8380e refs #8089: Update hibernate new 298fe49 Utilisation du mode strict et correction des problèmes de tag values new 8083eb1 on reste sur java 7 new 2fda67c on repasse sur develop pour avancer même si le point n'est pas complètement traité :(. Merge branch 'feature/8089' into develop The 7 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 2fda67c153b45098db89e57a3f18e5b972b26d5d Merge: 6727083 8083eb1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 7 17:31:07 2016 +0200 on repasse sur develop pour avancer même si le point n'est pas complètement traité :(. Merge branch 'feature/8089' into develop commit 8083eb1df6ab78fa256b6cf91404c86b47f02c51 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 7 17:18:45 2016 +0200 on reste sur java 7 commit 298fe496412fdbdf874ee6ba1a8fb61656f65b00 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 7 16:34:40 2016 +0200 Utilisation du mode strict et correction des problèmes de tag values commit af8380e7ca3c81f5e5f6b227ce6319a7a3acd292 Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Thu Mar 10 17:40:42 2016 +0100 refs #8089: Update hibernate commit 6dccdf9e07b9b3a2f9cd0548dc8ca0fa81f566b0 Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Thu Mar 10 17:31:03 2016 +0100 fixes #8089: Migrate to ToPIA 3.0 commit 8631fc281ea2b0996d917e00996eee1b8eeec3fb Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Wed Mar 9 15:31:08 2016 +0100 refs #8089: Migrate to ToPIA 3.0 commit 460d7431b8601b510b018bf782805dc56142062e Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Wed Mar 9 13:46:51 2016 +0100 refs: #8089: Migrate to ToPIA 3.0 Summary of changes: echobase-domain/pom.xml | 1 + .../java/fr/ifremer/echobase/FixedH2Dialect.java | 48 ++++++++++++++++++++++ .../echobase/entities/AbstractEchoBaseDao.java | 5 +-- .../fr/ifremer/echobase/entities/DriverType.java | 14 ++++--- .../EchoBaseUserTopiaApplicationContext.java | 2 +- .../echobase/entities/EchoBaseUserTopiaDao.java | 10 ++--- .../EchoBaseUserTopiaPersistenceContext.java | 9 ++-- .../echobase/entities/data/EchotypeTopiaDao.java | 1 - .../echobase/persistence/EchoBaseEntityHelper.java | 31 +++++++------- .../persistence/EchoBasePersistenceHelper.java | 18 ++------ .../EchobaseTopiaApplicationContexts.java | 8 ++++ .../echobase/persistence/JdbcConfiguration.java | 20 ++++----- .../EchoBaseMigrationCallBackResolver.java | 23 ++++++----- .../internalDb/MigrationCallBackForVersion.java | 3 +- .../internalDb/MigrationCallBackForVersion2_2.java | 29 +++++++------ .../migration/internalDb/MigrationCallback.java | 18 +++----- .../workingDb/MigrationCallBackForVersion.java | 44 +++++++++++++++++--- .../workingDb/MigrationCallBackForVersion2_2.java | 33 +++++++-------- .../MigrationCallBackForVersion2_5_1.java | 11 ++--- .../workingDb/MigrationCallBackForVersion2_6.java | 39 +++++++++--------- .../MigrationCallBackForVersion2_6_1.java | 18 ++++---- .../MigrationCallBackForVersion2_7_2.java | 25 +++++------ .../MigrationCallBackForVersionPostgresql.java} | 13 +++--- .../migration/workingDb/MigrationCallback.java | 11 +---- .../main/resources/echobase-internaldb.properties | 5 +-- .../main/resources/echobase-workingdb.properties | 5 +-- .../src/main/xmi/echobase-internal.properties | 10 +++-- echobase-domain/src/main/xmi/echobase.properties | 16 +++++--- .../echobase/services/service/DbEditorService.java | 15 +++++-- .../echobase/services/service/UserService.java | 15 ++++++- .../EmbeddedApplicationService.java | 2 +- .../services/service/exportdb/ExportDbService.java | 41 +++++++++--------- .../services/FakeEchoBaseServiceContext.java | 4 +- .../removedata/AbstractRemoveDataServiceTest.java | 3 +- pom.xml | 12 +++--- 35 files changed, 327 insertions(+), 235 deletions(-) create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/FixedH2Dialect.java copy echobase-domain/src/main/java/fr/ifremer/echobase/{I18nAble.java => persistence/migration/workingDb/MigrationCallBackForVersionPostgresql.java} (74%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 7

branch feature/8089 deleted (was 8083eb1)
by codelutin.com scm April 7, 2016

April 7, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8089 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git was 8083eb1 on reste sur java 7 This change permanently discards the following revisions: discards 8083eb1 on reste sur java 7 discards 298fe49 Utilisation du mode strict et correction des problèmes de tag values discards af8380e refs #8089: Update hibernate discards 6dccdf9 fixes #8089: Migrate to ToPIA 3.0 discards 8631fc2 refs #8089: Migrate to ToPIA 3.0 discards 460d743 refs: #8089: Migrate to ToPIA 3.0 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/8089-topia3-migration deleted (was d4cc480)
by codelutin.com scm April 7, 2016

April 7, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8089-topia3-migration in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git was d4cc480 Utilisation du mode strict et correction des problèmes de tag values 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

branch feature/8089 created (now 8083eb1)
by codelutin.com scm April 7, 2016

April 7, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8089 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git at 8083eb1 on reste sur java 7 This branch includes the following new commits: new 460d743 refs: #8089: Migrate to ToPIA 3.0 new 8631fc2 refs #8089: Migrate to ToPIA 3.0 new 6dccdf9 fixes #8089: Migrate to ToPIA 3.0 new af8380e refs #8089: Update hibernate new 298fe49 Utilisation du mode strict et correction des problèmes de tag values new 8083eb1 on reste sur java 7 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 8083eb1df6ab78fa256b6cf91404c86b47f02c51 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 7 17:18:45 2016 +0200 on reste sur java 7 commit 298fe496412fdbdf874ee6ba1a8fb61656f65b00 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 7 16:34:40 2016 +0200 Utilisation du mode strict et correction des problèmes de tag values commit af8380e7ca3c81f5e5f6b227ce6319a7a3acd292 Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Thu Mar 10 17:40:42 2016 +0100 refs #8089: Update hibernate commit 6dccdf9e07b9b3a2f9cd0548dc8ca0fa81f566b0 Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Thu Mar 10 17:31:03 2016 +0100 fixes #8089: Migrate to ToPIA 3.0 commit 8631fc281ea2b0996d917e00996eee1b8eeec3fb Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Wed Mar 9 15:31:08 2016 +0100 refs #8089: Migrate to ToPIA 3.0 commit 460d7431b8601b510b018bf782805dc56142062e Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Wed Mar 9 13:46:51 2016 +0100 refs: #8089: Migrate to ToPIA 3.0 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

branch feature/8089-topia3-migration updated (0c2bae8 -> d4cc480)
by codelutin.com scm April 7, 2016

April 7, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8089-topia3-migration in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 0c2bae8 refs #8089: Update hibernate new d4cc480 Utilisation du mode strict et correction des problèmes de tag values 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 d4cc48021293b18e17e6ee8dbe06ebe17cbbb801 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 7 16:34:40 2016 +0200 Utilisation du mode strict et correction des problèmes de tag values Summary of changes: echobase-domain/pom.xml | 1 + echobase-domain/src/main/xmi/echobase-internal.properties | 9 ++++++--- echobase-domain/src/main/xmi/echobase.properties | 15 +++++++++------ 3 files changed, 16 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8170 updated (b298df1 -> d75bed0)
by codelutin.com scm April 7, 2016

April 7, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from b298df1 i18n new d75bed0 Fix import files 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 d75bed0f531b57550d9a63d3c9372d137028bbd8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 7 09:18:04 2016 +0200 Fix import files Summary of changes: .../result/esdu/bySpeciesAndAgeCategory.csv.gz | Bin 141215 -> 141214 bytes .../esdu/bySpeciesAndAgeCategory_small.csv.gz | Bin 2379 -> 2379 bytes 2 files changed, 0 insertions(+), 0 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8170 updated (7a059c1 -> b298df1)
by codelutin.com scm April 7, 2016

April 7, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 7a059c1 Review tests again and again adds 3fb0038 Suppression classe de teste inutile adds cf25124 Add some check on ageCategory/sizeCategory meaning while importing them adds b298df1 i18n No new revisions were added by this update. Summary of changes: .../i18n/echobase-domain_en_GB.properties | 1 + .../i18n/echobase-domain_fr_FR.properties | 1 + .../MismatchAgeCategoryMeaningException.java | 19 +++++++++ .../MismatchSizeCategoryMeaningException.java | 19 +++++++++ ...sEsduSpeciesAndAgeCategoryCellImportAction.java | 6 +++ ...EsduSpeciesAndSizeCategoryCellImportAction.java | 6 +++ .../i18n/echobase-services_en_GB.properties | 4 ++ .../i18n/echobase-services_fr_FR.properties | 6 ++- .../ImportDataFakeEchoBaseServiceContext.java | 46 ---------------------- .../importdata/AbstractImportDataServiceIT.java | 6 +-- 10 files changed, 63 insertions(+), 51 deletions(-) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MismatchAgeCategoryMeaningException.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MismatchSizeCategoryMeaningException.java delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDataFakeEchoBaseServiceContext.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (b84da67 -> 6727083)
by codelutin.com scm April 7, 2016

April 7, 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 b84da67 Ajout CR réunion 24 mars 2016 new 6727083 Ajout CR réunion 5 avril 2016 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 6727083b1a37c85ab45783b2e16a8e94bbbf5055 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 7 08:42:53 2016 +0200 Ajout CR réunion 5 avril 2016 Summary of changes: src/doc/reunions/reunion_2016-04-05.md | 124 +++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 src/doc/reunions/reunion_2016-04-05.md -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (09b7f7b -> b84da67)
by codelutin.com scm April 7, 2016

April 7, 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 09b7f7b Revert "Refs #8168 nuiton-web 1.17" new b84da67 Ajout CR réunion 24 mars 2016 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 b84da674eb213dd8efa2db7075816233ef5acc4d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 7 08:18:53 2016 +0200 Ajout CR réunion 24 mars 2016 Summary of changes: src/doc/reunions/reunion_2016-03-24.txt | 122 ++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100644 src/doc/reunions/reunion_2016-03-24.txt -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8170 updated (3e840ed -> 7a059c1)
by codelutin.com scm April 7, 2016

April 7, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 3e840ed Voyage result esdu import ok (except for some categories meaning) \o/ (See #8170) adds 23c0ed2 Revue des l'import des résultats adds 4d6b37a Renommage classes d'imports de résultats d'esdu adds cab394c Ne pas importer deux fois les esdu manquantes adds 6ad6b5b Plus le meme nombre de resultats importés sur les regions :() adds eea6b20 Improve toString on entities adds 04532ec Revue des bases acoustiques à importer adds ef3e745 Voyage acoustic import ok \o/ (See #8170) adds 7a059c1 Review tests again and again No new revisions were added by this update. Summary of changes: .../ifremer/echobase/entities/data/CellImpl.java | 2 +- .../data/{SampleDataImpl.java => DataImpl.java} | 8 +- .../fr/ifremer/echobase/entities/data/Datas.java | 8 + .../echobase/entities/references/CellTypeImpl.java | 2 +- .../entities/references/DataMetadataImpl.java | 13 +- .../services/service/UserDbPersistenceService.java | 14 +- ...=> ElementaryCellWithoutDepthEndException.java} | 7 +- ...va => EsduCellWithDepthEndFilledException.java} | 7 +- .../actions/VoyageAcousticsImportAction.java | 572 ++++++++++++++++----- .../VoyageResultsCellImportDataActionSupport.java | 143 ++++++ ...EchotypeAndSpeciesCategoryCellImportAction.java | 30 +- ...oyageResultsEsduByEchotypeCellImportAction.java | 30 +- ...yageResultsEsduCellImportDataActionSupport.java | 194 ------- ...sEsduSpeciesAndAgeCategoryCellImportAction.java | 42 +- ...EsduSpeciesAndSizeCategoryCellImportAction.java | 42 +- .../actions/VoyageResultsRegionImportAction.java | 2 +- .../VoyageResultsRegionResultsImportAction.java | 291 ++++++----- ...chotypeAndSpeciesCategoryImportExportModel.java | 93 ---- .../csv/EsduResultByEchotypeImportExportModel.java | 83 --- ...ltBySpeciesAndAgeCategoryImportExportModel.java | 91 ---- ...tBySpeciesAndSizeCategoryImportExportModel.java | 93 ---- ...l.java => VoyageAcousticImportExportModel.java} | 128 ++--- ...ImportRow.java => VoyageAcousticImportRow.java} | 93 +++- ...chotypeAndSpeciesCategoryImportExportModel.java | 93 ++++ ...EsduByEchotypeAndSpeciesCategoryImportRow.java} | 8 +- ...yageResultsEsduByEchotypeImportExportModel.java | 83 +++ ...a => VoyageResultsEsduByEchotypeImportRow.java} | 8 +- ...duBySpeciesAndAgeCategoryImportExportModel.java | 91 ++++ ...sultsEsduBySpeciesAndAgeCategoryImportRow.java} | 8 +- ...uBySpeciesAndSizeCategoryImportExportModel.java | 93 ++++ ...ultsEsduBySpeciesAndSizeCategoryImportRow.java} | 8 +- .../VoyageResultsRegionCellResultImportRow.java | 93 ++-- .../i18n/echobase-services_fr_FR.properties | 2 + .../echobase/services/EchoBaseServiceFixtures.java | 28 - .../services/EchoBaseTestServiceSupport.java | 228 +------- .../services/FakeEchoBaseServiceContext.java | 14 + .../ImportDataFakeEchoBaseServiceContext.java} | 28 +- .../echobase/services/ImportDataFixtures.java | 132 +++++ .../services/MigrateImportDataDatabasesIT.java | 12 +- .../EmbeddedApplicationServiceIT.java | 4 +- .../exportCoser/ExportCoserServiceTest.java | 3 +- .../service/exportdb/ExportDbServiceTest.java | 4 +- .../importdata/AbstractImportDataServiceIT.java | 196 ++++--- .../importdata/VoyageAcousticImportServiceIT.java | 38 +- .../VoyageCatchesAllImportServiceIT.java | 25 +- ...geCatchesOnlyBiometrySampleImportServiceIT.java | 14 +- .../VoyageCatchesOnlySubSampleImportServiceIT.java | 14 +- ...oyageCatchesOnlyTotalSampleImportServiceIT.java | 13 +- .../VoyageCommonsAllImportServiceIT.java | 18 +- .../VoyageCommonsOnlyTransectImportServiceIT.java | 27 +- .../VoyageCommonsOnlyTransitImportServiceIT.java | 23 +- .../VoyageCommonsOnlyVoyageImportServiceIT.java | 31 +- .../importdata/VoyageOperationImportServiceIT.java | 14 +- ...yEchotypeAndSpeciesCategoryImportServiceIT.java | 16 +- ...ResultsEsduCellOnlyEchotypeImportServiceIT.java | 20 +- ...llOnlySpeciesAndAgeCategoryImportServiceIT.java | 16 +- ...lOnlySpeciesAndSizeCategoryImportServiceIT.java | 16 +- .../VoyageResultsMapFishCellImportServiceIT.java | 25 +- .../VoyageResultsMapOtherCellImportServiceIT.java | 16 +- .../VoyageResultsRegionCellImportServiceIT.java | 34 +- .../VoyageResultsVoyageImportServiceIT.java | 15 +- ...geResultsVoyageOnlyEchotypeImportServiceIT.java | 15 +- ...sultsVoyageOnlyLengthAgeKeyImportServiceIT.java | 15 +- ...tsVoyageOnlyLengthWeightKeyImportServiceIT.java | 18 +- .../removedata/AbstractRemoveDataServiceTest.java | 3 +- .../resources/import-data/acoustic/movies.csv.gz | Bin 596169 -> 596169 bytes .../import-data/acoustic/movies_small.csv.gz | Bin 0 -> 6141 bytes .../import-data/echobase-catches.h2.db.gz | Bin 659616 -> 663781 bytes 68 files changed, 1785 insertions(+), 1765 deletions(-) copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/{SampleDataImpl.java => DataImpl.java} (58%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{MoreThanOnceVoyageToImportException.java => ElementaryCellWithoutDepthEndException.java} (73%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{MoreThanOnceVoyageToImportException.java => EsduCellWithDepthEndFilledException.java} (76%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsCellImportDataActionSupport.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduCellImportDataActionSupport.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{AcousticImportExportModel.java => VoyageAcousticImportExportModel.java} (64%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{AcousticImportRow.java => VoyageAcousticImportRow.java} (70%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{EsduResultByEchotypeAndSpeciesCategoryImportRow.java => VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow.java} (88%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{EsduResultByEchotypeImportRow.java => VoyageResultsEsduByEchotypeImportRow.java} (87%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduBySpeciesAndAgeCategoryImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{EsduResultBySpeciesAndAgeCategoryImportRow.java => VoyageResultsEsduBySpeciesAndAgeCategoryImportRow.java} (89%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduBySpeciesAndSizeCategoryImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{EsduResultBySpeciesAndSizeCategoryImportRow.java => VoyageResultsEsduBySpeciesAndSizeCategoryImportRow.java} (89%) copy echobase-services/src/{main/java/fr/ifremer/echobase/services/ProgressModel.java => test/java/fr/ifremer/echobase/services/ImportDataFakeEchoBaseServiceContext.java} (51%) create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDataFixtures.java create mode 100644 echobase-services/src/test/resources/import-data/acoustic/movies_small.csv.gz -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/8170 updated (130fa02 -> 3e840ed)
by codelutin.com scm April 5, 2016

April 5, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 130fa02 Revue de l'api pour les imports de résults + début des imports de résultats esdu new 3e840ed Voyage result esdu import ok (except for some categories meaning) \o/ (See #8170) 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 3e840edbd3794983bf2a5b0929272519bb09aab6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 5 13:26:43 2016 +0200 Voyage result esdu import ok (except for some categories meaning) \o/ (See #8170) Summary of changes: .../VoyageResultsEsduCellImportServiceIT.java | 184 --------------------- ...EchotypeAndSpeciesCategoryImportServiceIT.java} | 26 ++- ...ResultsEsduCellOnlyEchotypeImportServiceIT.java | 5 - ...lOnlySpeciesAndAgeCategoryImportServiceIT.java} | 33 ++-- ...OnlySpeciesAndSizeCategoryImportServiceIT.java} | 33 ++-- .../esdu/byEchotypeAndSpeciesCategory.csv.gz | Bin 547091 -> 547121 bytes .../esdu/byEchotypeAndSpeciesCategory_small.csv.gz | Bin 0 -> 2042 bytes .../result/esdu/bySpeciesAndAgeCategory.csv.gz | Bin 141033 -> 141215 bytes .../esdu/bySpeciesAndAgeCategory_small.csv.gz | Bin 0 -> 2379 bytes .../result/esdu/bySpeciesAndSizeCategory.csv.gz | Bin 707226 -> 709007 bytes .../esdu/bySpeciesAndSizeCategory_small.csv.gz | Bin 0 -> 2544 bytes 11 files changed, 47 insertions(+), 234 deletions(-) delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellImportServiceIT.java copy echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsEsduCellOnlyEchotypeImportServiceIT.java => VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryImportServiceIT.java} (78%) copy echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsEsduCellOnlyEchotypeImportServiceIT.java => VoyageResultsEsduCellOnlySpeciesAndAgeCategoryImportServiceIT.java} (70%) copy echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsEsduCellOnlyEchotypeImportServiceIT.java => VoyageResultsEsduCellOnlySpeciesAndSizeCategoryImportServiceIT.java} (70%) create mode 100644 echobase-services/src/test/resources/import-data/result/esdu/byEchotypeAndSpeciesCategory_small.csv.gz create mode 100644 echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndAgeCategory_small.csv.gz create mode 100644 echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndSizeCategory_small.csv.gz -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8170 updated (c93fc68 -> 130fa02)
by codelutin.com scm April 5, 2016

April 5, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from c93fc68 Voyage map import ok \o/ (See #8170) new 26c5a8e Ajout colonne voyage sur import esdu echotype + fichier plus petit pour les tests new 822754f Correction de la clef du cache de category new 29a4316 Ajout d'un cache AgeCategory et SizeCategory new 130fa02 Revue de l'api pour les imports de résults + début des imports de résultats esdu The 4 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 130fa022c25914c1a515f0251f192a748fbc1691 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 5 12:53:41 2016 +0200 Revue de l'api pour les imports de résults + début des imports de résultats esdu commit 29a4316a329152aa3d6c5c9b88f067f44d7ae231 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 5 12:53:11 2016 +0200 Ajout d'un cache AgeCategory et SizeCategory commit 822754f55f86f3b79fad6c31fd2f08f916cad6c8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 5 12:52:52 2016 +0200 Correction de la clef du cache de category commit 26c5a8ebfdf926f3e72539cf18b4abcb4334a6e2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 5 12:52:18 2016 +0200 Ajout colonne voyage sur import esdu echotype + fichier plus petit pour les tests Summary of changes: .../fr/ifremer/echobase/services/csv/CellAble.java | 22 +++ .../service/importdata/AgeCategoryCache.java | 53 ++++++ .../service/importdata/ResultCategoryCache.java | 2 +- .../service/importdata/SizeCategoryCache.java | 53 ++++++ ...EchotypeAndSpeciesCategoryCellImportAction.java | 54 ++---- ...oyageResultsEsduByEchotypeCellImportAction.java | 47 +---- ...yageResultsEsduCellImportDataActionSupport.java | 194 +++++++++++++++++++++ ...sEsduSpeciesAndAgeCategoryCellImportAction.java | 82 +++------ ...EsduSpeciesAndSizeCategoryCellImportAction.java | 90 ++++------ .../contexts/VoyageResultsImportDataContext.java | 19 ++ .../csv/EchoBaseImportExportModelSupport.java | 10 ++ ...chotypeAndSpeciesCategoryImportExportModel.java | 22 +-- ...esultByEchotypeAndSpeciesCategoryImportRow.java | 54 ++++-- .../csv/EsduResultByEchotypeImportExportModel.java | 14 +- .../csv/EsduResultByEchotypeImportRow.java | 49 ++++-- ...ltBySpeciesAndAgeCategoryImportExportModel.java | 22 +-- ...EsduResultBySpeciesAndAgeCategoryImportRow.java | 74 +++++--- ...tBySpeciesAndSizeCategoryImportExportModel.java | 16 +- ...sduResultBySpeciesAndSizeCategoryImportRow.java | 74 +++++--- .../VoyageResultsMapFishCellImportExportModel.java | 7 +- .../csv/VoyageResultsMapFishCellImportRow.java | 4 +- ...VoyageResultsMapOtherCellImportExportModel.java | 7 +- .../csv/VoyageResultsMapOtherCellImportRow.java | 4 +- ...geResultsRegionCellResultImportExportModel.java | 15 +- .../VoyageResultsRegionCellResultImportRow.java | 4 +- ...yageResultsVoyageEchotypeImportExportModel.java | 5 +- ...ResultsVoyageLengthAgeKeyImportExportModel.java | 6 +- ...ultsVoyageLengthWeightKeyImportExportModel.java | 9 +- ...oyageResultsVoyageLengthWeightKeyImportRow.java | 1 + ...esultsEsduCellOnlyEchotypeImportServiceIT.java} | 52 +++--- .../import-data/result/esdu/byEchotype.csv.gz | Bin 73537 -> 73195 bytes .../result/esdu/byEchotype_small.csv.gz | Bin 0 -> 2802 bytes 32 files changed, 666 insertions(+), 399 deletions(-) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CellAble.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AgeCategoryCache.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/SizeCategoryCache.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduCellImportDataActionSupport.java copy echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsMapFishCellImportServiceIT.java => VoyageResultsEsduCellOnlyEchotypeImportServiceIT.java} (69%) create mode 100644 echobase-services/src/test/resources/import-data/result/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 4

branch feature/8170 updated (c573872 -> c93fc68)
by codelutin.com scm April 5, 2016

April 5, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from c573872 Voyage result import ok \o/ (See #8170) new 634557a Add a ageCategory formatter (can be null) new f806dc1 Add method to get Category from his id new c93fc68 Voyage map import ok \o/ (See #8170) 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 c93fc680d4be1b294e3458563d7059af06188bd9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 5 08:50:33 2016 +0200 Voyage map import ok \o/ (See #8170) commit f806dc100b3e29c1222eb644a290f986c7636a82 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 5 08:50:22 2016 +0200 Add method to get Category from his id commit 634557a5a2db12517bec714e79bec9aacb6e2dd3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 5 08:50:07 2016 +0200 Add a ageCategory formatter (can be null) Summary of changes: .../echobase/services/csv/EchoBaseCsvUtil.java | 10 ++ .../services/service/UserDbPersistenceService.java | 4 + .../VoyageResultsMapFishCellImportAction.java | 113 +++++++++++++++---- .../VoyageResultsMapOtherCellImportAction.java | 91 ++++++++++++---- .../importdata/csv/MapCellImportExportModel.java | 108 ------------------- .../VoyageResultsMapFishCellImportExportModel.java | 119 +++++++++++++++++++++ ...java => VoyageResultsMapFishCellImportRow.java} | 70 ++++++++---- ...VoyageResultsMapOtherCellImportExportModel.java | 104 ++++++++++++++++++ ...ava => VoyageResultsMapOtherCellImportRow.java} | 92 +++++++--------- .../VoyageResultsMapFishCellImportServiceIT.java | 26 +++-- .../VoyageResultsMapOtherCellImportServiceIT.java | 21 ++-- 11 files changed, 520 insertions(+), 238 deletions(-) delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MapCellImportExportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsMapFishCellImportExportModel.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{MapCellImportRow.java => VoyageResultsMapFishCellImportRow.java} (81%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsMapOtherCellImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{MapCellImportRow.java => VoyageResultsMapOtherCellImportRow.java} (75%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch feature/8170 updated (81dec8c -> c573872)
by codelutin.com scm April 4, 2016

April 4, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 81dec8c Can collect ids when creatin data cell new 3055fcc Rename voyage region import data classes new c9211b0 Pouvoir récupérer une espèces new c573872 Voyage result import ok \o/ (See #8170) 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 c57387276a2d7844c808c1f4797f52944fc56382 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 4 18:29:22 2016 +0200 Voyage result import ok \o/ (See #8170) commit c9211b0033af367bee1939c6dbaa76423ad301e6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 4 18:28:50 2016 +0200 Pouvoir récupérer une espèces commit 3055fcc9cfc866aa352d0036e6681ec780df8d0c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 4 17:00:07 2016 +0200 Rename voyage region import data classes Summary of changes: .../services/service/UserDbPersistenceService.java | 4 + ...VoyageResultsRegionAssociationImportAction.java | 20 ++--- .../actions/VoyageResultsRegionImportAction.java | 20 ++--- .../VoyageResultsRegionResultsImportAction.java | 26 +++--- .../VoyageResultsVoyageEchotypeImportAction.java | 54 +++++++++--- ...oyageResultsVoyageLengthAgeKeyImportAction.java | 34 +++++--- ...geResultsVoyageLengthWeightKeyImportAction.java | 36 +++++--- ...chotypeAndSpeciesCategoryImportExportModel.java | 4 +- .../csv/EsduResultByEchotypeImportExportModel.java | 4 +- ...ltBySpeciesAndAgeCategoryImportExportModel.java | 4 +- ...tBySpeciesAndSizeCategoryImportExportModel.java | 4 +- .../csv/LengthWeightKeyImportExportModel.java | 73 ---------------- .../RegionCellAssociationImportExportModel.java | 68 --------------- .../csv/RegionCellImportExportModel.java | 71 ---------------- .../csv/RegionCellResultImportExportModel.java | 96 ---------------------- ...ultsRegionCellAssociationImportExportModel.java | 68 +++++++++++++++ ...yageResultsRegionCellAssociationImportRow.java} | 10 +-- .../VoyageResultsRegionCellImportExportModel.java | 71 ++++++++++++++++ ....java => VoyageResultsRegionCellImportRow.java} | 10 +-- ...geResultsRegionCellResultImportExportModel.java | 96 ++++++++++++++++++++++ ...=> VoyageResultsRegionCellResultImportRow.java} | 8 +- ...ageResultsVoyageEchotypeImportExportModel.java} | 30 +++---- ...a => VoyageResultsVoyageEchotypeImportRow.java} | 47 +++++++++-- ...esultsVoyageLengthAgeKeyImportExportModel.java} | 22 ++--- ... VoyageResultsVoyageLengthAgeKeyImportRow.java} | 43 +++++++++- ...ultsVoyageLengthWeightKeyImportExportModel.java | 76 +++++++++++++++++ ...yageResultsVoyageLengthWeightKeyImportRow.java} | 40 +++++++-- .../VoyageResultsVoyageImportServiceIT.java | 34 +++++--- ...geResultsVoyageOnlyEchotypeImportServiceIT.java | 12 +-- ...sultsVoyageOnlyLengthAgeKeyImportServiceIT.java | 11 ++- ...tsVoyageOnlyLengthWeightKeyImportServiceIT.java | 11 ++- 31 files changed, 641 insertions(+), 466 deletions(-) delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthWeightKeyImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellAssociationImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellResultImportExportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellAssociationImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{RegionCellAssociationImportRow.java => VoyageResultsRegionCellAssociationImportRow.java} (81%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{RegionCellImportRow.java => VoyageResultsRegionCellImportRow.java} (88%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellResultImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{RegionCellResultImportRow.java => VoyageResultsRegionCellResultImportRow.java} (90%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{EchotypeImportExportModel.java => VoyageResultsVoyageEchotypeImportExportModel.java} (55%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{EchotypeImportRow.java => VoyageResultsVoyageEchotypeImportRow.java} (63%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{LengthAgeKeyImportExportModel.java => VoyageResultsVoyageLengthAgeKeyImportExportModel.java} (65%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{LengthAgeKeyImportRow.java => VoyageResultsVoyageLengthAgeKeyImportRow.java} (65%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsVoyageLengthWeightKeyImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{LengthWeightKeyImportRow.java => VoyageResultsVoyageLengthWeightKeyImportRow.java} (69%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch feature/8170 updated (10975a5 -> 81dec8c)
by codelutin.com scm April 4, 2016

April 4, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 10975a5 Normalize test names + readd ITs :) new 309f240 Add more toString on entities new bff9d9b Add predicate to filter cell data new 8af3bd6 Fix i18n new c16fdde Prise en compte de la nullité d'un résultat lors de l'export new 6ead589 Prise en compte de la nullité de la qualité d'un résultat lors de l'export new 47649ae Region import ok \o/ (See #8170) new 81dec8c Can collect ids when creatin data cell The 7 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 81dec8c1e018b7ba17740a3e3d4da4b3189de701 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 4 07:42:06 2016 +0200 Can collect ids when creatin data cell commit 47649ae66721626d0d8eb7a9d645565df2a32456 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 4 07:41:44 2016 +0200 Region import ok \o/ (See #8170) commit 6ead589b58c04a83d68e39e070eee3325a03b98f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 4 07:40:35 2016 +0200 Prise en compte de la nullité de la qualité d'un résultat lors de l'export commit c16fdde3666617cd3882bda4dcee89fb9d01ae97 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 4 07:39:36 2016 +0200 Prise en compte de la nullité d'un résultat lors de l'export commit 8af3bd6da06bff30e1f8e0d553b063aebd84d482 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Apr 3 09:58:02 2016 +0200 Fix i18n commit bff9d9b66a918c49a633c563ed9d5c2f46ce6b8f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Apr 3 09:57:33 2016 +0200 Add predicate to filter cell data commit 309f240165a54000ded40584bfe61390d74adfad Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Apr 3 09:57:09 2016 +0200 Add more toString on entities Summary of changes: .../ifremer/echobase/entities/data/CellImpl.java | 12 ++- .../fr/ifremer/echobase/entities/data/Datas.java | 33 +++++++ .../echobase/entities/references/CellTypeImpl.java | 15 ++- .../echobase/services/csv/EchoBaseCsvUtil.java | 2 +- .../services/csv/ResultValueFormatter.java | 2 +- .../actions/ImportDataActionSupport.java | 12 ++- .../actions/VoyageAcousticsImportAction.java | 3 +- .../VoyageResultsImportDataActionSupport.java | 29 +++--- .../VoyageResultsMapFishCellImportAction.java | 18 ++-- .../VoyageResultsMapOtherCellImportAction.java | 18 ++-- ...VoyageResultsRegionAssociationImportAction.java | 38 +++++++- .../actions/VoyageResultsRegionImportAction.java | 86 +++++++++++++++-- .../VoyageResultsRegionResultsImportAction.java | 106 ++++++++++++++++++++- .../csv/EchoBaseImportExportModelSupport.java | 2 +- .../RegionCellAssociationImportExportModel.java | 12 ++- .../csv/RegionCellAssociationImportRow.java | 10 +- .../importdata/csv/RegionCellImportRow.java | 22 ++++- .../importdata/csv/RegionCellResultImportRow.java | 28 +++++- .../i18n/echobase-services_fr_FR.properties | 2 +- .../VoyageResultsRegionCellImportServiceIT.java | 57 ++++++++--- .../result/region/regionAssociations_small.csv.gz | Bin 0 -> 296 bytes 21 files changed, 436 insertions(+), 71 deletions(-) create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Datas.java create mode 100644 echobase-services/src/test/resources/import-data/result/region/regionAssociations_small.csv.gz -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 7

branch feature/8170 updated (c29f78d -> 10975a5)
by codelutin.com scm April 2, 2016

April 2, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from c29f78d Operations import ok \o/ (See #8170) new 4435be2 Fix voyage commons bootstrap dbs new 3f175c7 Upgrade test import databases new c621df7 fix test results new 10975a5 Normalize test names + readd ITs :) The 4 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 10975a5daa6dd6e3c644797b4f5e2c97145784ab Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 2 15:26:10 2016 +0200 Normalize test names + readd ITs :) commit c621df7d5a10a3e4825fd5465f97f83580c16427 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 2 15:22:59 2016 +0200 fix test results commit 3f175c7dfb7b2da5e59a778057a18ab5d2784fd0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 2 15:15:45 2016 +0200 Upgrade test import databases commit 4435be218ca50aecbb75bf4e0504197eb09c2f99 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 2 14:35:52 2016 +0200 Fix voyage commons bootstrap dbs Summary of changes: echobase-services/pom.xml | 2 +- .../services/FakeEchoBaseServiceContext.java | 55 +++++---- .../services/MigrateImportDataDatabasesIT.java | 131 +++++++++++++++++++++ .../VoyageCatchesAllImportServiceIT.java | 60 +++++++--- ...eCatchesOnlyBiometrySampleImportServiceIT.java} | 4 +- ...VoyageCatchesOnlySubSampleImportServiceIT.java} | 4 +- ...yageCatchesOnlyTotalSampleImportServiceIT.java} | 4 +- .../VoyageCommonsAllImportServiceIT.java | 6 + .../VoyageCommonsImportServiceITSupport.java | 6 - ... VoyageCommonsOnlyTransectImportServiceIT.java} | 10 +- ...> VoyageCommonsOnlyTransitImportServiceIT.java} | 10 +- ...=> VoyageCommonsOnlyVoyageImportServiceIT.java} | 10 +- ...eResultsVoyageOnlyEchotypeImportServiceIT.java} | 4 +- ...ultsVoyageOnlyLengthAgeKeyImportServiceIT.java} | 4 +- ...sVoyageOnlyLengthWeightKeyImportServiceIT.java} | 4 +- .../echobase-catches-and-voyage-result.h2.db.gz | Bin 705722 -> 703063 bytes .../import-data/echobase-catches.h2.db.gz | Bin 662677 -> 659616 bytes .../import-data/echobase-commonData.h2.db.gz | Bin 178638 -> 179054 bytes .../resources/import-data/echobase-nodata.h2.db.gz | Bin 129028 -> 129703 bytes .../echobase-operation-total-samples.h2.db.gz | Bin 663495 -> 660514 bytes .../import-data/echobase-operation.h2.db.gz | Bin 324421 -> 323654 bytes 21 files changed, 247 insertions(+), 67 deletions(-) create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/MigrateImportDataDatabasesIT.java rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageCatchesImportServiceOnlyBiometrySampleIT.java => VoyageCatchesOnlyBiometrySampleImportServiceIT.java} (95%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageCatchesImportServiceOnlySubSampleIT.java => VoyageCatchesOnlySubSampleImportServiceIT.java} (95%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageCatchesImportServiceOnlyTotalSampleIT.java => VoyageCatchesOnlyTotalSampleImportServiceIT.java} (95%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageCommonsTransectImportServiceIT.java => VoyageCommonsOnlyTransectImportServiceIT.java} (88%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageCommonsTransitImportServiceIT.java => VoyageCommonsOnlyTransitImportServiceIT.java} (88%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageCommonsVoyageImportServiceIT.java => VoyageCommonsOnlyVoyageImportServiceIT.java} (87%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsVoyageImportServiceOnlyEchotypeIT.java => VoyageResultsVoyageOnlyEchotypeImportServiceIT.java} (95%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsVoyageImportServiceOnlyLengthAgeKeyIT.java => VoyageResultsVoyageOnlyLengthAgeKeyImportServiceIT.java} (95%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsVoyageImportServiceOnlyLengthWeightKeyIT.java => VoyageResultsVoyageOnlyLengthWeightKeyImportServiceIT.java} (95%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch feature/8170 updated (5edc41d -> c29f78d)
by codelutin.com scm April 2, 2016

April 2, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 5edc41d Sub sample import ok \o/ (See #8170) new 6256a3a Improve import data tests new 09d93ed Biometry sample import ok \o/ (See #8170) new 3748750 rename catches csv java classes new 7ed45de rename commons csv java classes new c29f78d Operations import ok \o/ (See #8170) 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 c29f78db2beaee2125351046e727be0ffaf359d5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 2 13:57:46 2016 +0200 Operations import ok \o/ (See #8170) commit 7ed45de9e0f51efa064646ce69405bb0949ed65d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 2 13:00:09 2016 +0200 rename commons csv java classes commit 3748750a5d46c9fa2c2023749f540aacd0b464a6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 2 12:58:57 2016 +0200 rename catches csv java classes commit 09d93ed44f054728df4f1d47caffbe198489a7e8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 2 12:57:41 2016 +0200 Biometry sample import ok \o/ (See #8170) commit 6256a3a8425a3018c89e9797e304adbda6fd1b16 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 2 12:33:28 2016 +0200 Improve import data tests Summary of changes: .../VoyageCatchesBiometrySampleImportAction.java | 65 +++++++++++++--- .../VoyageCatchesSubSampleImportAction.java | 26 +++---- .../VoyageCatchesTotalSampleImportAction.java | 20 ++--- .../actions/VoyageCommonsTransectImportAction.java | 20 ++--- .../actions/VoyageCommonsTransitImportAction.java | 20 ++--- .../actions/VoyageCommonsVoyageImportAction.java | 10 +-- .../VoyageOperationsGearMetadataImportAction.java | 60 ++++++++++++--- .../VoyageOperationsOperationImportAction.java | 48 +++++++++--- ...ageOperationsOperationMetadataImportAction.java | 61 ++++++++++++--- .../csv/GearMetadataValueImportExportModel.java | 72 ------------------ .../OperationMetadataValueImportExportModel.java | 68 ----------------- .../importdata/csv/SubSampleImportExportModel.java | 87 ---------------------- .../csv/TotalSampleImportExportModel.java | 78 ------------------- ...ageCatchesBiometrySampleImportExportModel.java} | 28 +++---- ...a => VoyageCatchesBiometrySampleImportRow.java} | 44 +++++++++-- .../VoyageCatchesSubSampleImportExportModel.java | 87 ++++++++++++++++++++++ ...w.java => VoyageCatchesSubSampleImportRow.java} | 12 +-- .../VoyageCatchesTotalSampleImportExportModel.java | 78 +++++++++++++++++++ ...java => VoyageCatchesTotalSampleImportRow.java} | 12 +-- ...=> VoyageCommonsTransectImportExportModel.java} | 20 ++--- ...ow.java => VoyageCommonsTransectImportRow.java} | 12 +-- ... => VoyageCommonsTransitImportExportModel.java} | 20 ++--- ...Row.java => VoyageCommonsTransitImportRow.java} | 12 +-- ...a => VoyageCommonsVoyageImportExportModel.java} | 12 +-- ...erationsGearMetadataValueImportExportModel.java | 72 ++++++++++++++++++ ...oyageOperationsGearMetadataValueImportRow.java} | 35 +++++++-- ...oyageOperationsOperationImportExportModel.java} | 20 ++--- ...ava => VoyageOperationsOperationImportRow.java} | 67 +++++++++++++++-- ...onsOperationMetadataValueImportExportModel.java | 68 +++++++++++++++++ ...OperationsOperationMetadataValueImportRow.java} | 39 +++++++--- .../importdata/AbstractImportDataServiceIT.java | 14 ++-- .../importdata/VoyageAcousticImportServiceIT.java | 11 +-- .../VoyageCatchesAllImportServiceIT.java | 9 ++- .../VoyageCatchesImportServiceITSupport.java | 19 ++--- ...geCatchesImportServiceOnlyBiometrySampleIT.java | 32 +++++--- .../VoyageCatchesImportServiceOnlySubSampleIT.java | 9 +-- ...oyageCatchesImportServiceOnlyTotalSampleIT.java | 15 ++-- .../VoyageCommonsAllImportServiceIT.java | 11 +-- .../VoyageCommonsImportServiceITSupport.java | 20 ++++- .../VoyageCommonsTransectImportServiceIT.java | 11 +-- .../VoyageCommonsTransitImportServiceIT.java | 11 +-- .../VoyageCommonsVoyageImportServiceIT.java | 12 +-- .../importdata/VoyageOperationImportServiceIT.java | 57 +++++++------- .../VoyageResultsEsduCellImportServiceIT.java | 9 +-- .../VoyageResultsImportServiceITSupport.java | 15 ++-- .../VoyageResultsMapFishCellImportServiceIT.java | 9 +-- .../VoyageResultsMapOtherCellImportServiceIT.java | 9 +-- .../VoyageResultsRegionCellImportServiceIT.java | 9 +-- .../VoyageResultsVoyageImportServiceIT.java | 9 +-- ...geResultsVoyageImportServiceOnlyEchotypeIT.java | 9 +-- ...sultsVoyageImportServiceOnlyLengthAgeKeyIT.java | 9 +-- ...tsVoyageImportServiceOnlyLengthWeightKeyIT.java | 9 +-- 52 files changed, 940 insertions(+), 651 deletions(-) delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/GearMetadataValueImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationMetadataValueImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/SubSampleImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TotalSampleImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{BiometrySampleImportExportModel.java => VoyageCatchesBiometrySampleImportExportModel.java} (58%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{BiometrySampleImportRow.java => VoyageCatchesBiometrySampleImportRow.java} (69%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesSubSampleImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{SubSampleImportRow.java => VoyageCatchesSubSampleImportRow.java} (91%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesTotalSampleImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{TotalSampleImportRow.java => VoyageCatchesTotalSampleImportRow.java} (89%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{TransectImportExportModel.java => VoyageCommonsTransectImportExportModel.java} (79%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{TransectImportRow.java => VoyageCommonsTransectImportRow.java} (92%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{TransitImportExportModel.java => VoyageCommonsTransitImportExportModel.java} (66%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{TransitImportRow.java => VoyageCommonsTransitImportRow.java} (85%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{VoyageImportExportModel.java => VoyageCommonsVoyageImportExportModel.java} (76%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageOperationsGearMetadataValueImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{GearMetadataValueImportRow.java => VoyageOperationsGearMetadataValueImportRow.java} (65%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{OperationImportExportModel.java => VoyageOperationsOperationImportExportModel.java} (77%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{OperationImportRow.java => VoyageOperationsOperationImportRow.java} (64%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageOperationsOperationMetadataValueImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{OperationMetadataValueImportRow.java => VoyageOperationsOperationMetadataValueImportRow.java} (64%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

branch feature/8170 updated (ffccaad -> 5edc41d)
by codelutin.com scm April 2, 2016

April 2, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from ffccaad Les imports commons voyage passent \o/ new 4e57363 Amélioration des tests d'import new d4e6f56 Utilisation des bons contrats new 30740d9 Import Catches total sample works new 5455012 Add toString on some entities new d65efd0 Can collect imported sample data new 73511a8 Remove units column from subsample import in import data new 8055fa7 Add test import database with total sample inside it new 5edc41d Sub sample import ok \o/ (See #8170) The 8 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 5edc41de112f0c1fb6401dcc5e71bd2303cceddf Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 2 12:26:10 2016 +0200 Sub sample import ok \o/ (See #8170) commit 8055fa73eae957c3458f5bf5de92b4c04c63dc6a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 2 12:25:40 2016 +0200 Add test import database with total sample inside it commit 73511a8e4ed647a4f207bd8c7ab1c2c4eebf3acd Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 2 12:25:16 2016 +0200 Remove units column from subsample import in import data commit d65efd09d12a99a6323020fa3bf66ab2b59c6c57 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 2 12:24:46 2016 +0200 Can collect imported sample data commit 5455012ac5bd04afaa49cdcc68efc8023aa175b3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 2 12:24:05 2016 +0200 Add toString on some entities commit 30740d94ecf9e2080e433c36d28c767b359aeef6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 1 23:24:36 2016 +0200 Import Catches total sample works commit d4e6f56107931c0f99c8a4b1ea8c8c63c2e28067 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 1 23:23:45 2016 +0200 Utilisation des bons contrats commit 4e57363be66dab4849ba1974970e3e0e94c7181f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 1 23:22:59 2016 +0200 Amélioration des tests d'import Summary of changes: .../echobase/entities/data/OperationImpl.java | 22 +- .../echobase/entities/data/SampleDataImpl.java | 18 ++ .../echobase/entities/data/SampleDatas.java | 19 ++ .../ifremer/echobase/entities/data/SampleImpl.java | 18 ++ .../echobase/entities/references/GearImpl.java | 17 ++ .../entities/references/SampleDataTypeImpl.java | 17 +- .../entities/references/SampleTypeImpl.java | 10 + .../service/importdata/ImportDataResult.java | 4 +- .../service/importdata/ImportDataService.java | 3 +- .../VoyageCatchesImportDataActionSupport.java | 8 +- .../VoyageCatchesSubSampleImportAction.java | 221 ++++++++++++++++++++- .../VoyageCatchesTotalSampleImportAction.java | 98 ++++++++- .../importdata/csv/SubSampleImportExportModel.java | 13 +- .../service/importdata/csv/SubSampleImportRow.java | 34 +++- .../csv/TotalSampleImportExportModel.java | 4 +- .../importdata/csv/TotalSampleImportRow.java | 25 ++- .../echobase/services/EchoBaseServiceFixtures.java | 10 + .../services/EchoBaseTestServiceSupport.java | 38 ++++ .../importdata/AbstractImportDataServiceIT.java | 39 +++- .../service/importdata/CatchesImportServiceIT.java | 81 -------- ...eIT.java => VoyageAcousticImportServiceIT.java} | 53 +++-- .../VoyageCatchesAllImportServiceIT.java | 84 ++++++++ ...va => VoyageCatchesImportServiceITSupport.java} | 39 ++-- ...eCatchesImportServiceOnlyBiometrySampleIT.java} | 38 ++-- .../VoyageCatchesImportServiceOnlySubSampleIT.java | 76 +++++++ ...yageCatchesImportServiceOnlyTotalSampleIT.java} | 42 ++-- .../VoyageCommonsAllImportServiceIT.java | 24 +-- .../VoyageCommonsImportServiceITSupport.java | 31 +-- .../VoyageCommonsTransectImportServiceIT.java | 12 +- .../VoyageCommonsTransitImportServiceIT.java | 8 +- .../VoyageCommonsVoyageImportServiceIT.java | 8 +- ...IT.java => VoyageOperationImportServiceIT.java} | 60 +++--- ...a => VoyageResultsEsduCellImportServiceIT.java} | 52 ++--- .../VoyageResultsImportServiceITSupport.java} | 34 ++-- ...> VoyageResultsMapFishCellImportServiceIT.java} | 45 +++-- ... VoyageResultsMapOtherCellImportServiceIT.java} | 44 ++-- ...=> VoyageResultsRegionCellImportServiceIT.java} | 61 +++--- ...ava => VoyageResultsVoyageImportServiceIT.java} | 51 ++--- ...eResultsVoyageImportServiceOnlyEchotypeIT.java} | 37 ++-- ...ultsVoyageImportServiceOnlyLengthAgeKeyIT.java} | 39 ++-- ...sVoyageImportServiceOnlyLengthWeightKeyIT.java} | 38 ++-- .../resources/import-data/catches/subsample.csv.gz | Bin 931 -> 920 bytes .../import-data/catches/subsample_all.csv.gz | Bin 23572 -> 22400 bytes .../echobase-operation-total-samples.h2.db.gz | Bin 0 -> 663495 bytes 44 files changed, 1094 insertions(+), 481 deletions(-) create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/SampleDataImpl.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/SampleDatas.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/SampleImpl.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/GearImpl.java delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CatchesImportServiceIT.java rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{AcousticImportServiceIT.java => VoyageAcousticImportServiceIT.java} (68%) create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesAllImportServiceIT.java rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{CatchesImportServiceOnlyTotalSampleIT.java => VoyageCatchesImportServiceITSupport.java} (54%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{CatchesImportServiceOnlySubSampleIT.java => VoyageCatchesImportServiceOnlyBiometrySampleIT.java} (53%) create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesImportServiceOnlySubSampleIT.java rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{CatchesImportServiceOnlyBiometrySampleIT.java => VoyageCatchesImportServiceOnlyTotalSampleIT.java} (50%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{OperationImportServiceIT.java => VoyageOperationImportServiceIT.java} (50%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{ResultsEsduCellImportServiceIT.java => VoyageResultsEsduCellImportServiceIT.java} (81%) copy echobase-services/src/{main/java/fr/ifremer/echobase/services/service/importdata/ImportException.java => test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsImportServiceITSupport.java} (50%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{ResultsMapFishCellImportServiceIT.java => VoyageResultsMapFishCellImportServiceIT.java} (60%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{ResultsMapOtherCellImportServiceIT.java => VoyageResultsMapOtherCellImportServiceIT.java} (58%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{ResultsRegionCellImportServiceIT.java => VoyageResultsRegionCellImportServiceIT.java} (52%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportServiceIT.java => VoyageResultsVoyageImportServiceIT.java} (53%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportServiceOnlyEchotypeIT.java => VoyageResultsVoyageImportServiceOnlyEchotypeIT.java} (61%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportServiceOnlyLengthAgeKeyIT.java => VoyageResultsVoyageImportServiceOnlyLengthAgeKeyIT.java} (60%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportServiceOnlyLengthWeightKeyIT.java => VoyageResultsVoyageImportServiceOnlyLengthWeightKeyIT.java} (60%) create mode 100644 echobase-services/src/test/resources/import-data/echobase-operation-total-samples.h2.db.gz -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 8

branch feature/8170 updated (48ac1c9 -> ffccaad)
by codelutin.com scm April 1, 2016

April 1, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 48ac1c9 Début de revue des tests pour intégrer les exports new ffccaad Les imports commons voyage passent \o/ 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 ffccaadc23d12262de46585ebf404a78864a14d0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 1 17:57:35 2016 +0200 Les imports commons voyage passent \o/ Summary of changes: .../importdata/csv/TransectImportExportModel.java | 2 +- .../service/importdata/csv/TransectImportRow.java | 110 ++++++++++++++++-- .../service/importdata/csv/TransitImportRow.java | 23 +++- .../services/EchoBaseTestServiceSupport.java | 35 ++++++ .../importdata/CommonAllImportServiceIT.java | 88 --------------- .../importdata/CommonTransectImportServiceIT.java | 78 ------------- .../importdata/CommonVoyageImportServiceIT.java | 109 ------------------ .../VoyageCommonsAllImportServiceIT.java | 123 +++++++++++++++++++++ .../VoyageCommonsImportServiceITSupport.java | 68 ++++++++++++ .../VoyageCommonsTransectImportServiceIT.java | 109 ++++++++++++++++++ ...va => VoyageCommonsTransitImportServiceIT.java} | 60 ++++++---- .../VoyageCommonsVoyageImportServiceIT.java | 101 +++++++++++++++++ 12 files changed, 600 insertions(+), 306 deletions(-) delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonAllImportServiceIT.java delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportServiceIT.java delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonVoyageImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsAllImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsImportServiceITSupport.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsTransectImportServiceIT.java rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{CommonTransitImportServiceIT.java => VoyageCommonsTransitImportServiceIT.java} (51%) create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsVoyageImportServiceIT.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8170 updated (520575f -> 48ac1c9)
by codelutin.com scm April 1, 2016

April 1, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 520575f Renommages, mise en place context d'import (impacts dans les actions d'ui) new 832ab3f Ajout du répertoire temporaire dans la configuration new 3480f7e Début d'implantation de l'export new 48ac1c9 Début de revue des tests pour intégrer les exports 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 48ac1c94a02825c67fd6f93fa6c8e22a02f1e1f1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 1 16:45:11 2016 +0200 Début de revue des tests pour intégrer les exports commit 3480f7e66f04a9fe8d30326b3e12a038c34700a7 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 1 16:44:44 2016 +0200 Début d'implantation de l'export commit 832ab3fcb4ca122e294cf1a214e2fb8f475351d1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 1 16:42:50 2016 +0200 Ajout du répertoire temporaire dans la configuration Summary of changes: .../echobase/config/EchoBaseConfiguration.java | 8 + .../config/EchoBaseConfigurationOption.java | 4 + .../echobase/services/csv/BatchCsvExport.java | 100 ++++++++ .../service/importdata/ImportDataFileResult.java | 27 ++- .../service/importdata/ImportDataService.java | 2 +- .../actions/ImportDataActionSupport.java | 261 +++++++++++++++++---- .../actions/VoyageAcousticsImportAction.java | 7 + .../VoyageCatchesBiometrySampleImportAction.java | 7 + .../VoyageCatchesSubSampleImportAction.java | 7 + .../VoyageCatchesTotalSampleImportAction.java | 7 + .../actions/VoyageCommonsTransectImportAction.java | 38 ++- .../actions/VoyageCommonsTransitImportAction.java | 42 +++- .../actions/VoyageCommonsVoyageImportAction.java | 21 ++ .../VoyageOperationsGearMetadataImportAction.java | 7 + .../VoyageOperationsOperationImportAction.java | 7 + ...ageOperationsOperationMetadataImportAction.java | 7 + ...EchotypeAndSpeciesCategoryCellImportAction.java | 7 + ...oyageResultsEsduByEchotypeCellImportAction.java | 7 + ...sEsduSpeciesAndAgeCategoryCellImportAction.java | 7 + ...EsduSpeciesAndSizeCategoryCellImportAction.java | 7 + .../VoyageResultsMapFishCellImportAction.java | 7 + .../VoyageResultsMapOtherCellImportAction.java | 7 + ...VoyageResultsRegionAssociationImportAction.java | 7 + .../actions/VoyageResultsRegionImportAction.java | 7 + .../VoyageResultsRegionResultsImportAction.java | 7 + .../VoyageResultsVoyageEchotypeImportAction.java | 7 + ...oyageResultsVoyageLengthAgeKeyImportAction.java | 7 + ...geResultsVoyageLengthWeightKeyImportAction.java | 7 + .../contexts/VoyageAcousticsImportDataContext.java | 2 +- .../contexts/VoyageCatchesImportDataContext.java | 4 +- .../contexts/VoyageCommonsImportDataContext.java | 2 +- ...xt.java => VoyageImportDataContextSupport.java} | 4 +- .../VoyageOperationsImportDataContext.java | 2 +- .../contexts/VoyageResultsImportDataContext.java | 2 +- .../csv/BiometrySampleImportExportModel.java | 7 +- .../importdata/csv/EchotypeImportExportModel.java | 7 +- .../csv/LengthAgeKeyImportExportModel.java | 7 +- .../csv/LengthWeightKeyImportExportModel.java | 7 +- .../importdata/csv/MapCellImportExportModel.java | 7 +- .../importdata/csv/SubSampleImportExportModel.java | 7 +- .../csv/TotalSampleImportExportModel.java | 7 +- .../importdata/csv/TransectImportExportModel.java | 7 +- .../service/importdata/csv/TransectImportRow.java | 12 +- .../importdata/csv/TransitImportExportModel.java | 7 +- .../service/importdata/csv/TransitImportRow.java | 24 +- .../importdata/csv/VoyageImportExportModel.java | 7 +- .../i18n/echobase-services_en_GB.properties | 1 + .../i18n/echobase-services_fr_FR.properties | 1 + .../services/EchoBaseTestServiceSupport.java | 39 +-- .../importdata/AbstractImportDataServiceIT.java | 8 +- .../importdata/AcousticImportServiceIT.java | 2 +- .../service/importdata/CatchesImportServiceIT.java | 6 +- .../CatchesImportServiceOnlyBiometrySampleIT.java | 2 +- .../CatchesImportServiceOnlySubSampleIT.java | 2 +- .../CatchesImportServiceOnlyTotalSampleIT.java | 2 +- .../importdata/CommonAllImportServiceIT.java | 6 +- .../importdata/CommonTransectImportServiceIT.java | 2 +- .../importdata/CommonTransitImportServiceIT.java | 2 +- .../importdata/CommonVoyageImportServiceIT.java | 42 +++- .../importdata/OperationImportServiceIT.java | 6 +- .../importdata/ResultsEsduCellImportServiceIT.java | 8 +- .../ResultsMapFishCellImportServiceIT.java | 2 +- .../ResultsMapOtherCellImportServiceIT.java | 2 +- .../ResultsRegionCellImportServiceIT.java | 2 +- .../importdata/ResultsVoyageImportServiceIT.java | 6 +- .../ResultsVoyageImportServiceOnlyEchotypeIT.java | 2 +- ...sultsVoyageImportServiceOnlyLengthAgeKeyIT.java | 2 +- ...tsVoyageImportServiceOnlyLengthWeightKeyIT.java | 2 +- 68 files changed, 733 insertions(+), 172 deletions(-) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/csv/BatchCsvExport.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/{VoyageImportDataContext.java => VoyageImportDataContextSupport.java} (94%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3