April 2021 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][release/8.0.10] [jgitflow-maven-plugin]updating poms for branch'release/8.0.10' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) April 16, 2021

April 16, 2021

Tony CHEMIT pushed to branch release/8.0.10 at ultreiaio / ird-observe Commits: ecf60e15 by Tony Chemit at 2021-04-16T13:10:38+02:00 [jgitflow-maven-plugin]updating poms for branch'release/8.0.10' with non-snapshot versions[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/api/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/i18n/pom.xml - client/pom.xml - client/runner/pom.xml - models/dto/definition/pom.xml - models/dto/java/pom.xml - models/dto/pom.xml - models/persistence/definition/pom.xml - models/persistence/java/pom.xml - models/persistence/migration/pom.xml - models/persistence/pom.xml - models/pom.xml - observe/pom.xml - pom.xml - server/configuration/pom.xml - server/core/pom.xml - server/i18n/pom.xml - server/pom.xml - server/runner/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ecf60e158016c467ccbe06922… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ecf60e158016c467ccbe06922… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master] 9 commits: [jgitflow-maven-plugin]updating poms for 8.0.10-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) April 16, 2021

April 16, 2021

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: 072030de by Tony Chemit at 2021-03-24T09:18:58+01:00 [jgitflow-maven-plugin]updating poms for 8.0.10-SNAPSHOT development[skip ci] - - - - - 5ad5bcc0 by Tony Chemit at 2021-03-24T09:40:21+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - ba10ed11 by Tony Chemit at 2021-03-24T09:40:22+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 79e95697 by Tony Chemit at 2021-03-24T09:40:22+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - a8f9598c by Tony Chemit at 2021-04-16T12:58:31+02:00 postgresql/update.sh ne démarre pas - Closes #1823 - - - - - a9de6914 by Tony Chemit at 2021-04-16T12:58:36+02:00 do not run validation tests by default - - - - - db3bdb1a by Tony Chemit at 2021-04-16T13:09:10+02:00 update CHANGELOG [skip ci] - - - - - ecf60e15 by Tony Chemit at 2021-04-16T13:10:38+02:00 [jgitflow-maven-plugin]updating poms for branch'release/8.0.10' with non-snapshot versions[skip ci] - - - - - ec1f93c7 by Tony Chemit at 2021-04-16T13:27:10+02:00 [jgitflow-maven-plugin]merging 'release/8.0.10' into 'master' - - - - - 30 changed files: - CHANGELOG.md - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/api/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/i18n/pom.xml - client/pom.xml - client/runner/pom.xml - client/runner/src/main/assembly/dist/go.sh - client/runner/src/main/assembly/dist/scripts/postgresql/create.bat - client/runner/src/main/assembly/dist/scripts/postgresql/create.sh - client/runner/src/main/assembly/dist/scripts/postgresql/createdb/create-empty-obstuna.sh - client/runner/src/main/assembly/dist/scripts/postgresql/createdb/create-ird_obstuna.sh - client/runner/src/main/assembly/dist/scripts/postgresql/createdb/create-test_obstuna.sh - client/runner/src/main/assembly/dist/scripts/postgresql/drop.bat - client/runner/src/main/assembly/dist/scripts/postgresql/drop.sh - client/runner/src/main/assembly/dist/scripts/postgresql/update-security.bat - client/runner/src/main/assembly/dist/scripts/postgresql/update-security.sh - client/runner/src/main/assembly/dist/scripts/postgresql/update.bat - client/runner/src/main/assembly/dist/scripts/postgresql/update.sh - client/runner/src/main/assembly/dist/scripts/server/create.sh - client/runner/src/main/assembly/dist/scripts/server/drop.sh The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8a17f6a8d4534addedf97054… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8a17f6a8d4534addedf97054… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/8.0.10' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) April 16, 2021

April 16, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ecf60e15 by Tony Chemit at 2021-04-16T13:10:38+02:00 [jgitflow-maven-plugin]updating poms for branch'release/8.0.10' with non-snapshot versions[skip ci] - - - - - ec1f93c7 by Tony Chemit at 2021-04-16T13:27:10+02:00 [jgitflow-maven-plugin]merging 'release/8.0.10' into 'master' - - - - - f4776a97 by Tony Chemit at 2021-04-16T13:27:13+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 3bbbbf6d by Tony Chemit at 2021-04-16T13:27:14+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 11dfa5dc by Tony Chemit at 2021-04-16T13:27:15+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/237229b51c7510197b5a5f50… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/237229b51c7510197b5a5f50… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/8.0.10
by Tony CHEMIT (＠tchemit) April 16, 2021

April 16, 2021

Tony CHEMIT pushed new branch release/8.0.10 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/release/8.0.10 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 8.0.11-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) April 16, 2021

April 16, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 237229b5 by Tony Chemit at 2021-04-16T13:09:55+02:00 [jgitflow-maven-plugin]updating poms for 8.0.11-SNAPSHOT development[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/api/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/i18n/pom.xml - client/pom.xml - client/runner/pom.xml - models/dto/definition/pom.xml - models/dto/java/pom.xml - models/dto/pom.xml - models/persistence/definition/pom.xml - models/persistence/java/pom.xml - models/persistence/migration/pom.xml - models/persistence/pom.xml - models/pom.xml - observe/pom.xml - pom.xml - server/configuration/pom.xml - server/core/pom.xml - server/i18n/pom.xml - server/pom.xml - server/runner/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/237229b51c7510197b5a5f509… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/237229b51c7510197b5a5f509… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update CHANGELOG [skip ci]
by Tony CHEMIT (＠tchemit) April 16, 2021

April 16, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: db3bdb1a by Tony Chemit at 2021-04-16T13:09:10+02:00 update CHANGELOG [skip ci] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,36 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2021-03-24 09:08. + * Last generated at 2021-04-16 13:09. + +## Version [9.0.0-RC-1](https://gitlab.com/ultreiaio/ird-observe/-/milestones/181) + +**Closed at 2021-03-27.** + + +### Issues + * [[Evolution 1250]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1250) **Ré usinage du formulaire marée PS et des sous-formulaires associés - Organisation hiérarchique des données senne** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 1252]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1252) **Réorganisation des données d’observation PS - Re localisation dans la hiérarchie** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 1254]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1254) **Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 1594]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1594) **Deplacer le réferentiel WeightCategory vers le schema ps_logbook** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 1603]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1603) **[PS][logbooks] Liste de référence des systèmes observés à utiliser** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1803]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1803) **Ajout des référentiels PS_LOGBOOK** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Evolution 1805]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1805) **Ajout des référentiels PS_LANDING** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 1806]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1806) **Ajout des référentiels PS_LOCALMARKET** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 1808]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1808) **Ajout des données PS_LOGBOOK** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 1809]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1809) **Ajout des données PS_LANDING** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 1810]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1810) **Ajout des données PS_LOCALMARKET** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 1812]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1812) **Modification des données PS_OBSERVATION** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 1813]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1813) **Modification du formulaire Trip** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + +## Version [8.0.10](https://gitlab.com/ultreiaio/ird-observe/-/milestones/187) + +**Closed at 2021-04-16.** + + +### Issues + * [[Anomalie 1822]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1822) **Bouton 'Enregistrer' désactivé alors qu'il devrait être activé** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1823]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1823) **postgresql/update.sh ne démarre pas** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) ## Version [8.0.9](https://gitlab.com/ultreiaio/ird-observe/-/milestones/185) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/db3bdb1a50d82d8300f571bff… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/db3bdb1a50d82d8300f571bff… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: postgresql/update.sh ne démarre pas - Closes #1823
by Tony CHEMIT (＠tchemit) April 16, 2021

April 16, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a8f9598c by Tony Chemit at 2021-04-16T12:58:31+02:00 postgresql/update.sh ne démarre pas - Closes #1823 - - - - - a9de6914 by Tony Chemit at 2021-04-16T12:58:36+02:00 do not run validation tests by default - - - - - 21 changed files: - client/runner/src/main/assembly/dist/go.sh - client/runner/src/main/assembly/dist/scripts/postgresql/create.bat - client/runner/src/main/assembly/dist/scripts/postgresql/create.sh - client/runner/src/main/assembly/dist/scripts/postgresql/createdb/create-empty-obstuna.sh - client/runner/src/main/assembly/dist/scripts/postgresql/createdb/create-ird_obstuna.sh - client/runner/src/main/assembly/dist/scripts/postgresql/createdb/create-test_obstuna.sh - client/runner/src/main/assembly/dist/scripts/postgresql/drop.bat - client/runner/src/main/assembly/dist/scripts/postgresql/drop.sh - client/runner/src/main/assembly/dist/scripts/postgresql/update-security.bat - client/runner/src/main/assembly/dist/scripts/postgresql/update-security.sh - client/runner/src/main/assembly/dist/scripts/postgresql/update.bat - client/runner/src/main/assembly/dist/scripts/postgresql/update.sh - client/runner/src/main/assembly/dist/scripts/server/create.sh - client/runner/src/main/assembly/dist/scripts/server/drop.sh - client/runner/src/main/assembly/dist/scripts/server/update-security.sh - client/runner/src/main/assembly/dist/scripts/server/update.sh - client/runner/src/main/assembly/dist/util/backup-obstuna.sh - client/runner/src/main/assembly/dist/util/create-postgis.sh - client/runner/src/main/assembly/dist/util/generate-id.sh - + services/validation/.mvn/skip-default-test - services/validation/pom.xml Changes: ===================================== client/runner/src/main/assembly/dist/go.sh ===================================== @@ -1,3 +1,4 @@ +#!/bin/sh ### # #%L # ObServe :: Admin Client @@ -22,6 +23,5 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -#!/bin/sh java -jar ${applicationJarName}.jar "$@" \ No newline at end of file ===================================== client/runner/src/main/assembly/dist/scripts/postgresql/create.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx512M -Xms512M -jar ../../${applicationJarName}.jar --obstuna-admin create \ No newline at end of file +java -Xmx512M -Xms512M -jar ../../${applicationJarName}.jar --remote-admin create \ No newline at end of file ===================================== client/runner/src/main/assembly/dist/scripts/postgresql/create.sh ===================================== @@ -1,3 +1,4 @@ +#!/bin/sh ### # #%L # ObServe :: Admin Client @@ -22,7 +23,6 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -#!/bin/sh # Pour créer une nouvelle base obstuna (le schéma sera créer et le référentiel rempli) -java -Xmx512M -Xms512M -jar ../../${applicationJarName}.jar --obstuna-admin create \ No newline at end of file +java -Xmx512M -Xms512M -jar ../../${applicationJarName}.jar --remote-admin create \ No newline at end of file ===================================== client/runner/src/main/assembly/dist/scripts/postgresql/createdb/create-empty-obstuna.sh ===================================== @@ -1,3 +1,4 @@ +#!/bin/sh ### # #%L # ObServe :: Admin Client @@ -22,7 +23,6 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -#!/bin/sh # # script pour creer une base obstuna en v2. ===================================== client/runner/src/main/assembly/dist/scripts/postgresql/createdb/create-ird_obstuna.sh ===================================== @@ -1,3 +1,4 @@ +#!/bin/sh ### # #%L # ObServe :: Admin Client @@ -22,7 +23,6 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -#!/bin/sh # # Pour créer la base obstuna de l'ird ===================================== client/runner/src/main/assembly/dist/scripts/postgresql/createdb/create-test_obstuna.sh ===================================== @@ -1,3 +1,4 @@ +#!/bin/sh ### # #%L # ObServe :: Admin Client @@ -22,7 +23,6 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -#!/bin/sh # # Pour créer la base de test obstuna utilisés dans les tests d'intégration. ===================================== client/runner/src/main/assembly/dist/scripts/postgresql/drop.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx512M -Xms512M -jar ../../${applicationJarName}.jar --obstuna-admin drop \ No newline at end of file +java -Xmx512M -Xms512M -jar ../../${applicationJarName}.jar --remote-admin drop \ No newline at end of file ===================================== client/runner/src/main/assembly/dist/scripts/postgresql/drop.sh ===================================== @@ -1,3 +1,4 @@ +#!/bin/sh ### # #%L # ObServe :: Admin Client @@ -22,7 +23,6 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -#!/bin/sh # Pour vider une base obstuna (toutes les tables seront supprimées) -java -Xmx512M -Xms512M -jar ../../${applicationJarName}.jar --obstuna-admin drop \ No newline at end of file +java -Xmx512M -Xms512M -jar ../../${applicationJarName}.jar --remote-admin drop \ No newline at end of file ===================================== client/runner/src/main/assembly/dist/scripts/postgresql/update-security.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx512M -Xms512M -jar ../../${applicationJarName}.jar --obstuna-admin security \ No newline at end of file +java -Xmx512M -Xms512M -jar ../../${applicationJarName}.jar --remote-admin security \ No newline at end of file ===================================== client/runner/src/main/assembly/dist/scripts/postgresql/update-security.sh ===================================== @@ -1,3 +1,4 @@ +#!/bin/sh ### # #%L # ObServe :: Admin Client @@ -25,4 +26,4 @@ #!/bin/sh # Pour mettre à jour la sécurité sur une base postgres -java -Xmx512M -Xms512M -jar ../../${applicationJarName}.jar --obstuna-admin security \ No newline at end of file +java -Xmx512M -Xms512M -jar ../../${applicationJarName}.jar --remote-admin security \ No newline at end of file ===================================== client/runner/src/main/assembly/dist/scripts/postgresql/update.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx2048M -Xms512M -jar ../../${applicationJarName}.jar --obstuna-admin update \ No newline at end of file +java -Xmx2048M -Xms512M -jar ../../${applicationJarName}.jar --remote-admin update \ No newline at end of file ===================================== client/runner/src/main/assembly/dist/scripts/postgresql/update.sh ===================================== @@ -1,3 +1,4 @@ +#!/bin/sh ### # #%L # ObServe :: Admin Client @@ -22,7 +23,6 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -#!/bin/sh # Pour mettre à jour une base obstuna (le schéma sera mis à jour si nécessaire) -java -Xmx1536M -Xms512M -jar ../../${applicationJarName}.jar --obstuna-admin update \ No newline at end of file +java -Xmx1536M -Xms512M -jar ../../${applicationJarName}.jar --remote-admin update \ No newline at end of file ===================================== client/runner/src/main/assembly/dist/scripts/server/create.sh ===================================== @@ -1,3 +1,4 @@ +#!/bin/sh ### # #%L # ObServe :: Admin Client @@ -22,7 +23,6 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -#!/bin/sh # Pour créer une nouvelle base obstuna (le schéma sera créer et le référentiel rempli) java -Xmx512M -Xms512M -jar ../../${applicationJarName}.jar --server-admin create \ No newline at end of file ===================================== client/runner/src/main/assembly/dist/scripts/server/drop.sh ===================================== @@ -1,3 +1,4 @@ +#!/bin/sh ### # #%L # ObServe :: Admin Client @@ -22,7 +23,6 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -#!/bin/sh # Pour vider une base obstuna (toutes les tables seront supprimées) java -Xmx512M -Xms512M -jar ../../${applicationJarName}.jar --server-admin drop \ No newline at end of file ===================================== client/runner/src/main/assembly/dist/scripts/server/update-security.sh ===================================== @@ -1,3 +1,4 @@ +#!/bin/sh ### # #%L # ObServe :: Admin Client @@ -22,7 +23,6 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -#!/bin/sh # Pour mettre à jour la sécurité sur une base postgres java -Xmx512M -Xms512M -jar ../../${applicationJarName}.jar --server-admin security \ No newline at end of file ===================================== client/runner/src/main/assembly/dist/scripts/server/update.sh ===================================== @@ -1,3 +1,4 @@ +#!/bin/sh ### # #%L # ObServe :: Admin Client @@ -22,7 +23,6 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -#!/bin/sh # Pour mettre à jour une base server (le schéma sera mis à jour si nécessaire) java -Xmx1536M -Xms512M -jar ../../${applicationJarName}.jar --server-admin update \ No newline at end of file ===================================== client/runner/src/main/assembly/dist/util/backup-obstuna.sh ===================================== @@ -1,3 +1,4 @@ +#!/bin/sh ### # #%L # ObServe :: Admin Client @@ -22,7 +23,6 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -#!/bin/sh # # script pour faire une backup d'obstuna. ===================================== client/runner/src/main/assembly/dist/util/create-postgis.sh ===================================== @@ -1,3 +1,4 @@ +#!/bin/sh ### # #%L # ObServe :: Admin Client ===================================== client/runner/src/main/assembly/dist/util/generate-id.sh ===================================== @@ -1,3 +1,4 @@ +#!/bin/sh ### # #%L # ObServe :: Admin Client @@ -23,6 +24,5 @@ # #L% ### -#!/bin/sh # Pour générer des topia ids java -Xmx512M -Xms512M -jar ../../${applicationJarName}.jar --create-id $1 $2 \ No newline at end of file ===================================== services/validation/.mvn/skip-default-test ===================================== ===================================== services/validation/pom.xml ===================================== @@ -182,4 +182,32 @@ </plugins> </build> + <profiles> + <profile> + <id>deploy</id> + <activation> + <property> + <name>run-tests</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <executions> + <execution> + <id>default-test</id> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>false</skip> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/79e956973e24ddf89264a7b7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/79e956973e24ddf89264a7b7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 10 commits: update pom
by Tony CHEMIT (＠tchemit) April 15, 2021

April 15, 2021

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: c30dea02 by Tony Chemit at 2021-04-13T14:09:22+02:00 update pom - - - - - 6f7099ce by Tony Chemit at 2021-04-13T14:09:22+02:00 Introduce models-navigation modules - - - - - 9bca6b7e by Tony Chemit at 2021-04-13T14:09:22+02:00 try to fix gitlab ci build - - - - - e62e8d00 by Tony Chemit at 2021-04-14T12:25:36+02:00 Improve decorators: now can use the dto one for his entity :) Still improve the new Navigation API. - - - - - 8a1688bb by Tony Chemit at 2021-04-14T20:29:24+02:00 Introduce models-navigation modules - - - - - 80fed944 by Tony Chemit at 2021-04-14T20:29:38+02:00 Fix on icon path - - - - - 2c8c51f2 by Tony Chemit at 2021-04-15T15:10:54+02:00 Use now new Selection tree using generated selection tree API. - - - - - eab31f1a by Tony Chemit at 2021-04-15T15:27:01+02:00 Use now new Selection tree using generated selection tree API. - - - - - d593a167 by Tony Chemit at 2021-04-15T15:57:30+02:00 Use now new Selection tree using generated selection tree API. - - - - - 9b7ccba8 by Tony Chemit at 2021-04-15T20:20:17+02:00 Use now new Selection tree using generated selection tree API. - - - - - 30 changed files: - client/configuration/pom.xml - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesFilter.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesFilterHelper.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - − client/core/src/main/resources/icons/checkBox.png - − client/core/src/main/resources/icons/checkBoxIndeterminateSelected.png - − client/core/src/main/resources/icons/checkBoxSelected.png - client/core/src/main/resources/observe-ui.properties - client/datasource/actions/pom.xml - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/DataManager.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/actions/SelectData.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/export/TripEntry.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/export/actions/Prepare.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/actions/ActivityLlPairingUIActionSupport.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/actions/Prepare.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/tree/node/ActivityPairingProgramNode.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/actions/Apply.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/task/CopyToLeftDataSynchronizeTask.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/task/CopyToRightDataSynchronizeTask.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f9246046c9fbba60b8473186… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f9246046c9fbba60b8473186… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] Introduce models-navigation modules
by Tony CHEMIT (＠tchemit) April 12, 2021

April 12, 2021

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: f9246046 by Tony Chemit at 2021-04-12T18:09:24+02:00 Introduce models-navigation modules - - - - - 3 changed files: - models/dto/java/src/main/java/fr/ird/observe/spi/module/ObserveBusinessModule.java - models/persistence/java/src/main/i18n/getters/java.getter - models/persistence/java/src/main/java/fr/ird/observe/entities/tree/TreeBuilderSupport.java Changes: ===================================== models/dto/java/src/main/java/fr/ird/observe/spi/module/ObserveBusinessModule.java ===================================== @@ -42,6 +42,10 @@ public interface ObserveBusinessModule { return gearType != null && Objects.equals(gearType, program.getGearType()); } + default boolean accept(GearType gearType) { + return Objects.equals(getGearType(), gearType); + } + /** * @return accepted gear type for this module ({@code null} value means does not use gear type). */ ===================================== models/persistence/java/src/main/i18n/getters/java.getter ===================================== @@ -1,3 +1,4 @@ +observe.data.Data.program observe.error.DuplicateLengthWeightParameterException observe.error.LengthLengthParameterNotFoundException observe.error.LengthWeightParameterNotFoundException ===================================== models/persistence/java/src/main/java/fr/ird/observe/entities/tree/TreeBuilderSupport.java ===================================== @@ -22,10 +22,8 @@ package fr.ird.observe.entities.tree; * #L% */ -import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Maps; import fr.ird.observe.dto.data.ps.common.TripReference; import fr.ird.observe.dto.decoration.DecoratorServiceSupport; import fr.ird.observe.dto.referential.ReferentialDto; @@ -33,6 +31,7 @@ import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.dto.referential.common.PersonReference; import fr.ird.observe.dto.referential.common.ProgramReference; import fr.ird.observe.dto.referential.common.VesselReference; +import fr.ird.observe.entities.Entity; import fr.ird.observe.entities.ObserveTopiaPersistenceContextSupport; import fr.ird.observe.entities.referential.common.Person; import fr.ird.observe.entities.referential.common.Program; @@ -44,6 +43,7 @@ import fr.ird.observe.spi.module.ObserveBusinessProject; import fr.ird.observe.spi.module.ps.BusinessModule; import fr.ird.observe.tree.ToolkitTreeNode; import fr.ird.observe.tree.ToolkitTreeNodeBean; +import fr.ird.observe.tree.ToolkitTreeNodeBuildChildrenInterceptor; import fr.ird.observe.tree.io.ToolkitTreeFlatModel; import fr.ird.observe.tree.io.ToolkitTreeFlatModelRootRequest; import fr.ird.observe.tree.io.ToolkitTreeFlatModelWriter; @@ -57,6 +57,8 @@ import java.util.Map; import java.util.TreeMap; import java.util.stream.Collectors; +import static io.ultreia.java4all.i18n.I18n.t; + /** * Created on 12/04/2021. * @@ -95,40 +97,35 @@ class TreeBuilderSupport implements WithPermission { fr.ird.observe.spi.module.ll.BusinessModule llBusinessModule = project.getLlBusinessModule(); boolean acceptPsModule = request.acceptedModule(psBusinessModule); boolean acceptLlModule = request.acceptedModule(llBusinessModule); - List<ProgramReference> programList = Program.toReferenceSet(referentialLocale, Program.getDao(persistenceContext).getProgramList(request, tripCountByProgram, acceptPsModule, acceptLlModule).stream(), now).toList(); - programById = Maps.uniqueIndex(programList, ProgramReference::getId); + List<Program> programList = Program.getDao(persistenceContext).getProgramList(request, tripCountByProgram, acceptPsModule, acceptLlModule); + programById = Program.uniqueIndex(referentialLocale, persistenceContext); personById = Person.uniqueIndex(referentialLocale, persistenceContext); vesselById = Vessel.uniqueIndex(referentialLocale, persistenceContext); - decoratorService.installDecorator(ProgramReference.class, programList.stream()); if (acceptPsModule) { - List<ProgramReference> psProgramList = programList.stream().filter(psBusinessModule::accept).collect(Collectors.toList()); + List<Program> psProgramList = programList.stream().filter(p -> psBusinessModule.accept(p.getGearType())).collect(Collectors.toList()); log.info(String.format("Found %d PS program(s).", psProgramList.size())); - for (ProgramReference program : psProgramList) { - builder.addReference("ps:", program).put("$$tripCount", tripCountByProgram.get(program.getId())); + for (Program program : psProgramList) { + String id = program.getTopiaId(); + addEntity(builder, "ps:", program).put("$$tripCount", tripCountByProgram.get(id)); if (loadTrip) { - ArrayListMultimap<String, TripReference> psTripByProgram = ArrayListMultimap.create(); - List<TripReference> trips = fr.ird.observe.entities.data.ps.common.Trip.SPI.getDao(persistenceContext).getChildren(referentialLocale, program.getId(), programById, personById, vesselById); - trips.forEach(t -> psTripByProgram.put(t.getProgram().getId(), t)); + List<TripReference> trips = fr.ird.observe.entities.data.ps.common.Trip.SPI.getDao(persistenceContext).getChildren(referentialLocale, id, programById, personById, vesselById); decoratorService.installDecorator(TripReference.class, trips.stream()); - String prefix = "ps:" + program.getId(); - List<TripReference> tripList = psTripByProgram.get(program.getId()); - tripList.forEach(r -> builder.addReference(prefix, r)); + String prefix = "ps:" + id; + trips.forEach(r -> builder.addReference(prefix, r)); } } } if (acceptLlModule) { - List<ProgramReference> llProgramList = programList.stream().filter(llBusinessModule::accept).collect(Collectors.toList()); + List<Program> llProgramList = programList.stream().filter(p -> llBusinessModule.accept(p.getGearType())).collect(Collectors.toList()); log.info(String.format("Found %d LL program(s).", llProgramList.size())); - for (ProgramReference program : llProgramList) { - builder.addReference("ll:", program).put("$$tripCount", tripCountByProgram.get(program.getId())); + for (Program program : llProgramList) { + String id = program.getTopiaId(); + addEntity(builder, "ll:", program).put("$$tripCount", tripCountByProgram.get(id)); if (loadTrip) { - ArrayListMultimap<String, fr.ird.observe.dto.data.ll.common.TripReference> llTripByProgram = ArrayListMultimap.create(); - List<fr.ird.observe.dto.data.ll.common.TripReference> trips = fr.ird.observe.entities.data.ll.common.Trip.SPI.getDao(persistenceContext).getChildren(referentialLocale, program.getId(), programById, personById, vesselById); + List<fr.ird.observe.dto.data.ll.common.TripReference> trips = fr.ird.observe.entities.data.ll.common.Trip.SPI.getDao(persistenceContext).getChildren(referentialLocale, id, programById, personById, vesselById); decoratorService.installDecorator(fr.ird.observe.dto.data.ll.common.TripReference.class, trips.stream()); - trips.forEach(t -> llTripByProgram.put(t.getProgram().getId(), t)); - String prefix = "ll:" + program.getId(); - List<fr.ird.observe.dto.data.ll.common.TripReference> tripList = llTripByProgram.get(program.getId()); - tripList.forEach(r -> builder.addReference(prefix, r)); + String prefix = "ll:" + id; + trips.forEach(r -> builder.addReference(prefix, r)); } } } @@ -143,6 +140,13 @@ class TreeBuilderSupport implements WithPermission { return builder.build(); } + + public Map<String, Object> addEntity(ToolkitTreeFlatModelWriter builder, String prefix, Entity entity) { + Map<String, Object> states = builder.addShortId(prefix, entity.getTopiaId(), entity.getLastUpdateDate()); + states.put(ToolkitTreeNodeBuildChildrenInterceptor.$$_DATA, entity); + return states; + } + protected Long countReferential(Class<? extends ReferentialDto> dtoType) { return PersistenceBusinessProject.fromReferentialDto(dtoType).getDao(persistenceContext).count(); } @@ -156,15 +160,16 @@ class TreeBuilderSupport implements WithPermission { protected void interceptProgram(ToolkitTreeNode node) { ToolkitTreeNodeBean userObject = node.getUserObject(); - ProgramReference reference = userObject.popState("$$reference"); - userObject.copy(reference.toShortDto()); + Program entity = userObject.popState(ToolkitTreeNodeBuildChildrenInterceptor.$$_DATA); Integer tripCount = userObject.popState("$$tripCount"); - userObject.addState(ToolkitTreeNodeBean.STATE_TEXT, reference.getLongLabel()); + String label = String.format("[%s] %s %s", entity.getGearType().getPrefix(), t("observe.data.Data.program"), entity.getLabel(referentialLocale)); + userObject.addState(ToolkitTreeNodeBean.STATE_TEXT, label); userObject.addState(ToolkitTreeNodeBean.STATE_COUNT, tripCount == null ? 0 : tripCount); - userObject.addState(ToolkitTreeNodeBean.STATE_ENABLED, reference.isEnabled()); + userObject.addState(ToolkitTreeNodeBean.STATE_ENABLED, entity.isEnabled()); userObject.addState(ToolkitTreeNodeBean.STATE_EDITABLE, canWriteData()); } + @Override public final Permission getCredentials() { return permission.getCredentials(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f9246046c9fbba60b84731864… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f9246046c9fbba60b84731864… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 3 commits: Introduce models-navigation modules
by Tony CHEMIT (＠tchemit) April 12, 2021

April 12, 2021

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 57dbe28a by Tony Chemit at 2021-04-12T14:58:33+02:00 Introduce models-navigation modules - - - - - 9a5007fb by Tony Chemit at 2021-04-12T14:59:13+02:00 update pom - - - - - 8f4efa4c by Tony Chemit at 2021-04-12T16:36:30+02:00 try to fix gitlab ci build - - - - - 30 changed files: - − client/core/src/main/resources/icons/checkBox.png - − client/core/src/main/resources/icons/checkBoxIndeterminateSelected.png - − client/core/src/main/resources/icons/checkBoxSelected.png - client/core/src/main/resources/observe-ui.properties - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/SelectionTreeCellRenderer.java - client/i18n/src/main/i18n/translations/observe_en_GB.properties - client/i18n/src/main/i18n/translations/observe_es_ES.properties - client/i18n/src/main/i18n/translations/observe_fr_FR.properties - models/definition/pom.xml - models/dto/java/pom.xml - models/navigation/edit/pom.xml - models/navigation/edit/src/test/java/fr/ird/observe/navigation/edit/RootEditNodeTest.java - models/navigation/pom.xml - models/navigation/select/pom.xml - models/navigation/select/src/test/java/fr/ird/observe/navigation/select/RootSelectNodeTest.java - models/tree/README.md → models/navigation/tree/.mvn/i18n - models/tree/navigation/.mvn/pom.gitflow.develop → models/navigation/tree/.mvn/pom.gitflow.develop - models/tree/navigation/.mvn/pom.gitflow.master → models/navigation/tree/.mvn/pom.gitflow.master - models/tree/navigation/.mvn/pom.organizationId → models/navigation/tree/.mvn/pom.organizationId - models/tree/navigation/.mvn/pom.projectId → models/navigation/tree/.mvn/pom.projectId - models/tree/navigation/.mvn/pom.stageId → models/navigation/tree/.mvn/pom.stageId - models/tree/LICENSE.txt → models/navigation/tree/LICENSE.txt - models/tree/navigation/README.md → models/navigation/tree/README.md - models/tree/navigation/pom.xml → models/navigation/tree/pom.xml - models/tree/navigation/src/license/THIRD-PARTY.properties → models/navigation/tree/src/license/THIRD-PARTY.properties - + models/navigation/tree/src/main/i18n/getters/tree.getter - + models/navigation/tree/src/test/java/fr/ird/observe/tree/TreeFixtures.java - + models/navigation/tree/src/test/java/fr/ird/observe/tree/navigation/DtoToNavigationTreePathMappingTest.java - + models/navigation/tree/src/test/java/fr/ird/observe/tree/navigation/DtoToTreeNavigationNodeClassMappingTest.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/25672a0a86cc3601d2cf60ab… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/25672a0a86cc3601d2cf60ab… You're receiving this email because of your account on gitlab.com.

1 0