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

branch feature/8175 created (now 6cb3384)
by codelutin.com scm 20 May '16

20 May '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8175 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git at 6cb3384 Mise en place du script de mise à jour au démarrage de l'application (See #8175) This branch includes the following new commits: new abb0eb3 Ajout d'un script pour faciliter les mises à jour (See #8175) new fbd0194 Mise à jour de la documentation des mise à jour (See #8175) new 3089b78 Mise à jour de la documentation d'installation (pré-requis tomcat 8) new 6cb3384 Mise en place du script de mise à jour au démarrage de l'application (See #8175) 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 6cb33848fb8aca99ccc50c2625f7f77e5504d153 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 20 12:08:51 2016 +0200 Mise en place du script de mise à jour au démarrage de l'application (See #8175) commit 3089b785682ae375791d19634fd0ec18abed54a5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun May 15 13:42:26 2016 +0200 Mise à jour de la documentation d'installation (pré-requis tomcat 8) commit fbd0194020b7d3986729b86db367fcc54fef70be Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun May 15 13:40:57 2016 +0200 Mise à jour de la documentation des mise à jour (See #8175) commit abb0eb3a3fa05fbe923eaa43c4eee2480a3feb91 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun May 15 13:40:32 2016 +0200 Ajout d'un script pour faciliter les mises à jour (See #8175) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch develop updated (f5bb858 -> c269a50)
by codelutin.com scm 14 May '16

14 May '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from f5bb858 Livrable #8181 Merge branch 'feature/8181' into develop new 1756a1b Ajout d'un parser formatter de String avec valeur NA new e72336a Ajout d'une colonne *label* dans l'import acoustic pour y mettre le numéro de radiale (See #8222) new 5c24c97 Mise à jour du test d'import acoustic pour intégrer la nouvelle colonne *label* (See #8222) new c269a50 Livrable #8222 Merge branch 'feature/8222' 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 c269a505620c9d990fd4668469c5045756d6cb33 Merge: f5bb858 5c24c97 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat May 14 12:22:02 2016 +0200 Livrable #8222 Merge branch 'feature/8222' into develop commit 5c24c971c6b4e1c23aad4e63f71ed8d3513884e8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat May 14 12:21:34 2016 +0200 Mise à jour du test d'import acoustic pour intégrer la nouvelle colonne *label* (See #8222) commit e72336a61f11ae4ce75b6aa5425506f0019150d8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat May 14 12:21:02 2016 +0200 Ajout d'une colonne *label* dans l'import acoustic pour y mettre le numéro de radiale (See #8222) commit 1756a1b88bb9f2b8252aeef471324b1bfcf42830 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat May 14 12:20:26 2016 +0200 Ajout d'un parser formatter de String avec valeur NA Summary of changes: .../entities/references/DataMetadataImpl.java | 2 + .../echobase/services/csv/EchoBaseCsvUtil.java | 18 +++++++++ .../actions/VoyageAcousticsImportAction.java | 33 ++++++++++++++-- .../csv/VoyageAcousticImportExportModel.java | 6 ++- .../importdata/csv/VoyageAcousticImportRow.java | 43 ++++++++++++++++++--- .../importdata/AbstractImportDataServiceIT.java | 20 ++++++++++ .../importdata/VoyageAcousticImportServiceIT.java | 12 ++++-- .../import-data/acoustic/movies_small.csv.gz | Bin 6128 -> 6972 bytes 8 files changed, 119 insertions(+), 15 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

01/04: Ajout d'un parser formatter de String avec valeur NA
by codelutin.com scm 14 May '16

14 May '16

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 1756a1b88bb9f2b8252aeef471324b1bfcf42830 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat May 14 12:20:26 2016 +0200 Ajout d'un parser formatter de String avec valeur NA --- .../ifremer/echobase/services/csv/EchoBaseCsvUtil.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EchoBaseCsvUtil.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EchoBaseCsvUtil.java index 645ca1d..a4a5792 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EchoBaseCsvUtil.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EchoBaseCsvUtil.java @@ -333,6 +333,24 @@ public class EchoBaseCsvUtil extends TopiaCsvCommons { }; + public static final ValueParserFormatter<String> NA_TO_STRING_PARSER_FORMATTER = new NullableParserFormatter<String>(null, true) { + + @Override + public String format(String value) { + return value == null ? NA : value; + } + + @Override + protected String parseNoneEmptyValue(String value) { + String result = null; + if (!NA.equals(value)) { + result = value; + } + return result; + } + + }; + public static final ValueParser<Date> DATE_TIME_VALUE_PARSER = new ChainValueParser<>(Arrays.<ValueParser<Date>>asList(TopiaCsvCommons.DAY_TIME_SECOND_WITH_TIMESTAMP, TopiaCsvCommons.DAY_TIME_SECOND, TopiaCsvCommons.DAY_TIME, -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

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

14 May '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 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 13 May '16

13 May '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 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 13 May '16

13 May '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 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 13 May '16

13 May '16

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 13 May '16

13 May '16

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 13 May '16

13 May '16

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 13 May '16

13 May '16

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