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

branch release/4.0-alpha-3 created (now 907cfc4)
by codelutin.com scm 20 Jun '16

20 Jun '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0-alpha-3 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git at 907cfc4 [jgitflow-maven-plugin]updating poms for 4.0-alpha-3 branch with snapshot versions This branch includes the following new commits: new 907cfc4 [jgitflow-maven-plugin]updating poms for 4.0-alpha-3 branch with snapshot versions 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 907cfc479eeabae7ee9ca4338e460c480faf3c75 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jun 20 13:27:31 2016 +0200 [jgitflow-maven-plugin]updating poms for 4.0-alpha-3 branch with snapshot versions -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (aa9a6ec -> 4de4f43)
by codelutin.com scm 20 Jun '16

20 Jun '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 aa9a6ec [jgitflow-maven-plugin]Updating develop poms back to pre merge state new a46492a Fix type no usefull refs #8353 new 00bc763 Fix column name refs #8353 new 4de4f43 Add forget callback for migration refs #8353 The 3 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 4de4f430edca3fcecd9f631e3d0a81c0f9e81aec Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 20 13:24:49 2016 +0200 Add forget callback for migration refs #8353 commit 00bc76376cb81bf7f4356986ee0b5d146b4fce1c Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 20 13:24:20 2016 +0200 Fix column name refs #8353 commit a46492a0460610806a4589e984cfc6b3af0aff83 Author: Julien Ruchaud <julien.ruchaud(a)debux.org> Date: Mon Jun 20 13:24:00 2016 +0200 Fix type no usefull refs #8353 Summary of changes: ...903.java => WorkingDbMigrationCallBackForVersion3_902.java} | 10 ++++------ .../resources/migration/workingDb/pg/3.900-0-fix-types.sql | 4 ++-- .../workingDb/pg/3.901-1-upgrade-importFile-table.sql | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{WorkingDbMigrationCallBackForVersion3_903.java => WorkingDbMigrationCallBackForVersion3_902.java} (84%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch release/4.0-alpha-2 deleted (was 297e5af)
by codelutin.com scm 20 Jun '16

20 Jun '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0-alpha-2 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git was 297e5af [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-2' with non-snapshot versions The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

annotated tag echobase-4.0-alpha-2 created (now 70405f0)
by codelutin.com scm 20 Jun '16

20 Jun '16

This is an automated email from the git hooks/post-receive script. New change to annotated tag echobase-4.0-alpha-2 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git at 70405f0 (tag) tagging 09f06f66e36281e9d469d11f046a846d62a4961a (commit) replaces echobase-4.0-alpha-1 tagged by Maven Release on Mon Jun 20 12:15:51 2016 +0200 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.0-alpha-2 ----------------------------------------------------------------------- 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-2 updated (2979db7 -> 297e5af)
by codelutin.com scm 20 Jun '16

20 Jun '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0-alpha-2 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 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 No new revisions were added by this update. Summary of changes: echobase-domain/pom.xml | 2 +- .../WorkingDbMigrationCallBackForVersion3_905.java | 21 +++++++++++++++++++++ .../migration/workingDb/3.905-1-insert-ports.sql | 20 ++++++++++++++++++++ .../migration/workingDb/h2/3.905-0-update-model.sql | 20 ++++++++++++++++++++ .../workingDb/h2/3.905-2-migrate-voyage-ports.sql | 20 ++++++++++++++++++++ .../migration/workingDb/pg/3.905-0-update-model.sql | 20 ++++++++++++++++++++ .../workingDb/pg/3.905-2-migrate-voyage-ports.sql | 20 ++++++++++++++++++++ echobase-services/pom.xml | 2 +- .../GearCharacteristicValuesImportModel.java | 21 +++++++++++++++++++++ .../importdb/GearCharacteristicValuesImportRow.java | 21 +++++++++++++++++++++ echobase-ui/pom.xml | 2 +- .../actions/dbeditor/ImportGearCharacteristics.java | 21 +++++++++++++++++++++ pom.xml | 2 +- 13 files changed, 188 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (de0e522 -> aa9a6ec)
by codelutin.com scm 20 Jun '16

20 Jun '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 de0e522 [jgitflow-maven-plugin]updating poms for 4.0-SNAPSHOT development new b3a6311 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 2979db7 [jgitflow-maven-plugin]updating poms for 4.0-alpha-2 branch with snapshot versions new 320d3d0 Fix license headers new 297e5af [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-2' with non-snapshot versions new 09f06f6 [jgitflow-maven-plugin]merging 'release/4.0-alpha-2' into 'master' new 9534a3d [jgitflow-maven-plugin]merging 'master' into 'develop' new aa9a6ec [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 aa9a6ec21e00f4398be0880fb0091847c29e26c6 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jun 20 12:15:55 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 9534a3ddcece86e2ffa22873340e13b8789d75d1 Merge: b3a6311 09f06f6 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jun 20 12:15:54 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit b3a63112e81155e0c7b6fe8dfc2ff9b973f9632d Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jun 20 12:15:54 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 09f06f66e36281e9d469d11f046a846d62a4961a Merge: 1e14261 297e5af Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jun 20 12:15:51 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.0-alpha-2' into 'master' commit 297e5af9da179f61f3e0927542f975bdf686244d Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jun 20 12:12:37 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-2' with non-snapshot versions commit 320d3d0f1b78ab02f4275fbbe10c2a66280bb5cc Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jun 20 12:12:21 2016 +0200 Fix license headers Summary of changes: .../WorkingDbMigrationCallBackForVersion3_905.java | 21 +++++++++++++++++++++ .../migration/workingDb/3.905-1-insert-ports.sql | 20 ++++++++++++++++++++ .../migration/workingDb/h2/3.905-0-update-model.sql | 20 ++++++++++++++++++++ .../workingDb/h2/3.905-2-migrate-voyage-ports.sql | 20 ++++++++++++++++++++ .../migration/workingDb/pg/3.905-0-update-model.sql | 20 ++++++++++++++++++++ .../workingDb/pg/3.905-2-migrate-voyage-ports.sql | 20 ++++++++++++++++++++ .../GearCharacteristicValuesImportModel.java | 21 +++++++++++++++++++++ .../importdb/GearCharacteristicValuesImportRow.java | 21 +++++++++++++++++++++ .../actions/dbeditor/ImportGearCharacteristics.java | 21 +++++++++++++++++++++ 9 files changed, 184 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

branch master updated (1e14261 -> 09f06f6)
by codelutin.com scm 20 Jun '16

20 Jun '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 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(a)codelutin.com>.

1 0

[ANN] - EchoBase 4.0-alpha-2 released
by codelutin.com Release Notification 20 Jun '16

20 Jun '16

The EchoBase team is pleased to announce the echobase-4.0-alpha-2 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 Ajouter le numéro de radiale lors de l'import acoustique Issue: 8222. Thanks to Tony Chemit. Resolved by tchemit. o Adaptation du modèle EchoBase depuis le modèle Atlantlos Issue: 8171. Thanks to Tony Chemit. Resolved by tchemit. o Améliorer la procédure de mise à jour de l'application Issue: 8175. Thanks to Tony Chemit. Resolved by tchemit. o Permettre d'ajouter des caractéritstiques à un engin Issue: 8181. 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-2.zip - https://forge.codelutin.com/attachments/download/3968 * echobase-referentiel-4.0-alpha-2.echobase - https://forge.codelutin.com/attachments/download/3969 * echobase-ui-4.0-alpha-2-full.war - https://forge.codelutin.com/attachments/download/3970 * echobase-ui-4.0-alpha-2-lizmap.zip - https://forge.codelutin.com/attachments/download/3971 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-2 created (now 2979db7)
by codelutin.com scm 20 Jun '16

20 Jun '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0-alpha-2 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git at 2979db7 [jgitflow-maven-plugin]updating poms for 4.0-alpha-2 branch with snapshot versions This branch includes the following new commits: new 2979db7 [jgitflow-maven-plugin]updating poms for 4.0-alpha-2 branch with snapshot versions 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 2979db76d60217292221a72a8965183f1d732867 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jun 20 12:05:07 2016 +0200 [jgitflow-maven-plugin]updating poms for 4.0-alpha-2 branch with snapshot versions -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (831ccc5 -> de0e522)
by codelutin.com scm 20 Jun '16

20 Jun '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 831ccc5 Modify topia version new de0e522 [jgitflow-maven-plugin]updating poms for 4.0-SNAPSHOT development 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 de0e522e4e99b46bad8087cac4b31cddf15d6a0e Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jun 20 12:05:31 2016 +0200 [jgitflow-maven-plugin]updating poms for 4.0-SNAPSHOT development Summary of changes: pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1