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 1e14261 [jgitflow-maven-plugin]merging 'release/4.0-alpha-1' into 'master' adds 963538e [jgitflow-maven-plugin]updating poms for 4.0-SNAPSHOT development adds c76022d [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 442f0fd [jgitflow-maven-plugin]merging 'master' into 'develop' adds a456593 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 24ea296 Revert "Ajout bidirection sur le modèle (A reverter quand import branche Atlantos)" adds b94e14b Revert "Ajout bidirection sur le modèle (A reverter quand import branche Atlantos)" adds 72765ae Revert "Ajout bidirection sur le modèle (A reverter quand import branche Atlantos)" adds 089477e Finish modification for the model with tagValues and declaration adds ffbf430 Rename comment to comments adds 963c190 Add missing decorators adds 90f1d7b Create the migration adds 20f4732 Do no change import/export model adds 636a72e Rename constraint name Rename id to code Put all request on one line adds 2575131 Add inserts for the ports adds 616bb75 Create migration for postgresql adds c98c727 Create migration class adds e0b74f4 Set a value for the real column adds b10d6eb Au final la migration sera en 3.905 car je risque d'avoir encore une ou deux migrtions à faire avant. adds 77b38e1 Despecialize quote in port insert adds ef5264c Ne pas charger tout le fichier sql en mémoire adds 7742f6d correction de l'échappement des simples quotes adds 20522a7 Fix voyage creation with ports adds 0102291 Fix mandatory field during import adds 85d2f8b Fix import for the voyage entity adds 9c1003f Fix NPE during import adds 273a7b8 On réapplique tout ce qui a été modifié sur le modèle (passage en bidirection) adds 7245530 Impact sur l'import du changement (renommage Transect#comment en comments) adds 8ec8f24 Mise à jour des bases de test adds a596d2d Livrable #8171 Merge branch 'feature/#8171' into develop adds dad5aa1 Faire fonctionner la migration 3.905 sous pg (See #8171) adds 3225ca9 Use java 8 adds 38c71a4 passage méthode en publique adds 6072d69 Ajout de l'import des mises en œuvre des engins (See #8181) adds f5bb858 Livrable #8181 Merge branch 'feature/8181' into develop adds 1756a1b Ajout d'un parser formatter de String avec valeur NA adds e72336a Ajout d'une colonne *label* dans l'import acoustic pour y mettre le numéro de radiale (See #8222) adds 5c24c97 Mise à jour du test d'import acoustic pour intégrer la nouvelle colonne *label* (See #8222) adds c269a50 Livrable #8222 Merge branch 'feature/8222' into develop adds 7cc43a1 Add cr réunion adds abb0eb3 Ajout d'un script pour faciliter les mises à jour (See #8175) adds fbd0194 Mise à jour de la documentation des mise à jour (See #8175) adds 3089b78 Mise à jour de la documentation d'installation (pré-requis tomcat 8) adds 6cb3384 Mise en place du script de mise à jour au démarrage de l'application (See #8175) adds 23c79a3 Merge branch 'feature/8175' into develop adds 98dfab4 Complete documentation for libreoffice (refs #8008) adds 07c92ed Fix copy update script adds 58fb101 Get the last model version from 8180 feature adds 831ccc5 Modify topia version adds 2979db7 [jgitflow-maven-plugin]updating poms for 4.0-alpha-2 branch with snapshot versions adds 320d3d0 Fix license headers adds 297e5af [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-2' with non-snapshot versions adds 09f06f6 [jgitflow-maven-plugin]merging 'release/4.0-alpha-2' into 'master' No new revisions were added by this update. Summary of changes: echobase-domain/pom.xml | 2 +- .../echobase/config/EchoBaseConfiguration.java | 14 + .../config/EchoBaseConfigurationOption.java | 46 +- .../entities/references/DataMetadataImpl.java | 2 + .../echobase/entities/references/Gears.java | 41 - .../references/{Vessels.java => Ports.java} | 10 +- .../echobase/persistence/EchoBaseDbMeta.java | 5 +- .../MigrationCallBackForVersionSupport.java | 15 +- ...WorkingDbMigrationCallBackForVersion3_905.java} | 20 +- .../i18n/echobase-domain_en_GB.properties | 3 + .../i18n/echobase-domain_fr_FR.properties | 3 + .../migration/workingDb/3.905-1-insert-ports.sql | 4916 ++++++++++++++++++++ .../workingDb/h2/3.905-0-update-model.sql | 115 + .../3.905-2-migrate-voyage-ports.sql} | 9 +- .../workingDb/pg/3.905-0-update-model.sql | 115 + .../3.905-2-migrate-voyage-ports.sql} | 9 +- echobase-domain/src/main/xmi/echobase.properties | 27 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 90445 -> 98231 bytes echobase-services/pom.xml | 2 +- .../echobase/services/csv/EchoBaseCsvUtil.java | 30 + .../echobase/services/service/DbEditorService.java | 10 +- .../services/service/DecoratorService.java | 12 + .../services/service/UserDbPersistenceService.java | 4 +- .../actions/VoyageAcousticsImportAction.java | 33 +- .../contexts/ImportDataContextSupport.java | 13 +- .../csv/VoyageAcousticImportExportModel.java | 6 +- .../importdata/csv/VoyageAcousticImportRow.java | 43 +- .../VoyageCommonsTransectImportExportModel.java | 4 +- .../csv/VoyageCommonsTransectImportRow.java | 8 +- .../csv/VoyageCommonsVoyageImportExportModel.java | 9 +- .../GearCharacteristicValuesImportModel.java | 60 + .../GearCharacteristicValuesImportRow.java | 68 + .../services/service/importdb/ImportService.java | 76 + .../importdb/strategy/EchoBaseImportStrategy.java | 2 +- .../importdata/AbstractImportDataServiceIT.java | 20 + .../importdata/VoyageAcousticImportServiceIT.java | 12 +- .../removedata/AbstractRemoveDataServiceTest.java | 11 +- .../resources/echobase-importDb-referentiel.zip | Bin 50556 -> 50514 bytes .../import-data/acoustic/movies_small.csv.gz | Bin 6128 -> 6972 bytes .../resources/import-data/common/transect.csv.gz | Bin 21723 -> 21725 bytes .../resources/import-data/common/voyage.csv.gz | Bin 126 -> 117 bytes .../echobase-catches-and-voyage-result.h2.db.gz | Bin 825254 -> 1006673 bytes .../import-data/echobase-catches.h2.db.gz | Bin 755094 -> 936199 bytes .../import-data/echobase-commonData.h2.db.gz | Bin 184645 -> 369833 bytes .../resources/import-data/echobase-nodata.h2.db.gz | Bin 137582 -> 318432 bytes .../echobase-operation-total-samples.h2.db.gz | Bin 601537 -> 785038 bytes .../import-data/echobase-operation.h2.db.gz | Bin 328156 -> 507447 bytes echobase-ui/pom.xml | 3 +- .../echobase/ui/EchoBaseApplicationContext.java | 22 + ...rtTable.java => ImportGearCharacteristics.java} | 38 +- .../src/main/resources/config/struts-dbeditor.xml | 9 + .../src/main/resources/embedded/update-echobase.sh | 54 + .../resources/i18n/echobase-ui_en_GB.properties | 1 + .../resources/i18n/echobase-ui_fr_FR.properties | 1 + .../main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp | 15 + pom.xml | 4 +- src/doc/reunions/reunion_2016-06-16.md | 97 + src/site/en/rst/exportData.rst | 3 + src/site/en/rst/install.rst.vm | 5 + src/site/en/rst/update.rst.vm | 33 +- src/site/rst/exportData.rst | 3 + src/site/rst/install.rst.vm | 20 +- src/site/rst/update.rst.vm | 29 +- 63 files changed, 5912 insertions(+), 200 deletions(-) delete mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Gears.java copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/{Vessels.java => Ports.java} (79%) rename echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{WorkingDbMigrationCallBackForVersion3_902.java => WorkingDbMigrationCallBackForVersion3_905.java} (72%) create mode 100644 echobase-domain/src/main/resources/migration/workingDb/3.905-1-insert-ports.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/h2/3.905-0-update-model.sql copy echobase-domain/src/main/resources/migration/workingDb/{3.901-0-clean-importLog-table.sql => h2/3.905-2-migrate-voyage-ports.sql} (67%) create mode 100644 echobase-domain/src/main/resources/migration/workingDb/pg/3.905-0-update-model.sql copy echobase-domain/src/main/resources/migration/workingDb/{3.901-0-clean-importLog-table.sql => pg/3.905-2-migrate-voyage-ports.sql} (55%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/GearCharacteristicValuesImportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/GearCharacteristicValuesImportRow.java copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/{ImportTable.java => ImportGearCharacteristics.java} (78%) create mode 100755 echobase-ui/src/main/resources/embedded/update-echobase.sh create mode 100644 src/doc/reunions/reunion_2016-06-16.md -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.