This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 011e67144a7d3eafb9a69a200f5a1747fd6698fc Merge: c970a73 b41b096 Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 4 11:14:07 2016 +0200 [jgitflow-maven-plugin]merging 'release/5.0.2' into 'master' 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(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.