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

annotated tag echobase-4.0-alpha-1 created (now 3e5f0c7)
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 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 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 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 13 May '16

13 May '16

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

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

1 6

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

13 May '16

The EchoBase team is pleased to announce the echobase-4.0-alpha-1 release! The French Institute for the Exploitation of the Sea (Ifremer) has designed an open software suite for storing fisheries acoustic data and computing acoustic indicators for survey-based ecosystem monitoring. It comprises a postgreSQL database designed to store acoustic, navigation and fishing data from ecosystemic surveys (EchoBase) and a suite of R codes (EchoR) for computing fish population indicators based on Echobase data. Documentation of the project can be found here: http://echobase.codelutin.com Changes ------- Changes in this version include: New features: o Mise à jour des librairies Issue: 8168. Thanks to Tony Chemit. Resolved by tchemit. o Passage en java 8 Issue: 8169. Thanks to Tony Chemit. Resolved by tchemit. o Vérification des données importées Issue: 8170. Thanks to Tony Chemit. Resolved by tchemit. o Migrate to ToPIA 3.0 Issue: 8089. Thanks to Tony Chemit. Resolved by tchemit. o Modification de l'import SubSample Issue: 8294. Thanks to Tony Chemit. Resolved by tchemit. o Modification de l'import biometry sample Issue: 8295. Thanks to Tony Chemit. Resolved by tchemit. o Import résultat esdu (validation) Issue: 8296. Thanks to Tony Chemit. Resolved by tchemit. o Import résultat esdu / espèces / taille (modification) Issue: 8297. Thanks to Tony Chemit. Resolved by tchemit. o Import données acoustiques (modifications) Issue: 8298. Thanks to Tony Chemit. Resolved by tchemit. Fixed Bugs: o Vérifier que les échantillons hors-vrac sont tous importés Issue: 1659. Thanks to Tony Chemit. Resolved by tchemit. Changes: o Vérifier le formattage de la documentation Issue: 8178. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: https://forge.codelutin.com/projects/echobase/files * echobase-embedded-4.0-alpha-1.zip - https://forge.codelutin.com/attachments/download/3924 * echobase-referentiel-4.0-alpha-1.echobase - https://forge.codelutin.com/attachments/download/3925 * echobase-ui-4.0-alpha-1-full.war - https://forge.codelutin.com/attachments/download/3926 * echobase-ui-4.0-alpha-1-lizmap.zip - https://forge.codelutin.com/attachments/download/3927 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -EchoBase team

1 0

branch release/4.0-alpha-1 created (now 18dcbff)
by codelutin.com scm 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 at 18dcbff [jgitflow-maven-plugin]updating poms for 4.0-alpha-1 branch with snapshot versions This branch includes the following new commits: new dcddba9 Add missing license header new 18dcbff [jgitflow-maven-plugin]updating poms for 4.0-alpha-1 branch with snapshot versions The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 18dcbfff63c190d67b11a7e1e0daa50a3b99eee3 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri May 13 09:07:33 2016 +0200 [jgitflow-maven-plugin]updating poms for 4.0-alpha-1 branch with snapshot versions commit dcddba9f75d0ac198d015152cdc9382997e28f73 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri May 13 09:07:15 2016 +0200 Add missing license header -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (5ea3948 -> 963538e)
by codelutin.com scm 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 5ea3948 Fix missing i18n new dcddba9 Add missing license header new 963538e [jgitflow-maven-plugin]updating poms for 4.0-SNAPSHOT development The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 963538e64e7221bcdd4eb4b1f1766f01462b44b4 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri May 13 09:07:39 2016 +0200 [jgitflow-maven-plugin]updating poms for 4.0-SNAPSHOT development commit dcddba9f75d0ac198d015152cdc9382997e28f73 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri May 13 09:07:15 2016 +0200 Add missing license header Summary of changes: .../ui/actions/importData/DownloadInputFile.java | 21 +++++++++++++++++++++ pom.xml | 3 +-- 2 files changed, 22 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (7d765dd -> 5ea3948)
by codelutin.com scm 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 7d765dd Livrable #8169 new 5ea3948 Fix missing i18n The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 5ea394895e959d6ce6e27c2eaabd8dd7095db7e5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 13 09:04:47 2016 +0200 Fix missing i18n Summary of changes: echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (7272ca2 -> 7d765dd)
by codelutin.com scm 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 7272ca2 Mise à jour des bases de test new 7d765dd Livrable #8169 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 7d765dd2452f853c34429ec9d47dff67b326abd9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 13 08:58:28 2016 +0200 Livrable #8169 Summary of changes: pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

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

1 11