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

branch develop updated (dad5aa1 -> f5bb858)
by codelutin.com scm May 14, 2016

May 14, 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 dad5aa1 Faire fonctionner la migration 3.905 sous pg (See #8171) new 3225ca9 Use java 8 new 38c71a4 passage méthode en publique new 6072d69 Ajout de l'import des mises en œuvre des engins (See #8181) new f5bb858 Livrable #8181 Merge branch 'feature/8181' into develop 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 f5bb858406547c39c947a324aa6f6ca780d5c601 Merge: dad5aa1 6072d69 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat May 14 11:38:46 2016 +0200 Livrable #8181 Merge branch 'feature/8181' into develop commit 6072d6954a5209c992d8aa3a3c403345a6d1b5a3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat May 14 11:38:43 2016 +0200 Ajout de l'import des mises en œuvre des engins (See #8181) commit 38c71a4b7034e5bb3acd1b287bdefef41558df59 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat May 14 11:29:53 2016 +0200 passage méthode en publique commit 3225ca9b1088e0a526d914ed76b10dbfe5efe31c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat May 14 11:19:29 2016 +0200 Use java 8 Summary of changes: .../echobase/entities/references/Gears.java | 41 ------------ .../echobase/services/service/DbEditorService.java | 10 +-- .../contexts/ImportDataContextSupport.java | 3 +- .../GearCharacteristicValuesImportModel.java | 39 +++++++++++ .../GearCharacteristicValuesImportRow.java | 47 +++++++++++++ .../services/service/importdb/ImportService.java | 76 ++++++++++++++++++++++ ...rtTable.java => ImportGearCharacteristics.java} | 53 +++------------ .../src/main/resources/config/struts-dbeditor.xml | 9 +++ .../resources/i18n/echobase-ui_en_GB.properties | 1 + .../resources/i18n/echobase-ui_fr_FR.properties | 1 + .../main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp | 15 +++++ 11 files changed, 202 insertions(+), 93 deletions(-) delete mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Gears.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/GearCharacteristicValuesImportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/GearCharacteristicValuesImportRow.java copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/{ImportTable.java => ImportGearCharacteristics.java} (62%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch develop updated (a596d2d -> dad5aa1)
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 a596d2d Livrable #8171 Merge branch 'feature/#8171' into develop new dad5aa1 Faire fonctionner la migration 3.905 sous pg (See #8171) 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 dad5aa14fb72db3eba69ef77f003f705fd794d35 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 13 20:28:27 2016 +0200 Faire fonctionner la migration 3.905 sous pg (See #8171) Summary of changes: .../workingDb/WorkingDbMigrationCallBackForVersion3_905.java | 5 +++++ .../main/resources/migration/workingDb/3.905-1-insert-ports.sql | 7 ------- .../migration/workingDb/h2/3.905-2-migrate-voyage-ports.sql | 7 +++++++ .../main/resources/migration/workingDb/pg/3.905-0-update-model.sql | 6 +++--- .../migration/workingDb/pg/3.905-2-migrate-voyage-ports.sql | 7 +++++++ 5 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 echobase-domain/src/main/resources/migration/workingDb/h2/3.905-2-migrate-voyage-ports.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/pg/3.905-2-migrate-voyage-ports.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (a456593 -> a596d2d)
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 a456593 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 24ea296 Revert "Ajout bidirection sur le modèle (A reverter quand import branche Atlantos)" adds b94e14b Revert "Ajout bidirection sur le modèle (A reverter quand import branche Atlantos)" adds 72765ae Revert "Ajout bidirection sur le modèle (A reverter quand import branche Atlantos)" adds 089477e Finish modification for the model with tagValues and declaration adds ffbf430 Rename comment to comments adds 963c190 Add missing decorators adds 90f1d7b Create the migration adds 20f4732 Do no change import/export model adds 636a72e Rename constraint name Rename id to code Put all request on one line adds 2575131 Add inserts for the ports adds 616bb75 Create migration for postgresql adds c98c727 Create migration class adds e0b74f4 Set a value for the real column adds b10d6eb Au final la migration sera en 3.905 car je risque d'avoir encore une ou deux migrtions à faire avant. adds 77b38e1 Despecialize quote in port insert adds ef5264c Ne pas charger tout le fichier sql en mémoire adds 7742f6d correction de l'échappement des simples quotes adds 20522a7 Fix voyage creation with ports adds 0102291 Fix mandatory field during import adds 85d2f8b Fix import for the voyage entity adds 9c1003f Fix NPE during import adds 273a7b8 On réapplique tout ce qui a été modifié sur le modèle (passage en bidirection) adds 7245530 Impact sur l'import du changement (renommage Transect#comment en comments) adds 8ec8f24 Mise à jour des bases de test new a596d2d Livrable #8171 Merge branch 'feature/#8171' into develop 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 a596d2df575d8b01fd0f1e86d34e25cfb691815c Merge: 72765ae 8ec8f24 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 13 13:47:49 2016 +0200 Livrable #8171 Merge branch 'feature/#8171' into develop Summary of changes: .../references/{Vessels.java => Ports.java} | 10 +- .../echobase/persistence/EchoBaseDbMeta.java | 5 +- .../MigrationCallBackForVersionSupport.java | 15 +- .../WorkingDbMigrationCallBackForVersion3_902.java | 54 - .../WorkingDbMigrationCallBackForVersion3_905.java | 38 + .../migration/workingDb/3.905-1-insert-ports.sql | 4903 ++++++++++++++++++++ .../workingDb/h2/3.905-0-update-model.sql | 95 + .../workingDb/pg/3.905-0-update-model.sql | 95 + echobase-domain/src/main/xmi/echobase.properties | 27 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 90445 -> 98244 bytes .../echobase/services/csv/EchoBaseCsvUtil.java | 12 + .../services/service/DecoratorService.java | 12 + .../services/service/UserDbPersistenceService.java | 4 +- .../contexts/ImportDataContextSupport.java | 10 + .../VoyageCommonsTransectImportExportModel.java | 4 +- .../csv/VoyageCommonsTransectImportRow.java | 8 +- .../csv/VoyageCommonsVoyageImportExportModel.java | 9 +- .../importdb/strategy/EchoBaseImportStrategy.java | 2 +- .../removedata/AbstractRemoveDataServiceTest.java | 11 +- .../resources/echobase-importDb-referentiel.zip | Bin 50556 -> 50514 bytes .../resources/import-data/common/transect.csv.gz | Bin 21723 -> 21725 bytes .../resources/import-data/common/voyage.csv.gz | Bin 126 -> 117 bytes .../echobase-catches-and-voyage-result.h2.db.gz | Bin 825254 -> 1006673 bytes .../import-data/echobase-catches.h2.db.gz | Bin 755094 -> 936199 bytes .../import-data/echobase-commonData.h2.db.gz | Bin 184645 -> 369833 bytes .../resources/import-data/echobase-nodata.h2.db.gz | Bin 137582 -> 318432 bytes .../echobase-operation-total-samples.h2.db.gz | Bin 601537 -> 785038 bytes .../import-data/echobase-operation.h2.db.gz | Bin 328156 -> 507447 bytes pom.xml | 5 +- 29 files changed, 5229 insertions(+), 90 deletions(-) copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/{Vessels.java => Ports.java} (79%) delete mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_902.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_905.java create mode 100644 echobase-domain/src/main/resources/migration/workingDb/3.905-1-insert-ports.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/h2/3.905-0-update-model.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/pg/3.905-0-update-model.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/#8171 deleted (was 8ec8f24)
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/#8171 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git was 8ec8f24 Mise à jour des bases de test 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/#8171 updated (64a73f6 -> 8ec8f24)
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/#8171 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git omits 64a73f6 Fix NPE during import omits 3df68fd Fix import for the voyage entity omits 8aec49a Fix mandatory field during import omits e73b8f4 Fix voyage creation with ports omits 2f07e9e correction de l'échappement des simples quotes omits c7d6700 Ne pas charger tout le fichier sql en mémoire omits 83663b4 Despecialize quote in port insert omits 66d4724 Migration 3.902 (See #8297) omits a0265ce Au final la migration sera en 3.905 car je risque d'avoir encore une ou deux migrtions à faire avant. omits 25e50c7 Ajout colum SpeciesCategory#lengthClass (report final) (See #8297) omits 5f7e91b Set a value for the real column omits 8804513 Create migration class omits e749b0b Create migration for postgresql omits c54c4ba Add inserts for the ports omits 8837aa9 Rename constraint name Rename id to code Put all request on one line omits 0f14ee2 Rename id to code for Port and Voyage omits a85d3da Do no change import/export model omits d361a1a Merge ImportfileId model + fix develop merge omits d4bd7c5 Create the migration omits b294a5f Add missing decorators omits e2e9340 Rename comment to comments omits f173e5d Finish modification for the model with tagValues and declaration adds 30322f4 Ajout liens vers tickets adds ab0ced8 Optimize dependencies adds b51765a formattage adds 58a129e Suppression de la colonne units de l'import SubSample (See #8294) adds 372a7e5 Livrable #8294 Merge branch 'feature/8294' into develop adds 15ee4d7 Enregistrement d'un sampleData avec le numéro de spéciment lors d'un import de données biométriques (See #8295) adds b0ff79b Livrable #8295 Merge branch 'feature/8295' into develop adds 843667b Revue du commit précédent car c'est uniquement dans les tests qu'on peut créer des SampleDataType à la volée... (See #8295) adds 3368926 Utiliser une base avec les bons imports catches adds eb72e94 Importer ce qui est nécessaire uniquement pour les esdu et les élementaires (See #8298) adds 4d76b38 Mise à jour des tests adds 5a9a6fa Livrable #8298 Merge branch 'feature/8298' into develop adds 59fdcac Ajout colum SpeciesCategory#lengthClass (See #8297) adds 130cd48 Migration 3.902 (See #8297) adds 106963e mise à jour de la base de tests après import catches adds df5c305 Ajout de SpeciesCategory#lengthClass dans le cache de SpeciesCategory + renommage de l'import concerné (See #8297) adds 04fb27a Renommage côté ui de l'import concerné (See #8297) adds 1980d1f On remete les données de tests sur sizeCategory + ajout d'un test sur le fichier complet (mais qu'on ignore pour le moment car trop long à lancer... (See #8297) adds 2106d05 Livrable #8297 Merge branch 'feature/8297' into develop adds 5a3027b Revue de la docuentation + impacts modification imports (See #8178) adds 6a57ee5 Livrable #8178 Merge branch 'feature/8178' into develop adds d8e8939 Use eugene stable version adds 78eecd4 Use Topia working findAllLazy method adds 19759ba Fixes #8089 adds 4c7c2a1 Fixes #8168 (Mise à jour des librairies) adds eeef6aa Ajout bidirection sur le modèle (A reverter quand import branche Atlantos) adds 42961ba Début d'optimisation des check d'import adds 952bddb Ajout bidirection sur le modèle (A reverter quand import branche Atlantos) adds bc5e510 Fin de l'optimisation des export (See #8170) adds 4500852 Utilisation ToPIA 3.1 adds 3d92141 On doit rajouter un order by à la main + correction de la fenetre à calculer adds 5fc7551 Afficher les fichiers résultats d'import dans le tableau de bord adds 3495e8a Bien vérifier que les fichiers importés sont correctes (See #8170) adds e9095b6 Livrable #8170 Merge branch 'feature/8170' into develop adds 1541342 Ne pas autorisé un import d'un voyage déjà existant (clef unique name) (See #2246) adds 2d6139e Ajout bidirection sur le modèle (A reverter quand import branche Atlantos) adds 262c51e Début ajout migration pour les clef naturelles + traitement pour import transit (See #2246) adds cda7281 Typo sur le nom d'une méthode adds 73ff899 Ne pas autoriser de réimporter des transits déjà existants (See #2246) adds 31e9b45 Ne pas autoriser de réimporter des transects déjà existants (See #2246) adds b3b3fac Ne pas pouvoir éditer les entitées transverses adds 3209872 Ne pas autoriser de réimporter des opérations déjà existantes (See #2246) adds dec2182 Renommage i18n adds e847db7 Ajout toString adds fa0d99e Bine utiliser la bonne page de résultat adds 045c9fc Gérer la nullité d'erreur sur un import adds 8690ac9 Meilleure gestion de la suppression d'un ImportLog adds 91a2107 Ajout toString adds 7a78dc1 Nom de Zeus... ne jamais utiliser id comme nom de colonne car en hql ici c'est égale au TopiaId... adds 42d9dbb Tester avant de supprimer lors de la suppression d'un import adds 9f72d77 Ne pas autoriser de réimporter des meta sur les opérations et engins déjà existantes (See #2246) adds 883d892 Ne pas pouvoir effectuer plusieurs imports du même type adds ea54a1e Début de check pour les Sub-Sample mais il me manque des confirmations, à revoir avec Mathieu adds 0896dd7 Catch more exception while importing + ajout meilleur TODO adds 6bcfd28 i18n adds a23905d Ne pas autoriser de réimporter les données acoustiques déjà existantes (See #2246) adds 0b1e7ee Ajout du numéro de ligne dans les messages d'erreurs (See #2246) adds 9867f8f Ne pas autoriser de réimporter les résultats sur les voyages déjà existants (See #2246) adds 8cf674f Ne pas autoriser de réimporter les résultats sur les voyages déjà existants (See #2246) adds 3800f29 Refs-60 #2246, il reste encore quelques petits ajustements à faire. Merge branch 'feature/2246' into develop adds 7272ca2 Mise à jour des bases de test adds 7d765dd Livrable #8169 adds 5ea3948 Fix missing i18n adds dcddba9 Add missing license header adds 963538e [jgitflow-maven-plugin]updating poms for 4.0-SNAPSHOT development adds 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 adds 2aa41ea [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-1' with non-snapshot versions adds fae7167 Add missing license header adds 1e14261 [jgitflow-maven-plugin]merging 'release/4.0-alpha-1' into 'master' adds 442f0fd [jgitflow-maven-plugin]merging 'master' into 'develop' adds a456593 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 24ea296 Revert "Ajout bidirection sur le modèle (A reverter quand import branche Atlantos)" new b94e14b Revert "Ajout bidirection sur le modèle (A reverter quand import branche Atlantos)" new 72765ae Revert "Ajout bidirection sur le modèle (A reverter quand import branche Atlantos)" new 089477e Finish modification for the model with tagValues and declaration new ffbf430 Rename comment to comments new 963c190 Add missing decorators new 90f1d7b Create the migration new 20f4732 Do no change import/export model new 636a72e Rename constraint name Rename id to code Put all request on one line new 2575131 Add inserts for the ports new 616bb75 Create migration for postgresql new c98c727 Create migration class new e0b74f4 Set a value for the real column new b10d6eb Au final la migration sera en 3.905 car je risque d'avoir encore une ou deux migrtions à faire avant. new 77b38e1 Despecialize quote in port insert new ef5264c Ne pas charger tout le fichier sql en mémoire new 7742f6d correction de l'échappement des simples quotes new 20522a7 Fix voyage creation with ports new 0102291 Fix mandatory field during import new 85d2f8b Fix import for the voyage entity new 9c1003f Fix NPE during import new 273a7b8 On réapplique tout ce qui a été modifié sur le modèle (passage en bidirection) new 7245530 Impact sur l'import du changement (renommage Transect#comment en comments) new 8ec8f24 Mise à jour des bases de test 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 (64a73f6) \ N -- N -- N refs/heads/feature/#8171 (8ec8f24) 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. The 24 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 8ec8f244317bdc5aa4125179ca3e0e8a6e557fa8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 13 13:39:21 2016 +0200 Mise à jour des bases de test commit 72455302deac119654833cf9ebaac669d9ea0abb Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 13 13:39:09 2016 +0200 Impact sur l'import du changement (renommage Transect#comment en comments) commit 273a7b8053ae226339c9420d06e8b6042dca4432 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 13 13:36:28 2016 +0200 On réapplique tout ce qui a été modifié sur le modèle (passage en bidirection) commit 9c1003f36950f66108e016b7bf574ce14e79b604 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Thu May 12 17:36:13 2016 +0200 Fix NPE during import commit 85d2f8b8e0b58f1973b4858bc0fbbd7f3e595c0b Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed May 11 17:22:14 2016 +0200 Fix import for the voyage entity commit 01022916f56ac42f389d11feb50ea8e5b55a1058 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed May 11 14:37:06 2016 +0200 Fix mandatory field during import commit 20522a7cb921b494ff4a41c0f5b994a0b1fe1309 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon May 2 14:18:01 2016 +0200 Fix voyage creation with ports commit 7742f6d0e7a8add8d16aad92c12c5a1a1ec63911 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 2 12:00:55 2016 +0200 correction de l'échappement des simples quotes commit ef5264c83a910729e8017a000a8f124e2fd96a40 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 2 11:59:52 2016 +0200 Ne pas charger tout le fichier sql en mémoire commit 77b38e1bcace7adcc226804a68b4cea78b73ade5 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon May 2 11:42:44 2016 +0200 Despecialize quote in port insert commit b10d6ebbe3f4503dbd01968bfede0728cf07e865 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 30 13:59:21 2016 +0200 Au final la migration sera en 3.905 car je risque d'avoir encore une ou deux migrtions à faire avant. commit e0b74f4861f4eebb2c2c16bc7a7bb80196e085d6 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Fri Apr 29 17:02:52 2016 +0200 Set a value for the real column commit c98c727b9b5ad5a348d783768c716afe3b62ef30 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Fri Apr 29 16:55:57 2016 +0200 Create migration class commit 616bb7536a58e373e1931cb051fcf323ff1a585f Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Fri Apr 29 15:57:55 2016 +0200 Create migration for postgresql commit 257513184f9cf1dd5b16e50e511799582fd23456 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Fri Apr 29 15:50:13 2016 +0200 Add inserts for the ports commit 636a72eaa258cc5d48c03b38664109583c0f1c3c Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Fri Apr 29 11:47:00 2016 +0200 Rename constraint name Rename id to code Put all request on one line commit 20f4732305665266a416a36057f350c3107ba1c8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 29 10:44:48 2016 +0200 Do no change import/export model commit 90f1d7b89c449fafde7d2c70695ebf7da61c2e17 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Apr 27 16:29:31 2016 +0200 Create the migration commit 963c190899aefed68e90d586b2e46c4d427f0a70 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Apr 27 14:33:05 2016 +0200 Add missing decorators commit ffbf43030d72743829c1440467622801334980b6 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Apr 27 14:32:42 2016 +0200 Rename comment to comments commit 089477ecef3a1c1f9875d88950def6f9efd3ad95 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Wed Apr 27 14:05:14 2016 +0200 Finish modification for the model with tagValues and declaration commit 72765aea2125309a0e93b0dc3bddc15d324107ca Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 13 11:48:11 2016 +0200 Revert "Ajout bidirection sur le modèle (A reverter quand import branche Atlantos)" This reverts commit eeef6aaec5fc57a5de6efd6f96c7bdf5214a2e47. commit b94e14b2035cbf0a538fbae66d8f5a1d744f336b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 13 11:48:00 2016 +0200 Revert "Ajout bidirection sur le modèle (A reverter quand import branche Atlantos)" This reverts commit 952bddb60fbf609052fea6bca7ba244923c3d5d2. commit 24ea296d70fa32a069bbff1acd4a08d708aca236 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 13 11:47:48 2016 +0200 Revert "Ajout bidirection sur le modèle (A reverter quand import branche Atlantos)" This reverts commit 2d6139eea45b74df2404f6f025c1b334cf57066c. Summary of changes: .../fr/ifremer/echobase/entities/DriverType.java | 4 +- .../EchoBaseInternalTopiaApplicationContext.java | 21 + .../echobase/entities/ImportFileIdTopiaDao.java | 79 +- .../echobase/entities/ImportFileTopiaDao.java | 36 +- .../echobase/entities/ImportLogTopiaDao.java | 27 +- .../fr/ifremer/echobase/entities/ImportedCell.java | 62 ++ .../echobase/entities/ImportedCellResult.java | 47 +- .../entities/ImportedSampleDataResult.java | 69 ++ .../ifremer/echobase/entities/data/DataImpl.java | 21 + .../fr/ifremer/echobase/entities/data/Datas.java | 21 + .../GearMetadataValueImpl.java} | 22 +- .../OperationMetadataValueImpl.java} | 23 +- .../echobase/entities/data/SampleDataImpl.java | 21 + .../echobase/entities/data/SampleDatas.java | 21 + .../ifremer/echobase/entities/data/SampleImpl.java | 21 + .../echobase/entities/references/GearImpl.java | 21 + .../entities/references/SampleDataTypeImpl.java | 2 + .../fr/ifremer/echobase/io/EchoBaseIOUtil.java | 82 ++ .../java/fr/ifremer/echobase/io/InputFile.java | 20 + .../echobase/persistence/EchoBaseDbMeta.java | 5 + .../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 | 33 - ...WorkingDbMigrationCallBackForVersion3_903.java} | 17 +- .../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 + ...tFile-entity.sql => 3.903-0-add-naturalIds.sql} | 7 +- .../migration/workingDb/pg/3.900-0-fix-types.sql | 20 + .../3.903-0-add-naturalIds.sql} | 7 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 98306 -> 98244 bytes .../echobase/services/csv/BatchCsvExport.java | 21 + .../fr/ifremer/echobase/services/csv/CellAble.java | 21 + .../echobase/services/csv/EchoBaseCsvUtil.java | 2 +- .../ifremer/echobase/services/csv/ResultAble.java | 21 + .../echobase/services/csv/ResultValueGetter.java | 21 + .../echobase/services/csv/ResultValueSetter.java | 21 + .../services/csv/ValueFormatterByFunction.java | 21 + .../echobase/services/service/DbEditorService.java | 39 +- .../services/service/UserDbPersistenceService.java | 188 +++- .../echobase/services/service/UserService.java | 7 +- .../service/exportquery/ExportQueryService.java | 6 +- .../service/importdata/AgeCategoryCache.java | 21 + ...mportException.java => CheckFileException.java} | 37 +- ...=> DuplicatedEchotypeAssociationException.java} | 15 +- ...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 +- ...licatedResultsVoyageLengthAgeKeyException.java} | 15 +- ...atedResultsVoyageLengthWeightKeyException.java} | 15 +- .../importdata/DuplicatedSampleException.java | 4 +- ...tion.java => DuplicatedSubSampleException.java} | 15 +- ...ption.java => DuplicatedTransectException.java} | 10 +- ...eption.java => DuplicatedTransitException.java} | 11 +- ...ception.java => DuplicatedVoyageException.java} | 10 +- .../service/importdata/ImportDataFileResult.java | 21 + .../service/importdata/ImportDataResult.java | 21 + .../service/importdata/ImportDataService.java | 27 +- .../service/importdata/ImportException.java | 26 + .../MismatchAgeCategoryMeaningException.java | 21 + .../MismatchSizeCategoryMeaningException.java | 21 + ...Exception.java => MismatchVoyageException.java} | 17 +- .../service/importdata/ResultCategoryCache.java | 23 + .../service/importdata/SizeCategoryCache.java | 21 + .../service/importdata/SpeciesCategoryCache.java | 27 +- .../actions/ImportDataActionSupport.java | 75 +- .../actions/VoyageAcousticsImportAction.java | 146 ++- .../VoyageAcousticsImportDataActionSupport.java | 21 + .../VoyageCatchesBiometrySampleImportAction.java | 77 +- .../VoyageCatchesImportDataActionSupport.java | 21 + .../VoyageCatchesSubSampleImportAction.java | 146 ++- .../VoyageCatchesTotalSampleImportAction.java | 117 +-- .../VoyageCommonsImportDataActionSupport.java | 21 + .../actions/VoyageCommonsTransectImportAction.java | 42 +- .../actions/VoyageCommonsTransitImportAction.java | 46 +- .../actions/VoyageCommonsVoyageImportAction.java | 42 +- .../VoyageOperationsGearMetadataImportAction.java | 79 +- .../VoyageOperationsImportDataActionSupport.java | 21 + .../VoyageOperationsOperationImportAction.java | 52 +- ...ageOperationsOperationMetadataImportAction.java | 69 +- .../VoyageResultsCellImportDataActionSupport.java | 96 +- ...ndSpeciesCategoryAndLengthCellImportAction.java | 93 ++ ...EchotypeAndSpeciesCategoryCellImportAction.java | 22 + ...oyageResultsEsduByEchotypeCellImportAction.java | 21 + ...sEsduSpeciesAndAgeCategoryCellImportAction.java | 23 +- ...EsduSpeciesAndSizeCategoryCellImportAction.java | 63 -- .../VoyageResultsImportDataActionSupport.java | 21 + .../VoyageResultsMapFishCellImportAction.java | 37 +- .../VoyageResultsMapOtherCellImportAction.java | 36 +- ...VoyageResultsRegionAssociationImportAction.java | 52 +- .../actions/VoyageResultsRegionImportAction.java | 83 +- .../VoyageResultsRegionResultsImportAction.java | 22 + .../VoyageResultsVoyageEchotypeImportAction.java | 40 +- ...oyageResultsVoyageLengthAgeKeyImportAction.java | 60 +- ...geResultsVoyageLengthWeightKeyImportAction.java | 69 +- .../VoyageResultsImportConfiguration.java | 12 +- .../contexts/ImportDataContextSupport.java | 21 + .../contexts/VoyageAcousticsImportDataContext.java | 21 + .../contexts/VoyageCatchesImportDataContext.java | 29 + .../contexts/VoyageCommonsImportDataContext.java | 21 + .../contexts/VoyageImportDataContextSupport.java | 21 + .../VoyageOperationsImportDataContext.java | 21 + .../contexts/VoyageResultsImportDataContext.java | 21 + .../csv/EchoBaseImportExportModelSupport.java | 21 + .../csv/VoyageAcousticImportExportModel.java | 4 +- .../importdata/csv/VoyageAcousticImportRow.java | 8 +- .../csv/VoyageCatchesBiometrySampleImportRow.java | 5 +- .../VoyageCatchesSubSampleImportExportModel.java | 5 +- .../csv/VoyageCatchesSubSampleImportRow.java | 12 +- .../csv/VoyageCatchesTotalSampleImportRow.java | 9 +- .../VoyageCommonsTransectImportExportModel.java | 4 +- ...VoyageOperationsGearMetadataValueImportRow.java | 5 +- .../csv/VoyageOperationsOperationImportRow.java | 3 +- ...eOperationsOperationMetadataValueImportRow.java | 5 +- ...dSpeciesCategoryAndLengthImportExportModel.java | 100 +++ ...otypeAndSpeciesCategoryAndLengthImportRow.java} | 39 +- ...chotypeAndSpeciesCategoryImportExportModel.java | 4 +- ...yageResultsEsduByEchotypeImportExportModel.java | 4 +- ...duBySpeciesAndAgeCategoryImportExportModel.java | 4 +- ...uBySpeciesAndSizeCategoryImportExportModel.java | 93 -- .../csv/VoyageResultsRegionCellImportRow.java | 3 +- .../service/removedata/RemoveDataService.java | 6 +- .../strategy/AbstractRemoveDataStrategy.java | 19 +- .../strategy/OperationRemoveDataStrategy.java | 25 +- .../workingDb/WorkingDbConfigurationService.java | 2 +- .../i18n/echobase-services_en_GB.properties | 19 +- .../i18n/echobase-services_fr_FR.properties | 17 +- .../echobase/services/EchoBaseServiceFixtures.java | 10 +- .../echobase/services/ImportDataFixtures.java | 21 + .../importdata/VoyageAcousticImportServiceIT.java | 2 +- .../VoyageCatchesAllImportServiceIT.java | 24 +- .../VoyageCatchesImportServiceITSupport.java | 24 + ...geCatchesOnlyBiometrySampleImportServiceIT.java | 8 + ...ndSpeciesCategoryAndLengthImportServiceIT.java} | 25 +- ...iesCategoryAndLength_SmallImportServiceIT.java} | 20 +- .../VoyageResultsRegionCellImportServiceIT.java | 7 +- ...oyageResultsRegionCell_AllImportServiceIT.java} | 15 +- .../removedata/AbstractRemoveDataServiceTest.java | 6 + .../import-data/acoustic/movies_small.csv.gz | Bin 6141 -> 6128 bytes .../resources/import-data/common/transect.csv.gz | Bin 21723 -> 21725 bytes .../echobase-catches-and-voyage-result.h2.db.gz | Bin 630979 -> 1006673 bytes .../import-data/echobase-catches.h2.db.gz | Bin 594894 -> 936199 bytes .../import-data/echobase-commonData.h2.db.gz | Bin 184388 -> 369833 bytes .../resources/import-data/echobase-nodata.h2.db.gz | Bin 137434 -> 318432 bytes .../echobase-operation-total-samples.h2.db.gz | Bin 601307 -> 785038 bytes .../import-data/echobase-operation.h2.db.gz | Bin 327903 -> 507447 bytes .../byEchotypeAndSpeciesCategoryAndLength.csv.gz | Bin 0 -> 709794 bytes ...chotypeAndSpeciesCategoryAndLength_small.csv.gz | Bin 0 -> 2585 bytes .../result/esdu/bySpeciesAndSizeCategory.csv.gz | Bin 709007 -> 0 bytes .../esdu/bySpeciesAndSizeCategory_small.csv.gz | Bin 2544 -> 0 bytes .../actions/importData/ConfigureCommonImport.java | 2 +- .../actions/importData/ConfigureResultsImport.java | 12 +- .../DownloadInputFile.java} | 65 +- .../ui/actions/workingDb/DownloadExportFile.java | 30 +- ...oadImportFile.java => DownloadFileSupport.java} | 24 +- .../ui/actions/workingDb/DownloadImportFile.java | 80 +- .../main/resources/config/struts-importData.xml | 11 + .../src/main/resources/config/struts-workingDb.xml | 11 + .../resources/i18n/echobase-ui_en_GB.properties | 7 +- .../resources/i18n/echobase-ui_fr_FR.properties | 7 +- .../jsp/importData/configureResultsImport.jsp | 4 +- .../jsp/importData/importDataActionResult.jsp | 62 ++ .../jsp/importData/resultAcousticImport.jsp | 2 +- .../WEB-INF/jsp/importData/resultCatchesImport.jsp | 2 +- .../WEB-INF/jsp/importData/resultCommonImport.jsp | 2 +- .../jsp/importData/resultOperationImport.jsp | 2 +- .../WEB-INF/jsp/importData/resultResultsImport.jsp | 2 +- .../webapp/WEB-INF/jsp/workingDb/dashboard.jsp | 70 +- pom.xml | 18 +- src/doc/reunions/reunion_2016-04-05.md | 20 +- src/site/{ => en}/rst/configure.rst.vm | 0 src/site/en/rst/embedded.rst | 5 + src/site/en/rst/exportData.rst | 5 + src/site/{ => en}/rst/gis.rst | 3 - src/site/en/rst/importData.rst | 797 ++++++++-------- src/site/en/rst/model.rst | 4 +- src/site/en/rst/removeData.rst | 2 +- src/site/{ => en}/rst/update.rst.vm | 0 src/site/en/rst/usage.rst.vm | 2 - src/site/rst/gis.rst | 3 - src/site/rst/importData.rst | 997 +++++++++++---------- src/site/rst/install.rst.vm | 3 - src/site/rst/model.rst | 4 +- src/site/rst/removeData.rst | 2 +- src/site/rst/usage.rst.vm | 2 - src/site/site_en.xml | 5 +- 195 files changed, 4239 insertions(+), 2169 deletions(-) create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportedCell.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ResultValueFormatter.java => echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportedCellResult.java (50%) create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportedSampleDataResult.java copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/{references/SampleTypeImpl.java => data/GearMetadataValueImpl.java} (62%) copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/{references/SampleTypeImpl.java => data/OperationMetadataValueImpl.java} (62%) delete mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_902.java copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{WorkingDbMigrationCallBackForVersion3_900.java => WorkingDbMigrationCallBackForVersion3_903.java} (82%) copy echobase-domain/src/main/resources/migration/workingDb/h2/{2.7.2-1-add-importFile-entity.sql => 3.903-0-add-naturalIds.sql} (64%) copy echobase-domain/src/main/resources/migration/workingDb/{h2/2.7.2-1-add-importFile-entity.sql => pg/3.903-0-add-naturalIds.sql} (64%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ImportException.java => CheckFileException.java} (53%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{DataMetadataNotFoundException.java => DuplicatedEchotypeAssociationException.java} (67%) 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%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{DataMetadataNotFoundException.java => DuplicatedResultsVoyageLengthAgeKeyException.java} (67%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{DataMetadataNotFoundException.java => DuplicatedResultsVoyageLengthWeightKeyException.java} (66%) 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%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{NoVoyageToImportException.java => MismatchVoyageException.java} (74%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthCellImportAction.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduSpeciesAndSizeCategoryCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{VoyageResultsEsduBySpeciesAndSizeCategoryImportRow.java => VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.java} (70%) delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduBySpeciesAndSizeCategoryImportExportModel.java copy echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryImportServiceIT.java => VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryAndLengthImportServiceIT.java} (82%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsEsduCellOnlySpeciesAndSizeCategoryImportServiceIT.java => VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryAndLength_SmallImportServiceIT.java} (79%) copy echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsRegionCellImportServiceIT.java => VoyageResultsRegionCell_AllImportServiceIT.java} (87%) create mode 100644 echobase-services/src/test/resources/import-data/result/esdu/byEchotypeAndSpeciesCategoryAndLength.csv.gz create mode 100644 echobase-services/src/test/resources/import-data/result/esdu/byEchotypeAndSpeciesCategoryAndLength_small.csv.gz delete mode 100644 echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndSizeCategory.csv.gz delete mode 100644 echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndSizeCategory_small.csv.gz copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/{workingDb/DownloadDriver.java => importData/DownloadInputFile.java} (58%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/GenerateCoserMapException.java => echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DownloadExportFile.java (65%) copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/{DownloadImportFile.java => DownloadFileSupport.java} (83%) create mode 100644 echobase-ui/src/main/webapp/WEB-INF/jsp/importData/importDataActionResult.jsp copy src/site/{ => en}/rst/configure.rst.vm (100%) copy src/site/{ => en}/rst/gis.rst (97%) copy src/site/{ => en}/rst/update.rst.vm (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 24

branch feature/8312 created (now 723ed56)
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/8312 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git at 723ed56 Passage sur la dernière version de struts (2.5), cela pose pleins de problèmes (xworks n'existe plus en autonome, log4j remplacé par log4j2 et ça ne fonctionne pas). (See #8312) This branch includes the following new commits: new 34ed43d Passage i18n 3.5 (See #8312) new 723ed56 Passage sur la dernière version de struts (2.5), cela pose pleins de problèmes (xworks n'existe plus en autonome, log4j remplacé par log4j2 et ça ne fonctionne pas). (See #8312) 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 723ed56dc6a694da13551e4c8dc7ee6db8391758 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 13 11:45:03 2016 +0200 Passage sur la dernière version de struts (2.5), cela pose pleins de problèmes (xworks n'existe plus en autonome, log4j remplacé par log4j2 et ça ne fonctionne pas). (See #8312) commit 34ed43de4ae61eeb09d9052bf23aac013b29d7db Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 13 09:51:06 2016 +0200 Passage i18n 3.5 (See #8312) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch release/4.0-alpha-1 deleted (was fae7167)
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 was fae7167 Add missing license header The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

annotated tag echobase-4.0-alpha-1 created (now 3e5f0c7)
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 annotated tag echobase-4.0-alpha-1 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git at 3e5f0c7 (tag) tagging 1e14261aa0f9d49e704b49dbfa6565f5401d6653 (commit) replaces echobase-2.12.1 tagged by Maven Release on Fri May 13 09:11:25 2016 +0200 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.0-alpha-1 ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch release/4.0-alpha-1 updated (18dcbff -> fae7167)
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 from 18dcbff [jgitflow-maven-plugin]updating poms for 4.0-alpha-1 branch with snapshot versions adds 2aa41ea [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-1' with non-snapshot versions adds fae7167 Add missing license header No new revisions were added by this update. Summary of changes: echobase-domain/pom.xml | 2 +- .../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/pom.xml | 2 +- .../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 +++++++++++++++++++++ echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 95 files changed, 1799 insertions(+), 21 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch master updated (21f7034 -> 1e14261)
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 master in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 21f7034 [jgitflow-maven-plugin]merging 'release/2.12.1' into 'master' adds bb56fe1 [jgitflow-maven-plugin]updating poms for 4.0-SNAPSHOT development adds ca04cdd [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 83ddd64 [jgitflow-maven-plugin]merging 'master' into 'develop' adds da8dcf6 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds f058407 Fixes #8169 Passage en java 8 adds 9177faf Refs #8168 nuiton-web 1.17 adds b01793c Refs #8168 postgresql 9.4.1208.jre7 adds 8b79a13 Refs #8168 slf4j 1.7.19 adds 6e77cc3 Refs #8168 sqlite-jdbc 3.8.11.2 adds 81ef38a Refs #8168 i18n 3.4.1 adds 9a81ac2 Refs #8168 nuiton-validator 3.0 adds 5a28919 Refs #8168 nuiton-utils 3.0-rc-11 adds 0add68f Refs #8168 nuiton-csv 3.0-rc-5 adds 861ad25 Refs #8168 nuiton-config 3.0-rc-3 adds 2a0486b Refs #8168 xwork-core + struts + struts plugins 2.3.28 adds 72701b3 Refs #8168 httpcomponents:httpcore 4.4.4 adds 1a78bd5 Refs #8168 httpcomponents:httpclient 4.5.2 adds edc2e03 Refs #8168 commons-lang3 3.4 adds 999dba4 Refs #8168 commons-collections4 4.1 adds 33bcdb0 Refs #8168 struts2-jquery-plugins 3.7.1 adds 6895be0 Refs #8168 guava 19.0 adds 047bbd1 Refs #8168 gson 2.6.2 adds 0fadc2e Revert "Refs #8168 struts2-jquery-plugins 3.7.1" adds 1d0cb37 Revert "Refs #8168 xwork-core + struts + struts plugins 2.3.28" adds 10fde42 Fix doc format adds f293181 Replace some deprecated api calls adds ce723d7 Use inline variables when possible adds aff2453 Fix javadoc author annotation adds 589f20d Fix assembly descriptors adds 09b7f7b Revert "Refs #8168 nuiton-web 1.17" 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 adds 75be19e up to topia and eugene snapshots adds b71258e USe new Version package adds 19d87d6 move migration files adds 5eb7c02 Improve logs adds abdc624 Review importLog model (make imported ids depends on his ImportFile + add lineNumber of each imported id) adds 8a9e58a Update migration test databases adds 2ef8fdd Add nice methods on ImportFile adds e09f24d Review import data cinematic, creating import log before do the math in order to be able to reuse imported ids from database to build the checked import file adds 0262d40 Update remove data api, but tests are not ok since test databases are to be rebuild :( adds a67b9e3 Add voyage id to importlog when created adds 0d299f5 Add normal resources to be included adds c61b1a4 Improve code adds c58fcaa Fix created importLog for remove data tests adds 5a12aa1 Use ToPIA 3 configuration adds 02c9fae move H2Dialect (nothing to do in root package) adds 5191cb5 Improve migration design (use Reflections to get possible migration) + make it works with ToPIA 3 adds 85a38c9 Use truth adds 59fd870 Use new API adds 1d25f66 clean code and do some method rename adds f168873 Fix H2 dialect and fix also test databases adds 6349f59 Fix abstract dao ? adds 4097786 Reformat code adds 0991c68 Use ToPIA persistence context close adds da6bb29 Utilisation nuitonWeb 1.17 pour être compatible avec ToPIA 3 adds 034ec06 La version 3.902 permet de lancer enfin echobase avec topia 3 sur tout type de base adds cfe3cd7 Introduction au final d'une vrai entité pour conserver chaque id importer (sinon on ne peut pas assurer l'ordre (la map n'est pas suffisante) + revue de la migration adds a53094d Utilisation de cet nouvel API ImortFileId dans les imports et suppression d'import adds 35ec2cf Retour sur la version 3.901 adds a29df6b Retour sur develop (le modèle est stabilisé restera à effectuer les optimisations pour la génértion des fichiers d'export)" Merge branch 'feature/8170' into develop adds 30322f4 Ajout liens vers tickets adds ab0ced8 Optimize dependencies adds b51765a formattage adds 58a129e Suppression de la colonne units de l'import SubSample (See #8294) adds 372a7e5 Livrable #8294 Merge branch 'feature/8294' into develop adds 15ee4d7 Enregistrement d'un sampleData avec le numéro de spéciment lors d'un import de données biométriques (See #8295) adds b0ff79b Livrable #8295 Merge branch 'feature/8295' into develop adds 843667b Revue du commit précédent car c'est uniquement dans les tests qu'on peut créer des SampleDataType à la volée... (See #8295) adds 3368926 Utiliser une base avec les bons imports catches adds eb72e94 Importer ce qui est nécessaire uniquement pour les esdu et les élementaires (See #8298) adds 4d76b38 Mise à jour des tests adds 5a9a6fa Livrable #8298 Merge branch 'feature/8298' into develop adds 59fdcac Ajout colum SpeciesCategory#lengthClass (See #8297) adds 130cd48 Migration 3.902 (See #8297) adds 106963e mise à jour de la base de tests après import catches adds df5c305 Ajout de SpeciesCategory#lengthClass dans le cache de SpeciesCategory + renommage de l'import concerné (See #8297) adds 04fb27a Renommage côté ui de l'import concerné (See #8297) adds 1980d1f On remete les données de tests sur sizeCategory + ajout d'un test sur le fichier complet (mais qu'on ignore pour le moment car trop long à lancer... (See #8297) adds 2106d05 Livrable #8297 Merge branch 'feature/8297' into develop adds 5a3027b Revue de la docuentation + impacts modification imports (See #8178) adds 6a57ee5 Livrable #8178 Merge branch 'feature/8178' into develop adds d8e8939 Use eugene stable version adds 78eecd4 Use Topia working findAllLazy method adds 19759ba Fixes #8089 adds 4c7c2a1 Fixes #8168 (Mise à jour des librairies) adds eeef6aa Ajout bidirection sur le modèle (A reverter quand import branche Atlantos) adds 42961ba Début d'optimisation des check d'import adds 952bddb Ajout bidirection sur le modèle (A reverter quand import branche Atlantos) adds bc5e510 Fin de l'optimisation des export (See #8170) adds 4500852 Utilisation ToPIA 3.1 adds 3d92141 On doit rajouter un order by à la main + correction de la fenetre à calculer adds 5fc7551 Afficher les fichiers résultats d'import dans le tableau de bord adds 3495e8a Bien vérifier que les fichiers importés sont correctes (See #8170) adds e9095b6 Livrable #8170 Merge branch 'feature/8170' into develop adds 1541342 Ne pas autorisé un import d'un voyage déjà existant (clef unique name) (See #2246) adds 2d6139e Ajout bidirection sur le modèle (A reverter quand import branche Atlantos) adds 262c51e Début ajout migration pour les clef naturelles + traitement pour import transit (See #2246) adds cda7281 Typo sur le nom d'une méthode adds 73ff899 Ne pas autoriser de réimporter des transits déjà existants (See #2246) adds 31e9b45 Ne pas autoriser de réimporter des transects déjà existants (See #2246) adds b3b3fac Ne pas pouvoir éditer les entitées transverses adds 3209872 Ne pas autoriser de réimporter des opérations déjà existantes (See #2246) adds dec2182 Renommage i18n adds e847db7 Ajout toString adds fa0d99e Bine utiliser la bonne page de résultat adds 045c9fc Gérer la nullité d'erreur sur un import adds 8690ac9 Meilleure gestion de la suppression d'un ImportLog adds 91a2107 Ajout toString adds 7a78dc1 Nom de Zeus... ne jamais utiliser id comme nom de colonne car en hql ici c'est égale au TopiaId... adds 42d9dbb Tester avant de supprimer lors de la suppression d'un import adds 9f72d77 Ne pas autoriser de réimporter des meta sur les opérations et engins déjà existantes (See #2246) adds 883d892 Ne pas pouvoir effectuer plusieurs imports du même type adds ea54a1e Début de check pour les Sub-Sample mais il me manque des confirmations, à revoir avec Mathieu adds 0896dd7 Catch more exception while importing + ajout meilleur TODO adds 6bcfd28 i18n adds a23905d Ne pas autoriser de réimporter les données acoustiques déjà existantes (See #2246) adds 0b1e7ee Ajout du numéro de ligne dans les messages d'erreurs (See #2246) adds 9867f8f Ne pas autoriser de réimporter les résultats sur les voyages déjà existants (See #2246) adds 8cf674f Ne pas autoriser de réimporter les résultats sur les voyages déjà existants (See #2246) adds 3800f29 Refs-60 #2246, il reste encore quelques petits ajustements à faire. Merge branch 'feature/2246' into develop adds 7272ca2 Mise à jour des bases de test adds 7d765dd Livrable #8169 adds 5ea3948 Fix missing i18n adds dcddba9 Add missing license header adds 18dcbff [jgitflow-maven-plugin]updating poms for 4.0-alpha-1 branch with snapshot versions adds 2aa41ea [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-1' with non-snapshot versions adds fae7167 Add missing license header adds 1e14261 [jgitflow-maven-plugin]merging 'release/4.0-alpha-1' into 'master' No new revisions were added by this update. Summary of changes: echobase-domain/pom.xml | 68 +- .../fr/ifremer/echobase/EchoBaseDateConverter.java | 5 +- .../echobase/config/EchoBaseConfiguration.java | 46 +- .../config/EchoBaseConfigurationOption.java | 6 +- .../fr/ifremer/echobase/csv/EchoBaseCsvUtil.java | 175 ---- .../echobase/entities/AbstractEchoBaseDao.java | 5 +- .../fr/ifremer/echobase/entities/DriverType.java | 29 +- .../EchoBaseInternalTopiaApplicationContext.java | 93 ++ .../EchoBaseUserTopiaApplicationContext.java | 98 +- .../echobase/entities/EchoBaseUserTopiaDao.java | 6 +- .../EchoBaseUserTopiaPersistenceContext.java | 12 +- .../echobase/entities/ExportQueryTopiaDao.java | 6 +- ...hoBaseUserTopiaDao.java => FixedH2Dialect.java} | 35 +- .../echobase/entities/ImportFileIdTopiaDao.java | 98 ++ .../echobase/entities/ImportFileTopiaDao.java | 47 + ...aseUserTopiaDao.java => ImportLogTopiaDao.java} | 30 +- .../fr/ifremer/echobase/entities/ImportedCell.java | 62 ++ .../echobase/entities/ImportedCellResult.java | 62 ++ .../entities/ImportedSampleDataResult.java | 69 ++ .../echobase/entities/data/CategoryTopiaDao.java | 6 +- .../ifremer/echobase/entities/data/CellImpl.java | 12 +- .../echobase/entities/data/CellTopiaDao.java | 21 +- .../fr/ifremer/echobase/entities/data/Cells.java | 12 +- .../SampleTypeImpl.java => data/DataImpl.java} | 26 +- .../fr/ifremer/echobase/entities/data/Datas.java | 62 ++ .../echobase/entities/data/EchotypeTopiaDao.java | 1 - .../GearMetadataValueImpl.java} | 24 +- .../echobase/entities/data/OperationImpl.java | 22 +- .../OperationMetadataValueImpl.java} | 25 +- .../SampleDataImpl.java} | 26 +- .../Gears.java => data/SampleDatas.java} | 20 +- .../SampleTypeImpl.java => data/SampleImpl.java} | 26 +- .../echobase/entities/references/CellTypeImpl.java | 15 +- .../echobase/entities/references/CellTypes.java | 15 +- .../entities/references/DataMetadataImpl.java | 13 +- .../{SampleTypeImpl.java => GearImpl.java} | 23 +- .../echobase/entities/references/Gears.java | 5 +- .../entities/references/SampleDataTypeImpl.java | 19 +- .../entities/references/SampleTypeImpl.java | 10 + .../fr/ifremer/echobase/io/EchoBaseIOUtil.java | 85 +- .../java/fr/ifremer/echobase/io/InputFile.java | 20 + .../echobase/persistence/EchoBaseDbMeta.java | 5 + .../echobase/persistence/EchoBaseEntityHelper.java | 120 +-- .../persistence/EchoBasePersistenceHelper.java | 18 +- .../EchobaseTopiaApplicationContexts.java | 226 ----- .../echobase/persistence/JdbcConfiguration.java | 23 +- .../EchoBaseMigrationCallBackResolver.java | 50 +- .../MigrationCallBackForVersionSupport.java | 96 ++ ...rVersion.java => MigrationCallbackSupport.java} | 26 +- ... InternalDbMigrationCallBackForVersion2_2.java} | 41 +- ...ernalDbMigrationCallBackForVersionSupport.java} | 26 +- .../internalDb/InternalDbMigrationCallback.java} | 26 +- .../migration/internalDb/MigrationCallback.java | 54 -- .../workingDb/MigrationCallBackForVersion.java | 74 -- ...> WorkingDbMigrationCallBackForVersion2_2.java} | 37 +- ...WorkingDbMigrationCallBackForVersion2_5_1.java} | 17 +- ...> WorkingDbMigrationCallBackForVersion2_6.java} | 43 +- ...WorkingDbMigrationCallBackForVersion2_6_1.java} | 22 +- ...WorkingDbMigrationCallBackForVersion2_7_2.java} | 29 +- ...WorkingDbMigrationCallBackForVersion3_900.java} | 27 +- ...WorkingDbMigrationCallBackForVersion3_901.java} | 31 +- ...WorkingDbMigrationCallBackForVersion3_902.java} | 34 +- ...WorkingDbMigrationCallBackForVersion3_903.java} | 30 +- ...rkingDbMigrationCallBackForVersionSupport.java} | 46 +- .../WorkingDbMigrationCallbackForH2.java} | 24 +- .../WorkingDbMigrationCallbackForPostgresql.java | 21 +- ...igration.internalDb.MigrationCallBackForVersion | 1 - ...migration.workingDb.MigrationCallBackForVersion | 5 - .../main/resources/echobase-internaldb.properties | 44 - .../main/resources/echobase-workingdb.properties | 44 - .../i18n/echobase-domain_en_GB.properties | 1 + .../i18n/echobase-domain_fr_FR.properties | 1 + .../workingDb/3.901-0-clean-importLog-table.sql | 22 + .../3.902-0-add-SpeciesCategory_lengthClass.sql | 21 + .../migration/workingDb/h2/3.900-0-fix-types.sql | 76 ++ .../h2/3.901-1-upgrade-importFile-table.sql | 30 + .../workingDb/h2/3.903-0-add-naturalIds.sql | 22 + .../{ => pg}/2.5.1-0-postgis-structure.sql | 0 .../workingDb/{ => pg}/2.5.1-1-postgis-view.sql | 0 .../workingDb/{ => pg}/2.6-0-postgis-view.sql | 0 .../{ => pg}/2.6.1-0-postgis-structure.sql | 0 .../workingDb/{ => pg}/2.7.2-0-postgis-view.sql | 0 .../migration/workingDb/pg/3.900-0-fix-types.sql | 76 ++ .../pg/3.901-1-upgrade-importFile-table.sql | 30 + .../workingDb/pg/3.903-0-add-naturalIds.sql | 22 + .../src/main/xmi/echobase-internal.properties | 11 +- echobase-domain/src/main/xmi/echobase.properties | 30 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 89705 -> 90445 bytes .../echobase/persistence/EchoBaseDbMetaTest.java | 2 +- echobase-services/pom.xml | 4 +- .../services/DefaultEchoBaseServiceContext.java | 3 +- .../echobase/services/EchoBaseServiceSupport.java | 2 +- .../echobase/services/csv/BatchCsvExport.java | 121 +++ .../CellAble.java} | 24 +- .../echobase/services/csv/CellValueFormatter.java | 115 +++ .../echobase/services}/csv/CellValueParser.java | 29 +- .../echobase/services}/csv/ChainValueParser.java | 13 +- .../echobase/services/csv/EchoBaseCsvUtil.java | 347 +++++++ .../ResultAble.java} | 25 +- .../services/csv/ResultValueFormatter.java | 33 +- .../ResultValueGetter.java} | 37 +- .../echobase/services}/csv/ResultValueParser.java | 9 +- .../ResultValueSetter.java} | 19 +- .../ValueFormatterByFunction.java} | 24 +- .../echobase/services/service/CoserApiService.java | 3 +- .../echobase/services/service/DbEditorService.java | 40 +- .../services/service/DecoratorService.java | 3 +- .../services/service/UserDbPersistenceService.java | 583 ++++++++---- .../echobase/services/service/UserService.java | 33 +- .../EmbeddedApplicationService.java | 9 +- .../service/exportCoser/ExportCoserService.java | 3 +- .../service/exportCoser/IndicatorExportModel.java | 2 +- .../exportCoser/RawDataCatchExportModel.java | 2 +- .../exportCoser/RawDataSizeExportModel.java | 4 +- .../exportCoser/RawDataStrataExportModel.java | 2 +- .../service/exportCoser/SpeciesExportModel.java | 2 +- .../services/service/exportdb/ExportDbService.java | 41 +- .../services/service/exportdb/ExportService.java | 19 +- .../service/exportquery/ExportQueryCsvModel.java | 2 +- .../service/exportquery/ExportQueryService.java | 24 +- .../service/exportquery/GenericSQLQuery.java | 10 +- .../importdata/AbstractImportDataService.java | 456 ---------- .../service/importdata/AcousticImportResult.java | 57 -- .../service/importdata/AcousticImportService.java | 778 ---------------- .../service/importdata/AgeCategoryCache.java | 74 ++ .../service/importdata/CatchesImportService.java | 535 ----------- ...mportException.java => CheckFileException.java} | 39 +- .../service/importdata/CommonAllImportService.java | 67 -- .../importdata/CommonTransectImportService.java | 158 ---- .../importdata/CommonTransitImportService.java | 123 --- .../importdata/CommonVoyageImportService.java | 133 --- ...ion.java => DataMetadataNotFoundException.java} | 13 +- ...=> DuplicatedEchotypeAssociationException.java} | 20 +- ...java => DuplicatedElementaryCellException.java} | 14 +- ...ption.java => DuplicatedEsduCellException.java} | 14 +- ...a => DuplicatedGearMetadataValueException.java} | 33 +- ...eption.java => DuplicatedMapCellException.java} | 14 +- ...tion.java => DuplicatedOperationException.java} | 16 +- ...DuplicatedOperationMetadataValueException.java} | 26 +- ...ion.java => DuplicatedRegionCellException.java} | 14 +- ...licatedResultsVoyageLengthAgeKeyException.java} | 20 +- ...atedResultsVoyageLengthWeightKeyException.java} | 20 +- ...ception.java => DuplicatedSampleException.java} | 16 +- ...tion.java => DuplicatedSubSampleException.java} | 30 +- ...ption.java => DuplicatedTransectException.java} | 16 +- ...eption.java => DuplicatedTransitException.java} | 17 +- ...ception.java => DuplicatedVoyageException.java} | 16 +- .../importdata/EchoBaseCsvFileImportResult.java | 60 -- ...=> ElementaryCellWithoutDepthEndException.java} | 13 +- ...ception.java => EsduCellNotFoundException.java} | 15 +- ...va => EsduCellWithDepthEndFilledException.java} | 13 +- .../service/importdata/ImportDataFileResult.java | 185 ++++ .../service/importdata/ImportDataResult.java | 66 ++ .../service/importdata/ImportDataService.java | 403 +++++++++ .../service/importdata/ImportException.java | 30 +- ...va => MismatchAgeCategoryMeaningException.java} | 19 +- ...a => MismatchSizeCategoryMeaningException.java} | 19 +- ...Exception.java => MismatchVoyageException.java} | 23 +- ...ommonImportService.java => MissionService.java} | 53 +- ...va => MoreThanOnceVoyageToImportException.java} | 12 +- ...ava => NoTransitFoundBetweenDateException.java} | 14 +- ...ception.java => NoVoyageToImportException.java} | 12 +- .../service/importdata/OperationImportService.java | 284 ------ .../service/importdata/ResultCategoryCache.java | 116 +++ .../importdata/ResultsEsduCellImportService.java | 500 ----------- .../service/importdata/ResultsImportService.java | 131 --- .../ResultsMapFishCellImportService.java | 231 ----- .../ResultsMapOtherCellImportService.java | 204 ----- .../importdata/ResultsRegionCellImportService.java | 315 ------- .../ResultsVoyageImportAlreadyExistException.java | 8 +- .../importdata/ResultsVoyageImportService.java | 345 ------- .../service/importdata/SizeCategoryCache.java | 74 ++ .../service/importdata/SpeciesCategoryCache.java | 105 +++ ...ception.java => TransectNotFoundException.java} | 15 +- ...xception.java => TransitNotFoundException.java} | 14 +- .../actions/ImportDataActionSupport.java | 494 ++++++++++ .../actions/VoyageAcousticsImportAction.java | 903 +++++++++++++++++++ .../VoyageAcousticsImportDataActionSupport.java} | 31 +- .../VoyageCatchesBiometrySampleImportAction.java | 170 ++++ .../VoyageCatchesImportDataActionSupport.java | 82 ++ .../VoyageCatchesSubSampleImportAction.java | 318 +++++++ .../VoyageCatchesTotalSampleImportAction.java | 230 +++++ .../VoyageCommonsImportDataActionSupport.java} | 26 +- .../actions/VoyageCommonsTransectImportAction.java | 143 +++ .../actions/VoyageCommonsTransitImportAction.java | 124 +++ .../actions/VoyageCommonsVoyageImportAction.java | 148 +++ .../VoyageOperationsGearMetadataImportAction.java | 130 +++ .../VoyageOperationsImportDataActionSupport.java} | 31 +- .../VoyageOperationsOperationImportAction.java | 131 +++ ...ageOperationsOperationMetadataImportAction.java | 117 +++ .../VoyageResultsCellImportDataActionSupport.java | 150 ++++ ...ndSpeciesCategoryAndLengthCellImportAction.java | 93 ++ ...EchotypeAndSpeciesCategoryCellImportAction.java | 73 ++ ...oyageResultsEsduByEchotypeCellImportAction.java | 68 ++ ...sEsduSpeciesAndAgeCategoryCellImportAction.java | 80 ++ .../VoyageResultsImportDataActionSupport.java | 90 ++ .../VoyageResultsMapFishCellImportAction.java | 266 ++++++ .../VoyageResultsMapOtherCellImportAction.java | 233 +++++ ...VoyageResultsRegionAssociationImportAction.java | 121 +++ .../actions/VoyageResultsRegionImportAction.java | 186 ++++ .../VoyageResultsRegionResultsImportAction.java | 211 +++++ .../VoyageResultsVoyageEchotypeImportAction.java | 174 ++++ ...oyageResultsVoyageLengthAgeKeyImportAction.java | 142 +++ ...geResultsVoyageLengthWeightKeyImportAction.java | 152 ++++ .../ImportDataConfigurationSupport.java} | 33 +- .../VoyageAcousticsImportConfiguration.java} | 31 +- .../VoyageCatchesImportConfiguration.java} | 21 +- .../VoyageCommonsImportConfiguration.java} | 38 +- .../VoyageImportDataConfigurationSupport.java | 22 +- .../VoyageOperationsImportConfiguration.java} | 19 +- .../VoyageResultsImportConfiguration.java} | 101 +-- .../contexts/ImportDataContextSupport.java | 291 ++++++ .../VoyageAcousticsImportDataContext.java} | 32 +- .../contexts/VoyageCatchesImportDataContext.java | 151 ++++ .../VoyageCommonsImportDataContext.java} | 34 +- .../contexts/VoyageImportDataContextSupport.java | 142 +++ .../VoyageOperationsImportDataContext.java | 42 + .../contexts/VoyageResultsImportDataContext.java | 235 +++++ .../importdata/csv/AcousticImportModel.java | 136 --- .../importdata/csv/BiometrySampleImportModel.java | 60 -- .../csv/EchoBaseImportExportModelSupport.java | 72 ++ .../importdata/csv/EchotypeImportModel.java | 58 -- ...ultByEchotypeAndSpeciesCategoryImportModel.java | 88 -- .../csv/EsduResultByEchotypeImportModel.java | 79 -- ...duResultBySpeciesAndAgeCategoryImportModel.java | 83 -- ...uResultBySpeciesAndSizeCategoryImportModel.java | 83 -- .../csv/GearMetadataValueImportModel.java | 62 -- .../importdata/csv/LengthAgeKeyImportModel.java | 60 -- .../importdata/csv/LengthWeightKeyImportModel.java | 60 -- .../service/importdata/csv/MapCellImportModel.java | 126 --- .../importdata/csv/OperationImportModel.java | 65 -- .../csv/OperationMetadataValueImportModel.java | 57 -- .../csv/RegionCellAssociationImportModel.java | 53 -- .../importdata/csv/RegionCellImportModel.java | 59 -- .../csv/RegionCellResultImportModel.java | 84 -- .../importdata/csv/SubSampleImportModel.java | 70 -- .../importdata/csv/TotalSampleImportModel.java | 63 -- .../importdata/csv/TransectImportModel.java | 74 -- .../service/importdata/csv/TransitImportModel.java | 53 -- .../csv/VoyageAcousticImportExportModel.java | 223 +++++ ...ImportRow.java => VoyageAcousticImportRow.java} | 99 +- ...yageCatchesBiometrySampleImportExportModel.java | 71 ++ ...a => VoyageCatchesBiometrySampleImportRow.java} | 43 +- .../VoyageCatchesSubSampleImportExportModel.java | 84 ++ ...w.java => VoyageCatchesSubSampleImportRow.java} | 52 +- .../VoyageCatchesTotalSampleImportExportModel.java | 78 ++ ...java => VoyageCatchesTotalSampleImportRow.java} | 40 +- .../VoyageCommonsTransectImportExportModel.java | 92 ++ ...ow.java => VoyageCommonsTransectImportRow.java} | 120 ++- .../csv/VoyageCommonsTransitImportExportModel.java | 70 ++ ...Row.java => VoyageCommonsTransitImportRow.java} | 50 +- .../csv/VoyageCommonsVoyageImportExportModel.java | 68 ++ .../service/importdata/csv/VoyageImportModel.java | 49 - ...erationsGearMetadataValueImportExportModel.java | 72 ++ ...oyageOperationsGearMetadataValueImportRow.java} | 37 +- ...VoyageOperationsOperationImportExportModel.java | 84 ++ ...ava => VoyageOperationsOperationImportRow.java} | 68 +- ...onsOperationMetadataValueImportExportModel.java | 68 ++ ...OperationsOperationMetadataValueImportRow.java} | 41 +- ...dSpeciesCategoryAndLengthImportExportModel.java | 100 +++ ...otypeAndSpeciesCategoryAndLengthImportRow.java} | 94 +- ...chotypeAndSpeciesCategoryImportExportModel.java | 93 ++ ...EsduByEchotypeAndSpeciesCategoryImportRow.java} | 73 +- ...yageResultsEsduByEchotypeImportExportModel.java | 83 ++ ...a => VoyageResultsEsduByEchotypeImportRow.java} | 53 +- ...duBySpeciesAndAgeCategoryImportExportModel.java | 91 ++ ...sultsEsduBySpeciesAndAgeCategoryImportRow.java} | 81 +- .../VoyageResultsMapFishCellImportExportModel.java | 114 +++ ...java => VoyageResultsMapFishCellImportRow.java} | 127 +-- ...VoyageResultsMapOtherCellImportExportModel.java | 99 ++ ...ava => VoyageResultsMapOtherCellImportRow.java} | 131 ++- ...ultsRegionCellAssociationImportExportModel.java | 68 ++ ...yageResultsRegionCellAssociationImportRow.java} | 32 +- .../VoyageResultsRegionCellImportExportModel.java | 71 ++ ....java => VoyageResultsRegionCellImportRow.java} | 57 +- ...geResultsRegionCellResultImportExportModel.java | 93 ++ ...=> VoyageResultsRegionCellResultImportRow.java} | 79 +- ...yageResultsVoyageEchotypeImportExportModel.java | 73 ++ ...a => VoyageResultsVoyageEchotypeImportRow.java} | 44 +- ...ResultsVoyageLengthAgeKeyImportExportModel.java | 76 ++ ... VoyageResultsVoyageLengthAgeKeyImportRow.java} | 46 +- ...ultsVoyageLengthWeightKeyImportExportModel.java | 77 ++ ...yageResultsVoyageLengthWeightKeyImportRow.java} | 42 +- .../importdb/EchoBaseImportModelFactory.java | 10 +- .../importdb/strategy/EchoBaseImportStrategy.java | 3 +- .../importdb/strategy/FreeImportDbStrategy.java | 13 +- .../service/removedata/RemoveDataService.java | 28 +- .../strategy/AbstractRemoveDataStrategy.java | 43 +- .../strategy/AcousticRemoveDataStrategy.java | 13 +- .../strategy/CatchesRemoveDataStrategy.java | 6 +- .../strategy/CommonAllRemoveDataStrategy.java | 23 +- .../strategy/CommonTransectRemoveDataStrategy.java | 17 +- .../strategy/CommonTransitRemoveDataStrategy.java | 19 +- .../strategy/CommonVoyageRemoveDataStrategy.java | 23 +- .../strategy/LegacyVoyageRemoveDataStrategy.java | 23 +- .../strategy/OperationRemoveDataStrategy.java | 31 +- .../strategy/ResultEsduRemoveDataStrategy.java | 6 +- .../strategy/ResultMapFishRemoveDataStrategy.java | 6 +- .../strategy/ResultMapOtherRemoveDataStrategy.java | 6 +- .../strategy/ResultRegionRemoveDataStrategy.java | 6 +- .../strategy/ResultVoyageRemoveDataStrategy.java | 11 +- .../services/service/spatial/GisService.java | 3 +- .../services/service/spatial/LizmapRepository.java | 6 +- .../workingDb/WorkingDbConfigurationService.java | 9 +- .../i18n/echobase-services_en_GB.properties | 24 +- .../i18n/echobase-services_fr_FR.properties | 22 +- .../echobase/services/EchoBaseServiceFixtures.java | 40 +- .../services/EchoBaseTestServiceSupport.java | 169 +--- .../services/FakeEchoBaseServiceContext.java | 81 +- .../fr/ifremer/echobase/services/FixCellsIT.java | 23 +- .../echobase/services/ImportDataFixtures.java | 153 ++++ .../services/MigrateImportDataDatabasesIT.java | 129 +++ .../EmbeddedApplicationServiceIT.java | 4 +- .../exportCoser/ExportCoserServiceTest.java | 3 +- .../service/exportdb/ExportDbServiceTest.java | 4 +- .../importdata/AbstractImportDataServiceIT.java | 236 ++--- .../service/importdata/CatchesImportServiceIT.java | 160 ---- .../importdata/CommonAllImportServiceIT.java | 92 -- .../importdata/CommonTransectImportServiceIT.java | 82 -- .../importdata/CommonTransitImportServiceIT.java | 87 -- .../importdata/CommonVoyageImportServiceIT.java | 83 -- .../importdata/OperationImportServiceIT.java | 83 -- .../importdata/ResultsEsduCellImportServiceIT.java | 191 ---- .../ResultsMapFishCellImportServiceIT.java | 80 -- .../ResultsMapOtherCellImportServiceIT.java | 79 -- .../ResultsRegionCellImportServiceIT.java | 92 -- .../importdata/ResultsVoyageImportServiceIT.java | 162 ---- ...eIT.java => VoyageAcousticImportServiceIT.java} | 73 +- .../VoyageCatchesAllImportServiceIT.java | 102 +++ .../VoyageCatchesImportServiceITSupport.java | 79 ++ ...geCatchesOnlyBiometrySampleImportServiceIT.java | 75 ++ .../VoyageCatchesOnlySubSampleImportServiceIT.java | 67 ++ ...oyageCatchesOnlyTotalSampleImportServiceIT.java | 67 ++ .../VoyageCommonsAllImportServiceIT.java | 98 ++ .../VoyageCommonsImportServiceITSupport.java | 53 ++ .../VoyageCommonsOnlyTransectImportServiceIT.java | 93 ++ .../VoyageCommonsOnlyTransitImportServiceIT.java | 93 ++ .../VoyageCommonsOnlyVoyageImportServiceIT.java | 82 ++ .../importdata/VoyageOperationImportServiceIT.java | 92 ++ ...AndSpeciesCategoryAndLengthImportServiceIT.java | 87 ++ ...ciesCategoryAndLength_SmallImportServiceIT.java | 85 ++ ...yEchotypeAndSpeciesCategoryImportServiceIT.java | 84 ++ ...ResultsEsduCellOnlyEchotypeImportServiceIT.java | 81 ++ ...llOnlySpeciesAndAgeCategoryImportServiceIT.java | 91 ++ .../VoyageResultsImportServiceITSupport.java | 51 ++ .../VoyageResultsMapFishCellImportServiceIT.java | 77 ++ .../VoyageResultsMapOtherCellImportServiceIT.java | 75 ++ .../VoyageResultsRegionCellImportServiceIT.java | 108 +++ ...VoyageResultsRegionCell_AllImportServiceIT.java | 108 +++ .../VoyageResultsVoyageImportServiceIT.java | 88 ++ ...geResultsVoyageOnlyEchotypeImportServiceIT.java | 68 ++ ...sultsVoyageOnlyLengthAgeKeyImportServiceIT.java | 68 ++ ...tsVoyageOnlyLengthWeightKeyImportServiceIT.java | 68 ++ .../removedata/AbstractRemoveDataServiceTest.java | 118 ++- .../resources/echobase-importDb-referentiel.zip | Bin 50920 -> 50556 bytes .../resources/import-data/acoustic/movies.csv.gz | Bin 596169 -> 596169 bytes .../import-data/acoustic/movies_small.csv.gz | Bin 0 -> 6128 bytes .../resources/import-data/catches/subsample.csv.gz | Bin 931 -> 920 bytes .../import-data/catches/subsample_all.csv.gz | Bin 23572 -> 22400 bytes .../echobase-catches-and-voyage-result.h2.db.gz | Bin 705722 -> 825254 bytes .../import-data/echobase-catches.h2.db.gz | Bin 662677 -> 755094 bytes .../import-data/echobase-commonData.h2.db.gz | Bin 178638 -> 184645 bytes .../resources/import-data/echobase-nodata.h2.db.gz | Bin 129028 -> 137582 bytes .../echobase-operation-total-samples.h2.db.gz | Bin 0 -> 601537 bytes .../import-data/echobase-operation.h2.db.gz | Bin 324421 -> 328156 bytes .../import-data/result/esdu/byEchotype.csv.gz | Bin 73537 -> 73195 bytes .../esdu/byEchotypeAndSpeciesCategory.csv.gz | Bin 547091 -> 547121 bytes .../byEchotypeAndSpeciesCategoryAndLength.csv.gz | Bin 0 -> 709794 bytes ...chotypeAndSpeciesCategoryAndLength_small.csv.gz | Bin 0 -> 2585 bytes .../esdu/byEchotypeAndSpeciesCategory_small.csv.gz | Bin 0 -> 2042 bytes .../result/esdu/byEchotype_small.csv.gz | Bin 0 -> 2802 bytes .../result/esdu/bySpeciesAndAgeCategory.csv.gz | Bin 141033 -> 141214 bytes .../esdu/bySpeciesAndAgeCategory_small.csv.gz | Bin 0 -> 2379 bytes .../result/esdu/bySpeciesAndSizeCategory.csv.gz | Bin 707226 -> 0 bytes .../result/region/regionAssociations_small.csv.gz | Bin 0 -> 296 bytes echobase-ui/pom.xml | 17 +- echobase-ui/src/main/assembly/embedded-zip.xml | 8 +- echobase-ui/src/main/assembly/full-war.xml | 4 +- echobase-ui/src/main/assembly/lizmap-zip.xml | 4 +- .../echobase/ui/EchoBaseApplicationContext.java | 23 +- .../fr/ifremer/echobase/ui/EchoBaseSession.java | 17 +- .../echobase/ui/actions/EchoBaseActionSupport.java | 9 +- .../echobase/ui/actions/dbeditor/ExportTable.java | 2 +- .../echobase/ui/actions/dbeditor/GetEntities.java | 3 +- .../echobase/ui/actions/dbeditor/GetEntity.java | 2 +- .../echobase/ui/actions/dbeditor/ImportTable.java | 2 +- .../ui/actions/embeddedApplication/Build.java | 5 +- .../ui/actions/embeddedApplication/Configure.java | 2 +- .../importData/AbstractConfigureImport.java | 4 +- .../actions/importData/AbstractLaunchImport.java | 19 +- .../importData/ConfigureAcousticImport.java | 12 +- .../actions/importData/ConfigureCatchesImport.java | 12 +- .../actions/importData/ConfigureCommonImport.java | 22 +- .../importData/ConfigureOperationImport.java | 12 +- .../actions/importData/ConfigureResultsImport.java | 24 +- .../ui/actions/importData/CreateMission.java | 6 +- .../ui/actions/importData/DownloadInputFile.java | 94 ++ .../importData/GetDataProcessingsForVoyage.java | 5 +- .../actions/importData/LaunchAcousticImport.java | 15 +- .../ui/actions/importData/LaunchCatchesImport.java | 15 +- .../ui/actions/importData/LaunchCommonImport.java | 15 +- .../actions/importData/LaunchOperationImport.java | 15 +- .../ui/actions/importData/LaunchResultsImport.java | 16 +- .../ifremer/echobase/ui/actions/user/GetUsers.java | 2 +- .../echobase/ui/actions/workingDb/Connect.java | 4 +- .../ui/actions/workingDb/CreatePostgresDb.java | 10 +- .../ui/actions/workingDb/DownloadExportFile.java | 27 +- ...oadImportFile.java => DownloadFileSupport.java} | 24 +- .../ui/actions/workingDb/DownloadImportFile.java | 80 +- .../ui/interceptors/AbstractCheckInterceptor.java | 3 +- .../ui/interceptors/CheckLogguedInterceptor.java | 7 +- .../ui/interceptors/EchoBaseInjectInterceptor.java | 17 +- .../validators/EchoBaseFieldValidatorSupport.java | 5 +- .../echobase/ui/validators/LoginValidator.java | 4 +- .../main/resources/config/struts-importData.xml | 11 + .../src/main/resources/config/struts-workingDb.xml | 11 + .../resources/i18n/echobase-ui_en_GB.properties | 7 +- .../resources/i18n/echobase-ui_fr_FR.properties | 7 +- .../jsp/importData/configureResultsImport.jsp | 4 +- .../jsp/importData/importDataActionResult.jsp | 62 ++ .../jsp/importData/resultAcousticImport.jsp | 2 +- .../WEB-INF/jsp/importData/resultCatchesImport.jsp | 2 +- .../WEB-INF/jsp/importData/resultCommonImport.jsp | 2 +- .../jsp/importData/resultOperationImport.jsp | 2 +- .../WEB-INF/jsp/importData/resultResultsImport.jsp | 2 +- .../webapp/WEB-INF/jsp/workingDb/dashboard.jsp | 70 +- pom.xml | 75 +- src/doc/reunions/reunion_2016-03-24.txt | 122 +++ src/doc/reunions/reunion_2016-04-05.md | 124 +++ src/site/{ => en}/rst/configure.rst.vm | 0 src/site/en/rst/embedded.rst | 5 + src/site/en/rst/exportData.rst | 5 + src/site/{ => en}/rst/gis.rst | 3 - src/site/en/rst/importData.rst | 797 ++++++++-------- src/site/en/rst/install.rst.vm | 1 + src/site/en/rst/model.rst | 4 +- src/site/en/rst/removeData.rst | 2 +- src/site/{ => en}/rst/update.rst.vm | 0 src/site/en/rst/usage.rst.vm | 2 - src/site/rst/gis.rst | 3 - src/site/rst/importData.rst | 997 +++++++++++---------- src/site/rst/install.rst.vm | 3 - src/site/rst/model.rst | 4 +- src/site/rst/removeData.rst | 2 +- src/site/rst/usage.rst.vm | 2 - src/site/site_en.xml | 5 +- src/site/site_fr.xml | 6 + 447 files changed, 17904 insertions(+), 11491 deletions(-) delete mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/csv/EchoBaseCsvUtil.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseInternalTopiaApplicationContext.java copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/{EchoBaseUserTopiaDao.java => FixedH2Dialect.java} (50%) create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportFileIdTopiaDao.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportFileTopiaDao.java copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/{EchoBaseUserTopiaDao.java => ImportLogTopiaDao.java} (57%) create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportedCell.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportedCellResult.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportedSampleDataResult.java copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/{references/SampleTypeImpl.java => data/DataImpl.java} (57%) create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Datas.java copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/{references/SampleTypeImpl.java => data/GearMetadataValueImpl.java} (58%) copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/{references/SampleTypeImpl.java => data/OperationMetadataValueImpl.java} (57%) copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/{references/SampleTypeImpl.java => data/SampleDataImpl.java} (56%) copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/{references/Gears.java => data/SampleDatas.java} (59%) copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/{references/SampleTypeImpl.java => data/SampleImpl.java} (56%) copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/{SampleTypeImpl.java => GearImpl.java} (63%) delete mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchobaseTopiaApplicationContexts.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/MigrationCallBackForVersionSupport.java copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/{internalDb/MigrationCallBackForVersion.java => MigrationCallbackSupport.java} (54%) rename echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/{MigrationCallBackForVersion2_2.java => InternalDbMigrationCallBackForVersion2_2.java} (88%) rename echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/{MigrationCallBackForVersion.java => InternalDbMigrationCallBackForVersionSupport.java} (63%) copy echobase-domain/src/main/java/fr/ifremer/echobase/{entities/references/SampleTypeImpl.java => persistence/migration/internalDb/InternalDbMigrationCallback.java} (60%) delete mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallback.java delete mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion.java rename echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{MigrationCallBackForVersion2_2.java => WorkingDbMigrationCallBackForVersion2_2.java} (68%) rename echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{MigrationCallBackForVersion2_5_1.java => WorkingDbMigrationCallBackForVersion2_5_1.java} (73%) rename echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{MigrationCallBackForVersion2_6.java => WorkingDbMigrationCallBackForVersion2_6.java} (81%) copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{MigrationCallBackForVersion2_6_1.java => WorkingDbMigrationCallBackForVersion2_6_1.java} (75%) rename echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{MigrationCallBackForVersion2_7_2.java => WorkingDbMigrationCallBackForVersion2_7_2.java} (70%) copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{MigrationCallBackForVersion2_6_1.java => WorkingDbMigrationCallBackForVersion3_900.java} (62%) copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{MigrationCallBackForVersion2_6_1.java => WorkingDbMigrationCallBackForVersion3_901.java} (62%) copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{MigrationCallback.java => WorkingDbMigrationCallBackForVersion3_902.java} (51%) rename echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{MigrationCallBackForVersion2_6_1.java => WorkingDbMigrationCallBackForVersion3_903.java} (61%) rename echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{MigrationCallback.java => WorkingDbMigrationCallBackForVersionSupport.java} (50%) copy echobase-domain/src/main/java/fr/ifremer/echobase/{entities/references/SampleTypeImpl.java => persistence/migration/workingDb/WorkingDbMigrationCallbackForH2.java} (59%) copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchOperationImport.java => echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallbackForPostgresql.java (59%) delete mode 100644 echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.internalDb.MigrationCallBackForVersion delete mode 100644 echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion delete mode 100644 echobase-domain/src/main/resources/echobase-internaldb.properties delete mode 100644 echobase-domain/src/main/resources/echobase-workingdb.properties create mode 100644 echobase-domain/src/main/resources/migration/workingDb/3.901-0-clean-importLog-table.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/3.902-0-add-SpeciesCategory_lengthClass.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/h2/3.900-0-fix-types.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/h2/3.901-1-upgrade-importFile-table.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/h2/3.903-0-add-naturalIds.sql rename echobase-domain/src/main/resources/migration/workingDb/{ => pg}/2.5.1-0-postgis-structure.sql (100%) rename echobase-domain/src/main/resources/migration/workingDb/{ => pg}/2.5.1-1-postgis-view.sql (100%) rename echobase-domain/src/main/resources/migration/workingDb/{ => pg}/2.6-0-postgis-view.sql (100%) rename echobase-domain/src/main/resources/migration/workingDb/{ => pg}/2.6.1-0-postgis-structure.sql (100%) rename echobase-domain/src/main/resources/migration/workingDb/{ => pg}/2.7.2-0-postgis-view.sql (100%) create mode 100644 echobase-domain/src/main/resources/migration/workingDb/pg/3.900-0-fix-types.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/pg/3.901-1-upgrade-importFile-table.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/csv/BatchCsvExport.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/{service/importdata/ResultsVoyageImportAlreadyExistException.java => csv/CellAble.java} (67%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CellValueFormatter.java rename {echobase-domain/src/main/java/fr/ifremer/echobase => echobase-services/src/main/java/fr/ifremer/echobase/services}/csv/CellValueParser.java (76%) rename {echobase-domain/src/main/java/fr/ifremer/echobase => echobase-services/src/main/java/fr/ifremer/echobase/services}/csv/ChainValueParser.java (86%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EchoBaseCsvUtil.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/{service/importdata/ResultsVoyageImportAlreadyExistException.java => csv/ResultAble.java} (64%) copy echobase-domain/src/main/java/fr/ifremer/echobase/csv/ResultValueParser.java => echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ResultValueFormatter.java (57%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/{service/exportquery/ExportQueryCsvModel.java => csv/ResultValueGetter.java} (52%) rename {echobase-domain/src/main/java/fr/ifremer/echobase => echobase-services/src/main/java/fr/ifremer/echobase/services}/csv/ResultValueParser.java (90%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/{service/importdata/ResultsVoyageImportAlreadyExistException.java => csv/ResultValueSetter.java} (66%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/{service/importdata/ResultsVoyageImportAlreadyExistException.java => csv/ValueFormatterByFunction.java} (60%) delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportResult.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportService.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AgeCategoryCache.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CatchesImportService.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ImportException.java => CheckFileException.java} (53%) delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonAllImportService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransitImportService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonVoyageImportService.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => DataMetadataNotFoundException.java} (70%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => DuplicatedEchotypeAssociationException.java} (59%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => DuplicatedElementaryCellException.java} (69%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => DuplicatedEsduCellException.java} (70%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ImportException.java => DuplicatedGearMetadataValueException.java} (50%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => DuplicatedMapCellException.java} (70%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => DuplicatedOperationException.java} (64%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ImportException.java => DuplicatedOperationMetadataValueException.java} (60%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => DuplicatedRegionCellException.java} (68%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => DuplicatedResultsVoyageLengthAgeKeyException.java} (59%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => DuplicatedResultsVoyageLengthWeightKeyException.java} (59%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => DuplicatedSampleException.java} (57%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ImportException.java => DuplicatedSubSampleException.java} (60%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => DuplicatedTransectException.java} (68%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => DuplicatedTransitException.java} (66%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => DuplicatedVoyageException.java} (70%) delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/EchoBaseCsvFileImportResult.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => ElementaryCellWithoutDepthEndException.java} (66%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => EsduCellNotFoundException.java} (61%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => EsduCellWithDepthEndFilledException.java} (67%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportDataFileResult.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportDataResult.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportDataService.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => MismatchAgeCategoryMeaningException.java} (62%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => MismatchSizeCategoryMeaningException.java} (61%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => MismatchVoyageException.java} (65%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{CommonImportService.java => MissionService.java} (55%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => MoreThanOnceVoyageToImportException.java} (74%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => NoTransitFoundBetweenDateException.java} (65%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => NoVoyageToImportException.java} (76%) delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/OperationImportService.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultCategoryCache.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsImportService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportService.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/SpeciesCategoryCache.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => TransectNotFoundException.java} (64%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => TransitNotFoundException.java} (68%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportDataActionSupport.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageAcousticsImportAction.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ImportException.java => actions/VoyageAcousticsImportDataActionSupport.java} (52%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesBiometrySampleImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesImportDataActionSupport.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesSubSampleImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesTotalSampleImportAction.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/{exportquery/ExportQueryCsvModel.java => importdata/actions/VoyageCommonsImportDataActionSupport.java} (52%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCommonsTransectImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCommonsTransitImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCommonsVoyageImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageOperationsGearMetadataImportAction.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ImportException.java => actions/VoyageOperationsImportDataActionSupport.java} (52%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageOperationsOperationImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageOperationsOperationMetadataImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsCellImportDataActionSupport.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeAndSpeciesCategoryCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduSpeciesAndAgeCategoryCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsImportDataActionSupport.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapFishCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapOtherCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsRegionAssociationImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsRegionImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsRegionResultsImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsVoyageEchotypeImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsVoyageLengthAgeKeyImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsVoyageLengthWeightKeyImportAction.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{AbstractImportConfiguration.java => configurations/ImportDataConfigurationSupport.java} (70%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{AcousticImportConfiguration.java => configurations/VoyageAcousticsImportConfiguration.java} (95%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{CatchesImportConfiguration.java => configurations/VoyageCatchesImportConfiguration.java} (74%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{CommonImportConfiguration.java => configurations/VoyageCommonsImportConfiguration.java} (89%) copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchOperationImport.java => echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/VoyageImportDataConfigurationSupport.java (64%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{OperationImportConfiguration.java => configurations/VoyageOperationsImportConfiguration.java} (71%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsImportConfiguration.java => configurations/VoyageResultsImportConfiguration.java} (62%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/ImportDataContextSupport.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ImportException.java => contexts/VoyageAcousticsImportDataContext.java} (50%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/VoyageCatchesImportDataContext.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ImportException.java => contexts/VoyageCommonsImportDataContext.java} (50%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/VoyageImportDataContextSupport.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/VoyageOperationsImportDataContext.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/VoyageResultsImportDataContext.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/BiometrySampleImportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EchoBaseImportExportModelSupport.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EchotypeImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/GearMetadataValueImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthAgeKeyImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthWeightKeyImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MapCellImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationMetadataValueImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellAssociationImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellResultImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/SubSampleImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TotalSampleImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransectImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransitImportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageAcousticImportExportModel.java 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/VoyageCatchesBiometrySampleImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{BiometrySampleImportRow.java => VoyageCatchesBiometrySampleImportRow.java} (70%) 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} (80%) 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} (76%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCommonsTransectImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{TransectImportRow.java => VoyageCommonsTransectImportRow.java} (54%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCommonsTransitImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{TransitImportRow.java => VoyageCommonsTransitImportRow.java} (67%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCommonsVoyageImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageImportModel.java 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} (64%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageOperationsOperationImportExportModel.java 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} (63%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{EsduResultBySpeciesAndSizeCategoryImportRow.java => VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.java} (56%) 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/{RegionCellResultImportRow.java => VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow.java} (72%) 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} (69%) 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} (68%) 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} (74%) 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} (75%) 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} (69%) 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/{EsduResultByEchotypeAndSpeciesCategoryImportRow.java => VoyageResultsRegionCellResultImportRow.java} (64%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsVoyageEchotypeImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{EchotypeImportRow.java => VoyageResultsVoyageEchotypeImportRow.java} (63%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsVoyageLengthAgeKeyImportExportModel.java 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} (68%) create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDataFixtures.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/MigrateImportDataDatabasesIT.java delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CatchesImportServiceIT.java 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/CommonTransitImportServiceIT.java delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonVoyageImportServiceIT.java delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/OperationImportServiceIT.java delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportServiceIT.java delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportServiceIT.java delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportServiceIT.java delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportServiceIT.java delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportServiceIT.java rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{AcousticImportServiceIT.java => VoyageAcousticImportServiceIT.java} (54%) create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesAllImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesImportServiceITSupport.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesOnlyBiometrySampleImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesOnlySubSampleImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesOnlyTotalSampleImportServiceIT.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/VoyageCommonsOnlyTransectImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsOnlyTransitImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsOnlyVoyageImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageOperationImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryAndLengthImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryAndLength_SmallImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlySpeciesAndAgeCategoryImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsImportServiceITSupport.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsMapFishCellImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsMapOtherCellImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsRegionCellImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsRegionCell_AllImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsVoyageImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsVoyageOnlyEchotypeImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsVoyageOnlyLengthAgeKeyImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsVoyageOnlyLengthWeightKeyImportServiceIT.java create mode 100644 echobase-services/src/test/resources/import-data/acoustic/movies_small.csv.gz create mode 100644 echobase-services/src/test/resources/import-data/echobase-operation-total-samples.h2.db.gz create mode 100644 echobase-services/src/test/resources/import-data/result/esdu/byEchotypeAndSpeciesCategoryAndLength.csv.gz create mode 100644 echobase-services/src/test/resources/import-data/result/esdu/byEchotypeAndSpeciesCategoryAndLength_small.csv.gz 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/byEchotype_small.csv.gz create mode 100644 echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndAgeCategory_small.csv.gz delete mode 100644 echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndSizeCategory.csv.gz create mode 100644 echobase-services/src/test/resources/import-data/result/region/regionAssociations_small.csv.gz create mode 100644 echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/DownloadInputFile.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportAlreadyExistException.java => echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DownloadExportFile.java (64%) copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/{DownloadImportFile.java => DownloadFileSupport.java} (83%) create mode 100644 echobase-ui/src/main/webapp/WEB-INF/jsp/importData/importDataActionResult.jsp create mode 100644 src/doc/reunions/reunion_2016-03-24.txt create mode 100644 src/doc/reunions/reunion_2016-04-05.md copy src/site/{ => en}/rst/configure.rst.vm (100%) copy src/site/{ => en}/rst/gis.rst (97%) copy src/site/{ => en}/rst/update.rst.vm (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0