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

[Git][ultreiaio/ird-observe][develop] update pom
by Tony CHEMIT (＠tchemit) 04 Jul '24

04 Jul '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0a3d411f by Tony Chemit at 2024-07-04T14:11:43+02:00 update pom - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2024.28</version> + <version>2024.29</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> @@ -111,7 +111,6 @@  <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <lib.version.java4all.config>1.0.29</lib.version.java4all.config>  <plugin.version.site>4.0.0-M13</plugin.version.site> <lib.version.java4all.jaxx>3.0.25</lib.version.java4all.jaxx> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0a3d411f951b6da565355233f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0a3d411f951b6da565355233f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Un utilisateur Windows a toujours un souci avec les chemins lors du démarrage...
by Tony CHEMIT (＠tchemit) 04 Jul '24

04 Jul '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5fef6a5c by Tony Chemit at 2024-07-04T13:42:24+02:00 Un utilisateur Windows a toujours un souci avec les chemins lors du démarrage en 9.3.5 - Closes #2915 - - - - - 6f2e45f2 by Tony Chemit at 2024-07-04T13:42:24+02:00 update pom - - - - - 9c342c5e by Tony Chemit at 2024-07-04T13:42:24+02:00 Micro correction dans la doc du migrateur AVDTH - Closes #2916 - - - - - 66dc62e3 by Tony Chemit at 2024-07-04T14:04:59+02:00 Update changelog for v.9.3.6 [skip CI] - - - - - 5 changed files: - CHANGELOG.md - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - pom.xml - server/configuration/src/main/java/fr/ird/observe/server/configuration/ServerConfig.java - src/site/markdown/avdth/referential.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,18 +1,17 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2024-06-27 13:24. + * Last generated at 2024-07-03 16:10. ## Version [9.3.6](https://gitlab.com/ultreiaio/ird-observe/-/milestones/283) -**Closed at 2024-06-27.** +**Closed at 2024-07-03.** ### Download * [Client (observe-9.3.6-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) * [Serveur (observe-9.3.6.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9…) * [Serveur (observe-9.3.6-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) - ### Issues * [[Type::Anomalie 2887]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2887) **En synchro avancée de données, la modification de la configuration des arbres de navigation ne fonctionne plus** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2889]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2889) **Les transcodages ASSOC ne sont plus totalement respectés par l'importeur AVDTH** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) @@ -20,14 +19,17 @@ * [[Type::Anomalie 2891]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2891) **L'utilisation du bouton de création d'un FOB brut (sans présélection) ne fonctionne plus en mode serveur** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2896]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2896) **Une règle de migration AVDTH ASSOC non respectée** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2899]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2899) **Amélioration du code de mise à jour sql pour les associations lors de remplacement de référentiel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2915]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2915) **Un utilisateur Windows a toujours un souci avec les chemins lors du démarrage en 9.3.5** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2888]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2888) **En synchro avancée de données, amélioration de la gestion des droits des bases utilisées** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2892]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2892) **Empêcher l 'assistant synchro données avancées de poursuivre si les 2 bases n'ont pas un droit saisisseur au minimum** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) * [[Type::Evolution 2905]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2905) **Sur le formulaire Schéma détaillé de palangre, onglet "Composition", tableau "Paniers", préciser l'unité dans les en-têtes des colonnes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Type::Evolution 2908]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2908) **LL observations/captures : ajout de champs dans le tableau récapitulatif** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Type::Evolution 2910]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2910) **Dans le cas d'une opération activité 34, toujours ajouter le matériaux balise seule sur le FOB** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Type::Evolution 2911]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2911) **Ultime peaufinage sur traitement d'une OPERA 34 (retrait de balise seule)** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2912]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2912) **Externaliser les bases avdth utilisées dans les tests** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Type::Documentation 2894]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2894) **Mini erreur dans la doc du migrateur AVDTH** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Documentation 2897]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2897) **Précisions à ajouter dans la documentation de migration AVDTH** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Type::Documentation 2916]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2916) **Micro correction dans la doc du migrateur AVDTH** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) ## Version [9.3.5](https://gitlab.com/ultreiaio/ird-observe/-/milestones/282) ===================================== client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java ===================================== @@ -542,6 +542,7 @@ public class ClientConfig extends GeneratedClientConfig implements TripMapConfig public void initConfig(String... args) throws ArgumentsParserException { ApplicationConfig applicationConfig = get(); applicationConfig.parse(args); + File userConfigFile = applicationConfig.getUserConfigFile(); if (userConfigFile.exists() && (Files.notExists(getServerDataSourceConfigurationsFile().toPath()) || Files.notExists(getRemoteDataSourceConfigurationsFile().toPath()))) { Properties old = new Properties(); ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2024.26</version> + <version>2024.28</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> @@ -111,6 +111,7 @@  <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> + <lib.version.java4all.config>1.0.29</lib.version.java4all.config>  <plugin.version.site>4.0.0-M13</plugin.version.site> <lib.version.java4all.jaxx>3.0.25</lib.version.java4all.jaxx> ===================================== server/configuration/src/main/java/fr/ird/observe/server/configuration/ServerConfig.java ===================================== @@ -162,10 +162,6 @@ public class ServerConfig extends GeneratedServerConfig implements CleanTemporar log.info(String.format("Generate empty log4j configuration file to: %s", log4jConfigurationFile)); } - public boolean isWindows() { - return get().getOsName().toLowerCase().contains("windows"); - } - public void init(boolean strict) { log.info("Starts to init ObServe server configuration..."); @@ -196,7 +192,7 @@ public class ServerConfig extends GeneratedServerConfig implements CleanTemporar if (strict && !commonSecurityConfigurationFile.exists()) { throw new IllegalStateException(String.format("Can not start application. Could not find security.yml file.\n\nPlease add it to one of this places:\n\t%s\n\t%s", commonSecurityConfigurationFile, securityConfigurationFile)); } - boolean generated = ServerResources.SECURITY_CONFIGURATION.setStrict(strict).setForWindows(isWindows()).copyResource(commonSecurityConfigurationFile.toPath(), securityConfigurationFile); + boolean generated = ServerResources.SECURITY_CONFIGURATION.setStrict(strict).setForWindows(get().isWindowsOs()).copyResource(commonSecurityConfigurationFile.toPath(), securityConfigurationFile); if (generated) { log.info("Generate default security.yml"); } else { ===================================== src/site/markdown/avdth/referential.md ===================================== @@ -30,7 +30,7 @@ On transpose les codes espèce AVDTH (**ESPECE.C_ESP**) en **Species.faoCode** | 9 | TUN | | 34 | BUM | | 40 | TUS | -| 43 | RVA* | +| 43 | RAV* | | 99 | XXX* | | 701 | PIL | | 702 | CLP | View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b831c01b3040aaa5a497b4b0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b831c01b3040aaa5a497b4b0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog for v.9.3.6 [skip CI]
by Tony CHEMIT (＠tchemit) 03 Jul '24

03 Jul '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b831c01b by Tony Chemit at 2024-07-03T16:11:10+02:00 Update changelog for v.9.3.6 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,18 +1,17 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2024-06-27 13:24. + * Last generated at 2024-07-03 16:10. ## Version [9.3.6](https://gitlab.com/ultreiaio/ird-observe/-/milestones/283) -**Closed at 2024-06-27.** +**Closed at 2024-07-03.** ### Download * [Client (observe-9.3.6-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) * [Serveur (observe-9.3.6.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9…) * [Serveur (observe-9.3.6-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) - ### Issues * [[Type::Anomalie 2887]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2887) **En synchro avancée de données, la modification de la configuration des arbres de navigation ne fonctionne plus** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2889]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2889) **Les transcodages ASSOC ne sont plus totalement respectés par l'importeur AVDTH** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) @@ -20,6 +19,7 @@ * [[Type::Anomalie 2891]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2891) **L'utilisation du bouton de création d'un FOB brut (sans présélection) ne fonctionne plus en mode serveur** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2896]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2896) **Une règle de migration AVDTH ASSOC non respectée** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2899]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2899) **Amélioration du code de mise à jour sql pour les associations lors de remplacement de référentiel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2915]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2915) **Un utilisateur Windows a toujours un souci avec les chemins lors du démarrage en 9.3.5** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2888]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2888) **En synchro avancée de données, amélioration de la gestion des droits des bases utilisées** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2892]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2892) **Empêcher l 'assistant synchro données avancées de poursuivre si les 2 bases n'ont pas un droit saisisseur au minimum** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) * [[Type::Evolution 2905]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2905) **Sur le formulaire Schéma détaillé de palangre, onglet "Composition", tableau "Paniers", préciser l'unité dans les en-têtes des colonnes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) @@ -28,6 +28,7 @@ * [[Type::Evolution 2911]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2911) **Ultime peaufinage sur traitement d'une OPERA 34 (retrait de balise seule)** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Documentation 2894]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2894) **Mini erreur dans la doc du migrateur AVDTH** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Documentation 2897]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2897) **Précisions à ajouter dans la documentation de migration AVDTH** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Type::Documentation 2916]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2916) **Micro correction dans la doc du migrateur AVDTH** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) ## Version [9.3.5](https://gitlab.com/ultreiaio/ird-observe/-/milestones/282) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b831c01b3040aaa5a497b4b09… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b831c01b3040aaa5a497b4b09… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Micro correction dans la doc du migrateur AVDTH - Closes #2916
by Tony CHEMIT (＠tchemit) 03 Jul '24

03 Jul '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 41a0b642 by Tony Chemit at 2024-07-03T12:44:23+02:00 Micro correction dans la doc du migrateur AVDTH - Closes #2916 - - - - - 1 changed file: - src/site/markdown/avdth/referential.md Changes: ===================================== src/site/markdown/avdth/referential.md ===================================== @@ -30,7 +30,7 @@ On transpose les codes espèce AVDTH (**ESPECE.C_ESP**) en **Species.faoCode** | 9 | TUN | | 34 | BUM | | 40 | TUS | -| 43 | RVA* | +| 43 | RAV* | | 99 | XXX* | | 701 | PIL | | 702 | CLP | View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/41a0b642512bf671c373df74e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/41a0b642512bf671c373df74e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Un utilisateur Windows a toujours un souci avec les chemins lors du démarrage...
by Tony CHEMIT (＠tchemit) 03 Jul '24

03 Jul '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 34418a81 by Tony Chemit at 2024-07-03T12:27:37+02:00 Un utilisateur Windows a toujours un souci avec les chemins lors du démarrage en 9.3.5 - Closes #2915 - - - - - a656bf4b by Tony Chemit at 2024-07-03T12:38:32+02:00 update pom - - - - - 3 changed files: - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - pom.xml - server/configuration/src/main/java/fr/ird/observe/server/configuration/ServerConfig.java Changes: ===================================== client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java ===================================== @@ -542,6 +542,8 @@ public class ClientConfig extends GeneratedClientConfig implements TripMapConfig public void initConfig(String... args) throws ArgumentsParserException { ApplicationConfig applicationConfig = get(); applicationConfig.parse(args); + applicationConfig.fixFileOptionsForWindows(options()); + File userConfigFile = applicationConfig.getUserConfigFile(); if (userConfigFile.exists() && (Files.notExists(getServerDataSourceConfigurationsFile().toPath()) || Files.notExists(getRemoteDataSourceConfigurationsFile().toPath()))) { Properties old = new Properties(); ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2024.26</version> + <version>2024.28</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> ===================================== server/configuration/src/main/java/fr/ird/observe/server/configuration/ServerConfig.java ===================================== @@ -162,10 +162,6 @@ public class ServerConfig extends GeneratedServerConfig implements CleanTemporar log.info(String.format("Generate empty log4j configuration file to: %s", log4jConfigurationFile)); } - public boolean isWindows() { - return get().getOsName().toLowerCase().contains("windows"); - } - public void init(boolean strict) { log.info("Starts to init ObServe server configuration..."); @@ -196,7 +192,7 @@ public class ServerConfig extends GeneratedServerConfig implements CleanTemporar if (strict && !commonSecurityConfigurationFile.exists()) { throw new IllegalStateException(String.format("Can not start application. Could not find security.yml file.\n\nPlease add it to one of this places:\n\t%s\n\t%s", commonSecurityConfigurationFile, securityConfigurationFile)); } - boolean generated = ServerResources.SECURITY_CONFIGURATION.setStrict(strict).setForWindows(isWindows()).copyResource(commonSecurityConfigurationFile.toPath(), securityConfigurationFile); + boolean generated = ServerResources.SECURITY_CONFIGURATION.setStrict(strict).setForWindows(get().isWindowsOs()).copyResource(commonSecurityConfigurationFile.toPath(), securityConfigurationFile); if (generated) { log.info("Generate default security.yml"); } else { @@ -227,6 +223,7 @@ public class ServerConfig extends GeneratedServerConfig implements CleanTemporar private void parse() { try { get().parse(); + get().fixFileOptionsForWindows(options()); } catch (ArgumentsParserException e) { throw new ObserveWebApplicationConfigInitException("could not parse configuration", e); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9cab949ebbf594066bc98e67… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9cab949ebbf594066bc98e67… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Echecs d'imports de marées volumineux - Closes #2913
by Tony CHEMIT (＠tchemit) 03 Jul '24

03 Jul '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9cab949e by Tony Chemit at 2024-07-01T16:00:22+02:00 Echecs d'imports de marées volumineux - Closes #2913 - - - - - 1 changed file: - toolkit/api-services/src/main/java/fr/ird/observe/services/service/data/RootOpenableService.java Changes: ===================================== toolkit/api-services/src/main/java/fr/ird/observe/services/service/data/RootOpenableService.java ===================================== @@ -139,7 +139,7 @@ public interface RootOpenableService extends ObserveService { <D extends RootOpenableDto> void moveLayout(Class<D> dtoType, MoveLayoutRequest request); - @Post(useMultiPartForm = true) + @Post(useMultiPartForm = true, timeOut = 120) @MethodCredential(Permission.READ_ALL) <D extends RootOpenableDto> MissingReferentialResult computeMissingReferential(Class<D> dtoType, MissingReferentialRequest request); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9cab949ebbf594066bc98e67b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9cab949ebbf594066bc98e67b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Externaliser les bases avdth utilisées dans les tests - Closes #2912
by Tony CHEMIT (＠tchemit) 29 Jun '24

29 Jun '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8c311f15 by Tony Chemit at 2024-06-29T12:01:03+02:00 Externaliser les bases avdth utilisées dans les tests - Closes #2912 - - - - - 9 changed files: - + core/persistence/test/.mvn/need-avdth - core/persistence/test/src/test/java/fr/ird/observe/persistence/avdth/referential/AvdthWeightCategoryBuilderTest.java - model/src/main/filtered-resources/observetest.properties - pom.xml - toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/PersistenceRunner.java - + toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/avdth/AvdthCreateDatabasesMojo.java - + toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/avdth/AvdthDeleteCacheMojo.java - + toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/avdth/CreateAvdthDatabases.java - + toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/avdth/DeleteAvdthCache.java Changes: ===================================== core/persistence/test/.mvn/need-avdth ===================================== ===================================== core/persistence/test/src/test/java/fr/ird/observe/persistence/avdth/referential/AvdthWeightCategoryBuilderTest.java ===================================== @@ -71,7 +71,7 @@ public class AvdthWeightCategoryBuilderTest extends TestSupportWithConfig { @Test public void build() throws SQLException, IOException { Path avdthFile = AvdthFixtures.getAvdthCachePath() - .resolve("avdth-gen-35_74.mdb"); + .resolve("OA/OA_2020_V35.mdb"); Assume.assumeTrue("Skip, avdth file " + avdthFile + " not found", Files.exists(avdthFile)); Path scriptPath = localTestMethodResource.getTestDirectory().toPath().resolve("export-" + avdthFile.toFile().getName().replace(".mdb", ".sql")); Path scriptTemporaryDirectory = scriptPath.getParent().resolve(scriptPath.toFile().getName().replace(".sql", "-tmp")); ===================================== model/src/main/filtered-resources/observetest.properties ===================================== @@ -25,7 +25,7 @@ observetest.model.version=${persistence.model.version} observetest.previous.model.version=${persistence.previous.model.version} observetest.tck.cache.path=${tck.cache.path} observetest.tck.credentials.path=${tck.credentials.store.path} -observetest.avdth.cache.path=${avdth.cache.path} +observetest.avdth.cache.path=${avdth.cache.path}/data observetest.first.model.version=7.0 observetest.h2.login=sa observetest.h2.password=sa ===================================== pom.xml ===================================== @@ -98,13 +98,11 @@ <persistence.previous.model.version>9.2</persistence.previous.model.version> <tck.filename>tck-v${persistence.model.version}.zip</tck.filename> <tck.updated.filename>updated-${tck.filename}</tck.updated.filename> - <tck.remote.path>/var/www/html/private/ird-observe/tck</tck.remote.path> + <tck.remote.path>/var/www/html/private/ird-observe/tck/tck</tck.remote.path> <tck.cache.path>${user.home}/.mvn/tck-cache/${model.name}/tck</tck.cache.path> <tck.credentials.store.path>${user.home}/.mvn/tck-cache/${model.name}/credentials.properties</tck.credentials.store.path> -  - <avdth.filename>avdth-v${persistence.model.version}.zip</avdth.filename> -  - <avdth.remote.path>/var/www/html/private/ird-observe/avdth</avdth.remote.path> + <avdth.filename>avdth-v9.3.6.zip</avdth.filename> + <avdth.remote.path>/var/www/html/private/ird-observe/tck/avdth</avdth.remote.path> <avdth.cache.path>${user.home}/.mvn/tck-cache/${model.name}/avdth</avdth.cache.path>  <test.skipAsserts>false</test.skipAsserts> @@ -1589,6 +1587,66 @@ </plugins> </build> </profile> + <profile> + <id>get-avdth</id> + <activation> + <file> + <exists>.mvn/need-avdth</exists> + </file> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>wagon-maven-plugin</artifactId> + <executions> + <execution> + <id>download-avdth</id> + <goals> + <goal>download-single</goal> + </goals> + <phase>initialize</phase> + <configuration> + <skipIfExists>true</skipIfExists> + <url>scpexe://ultreia.io</url> + <serverId>doc.ultreia.io</serverId> + <fromFile>${avdth.remote.path}/${avdth.filename}</fromFile> + <toDir>${avdth.cache.path}</toDir> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>${project.groupId}</groupId> + <artifactId>toolkit-maven-plugin</artifactId> + <version>${project.version}</version> + <dependencies> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>${lib.version.h2}</version> + </dependency> + <dependency> + <groupId>org.postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>${lib.version.postgresql}</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>default-avdth-create-databases</id> + <goals> + <goal>avdth-create-databases</goal> + </goals> + <configuration> + <skipIfExists>true</skipIfExists> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> <profile> <id>delete-tck</id> <activation> @@ -1616,6 +1674,33 @@ </plugins> </build> </profile> + <profile> + <id>delete-avdth</id> + <activation> + <property> + <name>delete-avdth</name> + <value>true</value> + </property> + </activation> + <build> + <defaultGoal>initialize</defaultGoal> + <plugins> + <plugin> + <groupId>${project.groupId}</groupId> + <artifactId>toolkit-maven-plugin</artifactId> + <version>${project.version}</version> + <executions> + <execution> + <id>default-avdth-delete-cache</id> + <goals> + <goal>avdth-delete-cache</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> <profile> <id>documentation-generate-html</id> <activation> ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/PersistenceRunner.java ===================================== @@ -115,7 +115,21 @@ public abstract class PersistenceRunner extends MojoRunnable { throw new IllegalStateException(e); } } - return exploded; + return explodeArchive(archiveFile,exploded); + } + + protected Path explodeArchive(Path archiveFile, Path target) { + if (Files.notExists(target)) { + try { + Files.createDirectories(target); + try (InputStream inputStream = Files.newInputStream(archiveFile)) { + Zips.uncompress(inputStream, target.toFile()); + } + } catch (IOException e) { + throw new IllegalStateException(e); + } + } + return target; } protected void createForVersion(Version version, Path exploded, Path targetPath, DatabaseName... databaseNames) { ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/avdth/AvdthCreateDatabasesMojo.java ===================================== @@ -0,0 +1,78 @@ +package fr.ird.observe.toolkit.maven.plugin.avdth; + +/*- + * #%L + * ObServe Toolkit :: Maven plugin + * %% + * Copyright (C) 2008 - 2023 IRD, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.toolkit.maven.plugin.PersistenceMojoSupport; +import fr.ird.observe.toolkit.maven.plugin.PersistenceRunner; +import io.ultreia.java4all.i18n.spi.builder.I18nKeySet; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; + +/** + * Created on 29/06/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.4.0 + */ +@Mojo(name = "avdth-create-databases", threadSafe = true, defaultPhase = LifecyclePhase.INITIALIZE) +public class AvdthCreateDatabasesMojo extends PersistenceMojoSupport { + + @Parameter(property = "runner.archiveFile", defaultValue = "${avdth.cache.path}/${avdth.filename}", required = true) + private File archiveFile; + + @Parameter(property = "runner.avdthRootPath", defaultValue = "${avdth.cache.path}/data", required = true) + private File avdthRootPath; + + @Parameter(property = "runner.skipIfExists", defaultValue = "false") + private boolean skipIfExists; + + @Override + protected void doAction(I18nKeySet getterFile, ClassLoader classLoader) throws IOException { + Path resolve = avdthRootPath.toPath().resolve(getModelVersion().getVersion()); + if (skipIfExists && Files.exists(resolve)) { + getLog().info(String.format("Skip - files already at: %s", resolve)); + return; + } + super.doAction(getterFile, classLoader); + } + + @Override + protected CreateAvdthDatabases createRunner() { + CreateAvdthDatabases runner = new CreateAvdthDatabases(); + runner.setArchiveFile(archiveFile.toPath()); + return runner; + } + + @Override + protected void prepare(PersistenceRunner runner) { + super.prepare(runner); + runner.setSourceDirectory(avdthRootPath.toPath()); + } +} + ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/avdth/AvdthDeleteCacheMojo.java ===================================== @@ -0,0 +1,50 @@ +package fr.ird.observe.toolkit.maven.plugin.avdth; + +/*- + * #%L + * ObServe Toolkit :: Maven plugin + * %% + * Copyright (C) 2008 - 2023 IRD, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.toolkit.maven.plugin.PersistenceMojoSupport; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; + +import java.io.File; + +/** + * Created on 29/06/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.4.0 + */ +@Mojo(name = "avdth-delete-cache", threadSafe = true, defaultPhase = LifecyclePhase.INITIALIZE) +public class AvdthDeleteCacheMojo extends PersistenceMojoSupport { + + @Parameter(property = "runner.avdthRootPath", defaultValue = "${avdth.cache.path}", required = true) + private File avdthRootPath; + + @Override + protected DeleteAvdthCache createRunner() { + DeleteAvdthCache runner = new DeleteAvdthCache(); + runner.setAvdthRootPath(avdthRootPath.toPath()); + return runner; + } +} ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/avdth/CreateAvdthDatabases.java ===================================== @@ -0,0 +1,56 @@ +package fr.ird.observe.toolkit.maven.plugin.avdth; + +/*- + * #%L + * ObServe Toolkit :: Maven plugin + * %% + * Copyright (C) 2008 - 2023 IRD, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.toolkit.maven.plugin.PersistenceRunner; + +import java.nio.file.Path; +import java.util.Objects; + +/** + * To create avdth databases from the avdth archive. + * <p> + * Created on 29/06/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.4.0 + */ +public class CreateAvdthDatabases extends PersistenceRunner { + protected Path archiveFile; + + public void setArchiveFile(Path archiveFile) { + this.archiveFile = archiveFile; + } + + @Override + public void init() { + super.init(); + Objects.requireNonNull(archiveFile); + } + + @Override + public void run() { + Path exploded = explodeArchive(archiveFile, sourceDirectory); + log.info(String.format("Load avdth databases for version %s to %s", modelVersion, exploded)); + } +} ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/avdth/DeleteAvdthCache.java ===================================== @@ -0,0 +1,61 @@ +package fr.ird.observe.toolkit.maven.plugin.avdth; + +/*- + * #%L + * ObServe Toolkit :: Maven plugin + * %% + * Copyright (C) 2008 - 2023 IRD, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.test.DataSourcesForTestManager; +import fr.ird.observe.toolkit.maven.plugin.PersistenceRunner; + +import java.io.IOException; +import java.nio.file.Path; +import java.util.Objects; + +/** + * Created on 29/06/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.4.0 + */ +public class DeleteAvdthCache extends PersistenceRunner { + + private Path avdthRootPath; + + public void setAvdthRootPath(Path avdthRootPath) { + this.avdthRootPath = avdthRootPath; + } + + @Override + public void init() { + super.init(); + Objects.requireNonNull(avdthRootPath); + } + + @Override + public void run() { + try { + DataSourcesForTestManager.clearCache(avdthRootPath); + } catch (IOException e) { + throw new IllegalStateException(String.format("Can't delete avdth cache at: %s", avdthRootPath), e); + } + } +} + View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8c311f15d3bbb8458227a7bd1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8c311f15d3bbb8458227a7bd1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch feature/issue_avdth_cache
by Tony CHEMIT (＠tchemit) 29 Jun '24

29 Jun '24

Tony CHEMIT deleted branch feature/issue_avdth_cache at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch feature/issue_avdth_cache
by Tony CHEMIT (＠tchemit) 29 Jun '24

29 Jun '24

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

1 0

[Git][ultreiaio/ird-observe] Pushed new branch develop-9.3.x
by Tony CHEMIT (＠tchemit) 29 Jun '24

29 Jun '24

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

1 0