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

branch feature/8170 updated (0262d40 -> c58fcaa)
by codelutin.com scm 10 Apr '16

10 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 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 No new revisions were added by this update. Summary of changes: echobase-domain/pom.xml | 7 ++ .../EchobaseTopiaApplicationContexts.java | 78 ++++++---------------- .../actions/VoyageCommonsVoyageImportAction.java | 1 + .../removedata/AbstractRemoveDataServiceTest.java | 2 + 4 files changed, 30 insertions(+), 58 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/8170 updated (5df9496 -> 0262d40)
by codelutin.com scm 09 Apr '16

09 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 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 :( No new revisions were added by this update. Summary of changes: echobase-domain/pom.xml | 8 + .../echobase/entities/ImportFileImpl.hbm.xml | 22 +++ .../ifremer/echobase/entities/ImportFileImpl.java | 30 ++++ .../ifremer/echobase/entities/ImportLogImpl.java | 35 ++++ .../EchoBaseMigrationCallBackResolver.java | 7 +- .../internalDb/MigrationCallBackForVersion.java | 7 + .../internalDb/MigrationCallBackForVersion2_2.java | 23 ++- .../migration/internalDb/MigrationCallback.java | 13 +- .../workingDb/MigrationCallBackForVersion.java | 8 + .../workingDb/MigrationCallBackForVersion2_2.java | 4 +- .../MigrationCallBackForVersion2_5_1.java | 8 +- .../workingDb/MigrationCallBackForVersion2_6.java | 14 +- .../MigrationCallBackForVersion2_6_1.java | 10 +- .../MigrationCallBackForVersion2_7_2.java | 10 +- .../MigrationCallBackForVersion3_900.java | 4 +- .../MigrationCallBackForVersion3_901.java | 36 +++++ .../migration/workingDb/MigrationCallback.java | 2 +- ...migration.workingDb.MigrationCallBackForVersion | 3 +- .../3.901-2-drop-importLog_importId-table.sql | 1 + .../3.901-3-drop-importLog-voyageId-notNull.sql | 1 + .../h2/3.901-0-add-importFile_importId-table.sql | 2 + .../3.901-1-add-importFile-importText-column.sql | 1 + .../{ => 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 echobase-domain/src/main/xmi/echobase.properties | 11 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 89758 -> 90261 bytes .../services/service/UserDbPersistenceService.java | 48 +++--- .../service/importdata/ImportDataFileResult.java | 34 ++-- .../service/importdata/ImportDataResult.java | 10 +- .../service/importdata/ImportDataService.java | 180 +++++---------------- .../actions/ImportDataActionSupport.java | 75 ++++++++- .../actions/VoyageAcousticsImportAction.java | 62 +++---- .../VoyageCatchesBiometrySampleImportAction.java | 6 +- .../VoyageCatchesImportDataActionSupport.java | 8 +- .../VoyageCatchesSubSampleImportAction.java | 8 +- .../VoyageCatchesTotalSampleImportAction.java | 12 +- .../actions/VoyageCommonsTransectImportAction.java | 14 +- .../actions/VoyageCommonsTransitImportAction.java | 14 +- .../actions/VoyageCommonsVoyageImportAction.java | 9 +- .../VoyageOperationsGearMetadataImportAction.java | 4 +- .../VoyageOperationsOperationImportAction.java | 4 +- ...ageOperationsOperationMetadataImportAction.java | 4 +- .../VoyageResultsCellImportDataActionSupport.java | 4 +- .../VoyageResultsImportDataActionSupport.java | 4 +- .../VoyageResultsMapFishCellImportAction.java | 18 +-- .../VoyageResultsMapOtherCellImportAction.java | 18 +-- .../actions/VoyageResultsRegionImportAction.java | 8 +- .../VoyageResultsRegionResultsImportAction.java | 8 - .../VoyageResultsVoyageEchotypeImportAction.java | 2 +- ...oyageResultsVoyageLengthAgeKeyImportAction.java | 4 +- ...geResultsVoyageLengthWeightKeyImportAction.java | 4 +- .../contexts/ImportDataContextSupport.java | 38 ++++- .../contexts/VoyageAcousticsImportDataContext.java | 5 +- .../contexts/VoyageCatchesImportDataContext.java | 5 +- .../contexts/VoyageCommonsImportDataContext.java | 5 +- .../contexts/VoyageImportDataContextSupport.java | 13 +- .../VoyageOperationsImportDataContext.java | 5 +- .../contexts/VoyageResultsImportDataContext.java | 5 +- .../importdb/strategy/FreeImportDbStrategy.java | 13 +- .../service/removedata/RemoveDataService.java | 2 +- .../strategy/AbstractRemoveDataStrategy.java | 2 +- .../strategy/AcousticRemoveDataStrategy.java | 2 +- .../strategy/CatchesRemoveDataStrategy.java | 2 +- .../strategy/CommonAllRemoveDataStrategy.java | 2 +- .../strategy/CommonTransectRemoveDataStrategy.java | 2 +- .../strategy/CommonTransitRemoveDataStrategy.java | 2 +- .../strategy/CommonVoyageRemoveDataStrategy.java | 2 +- .../strategy/LegacyVoyageRemoveDataStrategy.java | 2 +- .../strategy/OperationRemoveDataStrategy.java | 2 +- .../strategy/ResultEsduRemoveDataStrategy.java | 2 +- .../strategy/ResultMapFishRemoveDataStrategy.java | 2 +- .../strategy/ResultMapOtherRemoveDataStrategy.java | 2 +- .../strategy/ResultRegionRemoveDataStrategy.java | 2 +- .../strategy/ResultVoyageRemoveDataStrategy.java | 2 +- .../services/MigrateImportDataDatabasesIT.java | 2 - .../importdata/AbstractImportDataServiceIT.java | 9 +- .../removedata/AbstractRemoveDataServiceTest.java | 35 ++-- .../echobase-catches-and-voyage-result.h2.db.gz | Bin 703063 -> 657421 bytes .../import-data/echobase-catches.h2.db.gz | Bin 663781 -> 624390 bytes .../import-data/echobase-commonData.h2.db.gz | Bin 179054 -> 179274 bytes .../resources/import-data/echobase-nodata.h2.db.gz | Bin 129703 -> 129991 bytes .../echobase-operation-total-samples.h2.db.gz | Bin 660514 -> 625297 bytes .../import-data/echobase-operation.h2.db.gz | Bin 323654 -> 320307 bytes pom.xml | 4 +- 87 files changed, 577 insertions(+), 414 deletions(-) create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportFileImpl.hbm.xml create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportFileImpl.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportLogImpl.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion3_901.java create mode 100644 echobase-domain/src/main/resources/migration/workingDb/3.901-2-drop-importLog_importId-table.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/3.901-3-drop-importLog-voyageId-notNull.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/h2/3.901-0-add-importFile_importId-table.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/h2/3.901-1-add-importFile-importText-column.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%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/8170 updated (d75bed0 -> 5df9496)
by codelutin.com scm 08 Apr '16

08 Apr '16

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

1 0

branch develop updated (6727083 -> 2fda67c)
by codelutin.com scm 07 Apr '16

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

1 7

branch feature/8089 deleted (was 8083eb1)
by codelutin.com scm 07 Apr '16

07 Apr '16

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

1 0

branch feature/8089-topia3-migration deleted (was d4cc480)
by codelutin.com scm 07 Apr '16

07 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8089-topia3-migration in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git was d4cc480 Utilisation du mode strict et correction des problèmes de tag values The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/8089 created (now 8083eb1)
by codelutin.com scm 07 Apr '16

07 Apr '16

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

1 6

branch feature/8089-topia3-migration updated (0c2bae8 -> d4cc480)
by codelutin.com scm 07 Apr '16

07 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8089-topia3-migration in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 0c2bae8 refs #8089: Update hibernate new d4cc480 Utilisation du mode strict et correction des problèmes de tag values The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d4cc48021293b18e17e6ee8dbe06ebe17cbbb801 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 7 16:34:40 2016 +0200 Utilisation du mode strict et correction des problèmes de tag values Summary of changes: echobase-domain/pom.xml | 1 + echobase-domain/src/main/xmi/echobase-internal.properties | 9 ++++++--- echobase-domain/src/main/xmi/echobase.properties | 15 +++++++++------ 3 files changed, 16 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8170 updated (b298df1 -> d75bed0)
by codelutin.com scm 07 Apr '16

07 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from b298df1 i18n new d75bed0 Fix import files The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d75bed0f531b57550d9a63d3c9372d137028bbd8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 7 09:18:04 2016 +0200 Fix import files Summary of changes: .../result/esdu/bySpeciesAndAgeCategory.csv.gz | Bin 141215 -> 141214 bytes .../esdu/bySpeciesAndAgeCategory_small.csv.gz | Bin 2379 -> 2379 bytes 2 files changed, 0 insertions(+), 0 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8170 updated (7a059c1 -> b298df1)
by codelutin.com scm 07 Apr '16

07 Apr '16

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

1 0