This is an automated email from the git hooks/post-receive script. New change to branch master in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from c970a73 [jgitflow-maven-plugin]merging 'release/5.0.1' into 'master' adds a087eae [jgitflow-maven-plugin]updating poms for 5.1-SNAPSHOT development adds 1c90770 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 8438859 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 97eebb2 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 301b04c Amélioration de la documentation sur l'installation serveur web (Fixes #8550) adds 529dd05 Toujours générer le fichier de configuration des logs (et pas seulement en dev mode) (Fixes #8551) adds dd8c68c [WIN] Le serveur ne démarre pas sous Windows en raison d'une erreur POSIX (Fixes #8549) adds 6a95d6a Amélioration de la documentation et du démarrage de l'application web adds 259d5dd Amélioration de la documentation et du démarrage de l'application web adds 5e0ca79 Improve name of release files adds ea6a817 [GEAR] Affichage des valeurs 0 dans les caractéristiques de type Entier (Fixes #8553) adds 80fd120 [UI] Assistant de connexion à un serveur (Fixes #8556) adds ebfe1c2 La boîte "A propos" ne fonctionne pas (fixes #8564) adds 743aef1 Use nuiton-config 3.0-SNAPSHOT adds 1259b0a Normalize configurations and use new configuration description file adds 3659c87 Use now toml configuration description adds 5a6d995 remove yaml configuration files adds dcbca30 Use nuiton-config 3.0 \o/ adds 15c02cf [GESTION AVANCEE DES MAREES] Identifier les marées qui sont présentes des 2 côtés (Fixes #8575) adds f6c4c24 Dans l'UI de gestion avancée du référentiel, l'affichage des dates est différent à droite et à gauche (Fixes #8574) adds 00717c6 [GESTION AVANCEE REFERENTIEL] 2 boutons semblent avoir la même fonction (Fixes #8581) adds d448e55 [GESTION AVANCEE REFERENTIEL] Comportement de l'UI gestion avancée du référentiel suite à migration de bases (Fixes #8580) adds a4443f1 [jgitflow-maven-plugin]updating poms for 5.0.2 branch with snapshot versions adds e513d71 Add missing license header adds b41b096 [jgitflow-maven-plugin]updating poms for branch'release/5.0.2' with non-snapshot versions adds 011e671 [jgitflow-maven-plugin]merging 'release/5.0.2' into 'master' No new revisions were added by this update. Summary of changes: application-swing-configuration/pom.xml | 15 +- .../src/main/config/ObserveSwingApplication.toml | 601 +++++++++++++++++++++ .../ObserveSwingApplicationConfig.java | 51 +- .../ObserveSwingApplicationConfigProvider.java | 59 -- .../org.nuiton.config.ApplicationConfigProvider | 1 - ...pplication-swing-configuration_en_GB.properties | 2 +- ...pplication-swing-configuration_es_ES.properties | 2 +- ...pplication-swing-configuration_fr_FR.properties | 2 +- application-swing-decoration/pom.xml | 2 +- application-swing-validation/pom.xml | 2 +- application-swing-validators/pom.xml | 2 +- application-swing/pom.xml | 55 +- application-swing/src/main/assembly/bin.xml | 2 +- .../data/DataSynchroSelectionTreeCellRenderer.java | 84 +++ .../ui/admin/synchronize/data/DataSynchroUI.jcss | 4 +- .../referential/ng/ReferentialSynchroUI.jcss | 6 - .../ng/ReferentialSynchronizeResources.java | 11 + .../ng/action/RegisterDesactivateTaskAction.java | 6 +- .../ReferentialSynchronizeTreeCellRenderer.java | 6 +- .../GearUseFeatureMeasurementCellEditor.java | 13 +- .../GearUseFeatureMeasurementCellRenderer.java | 24 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 4 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 2 + .../swing/ui/storage/StorageUIHandler.java | 2 +- .../swing/ui/storage/tabs/ConfigUI.jcss | 2 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 2 +- .../i18n/application-swing_en_GB.properties | 8 +- .../i18n/application-swing_es_ES.properties | 8 +- .../i18n/application-swing_fr_FR.properties | 8 +- application-web-configuration/pom.xml | 16 +- .../src/main/config/ObserveWebApplication.toml | 112 ++++ .../configuration/ObserveWebApplicationConfig.java | 237 ++++++++ ... ObserveWebApplicationConfigInitException.java} | 6 +- .../ObserveWebApplicationConfiguration.java | 266 --------- .../ObserveWebApplicationConfigurationOption.java | 131 ----- ...ObserveWebApplicationConfigurationProvider.java | 61 --- .../org.nuiton.config.ApplicationConfigProvider | 1 - .../src/main/resources/defaultDatabases.yml | 16 + .../src/main/resources/defaultUsers.yml | 13 + .../application-web-configuration_en_GB.properties | 2 +- .../application-web-configuration_es_ES.properties | 2 +- .../application-web-configuration_fr_FR.properties | 2 +- application-web/pom.xml | 20 +- .../web/ObserveWebApplicationContext.java | 8 +- .../web/ObserveWebApplicationListener.java | 9 +- .../web/controller/ObserveWebMotionController.java | 4 +- .../web/controller/v1/PingServiceController.java | 4 +- .../ObserveWebSecurityApplicationContext.java | 4 +- .../db/ObserveWebDatabasesHelperTest.java | 8 +- .../user/ObserveWebUsersHelperTest.java | 6 +- entities-migration/pom.xml | 2 +- entities/pom.xml | 2 +- pom.xml | 26 +- services-configuration-rest/pom.xml | 2 +- services-configuration-topia/pom.xml | 2 +- services-configuration/pom.xml | 2 +- services-dto/pom.xml | 2 +- services-rest/pom.xml | 2 +- services-runner/pom.xml | 2 +- services-topia-validation/pom.xml | 2 +- services-topia-validators/pom.xml | 2 +- services-topia/pom.xml | 2 +- services/pom.xml | 2 +- .../diff/ReferentialSynchronizeDiffState.java | 8 +- src/site/rst/administration-web.rst.vm | 99 +++- test/pom.xml | 2 +- toolbox-maven-plugin/pom.xml | 2 +- topia-extension/pom.xml | 2 +- topia-templates-extension/pom.xml | 2 +- 69 files changed, 1393 insertions(+), 686 deletions(-) create mode 100644 application-swing-configuration/src/main/config/ObserveSwingApplication.toml delete mode 100644 application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigProvider.java delete mode 100644 application-swing-configuration/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroSelectionTreeCellRenderer.java rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/{seine => }/GearUseFeatureMeasurementCellEditor.java (90%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/{seine => }/GearUseFeatureMeasurementCellRenderer.java (76%) create mode 100644 application-web-configuration/src/main/config/ObserveWebApplication.toml create mode 100644 application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfig.java rename application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/{ObserveWebApplicationConfigurationInitException.java => ObserveWebApplicationConfigInitException.java} (80%) delete mode 100644 application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java delete mode 100644 application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfigurationOption.java delete mode 100644 application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfigurationProvider.java delete mode 100644 application-web-configuration/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider create mode 100644 application-web-configuration/src/main/resources/defaultDatabases.yml create mode 100644 application-web-configuration/src/main/resources/defaultUsers.yml -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.