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

[Git][ultreiaio/ird-observe][develop] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-4' with…
by Tony CHEMIT 02 Aug '17

02 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 67ed0d40 by 166231 at 2017-08-02T12:19:23+00:00 [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-4' with non-snapshot versions[skip ci] - - - - - e9fde02d by 166231 at 2017-08-02T12:27:17+00:00 [jgitflow-maven-plugin]merging 'release/7.0-RC-4' into 'master'[skip ci] - - - - - 22cf0be6 by 166231 at 2017-08-02T12:27:25+00:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 14a30298 by 166231 at 2017-08-02T12:27:26+00:00 [jgitflow-maven-plugin]merging 'master' into 'develop'[skip ci] - - - - - 3839bdc3 by 166231 at 2017-08-02T12:27:28+00: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/39c7c529fee3ee0cdf5de4e87a… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/39c7c529fee3ee0cdf5de4e87a… 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 7.0-RC-5-SNAPSHOT development[skip ci]
by Tony CHEMIT 02 Aug '17

02 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 39c7c529 by 166231 at 2017-08-02T12:19:07+00:00 [jgitflow-maven-plugin]updating poms for 7.0-RC-5-SNAPSHOT development[skip ci] - - - - - 18 changed files: - client-configuration/pom.xml - client-validation/pom.xml - client/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== --- a/client-configuration/pom.xml +++ b/client-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-4-SNAPSHOT</version> + <version>7.0-RC-5-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-validation/pom.xml ===================================== --- a/client-validation/pom.xml +++ b/client-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-4-SNAPSHOT</version> + <version>7.0-RC-5-SNAPSHOT</version> </parent> <artifactId>client-validation</artifactId> ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-4-SNAPSHOT</version> + <version>7.0-RC-5-SNAPSHOT</version> </parent> <artifactId>client</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-4-SNAPSHOT</version> + <version>7.0-RC-5-SNAPSHOT</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-4-SNAPSHOT</version> + <version>7.0-RC-5-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-4-SNAPSHOT</version> + <version>7.0-RC-5-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-4-SNAPSHOT</version> + <version>7.0-RC-5-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== --- a/server-configuration/pom.xml +++ b/server-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-4-SNAPSHOT</version> + <version>7.0-RC-5-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server/pom.xml ===================================== --- a/server/pom.xml +++ b/server/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-4-SNAPSHOT</version> + <version>7.0-RC-5-SNAPSHOT</version> </parent> <artifactId>server</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-4-SNAPSHOT</version> + <version>7.0-RC-5-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-4-SNAPSHOT</version> + <version>7.0-RC-5-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-4-SNAPSHOT</version> + <version>7.0-RC-5-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-4-SNAPSHOT</version> + <version>7.0-RC-5-SNAPSHOT</version> </parent> <artifactId>services-validation</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-4-SNAPSHOT</version> + <version>7.0-RC-5-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-4-SNAPSHOT</version> + <version>7.0-RC-5-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-4-SNAPSHOT</version> + <version>7.0-RC-5-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-4-SNAPSHOT</version> + <version>7.0-RC-5-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-4-SNAPSHOT</version> + <version>7.0-RC-5-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/39c7c529fee3ee0cdf5de4e87ac… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/39c7c529fee3ee0cdf5de4e87ac… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/7.0-RC-4
by Tony CHEMIT 02 Aug '17

02 Aug '17

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

1 0

[Git][ultreiaio/ird-observe][develop] add missing license headers
by Tony CHEMIT 02 Aug '17

02 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 65564f99 by Tony CHEMIT at 2017-08-02T14:07:37+02:00 add missing license headers - - - - - 2 changed files: - common/src/main/java/fr/ird/observe/common/constants/seine/DcpComputedValue.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidationActivitySeineDataContext.java Changes: ===================================== common/src/main/java/fr/ird/observe/common/constants/seine/DcpComputedValue.java ===================================== --- a/common/src/main/java/fr/ird/observe/common/constants/seine/DcpComputedValue.java +++ b/common/src/main/java/fr/ird/observe/common/constants/seine/DcpComputedValue.java @@ -1,5 +1,27 @@ package fr.ird.observe.common.constants.seine; +/*- + * #%L + * ObServe :: Common + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, 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% + */ + /** * Created by tchemit on 02/08/17. * ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidationActivitySeineDataContext.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidationActivitySeineDataContext.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidationActivitySeineDataContext.java @@ -1,5 +1,27 @@ package fr.ird.observe.services.topia.service.actions.consolidate; +/*- + * #%L + * ObServe :: Services ToPIA Implementation + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, 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.common.constants.seine.SchoolType; import fr.ird.observe.entities.referentiel.LengthWeightParameter; import fr.ird.observe.entities.referentiel.LengthWeightParameterNotFoundException; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/65564f99cfad547f7eeba2404c6… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/65564f99cfad547f7eeba2404c6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Changement du nom des fichiers de configuration du client et serveur (See #811)
by Tony CHEMIT 02 Aug '17

02 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b9557271 by Tony CHEMIT at 2017-08-02T14:00:37+02:00 Changement du nom des fichiers de configuration du client et serveur (See #811) - - - - - 5 changed files: - client-configuration/src/main/filtered-resources/observeSwing.conf → client-configuration/src/main/filtered-resources/observe-client.conf - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - server-configuration/src/main/filtered-resources/observeweb.conf → server-configuration/src/main/filtered-resources/observe-server.conf - server-configuration/src/main/java/fr/ird/observe/server/configuration/ServerConfig.java - src/site/markdown/administration-web.md.vm Changes: ===================================== client-configuration/src/main/filtered-resources/observeSwing.conf → client-configuration/src/main/filtered-resources/observe-client.conf ===================================== ===================================== client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java ===================================== --- a/client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java +++ b/client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java @@ -81,7 +81,7 @@ public class ClientConfig extends GeneratedClientConfig { /** Logger */ private static final Log log = LogFactory.getLog(ClientConfig.class); - static final String DEFAULT_OBSERVE_SWING_CONFIGURATION_FILENAME = "observeSwing.conf"; + static final String DEFAULT_OBSERVE_SWING_CONFIGURATION_FILENAME = "observe-client.conf"; /** * un drapeau pour savoir s'il faut lancer l'interface graphique. Cette ===================================== server-configuration/src/main/filtered-resources/observeweb.conf → server-configuration/src/main/filtered-resources/observe-server.conf ===================================== ===================================== server-configuration/src/main/java/fr/ird/observe/server/configuration/ServerConfig.java ===================================== --- a/server-configuration/src/main/java/fr/ird/observe/server/configuration/ServerConfig.java +++ b/server-configuration/src/main/java/fr/ird/observe/server/configuration/ServerConfig.java @@ -53,7 +53,7 @@ public class ServerConfig extends GeneratedServerConfig { /** Logger. */ private static Log log = LogFactory.getLog(ServerConfig.class); - private static final String DEFAULT_OBSERVE_WEB_CONFIGURATION_FILENAME = "observeweb.conf"; + private static final String DEFAULT_OBSERVE_WEB_CONFIGURATION_FILENAME = "observe-server.conf"; public static ServerConfig fromContextPath(String contextPath) { ServerConfig config = new ServerConfig(); @@ -75,7 +75,7 @@ public class ServerConfig extends GeneratedServerConfig { public void init(String... args) { if (log.isInfoEnabled()) { - log.info("Starts to init ObserVeWeb configuration..."); + log.info("Starts to init ObServe server configuration..."); } try { @@ -172,7 +172,7 @@ public class ServerConfig extends GeneratedServerConfig { initLog(); if (log.isInfoEnabled()) { - log.info("Observe web configuration init done."); + log.info("ObServe server configuration init done."); } } ===================================== src/site/markdown/administration-web.md.vm ===================================== --- a/src/site/markdown/administration-web.md.vm +++ b/src/site/markdown/administration-web.md.vm @@ -7,7 +7,7 @@ L'application web est une application web classique à installer dans un contene La configuration de l'application web est regroupé dans un seul fichier à placer ici ``` - /etc/observeweb.conf + /etc/observe-server.conf ``` La configuration de l'application possède des valeurs par défaut pour toutes les options, si vous utiliser ces valeurs par défaut, un minimum de configuration est requise. @@ -24,7 +24,7 @@ Par défaut, l'application utilise le répertoire **/var/local/observeweb** pour Voici le contenu de ce dossier suite à un premier démarrage : ``` - /var/local/observeweb/ + /var/local/observeweb/{contextPath} |-- databases.yml # configuration des bases de données |-- log | `-- observeweb-${project.version}.log # logs de l'application View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b955727197f31e9f1725a395181… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b955727197f31e9f1725a395181… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Correction du nom d'un champs sur FloatingObject + ne pas pouvoir éditer…
by Tony CHEMIT 02 Aug '17

02 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ef671e2f by Tony CHEMIT at 2017-08-02T13:33:52+02:00 Correction du nom d'un champs sur FloatingObject + ne pas pouvoir éditer l'opération de l'objet est mode modification (See #809) - - - - - f015dc52 by Tony CHEMIT at 2017-08-02T13:36:24+02:00 Ajout de la consolidation des dcp (See #810) - début d'implantation - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ObserveFocusManager.java - client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/open/ContentOpenableUIHandler.java - client/src/main/resources/i18n/client_en_GB.properties - client/src/main/resources/i18n/client_es_ES.properties - client/src/main/resources/i18n/client_fr_FR.properties - common/pom.xml - + common/src/main/java/fr/ird/observe/common/constants/seine/DcpComputedValue.java - common/src/main/resources/i18n/common_en_GB.properties - common/src/main/resources/i18n/common_es_ES.properties - common/src/main/resources/i18n/common_fr_FR.properties - persistence/src/main/models/Observe.model - persistence/src/main/resources/db/migration/6.901/08_add_floating_object_fields-common.sql - services-rest/src/test/java/fr/ird/observe/services/rest/service/actions/consolidate/ConsolidateDataServiceRestTest.java - services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngine.java - services-topia/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectBinder.java - services-topia/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectMaterialBinder.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java - + services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidationActivitySeineDataContext.java - services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java - services/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java - services/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataRequest.java - services/src/main/models/Observe.model - services/src/main/resources/i18n/services_es_ES.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/7a1196d87d1bc89339ae67bc8f… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/7a1196d87d1bc89339ae67bc8f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Optimisation traductions (See #808)
by Tony CHEMIT 02 Aug '17

02 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6da3e14e by Tony CHEMIT at 2017-08-02T10:24:52+02:00 Optimisation traductions (See #808) - - - - - 7a1196d8 by Tony CHEMIT at 2017-08-02T11:05:14+02:00 Optimisation des traductions (un seul prefix pour toute la validation (économie de 400 traductions)) (See #808) - - - - - 30 changed files: - client-validation/src/main/java/fr/ird/observe/client/validators/CoordinateLatitudeDtoFieldValidator.java - client-validation/src/main/java/fr/ird/observe/client/validators/CoordinateLongitudeDtoFieldValidator.java - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-create-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-create-warning-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-update-warning-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineEncounterDto-ui-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineSensorUsedDto-ui-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BaitsCompositionDto-ui-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BasketDto-ui-update-table-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-catchLongline-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-table-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-warning-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlinesCompositionDto-ui-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-ui-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-ui-update-warning-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-ui-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-ui-update-warning-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/FloatlinesCompositionDto-ui-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/GearUseFeaturesLonglineDto-ui-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/HooksCompositionDto-ui-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/SectionDto-ui-update-table-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/SensorUsedDto-ui-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/SensorUsedDto-ui-update-warning-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-create-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-create-warning-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-update-warning-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-ui-update-baitsComposition-error-validation.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ef2526ae57ffb7ef5c3f23d161… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ef2526ae57ffb7ef5c3f23d161… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Problème de chargement de l'écran de référentiel FloatingObjectMaterial (See #807) + revue i18n
by Tony CHEMIT 02 Aug '17

02 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ef2526ae by Tony CHEMIT at 2017-08-02T09:59:57+02:00 Problème de chargement de l'écran de référentiel FloatingObjectMaterial (See #807) + revue i18n - - - - - 29 changed files: - client-configuration/pom.xml - client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties - client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties - client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties - client-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-create-warning-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-update-warning-validation.xml - client-validation/src/main/resources/i18n/client-validation_en_GB.properties - client-validation/src/main/resources/i18n/client-validation_es_ES.properties - client-validation/src/main/resources/i18n/client-validation_fr_FR.properties - client/pom.xml - client/src/main/java/fr/ird/observe/client/ui/content/ref/impl/seine/ObjectMaterialUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/impl/seine/ObjectMaterialUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/ref/impl/seine/ObjectMaterialUIModel.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeHeader.jcss - client/src/main/resources/i18n/client_en_GB.properties - client/src/main/resources/i18n/client_es_ES.properties - client/src/main/resources/i18n/client_fr_FR.properties - common/pom.xml - + common/src/main/resources/i18n/common_en_GB.properties - + common/src/main/resources/i18n/common_es_ES.properties - + common/src/main/resources/i18n/common_fr_FR.properties - services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java - services-topia/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectMaterialBinder.java - services/pom.xml - services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java - services/src/main/java/fr/ird/observe/services/decoration/ObserveI18nDecoratorHelper.java - services/src/main/resources/i18n/services_en_GB.properties - services/src/main/resources/i18n/services_es_ES.properties - services/src/main/resources/i18n/services_fr_FR.properties Changes: ===================================== client-configuration/pom.xml ===================================== --- a/client-configuration/pom.xml +++ b/client-configuration/pom.xml @@ -123,6 +123,34 @@ <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> + <id>generateI18nEnumHelper</id> + <goals> + <goal>generateI18nEnumHelper</goal> + </goals> + <configuration> + <enumerationSets> + <enumerationSet> + <name>label</name> +  + <pattern>observe.enum.@CLASS_NAME@.@NAME@</pattern> + <enums> + <enum>fr.ird.observe.client.configuration.constants.CreationMode</enum> + <enum>fr.ird.observe.client.configuration.constants.DbMode</enum> + </enums> + </enumerationSet> + <enumerationSet> + <name>description</name> +  + <pattern>observe.enum.@CLASS_NAME@.@NAME@.description</pattern> + <enums> + <enum>fr.ird.observe.client.configuration.constants.CreationMode</enum> + <enum>fr.ird.observe.client.configuration.constants.DbMode</enum> + </enums> + </enumerationSet> + </enumerationSets> + </configuration> + </execution> + <execution> <id>scan-sources</id> <goals> <goal>parserJava</goal> ===================================== client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties ===================================== --- a/client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties +++ b/client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties @@ -89,5 +89,25 @@ observe.config.ui.treeOpenNodes=Opened data from last session observe.config.validation.lengthWeightEnable=Force validation of species length max observe.config.validation.speedEnable=Force validation of activities speed observe.config.validation.speedMaxValue=Max speed value used in activities speed validation +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.EMPTY=Generate an empty data base. +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.EMPTY.description=Generate a new empty data base. +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP=Load a database backup (*.sql.gz) +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP.description=Create a new databse from +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP=Load embbeded local database +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP.description=Generate a new local data base and import in it the referential of the last embbeded database. +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE=Import referential from a local data base +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE.description=Generate a new local data bse and import in it the referential of another local data base. +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE=Import referential from a remote database +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE.description=Generate a new local data base and import in it the referential of a remove database. +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE=Import referential from a remote server +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE.description=Generate a new local data base and import in it the referential of a remove server. +observe.enum.fr.ird.observe.client.configuration.constants.DbMode.CREATE_LOCAL=Create a new local database +observe.enum.fr.ird.observe.client.configuration.constants.DbMode.CREATE_LOCAL.description=Create a new local database (type H2) +observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_LOCAL=Use local database +observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_LOCAL.description=Use the local database (type H2) +observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_REMOTE=Use a direct connection to a remote database +observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_REMOTE.description=sans service web (moins performant) +observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_SERVER=Use a remote web service +observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_SERVER.description=Use a remote ObServe web service to connect to a central database with better performances than with a direct connection observe.message.save.configuration=Save configuration in file %1$s observe.model.version=Model version ===================================== client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties ===================================== --- a/client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties +++ b/client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties @@ -89,5 +89,25 @@ observe.config.ui.treeOpenNodes=Nudos abiertos del arbol abiertos cuando se cerr observe.config.validation.lengthWeightEnable=Forcer la validation des bormes min/max de taille d'espèce \#TODO observe.config.validation.speedEnable=Force validation of activities speedTODO observe.config.validation.speedMaxValue=Max speed value used in activities speed validationTODO +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.EMPTY=Generar una base vacía +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.EMPTY.description=Generar una nueva base local vacía.\nEsta base no tendrá referencial y usted tendrá que importar lo posteriormente... +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP=Cargar una copia de seguridad de la base local (*.sql.gz) +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP.description=Crear una nueva base local a partir\nde una copia de seguridad anterior de la aplicación +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP=Cargar la base de datos incrustada +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP.description=Generar una nueva base local a partir\nde la última versión de la base incrustada. +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE=Importar el referencial de una base local +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE.description=Generar una nueva base local e importar el referencial de una otra base local. +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE=Importar el referencial de una base remota +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE.description=Generar una nueva base locale e importar el referencial e una otra base remota. +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE=Importar el referencial de un servidor remoto +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE.description=Generar una nueva base local e importar el referencial de un servidor remoto. +observe.enum.fr.ird.observe.client.configuration.constants.DbMode.CREATE_LOCAL=Crear una base local +observe.enum.fr.ird.observe.client.configuration.constants.DbMode.CREATE_LOCAL.description=Crear una base local de tipo H2 +observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_LOCAL=Utilizar une base local +observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_LOCAL.description=Utilizar una base local de tipo H2 +observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_REMOTE=Utilizar una conexión directa a une base remota +observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_REMOTE.description=Use a remote database (PostgreSQL)\= without web service (less efficient)\=Utilizar una base remota de tipo PostgreSQL\= sin servicio web (menos eficiente) +observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_SERVER=Utilizar un servicio web remoto +observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_SERVER.description=Utilizar un servicio web remoto para obtener un mejor rendimiento observe.message.save.configuration=Guardar la configuración en el archivo %1$s observe.model.version=Versión del modelo ===================================== client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties ===================================== --- a/client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties +++ b/client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties @@ -89,5 +89,25 @@ observe.config.ui.treeOpenNodes=Nœuds de l'arbre ouverts lors de la dernière f observe.config.validation.lengthWeightEnable=Forcer la validation des bormes min/max de taille d'espèce observe.config.validation.speedEnable=Forcer la validation des vitesses d'activités observe.config.validation.speedMaxValue=Vitesse maximale autorisée dans le contrôle des vitesses d'activités +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.EMPTY=Générer une base vide +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.EMPTY.description=Générer une nouvelle base locale vide. +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP=Charger une sauvegarde de base locale (*.sql.gz) +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP.description=Créer une nouvelle base locale à partir +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP=Charger la base embarquée +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP.description=Générer une nouvelle base locale à partir +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE=Importer le référentiel d'une base locale +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE.description=Générer une nouvelle base locale et y importer le référentiel d'une autre base locale. +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE=Importer le référentiel d'une base distante +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE.description=Générer une nouvelle base locale et y importer le référentiel d'une autre base distante. +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE=Importer le référentiel dun serveur distant +observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE.description=Générer une nouvelle base locale et y importer le référentiel d'un serveur distant. +observe.enum.fr.ird.observe.client.configuration.constants.DbMode.CREATE_LOCAL=Créer une base locale +observe.enum.fr.ird.observe.client.configuration.constants.DbMode.CREATE_LOCAL.description=Créer une base locale de type H2 +observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_LOCAL=Utiliser une base locale +observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_LOCAL.description=Utiliser une base locale de type H2 +observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_REMOTE=Utiliser une base distante en connexion directe +observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_REMOTE.description=Utiliser une base distante de type PostgreSQL en connexion directe +observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_SERVER=Utiliser un service web distant +observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_SERVER.description=Utiliser un service web ObServe distant pour se connecter à une base centrale avec de meilleures performances qu'en connexion directe observe.message.save.configuration=Sauvegarde de la configuration dans le fichier %1$s observe.model.version=Version du modèle ===================================== client-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-create-warning-validation.xml ===================================== --- a/client-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-create-warning-validation.xml +++ b/client-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-create-warning-validation.xml @@ -42,6 +42,7 @@ <message>validator.ui.referentiel.null.uri</message> </field-validator> </field> + <field name="label1">  <field-validator type="fieldexpression"> @@ -62,4 +63,32 @@ </field-validator> </field> + <field name="parent"> +  + <field-validator type="required" short-circuit="true"> + <message>validator.ui.referentiel.null.parentCode</message> + </field-validator> + </field> + + <field name="objectMaterialType"> +  + <field-validator type="required" short-circuit="true"> + <message>validator.ui.referentiel.null.objectMaterialType</message> + </field-validator> + </field> + + <field name="legacyCode"> +  + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.ui.referentiel.null.legacyCode</message> + </field-validator> + </field> + + <field name="standardCode"> +  + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.ui.referentiel.null.standardCode</message> + </field-validator> + </field> + </validators> ===================================== client-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-update-warning-validation.xml ===================================== --- a/client-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-update-warning-validation.xml +++ b/client-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-update-warning-validation.xml @@ -42,6 +42,7 @@ <message>validator.ui.referentiel.null.uri</message> </field-validator> </field> + <field name="label1">  <field-validator type="fieldexpression"> @@ -62,4 +63,32 @@ </field-validator> </field> + <field name="parent"> +  + <field-validator type="required" short-circuit="true"> + <message>validator.ui.referentiel.null.parentCode</message> + </field-validator> + </field> + + <field name="objectMaterialType"> +  + <field-validator type="required" short-circuit="true"> + <message>validator.ui.referentiel.null.objectMaterialType</message> + </field-validator> + </field> + + <field name="legacyCode"> +  + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.ui.referentiel.null.legacyCode</message> + </field-validator> + </field> + + <field name="standardCode"> +  + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.ui.referentiel.null.standardCode</message> + </field-validator> + </field> + </validators> ===================================== client-validation/src/main/resources/i18n/client-validation_en_GB.properties ===================================== --- a/client-validation/src/main/resources/i18n/client-validation_en_GB.properties +++ b/client-validation/src/main/resources/i18n/client-validation_en_GB.properties @@ -229,6 +229,10 @@ validator.ui.program.required.startDate=Start date must be filled. validator.ui.referentiel.bad.parentCode=Code should starts with %1$s- validator.ui.referentiel.invalid.code.uniqueKey=Code must be unique, value %s is already used. validator.ui.referentiel.invalid.uri.uniqueKey=Uri must be unique, value %s is already used. +validator.ui.referentiel.null.legacyCode=No legacy code filled. +validator.ui.referentiel.null.objectMaterialType=No type selected. +validator.ui.referentiel.null.parentCode=No parent selected. +validator.ui.referentiel.null.standardCode=No standard code filled. validator.ui.referentiel.null.uri=Uri is not filled. validator.ui.referentiel.required.brandName=Brand name must be filled. validator.ui.referentiel.required.code=Code must be filled. ===================================== client-validation/src/main/resources/i18n/client-validation_es_ES.properties ===================================== --- a/client-validation/src/main/resources/i18n/client-validation_es_ES.properties +++ b/client-validation/src/main/resources/i18n/client-validation_es_ES.properties @@ -229,6 +229,10 @@ validator.ui.program.required.startDate=Fecha de comienzo de programa debe ser e validator.ui.referentiel.bad.parentCode=Code should starts with %1$s- \#TODO validator.ui.referentiel.invalid.code.uniqueKey=El código debe ser único, el valor %1$s ya se ha usado. validator.ui.referentiel.invalid.uri.uniqueKey=El uri debe ser único, el valor %1$s ya se ha usado. +validator.ui.referentiel.null.legacyCode=Pas de code ancien renseigné. \#TODO +validator.ui.referentiel.null.objectMaterialType=Pas de type sélectionné. \#TODO +validator.ui.referentiel.null.parentCode=Pas de parent sélectionné. \#TODO +validator.ui.referentiel.null.standardCode=Pas de code standard renseigné. \#TODO validator.ui.referentiel.null.uri=Ningún uri especificado. validator.ui.referentiel.required.brandName=El nombre de marca es mandatorio validator.ui.referentiel.required.code=Code must be filled \#TODO ===================================== client-validation/src/main/resources/i18n/client-validation_fr_FR.properties ===================================== --- a/client-validation/src/main/resources/i18n/client-validation_fr_FR.properties +++ b/client-validation/src/main/resources/i18n/client-validation_fr_FR.properties @@ -229,6 +229,10 @@ validator.ui.program.required.startDate=Date de début de programme non renseign validator.ui.referentiel.bad.parentCode=Le code doit commencer par %1$s- validator.ui.referentiel.invalid.code.uniqueKey=Le code doit être unique, la valeur %1$s est déjà utilisée. validator.ui.referentiel.invalid.uri.uniqueKey=L'uri doit être unique, la valeur %1$s est déjà utilisée. +validator.ui.referentiel.null.legacyCode=Pas de code ancien renseigné. +validator.ui.referentiel.null.objectMaterialType=Pas de type sélectionné. +validator.ui.referentiel.null.parentCode=Pas de parent sélectionné. +validator.ui.referentiel.null.standardCode=Pas de code standard renseigné. validator.ui.referentiel.null.uri=Aucune uri renseignée. validator.ui.referentiel.required.brandName=Le nom n'est pas renseigné. validator.ui.referentiel.required.code=Aucun code renseigné. ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -645,25 +645,14 @@  <pattern>observe.enum.@CLASS_NAME@.@NAME@</pattern> <enums> - <enum>fr.ird.observe.common.constants.GearType</enum> - <enum>fr.ird.observe.common.constants.ReferenceStatus</enum> - <enum>fr.ird.observe.common.constants.TripMapPointType</enum> - <enum>fr.ird.observe.common.constants.seine.SchoolType</enum> - <enum>fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation</enum> - <enum>fr.ird.observe.common.constants.seine.Ownership</enum> - <enum>fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource</enum> - <enum>fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus</enum> - <enum>fr.ird.observe.client.configuration.constants.CreationMode</enum> - <enum>fr.ird.observe.client.configuration.constants.DbMode</enum> <enum>fr.ird.observe.client.db.constants.ConnexionStatus</enum> + <enum>fr.ird.observe.client.ui.admin.AdminStep</enum> <enum>fr.ird.observe.client.ui.admin.synchronize.referential.ReferentialSynchronizeMode</enum> <enum>fr.ird.observe.client.ui.content.ref.impl.ProgramObservationEnum</enum> <enum>fr.ird.observe.client.ui.content.table.impl.seine.ModeSaisieEchantillonEnum</enum> - <enum>fr.ird.observe.client.ui.storage.StorageStep</enum> <enum>fr.ird.observe.client.ui.storage.ObstunaAdminAction</enum> - <enum>fr.ird.observe.client.ui.admin.AdminStep</enum> + <enum>fr.ird.observe.client.ui.storage.StorageStep</enum> <enum>fr.ird.observe.client.validation.ValidationModelMode</enum> - <enum>fr.ird.observe.services.dto.constants.ObserveModelType</enum> </enums> </enumerationSet> <enumerationSet> @@ -671,13 +660,11 @@  <pattern>observe.enum.@CLASS_NAME@.@NAME@.description</pattern> <enums> - <enum>fr.ird.observe.client.configuration.constants.CreationMode</enum> - <enum>fr.ird.observe.client.configuration.constants.DbMode</enum> <enum>fr.ird.observe.client.validation.ValidationModelMode</enum> <enum>fr.ird.observe.client.db.constants.ConnexionStatus</enum> <enum>fr.ird.observe.client.ui.admin.AdminStep</enum> - <enum>fr.ird.observe.client.ui.storage.StorageStep</enum> <enum>fr.ird.observe.client.ui.storage.ObstunaAdminAction</enum> + <enum>fr.ird.observe.client.ui.storage.StorageStep</enum> </enums> </enumerationSet> </enumerationSets> ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ref/impl/seine/ObjectMaterialUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ref/impl/seine/ObjectMaterialUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ref/impl/seine/ObjectMaterialUI.jaxx @@ -40,6 +40,7 @@ <BeanValidator id='validator' autoField='true' beanClass='fr.ird.observe.services.dto.referential.seine.ObjectMaterialDto' context='ui-create' errorTableModel='{getErrorTableModel()}'> + <field name='parent' component='parentCode'/> <field name='label1' component='label1'/> <field name='label2' component='label2'/> <field name='label3' component='label3'/> @@ -79,15 +80,27 @@ </cell> </row> +  + <row> + <cell anchor="west"> + <JLabel id='legacyCodeStandardCodeLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JPanel id='legacyCodeStandardCodePanel' layout='{new GridLayout(1,0)}'> + <JTextField id='legacyCode'/> + <JTextField id='standardCode'/> + </JPanel> + </cell> + </row> +  <row> <cell anchor="west"> <JLabel id='parentCodeLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='parentCode' constructorParams='this' - genericType='ReferentialReference<ObjectMaterialDto>' - _entityClass='ObjectMaterialDto.class'/> + <BeanComboBox id='parentCode' constructorParams='this' _entityClass='ObjectMaterialDto.class' + genericType='ReferentialReference<ObjectMaterialDto>'/> </cell> </row> @@ -97,9 +110,8 @@ <JLabel id='objectMaterialTypeLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='objectMaterialType' constructorParams='this' - genericType='ReferentialReference<ObjectMaterialTypeDto>' - _entityClass='ObjectMaterialTypeDto.class'/> + <BeanComboBox id='objectMaterialType' constructorParams='this' _entityClass='ObjectMaterialTypeDto.class' + genericType='ReferentialReference<ObjectMaterialTypeDto>'/> </cell> </row> ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ref/impl/seine/ObjectMaterialUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ref/impl/seine/ObjectMaterialUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ref/impl/seine/ObjectMaterialUI.jcss @@ -20,6 +20,20 @@ * #L% */ +#legacyCodeStandardCodeLabel { + text:"observe.ui.objectMaterial.legacyCodeStandardCode"; +} + +#legacyCode { + text:{getStringValue(bean.getLegacyCode())}; + _propertyName:{ObjectMaterialDto.PROPERTY_LEGACY_CODE}; +} + +#standardCode { + text:{getStringValue(bean.getStandardCode())}; + _propertyName:{ObjectMaterialDto.PROPERTY_STANDARD_CODE}; +} + #parentCodeLabel { text:"observe.common.parentCode"; labelFor:{parentCode}; @@ -28,7 +42,6 @@ #parentCode { property:{ObjectMaterialDto.PROPERTY_PARENT}; selectedItem:{bean.getParent()}; - _validatorLabel: {t("observe.common.parentCode")}; } #objectMaterialTypeLabel { @@ -48,7 +61,7 @@ #validation { text:{getStringValue(bean.getValidation())}; - _propertyName:{ObjectMaterialDto.PROPERTY_VALIDATION}; + _propertyName:{ObjectMaterialDto.PROPERTY_VALIDATION}; } #selectable { ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ref/impl/seine/ObjectMaterialUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ref/impl/seine/ObjectMaterialUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ref/impl/seine/ObjectMaterialUIModel.java @@ -36,7 +36,27 @@ public class ObjectMaterialUIModel extends ContentReferenceUIModel<ObjectMateria private static final long serialVersionUID = 1L; public ObjectMaterialUIModel() { - super(ObjectMaterialDto.class); + super(ObjectMaterialDto.class, + new String[]{ + ObjectMaterialDto.PROPERTY_PARENT, + ObjectMaterialDto.PROPERTY_LEGACY_CODE, + ObjectMaterialDto.PROPERTY_STANDARD_CODE, + ObjectMaterialDto.PROPERTY_OBJECT_MATERIAL_TYPE, + ObjectMaterialDto.PROPERTY_VALIDATION, + ObjectMaterialDto.PROPERTY_SELECTABLE, + ObjectMaterialDto.PROPERTY_CHILD_SELECTION_MANDATORY, + ObjectMaterialDto.PROPERTY_CHILDREN_MULTI_SELECTABLE + }, + new String[]{ + ObjectMaterialUI.BINDING_PARENT_CODE_SELECTED_ITEM, + ObjectMaterialUI.BINDING_OBJECT_MATERIAL_TYPE_SELECTED_ITEM, + ObjectMaterialUI.BINDING_LEGACY_CODE_TEXT, + ObjectMaterialUI.BINDING_STANDARD_CODE_TEXT, + ObjectMaterialUI.BINDING_VALIDATION_TEXT, + ObjectMaterialUI.BINDING_SELECTABLE_SELECTED, + ObjectMaterialUI.BINDING_CHILD_SELECTION_MANDATORY_SELECTED, + ObjectMaterialUI.BINDING_CHILDREN_MULTI_SELECTABLE_SELECTED + }); } } ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeHeader.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeHeader.jcss +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeHeader.jcss @@ -23,23 +23,23 @@ #showSeine { selected: {tree.getTreeModel().isLoadSeine()}; text:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS"; - toolTipText:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS.tip"; + toolTipText:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS.description"; } #showLongline { selected: {tree.getTreeModel().isLoadLongline()}; text:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL"; - toolTipText:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL.tip"; + toolTipText:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL.description"; } #showReferential { selected: {tree.getTreeModel().isLoadReferential()}; text:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF"; - toolTipText:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF.tip"; + toolTipText:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF.description"; } #showEmptyProgram { selected: {tree.getTreeModel().isLoadEmptyProgram()}; text:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY"; - toolTipText:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY.tip"; + toolTipText:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY.description"; } JToggleButton { ===================================== client/src/main/resources/i18n/client_en_GB.properties ===================================== --- a/client/src/main/resources/i18n/client_en_GB.properties +++ b/client/src/main/resources/i18n/client_en_GB.properties @@ -1291,26 +1291,6 @@ observe.converter.error.float.format=Decimal format not correct for value %s observe.converter.error.no.convertor=could not convert decimal %s using convertor %s observe.converter.error.noValue=No value to convert using convertor %s observe.entity.message.updating=object '%1$s' is in editing mode. -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.EMPTY=Generate an empty data base. -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.EMPTY.description=Generate a new empty data base. -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP=Load a database backup (*.sql.gz) -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP.description=Create a new databse from -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP=Load embbeded local database -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP.description=Generate a new local data base and import in it the referential of the last embbeded database. -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE=Import referential from a local data base -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE.description=Generate a new local data bse and import in it the referential of another local data base. -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE=Import referential from a remote database -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE.description=Generate a new local data base and import in it the referential of a remove database. -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE=Import referential from a remote server -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE.description=Generate a new local data base and import in it the referential of a remove server. -observe.enum.fr.ird.observe.client.configuration.constants.DbMode.CREATE_LOCAL=Create a new local database -observe.enum.fr.ird.observe.client.configuration.constants.DbMode.CREATE_LOCAL.description=Create a new local database (type H2) -observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_LOCAL=Use local database -observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_LOCAL.description=Use the local database (type H2) -observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_REMOTE=Use a direct connection to a remote database -observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_REMOTE.description=sans service web (moins performant) -observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_SERVER=Use a remote web service -observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_SERVER.description=Use a remote ObServe web service to connect to a central database with better performances than with a direct connection observe.enum.fr.ird.observe.client.db.constants.ConnexionStatus.FAILED=Connexion failed observe.enum.fr.ird.observe.client.db.constants.ConnexionStatus.FAILED.description=The connexion failed for following reason\: observe.enum.fr.ird.observe.client.db.constants.ConnexionStatus.SUCCESS=Connexion success @@ -1387,52 +1367,10 @@ observe.enum.fr.ird.observe.client.validation.ValidationModelMode.DATA=Only data observe.enum.fr.ird.observe.client.validation.ValidationModelMode.DATA.description=Only data observe.enum.fr.ird.observe.client.validation.ValidationModelMode.REFERENTIEL=Only referentials observe.enum.fr.ird.observe.client.validation.ValidationModelMode.REFERENTIEL.description=Only referentials -observe.enum.fr.ird.observe.common.constants.GearType.longline=Longline gear type -observe.enum.fr.ird.observe.common.constants.GearType.seine=Senne gear type -observe.enum.fr.ird.observe.common.constants.ReferenceStatus.disabled=Disabled -observe.enum.fr.ird.observe.common.constants.ReferenceStatus.enabled=Enabled -observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivity=Activity -observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityInHarbour=Au Harbour -observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithHaulingEnd=Hauling end -observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithHaulingStart=Hauling start -observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithInteraction=Encounter -observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithSettingEnd=Setting end -observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithSettingStart=Setting start -observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithStation=Station -observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineDepartureHarbour=Harbour departure -observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineLandingHarbour=Harbour landing -observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivity=Activity -observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityInHarbour=In harbour -observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityWithFreeSchoolType=Free School type -observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityWithObjectSchoolType=Object School type -observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineDepartureHarbour=Harbour departure -observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineLandingHarbour=Harbour landing -observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromData=Computed from data -observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromReferentiel=Computed from referential -observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromSample=Computed from samples -observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.M=Moderate -observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.P=Perfect -observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.S=Bad -observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.U=Unknown -observe.enum.fr.ird.observe.common.constants.seine.Ownership.autreVessel=Other vessel -observe.enum.fr.ird.observe.common.constants.seine.Ownership.ceVessel=This vessel -observe.enum.fr.ird.observe.common.constants.seine.Ownership.unknown=Unknown -observe.enum.fr.ird.observe.common.constants.seine.SchoolType.libre=Free school type -observe.enum.fr.ird.observe.common.constants.seine.SchoolType.objet=Object school type -observe.enum.fr.ird.observe.common.constants.seine.SchoolType.undefined=Undefined school type -observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.pasDeBalise=No Beacon -observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.pose=Posing -observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperation=Grab -observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Grab and change -observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.visite=Visit observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY=Without trips -observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY.tip=Display programs with no trip -observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL=Longline -observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL.tip=Display Palangre's programs -observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS=Seine -observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS.tip=Display Seine's programs +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY.description=Display programs with no trip observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF=Referential -observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF.tip=Display referential +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF.description=Display referential observe.error.can.not.create.directory=Can't create directory %&$s\! observe.error.no.activity.6=Activity of type 6 was not found. observe.error.storage.could.not.backup.unsane.local.db=Can not save an borken database @@ -1739,6 +1677,7 @@ observe.type.setLongline.unsaved=New fishing operation observe.type.setSeine.unsaved=New set observe.type.tripLongline.unsaved=New trip observe.type.tripSeine.unsaved=New trip +observe.ui.objectMaterial.legacyCodeStandardCode=Legacy code / Standard code observe.usage.action.shouldReplace=Remplace desactivated referential ? observe.usage.replaceTitle=Replacement object observe.usage.usageTitle=Founded references ===================================== client/src/main/resources/i18n/client_es_ES.properties ===================================== --- a/client/src/main/resources/i18n/client_es_ES.properties +++ b/client/src/main/resources/i18n/client_es_ES.properties @@ -1291,26 +1291,6 @@ observe.converter.error.float.format=Formato de decimal incorrecto para el valor observe.converter.error.no.convertor=Impossible de convertir el decimal %s con el convertidor %s observe.converter.error.noValue=Ningún valor necesita ser convertida con el convertidor %s observe.entity.message.updating=Se está modificando el objeto actual '%1$s'. -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.EMPTY=Generar una base vacía -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.EMPTY.description=Generar una nueva base local vacía.\nEsta base no tendrá referencial y usted tendrá que importar lo posteriormente... -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP=Cargar una copia de seguridad de la base local (*.sql.gz) -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP.description=Crear una nueva base local a partir\nde una copia de seguridad anterior de la aplicación -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP=Cargar la base de datos incrustada -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP.description=Generar una nueva base local a partir\nde la última versión de la base incrustada. -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE=Importar el referencial de una base local -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE.description=Generar una nueva base local e importar el referencial de una otra base local. -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE=Importar el referencial de una base remota -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE.description=Generar una nueva base locale e importar el referencial e una otra base remota. -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE=Importar el referencial de un servidor remoto -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE.description=Generar una nueva base local e importar el referencial de un servidor remoto. -observe.enum.fr.ird.observe.client.configuration.constants.DbMode.CREATE_LOCAL=Crear una base local -observe.enum.fr.ird.observe.client.configuration.constants.DbMode.CREATE_LOCAL.description=Crear una base local de tipo H2 -observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_LOCAL=Utilizar une base local -observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_LOCAL.description=Utilizar una base local de tipo H2 -observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_REMOTE=Utilizar una conexión directa a une base remota -observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_REMOTE.description=Use a remote database (PostgreSQL)\= without web service (less efficient)\=Utilizar una base remota de tipo PostgreSQL\= sin servicio web (menos eficiente) -observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_SERVER=Utilizar un servicio web remoto -observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_SERVER.description=Utilizar un servicio web remoto para obtener un mejor rendimiento observe.enum.fr.ird.observe.client.db.constants.ConnexionStatus.FAILED=Conexión falló observe.enum.fr.ird.observe.client.db.constants.ConnexionStatus.FAILED.description=La conexión falló por la razón siguiente \:\n %1$s observe.enum.fr.ird.observe.client.db.constants.ConnexionStatus.SUCCESS=Conexión con éxito @@ -1387,52 +1367,10 @@ observe.enum.fr.ird.observe.client.validation.ValidationModelMode.DATA=Datos del observe.enum.fr.ird.observe.client.validation.ValidationModelMode.DATA.description=Datos del observador observe.enum.fr.ird.observe.client.validation.ValidationModelMode.REFERENTIEL=Referencial observe.enum.fr.ird.observe.client.validation.ValidationModelMode.REFERENTIEL.description=Todos los referenciales -observe.enum.fr.ird.observe.common.constants.GearType.longline=Palangre -observe.enum.fr.ird.observe.common.constants.GearType.seine=Senne -observe.enum.fr.ird.observe.common.constants.ReferenceStatus.disabled=Desactivado -observe.enum.fr.ird.observe.common.constants.ReferenceStatus.enabled=Activo -observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivity=Actividad -observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityInHarbour=En el puerto -observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithHaulingEnd=Fin de arrastre -observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithHaulingStart=Inicio de arrastre -observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithInteraction=Encuentro -observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithSettingEnd=Fin de calada -observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithSettingStart=Inicio de calada -observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithStation=Station -observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineDepartureHarbour=Puerto de salida -observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineLandingHarbour=Puerto de llegada -observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivity=Actividad -observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityInHarbour=En el puerto -observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityWithFreeSchoolType=Banco libre -observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityWithObjectSchoolType=Banco a objeto -observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineDepartureHarbour=Puerto de salida -observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineLandingHarbour=Puerto de llegada -observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromData=Calculado a partir de otros datos -observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromReferentiel=Calculado a partir del referencial -observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromSample=Calculado a partir de las muestras -observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.M=Modéré \#TODO -observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.P=Parfait \#TODO -observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.S=Sévère \#TODO -observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.U=Inconnu \#TODO -observe.enum.fr.ird.observe.common.constants.seine.Ownership.autreVessel=Barco ajeno -observe.enum.fr.ird.observe.common.constants.seine.Ownership.ceVessel=Este barco o un barco del mismo armador -observe.enum.fr.ird.observe.common.constants.seine.Ownership.unknown=Desconocido -observe.enum.fr.ird.observe.common.constants.seine.SchoolType.libre=Banco libre -observe.enum.fr.ird.observe.common.constants.seine.SchoolType.objet=Banco a objeto -observe.enum.fr.ird.observe.common.constants.seine.SchoolType.undefined=Banco indeterminado -observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.pasDeBalise=DCP sin baliza -observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.pose=Colocación de nueva baliza -observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperation=Recogida de baliza sin regreso al agua -observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Recuperación y colocación de una nueva baliza -observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.visite=Visita a la baliza observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY=Sans marée\#TODO -observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY.tip=Voir les programmes sans marée \#TODO -observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL=Palangre -observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL.tip=Voir les programmes Palangre \#TODO -observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS=Senne -observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS.tip=Voir les programmes Senne \#TODO +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY.description=Voir les programmes sans marée \#TODO observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF=Referencial -observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF.tip=Voir le référentiel \#TODO +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF.description=Voir le référentiel \#TODO observe.error.can.not.create.directory=¡Imposible crear el directorio %1$s\! observe.error.no.activity.6=La actividad con código 6 no se ha encontrado en la base de datos. observe.error.storage.could.not.backup.unsane.local.db=Impossible grabar una base dañada @@ -1739,6 +1677,7 @@ observe.type.setLongline.unsaved=Nuevo lance observe.type.setSeine.unsaved=Nuevo lance observe.type.tripLongline.unsaved=Nueva marea observe.type.tripSeine.unsaved=Nueva marea +observe.ui.objectMaterial.legacyCodeStandardCode=Ancien code / Code standard \#TODO observe.usage.action.shouldReplace=Reemplaza referencial desactivado? observe.usage.replaceTitle=Objeto de sustitución observe.usage.usageTitle=Referencias encontradas ===================================== client/src/main/resources/i18n/client_fr_FR.properties ===================================== --- a/client/src/main/resources/i18n/client_fr_FR.properties +++ b/client/src/main/resources/i18n/client_fr_FR.properties @@ -1291,32 +1291,12 @@ observe.converter.error.float.format=Format de décimal incorrecte pour la valeu observe.converter.error.no.convertor=Impossible de convertir le décimal %s depuis le convertisseur %s observe.converter.error.noValue=Aucune valeur à convertir pour le convertisseur %s observe.entity.message.updating=L'objet '%1$s' est en cours de modification. -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.EMPTY=Générer une base vide -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.EMPTY.description=Générer une nouvelle base locale vide. -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP=Charger une sauvegarde de base locale (*.sql.gz) -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP.description=Créer une nouvelle base locale à partir -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP=Charger la base embarquée -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP.description=Générer une nouvelle base locale à partir -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE=Importer le référentiel d'une base locale -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE.description=Générer une nouvelle base locale et y importer le référentiel d'une autre base locale. -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE=Importer le référentiel d'une base distante -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE.description=Générer une nouvelle base locale et y importer le référentiel d'une autre base distante. -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE=Importer le référentiel dun serveur distant -observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE.description=Générer une nouvelle base locale et y importer le référentiel d'un serveur distant. -observe.enum.fr.ird.observe.client.configuration.constants.DbMode.CREATE_LOCAL=Créer une base locale -observe.enum.fr.ird.observe.client.configuration.constants.DbMode.CREATE_LOCAL.description=Créer une base locale de type H2 -observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_LOCAL=Utiliser une base locale -observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_LOCAL.description=Utiliser une base locale de type H2 -observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_REMOTE=Utiliser une base distante en connexion directe -observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_REMOTE.description=Utiliser une base distante de type PostgreSQL en connexion directe -observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_SERVER=Utiliser un service web distant -observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_SERVER.description=Utiliser un service web ObServe distant pour se connecter à une base centrale avec de meilleures performances qu'en connexion directe observe.enum.fr.ird.observe.client.db.constants.ConnexionStatus.FAILED=Connexion échouée observe.enum.fr.ird.observe.client.db.constants.ConnexionStatus.FAILED.description=La connexion a échouée pour la raison suivante \: observe.enum.fr.ird.observe.client.db.constants.ConnexionStatus.SUCCESS=Connexion réussie observe.enum.fr.ird.observe.client.db.constants.ConnexionStatus.SUCCESS.description=Information sur la connexion \: observe.enum.fr.ird.observe.client.db.constants.ConnexionStatus.UNTESTED=Connexion non validée -observe.enum.fr.ird.observe.client.db.constants.ConnexionStatus.UNTESTED.description=La connexion n'a jamais été validée, +observe.enum.fr.ird.observe.client.db.constants.ConnexionStatus.UNTESTED.description=La connexion n'a jamais été validée, observe.enum.fr.ird.observe.client.ui.admin.AdminStep.CONFIG=Configuration observe.enum.fr.ird.observe.client.ui.admin.AdminStep.CONFIG.description=Configuration des opérations et sources de données à utiliser. observe.enum.fr.ird.observe.client.ui.admin.AdminStep.CONSOLIDATE=Calculer les données @@ -1387,52 +1367,10 @@ observe.enum.fr.ird.observe.client.validation.ValidationModelMode.DATA=Données observe.enum.fr.ird.observe.client.validation.ValidationModelMode.DATA.description=Données observées observe.enum.fr.ird.observe.client.validation.ValidationModelMode.REFERENTIEL=Référentiel observe.enum.fr.ird.observe.client.validation.ValidationModelMode.REFERENTIEL.description=Tous les référentiels -observe.enum.fr.ird.observe.common.constants.GearType.longline=Palangre -observe.enum.fr.ird.observe.common.constants.GearType.seine=Senne -observe.enum.fr.ird.observe.common.constants.ReferenceStatus.disabled=Désactivé -observe.enum.fr.ird.observe.common.constants.ReferenceStatus.enabled=Actif -observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivity=point d'activité -observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityInHarbour=Au port -observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithHaulingEnd=Fin de virage -observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithHaulingStart=Début de virage -observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithInteraction=Rencontre -observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithSettingEnd=Fin de filage -observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithSettingStart=Début de filage -observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithStation=Station océanographique -observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineDepartureHarbour=Port de départ -observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineLandingHarbour=Port d'arrivée -observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivity=point d'activité -observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityInHarbour=Au port -observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityWithFreeSchoolType=Banc libre -observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityWithObjectSchoolType=Banc objet -observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineDepartureHarbour=Port de départ -observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineLandingHarbour=Port d'arrivée -observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromData=calculé à partir des autres données -observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromReferentiel=calculé à partir du référentiel -observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromSample=calculé à partir des échantillons -observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.M=Modéré -observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.P=Parfait -observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.S=Sévère -observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.U=Inconnu -observe.enum.fr.ird.observe.common.constants.seine.Ownership.autreVessel=Navire d'un autre armement -observe.enum.fr.ird.observe.common.constants.seine.Ownership.ceVessel=Ce navire ou cet armement -observe.enum.fr.ird.observe.common.constants.seine.Ownership.unknown=Inconnue -observe.enum.fr.ird.observe.common.constants.seine.SchoolType.libre=Banc libre -observe.enum.fr.ird.observe.common.constants.seine.SchoolType.objet=Banc objet -observe.enum.fr.ird.observe.common.constants.seine.SchoolType.undefined=Banc indéterminé -observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.pasDeBalise=Pas de balise liée au DCP -observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.pose=Pose d'une nouvelle balise -observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperation=Récupération d'une balise sans remise à l'eau -observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Récupération et pose d'une nouvelle balise -observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.visite=Simple visite de la balise observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY=Sans marée -observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY.tip=Voir les programmes sans marée -observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL=Palangre -observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL.tip=Voir les programmes Palangre -observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS=Senne -observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS.tip=Voir les programmes Seine +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY.description=Voir les programmes sans marée observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF=Référentiel -observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF.tip=Voir le référentiel +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF.description=Voir le référentiel observe.error.can.not.create.directory=Création du répertoire %1$s impossible\! observe.error.no.activity.6=L'activité de type 6 n'a pas été trouvée en base. observe.error.storage.could.not.backup.unsane.local.db=Impossible d'enregistrer une base non endommagée @@ -1739,6 +1677,7 @@ observe.type.setLongline.unsaved=Nouvelle opération de pêche observe.type.setSeine.unsaved=Nouvelle calée observe.type.tripLongline.unsaved=Nouvelle marée observe.type.tripSeine.unsaved=Nouvelle marée +observe.ui.objectMaterial.legacyCodeStandardCode=Ancien code / Code standard observe.usage.action.shouldReplace=Remplacer le référentiel désactivé ? observe.usage.replaceTitle=Objet de remplacement observe.usage.usageTitle=Références trouvées ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -78,4 +78,55 @@ </dependency> </dependencies> + + <build> + <plugins> + <plugin> + <groupId>io.ultreia.java4all.i18n</groupId> + <artifactId>i18n-maven-plugin</artifactId> + <executions> + <execution> + <id>generateI18nEnumHelper</id> + <goals> + <goal>generateI18nEnumHelper</goal> + </goals> + <configuration> + <enumerationSets> + <enumerationSet> + <name>label</name> +  + <pattern>observe.enum.@CLASS_NAME@.@NAME@</pattern> + <enums> + <enum>fr.ird.observe.common.constants.GearType</enum> + <enum>fr.ird.observe.common.constants.ReferenceStatus</enum> + <enum>fr.ird.observe.common.constants.TripMapPointType</enum> + <enum>fr.ird.observe.common.constants.seine.SchoolType</enum> + <enum>fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation</enum> + <enum>fr.ird.observe.common.constants.seine.Ownership</enum> + <enum>fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource</enum> + <enum>fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus</enum> + </enums> + </enumerationSet> + </enumerationSets> + </configuration> + </execution> + <execution> + <id>scan-sources</id> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + <configuration> + <entries> + <entry> + <specificGoal>parserJava</specificGoal> + <basedir>${project.build.directory}/generated-sources/java/</basedir> + </entry> + </entries> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> ===================================== common/src/main/resources/i18n/common_en_GB.properties ===================================== --- /dev/null +++ b/common/src/main/resources/i18n/common_en_GB.properties @@ -0,0 +1,38 @@ +observe.enum.fr.ird.observe.common.constants.GearType.longline=Longline gear type +observe.enum.fr.ird.observe.common.constants.GearType.seine=Senne gear type +observe.enum.fr.ird.observe.common.constants.ReferenceStatus.disabled=Disabled +observe.enum.fr.ird.observe.common.constants.ReferenceStatus.enabled=Enabled +observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivity=Activity +observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityInHarbour=Au Harbour +observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithHaulingEnd=Hauling end +observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithHaulingStart=Hauling start +observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithInteraction=Encounter +observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithSettingEnd=Setting end +observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithSettingStart=Setting start +observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithStation=Station +observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineDepartureHarbour=Harbour departure +observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineLandingHarbour=Harbour landing +observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivity=Activity +observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityInHarbour=In harbour +observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityWithFreeSchoolType=Free School type +observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityWithObjectSchoolType=Object School type +observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineDepartureHarbour=Harbour departure +observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineLandingHarbour=Harbour landing +observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromData=Computed from data +observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromReferentiel=Computed from referential +observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromSample=Computed from samples +observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.M=Moderate +observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.P=Perfect +observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.S=Bad +observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.U=Unknown +observe.enum.fr.ird.observe.common.constants.seine.Ownership.autreVessel=Other vessel +observe.enum.fr.ird.observe.common.constants.seine.Ownership.ceVessel=This vessel +observe.enum.fr.ird.observe.common.constants.seine.Ownership.unknown=Unknown +observe.enum.fr.ird.observe.common.constants.seine.SchoolType.libre=Free school type +observe.enum.fr.ird.observe.common.constants.seine.SchoolType.objet=Object school type +observe.enum.fr.ird.observe.common.constants.seine.SchoolType.undefined=Undefined school type +observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.pasDeBalise=No Beacon +observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.pose=Posing +observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperation=Grab +observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Grab and change +observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.visite=Visit ===================================== common/src/main/resources/i18n/common_es_ES.properties ===================================== --- /dev/null +++ b/common/src/main/resources/i18n/common_es_ES.properties @@ -0,0 +1,38 @@ +observe.enum.fr.ird.observe.common.constants.GearType.longline=Palangre +observe.enum.fr.ird.observe.common.constants.GearType.seine=Senne +observe.enum.fr.ird.observe.common.constants.ReferenceStatus.disabled=Desactivado +observe.enum.fr.ird.observe.common.constants.ReferenceStatus.enabled=Activo +observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivity=Actividad +observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityInHarbour=En el puerto +observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithHaulingEnd=Fin de arrastre +observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithHaulingStart=Inicio de arrastre +observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithInteraction=Encuentro +observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithSettingEnd=Fin de calada +observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithSettingStart=Inicio de calada +observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithStation=Station +observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineDepartureHarbour=Puerto de salida +observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineLandingHarbour=Puerto de llegada +observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivity=Actividad +observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityInHarbour=En el puerto +observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityWithFreeSchoolType=Banco libre +observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityWithObjectSchoolType=Banco a objeto +observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineDepartureHarbour=Puerto de salida +observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineLandingHarbour=Puerto de llegada +observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromData=Calculado a partir de otros datos +observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromReferentiel=Calculado a partir del referencial +observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromSample=Calculado a partir de las muestras +observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.M=Modéré \#TODO +observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.P=Parfait \#TODO +observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.S=Sévère \#TODO +observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.U=Inconnu \#TODO +observe.enum.fr.ird.observe.common.constants.seine.Ownership.autreVessel=Barco ajeno +observe.enum.fr.ird.observe.common.constants.seine.Ownership.ceVessel=Este barco o un barco del mismo armador +observe.enum.fr.ird.observe.common.constants.seine.Ownership.unknown=Desconocido +observe.enum.fr.ird.observe.common.constants.seine.SchoolType.libre=Banco libre +observe.enum.fr.ird.observe.common.constants.seine.SchoolType.objet=Banco a objeto +observe.enum.fr.ird.observe.common.constants.seine.SchoolType.undefined=Banco indeterminado +observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.pasDeBalise=DCP sin baliza +observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.pose=Colocación de nueva baliza +observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperation=Recogida de baliza sin regreso al agua +observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Recuperación y colocación de una nueva baliza +observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.visite=Visita a la baliza ===================================== common/src/main/resources/i18n/common_fr_FR.properties ===================================== --- /dev/null +++ b/common/src/main/resources/i18n/common_fr_FR.properties @@ -0,0 +1,38 @@ +observe.enum.fr.ird.observe.common.constants.GearType.longline=Palangre +observe.enum.fr.ird.observe.common.constants.GearType.seine=Senne +observe.enum.fr.ird.observe.common.constants.ReferenceStatus.disabled=Désactivé +observe.enum.fr.ird.observe.common.constants.ReferenceStatus.enabled=Actif +observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivity=point d'activité +observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityInHarbour=Au port +observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithHaulingEnd=Fin de virage +observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithHaulingStart=Début de virage +observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithInteraction=Rencontre +observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithSettingEnd=Fin de filage +observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithSettingStart=Début de filage +observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithStation=Station océanographique +observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineDepartureHarbour=Port de départ +observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineLandingHarbour=Port d'arrivée +observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivity=point d'activité +observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityInHarbour=Au port +observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityWithFreeSchoolType=Banc libre +observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityWithObjectSchoolType=Banc objet +observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineDepartureHarbour=Port de départ +observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineLandingHarbour=Port d'arrivée +observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromData=calculé à partir des autres données +observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromReferentiel=calculé à partir du référentiel +observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromSample=calculé à partir des échantillons +observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.M=Modéré +observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.P=Parfait +observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.S=Sévère +observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.U=Inconnu +observe.enum.fr.ird.observe.common.constants.seine.Ownership.autreVessel=Navire d'un autre armement +observe.enum.fr.ird.observe.common.constants.seine.Ownership.ceVessel=Ce navire ou cet armement +observe.enum.fr.ird.observe.common.constants.seine.Ownership.unknown=Inconnue +observe.enum.fr.ird.observe.common.constants.seine.SchoolType.libre=Banc libre +observe.enum.fr.ird.observe.common.constants.seine.SchoolType.objet=Banc objet +observe.enum.fr.ird.observe.common.constants.seine.SchoolType.undefined=Banc indéterminé +observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.pasDeBalise=Pas de balise liée au DCP +observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.pose=Pose d'une nouvelle balise +observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperation=Récupération d'une balise sans remise à l'eau +observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Récupération et pose d'une nouvelle balise +observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.visite=Simple visite de la balise ===================================== services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java +++ b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java @@ -55,18 +55,20 @@ public abstract class ReferentialBinderSupport<E extends ObserveReferentialEntit protected ReferentialReference<D> toReferentialReference(E entity, Serializable... values) { - ReferentialReference<D> reference = new ReferentialReference<>(); - - reference.setId(entity.getTopiaId()); - reference.setCreateDate(entity.getTopiaCreateDate()); - reference.setVersion(entity.getTopiaVersion()); + ReferentialReference<D> reference=null; + if (entity!=null) { + reference = new ReferentialReference<>(); - reference.setLastUpdateDate(entity.getLastUpdateDate()); - reference.setEnabled(entity.isEnabled()); - reference.setNeedComment(entity.isNeedComment()); + reference.setId(entity.getTopiaId()); + reference.setCreateDate(entity.getTopiaCreateDate()); + reference.setVersion(entity.getTopiaVersion()); - reference.init(definition.getType(), definition.getPropertyNames(), values); + reference.setLastUpdateDate(entity.getLastUpdateDate()); + reference.setEnabled(entity.isEnabled()); + reference.setNeedComment(entity.isNeedComment()); + reference.init(definition.getType(), definition.getPropertyNames(), values); + } return reference; } ===================================== services-topia/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectMaterialBinder.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectMaterialBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectMaterialBinder.java @@ -50,7 +50,7 @@ public class ObjectMaterialBinder extends ReferentialBinderSupport<ObjectMateria copyDtoI18nFieldsToEntity(dto, entity); entity.setLegacyCode(dto.getLegacyCode()); entity.setStandardCode(dto.getStandardCode()); - entity.setParent(dto.getParent() == null ? null : toEntity(dto.getParent(), ObjectMaterial.class)); + entity.setParent(toEntity(dto.getParent(), ObjectMaterial.class)); entity.setObjectMaterialType(toEntity(dto.getObjectMaterialType(), ObjectMaterialType.class)); entity.setSelectable(dto.isSelectable()); entity.setValidation(dto.getValidation()); @@ -66,7 +66,7 @@ public class ObjectMaterialBinder extends ReferentialBinderSupport<ObjectMateria dto.setLegacyCode(entity.getLegacyCode()); dto.setStandardCode(entity.getStandardCode()); - dto.setParent(entity.getParent() == null ? null : toReferentialReference(referentialLocale, entity.getParent())); + dto.setParent(toReferentialReference(referentialLocale, entity.getParent())); dto.setObjectMaterialType(toReferentialReference(referentialLocale, entity.getObjectMaterialType(), ObjectMaterialTypeDto.class)); dto.setValidation(entity.getValidation()); dto.setSelectable(entity.isSelectable()); @@ -91,7 +91,7 @@ public class ObjectMaterialBinder extends ReferentialBinderSupport<ObjectMateria return toReferentialReference(dto, dto.getCode(), getLabel(referentialLocale, dto), - Optional.ofNullable(dto.getParent()).map(r -> r.getPropertyValue("parent")).orElse(null), + Optional.ofNullable(dto.getParent()).map(r -> r.getPropertyValue(ObjectMaterialDto.PROPERTY_PARENT)).orElse(null), dto.getObjectMaterialType().getId(), dto.getValidation()); ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -229,15 +229,48 @@ <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> + <id>generateI18nEnumHelper</id> + <goals> + <goal>generateI18nEnumHelper</goal> + </goals> + <configuration> + <enumerationSets> + <enumerationSet> + <name>label</name> +  + <pattern>observe.enum.@CLASS_NAME@.@NAME@</pattern> + <enums> + <enum>fr.ird.observe.services.dto.constants.ObserveModelType</enum> + </enums> + </enumerationSet> + <enumerationSet> + <name>description</name> +  + <pattern>observe.enum.@CLASS_NAME@.@NAME@.description</pattern> + <enums> + <enum>fr.ird.observe.services.dto.constants.ObserveModelType</enum> + </enums> + </enumerationSet> + </enumerationSets> + </configuration> + </execution> + <execution> <id>scan-sources</id> <goals> <goal>parserJava</goal> <goal>gen</goal> </goals> + <configuration> + <entries> + <entry> + <specificGoal>parserJava</specificGoal> + <basedir>${project.build.directory}/generated-sources/java/</basedir> + </entry> + </entries> + </configuration> </execution> </executions> </plugin> </plugins> - </build> </project> ===================================== services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java +++ b/services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java @@ -1761,9 +1761,8 @@ class ObserveDtoInitializer { flushReferential(referentialFormBuilder((ObjectMaterialDto.class)) - .addKey("parentCode", referenceSetDefinition(ObjectMaterialDto.class)) - . - addKey(ObjectMaterialDto.PROPERTY_OBJECT_MATERIAL_TYPE, referenceSetDefinition(ObjectMaterialTypeDto.class))); + .addKey(ObjectMaterialDto.PROPERTY_PARENT, referenceSetDefinition(ObjectMaterialDto.class)) + .addKey(ObjectMaterialDto.PROPERTY_OBJECT_MATERIAL_TYPE, referenceSetDefinition(ObjectMaterialTypeDto.class))); } @Override ===================================== services/src/main/java/fr/ird/observe/services/decoration/ObserveI18nDecoratorHelper.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/decoration/ObserveI18nDecoratorHelper.java +++ b/services/src/main/java/fr/ird/observe/services/decoration/ObserveI18nDecoratorHelper.java @@ -219,6 +219,9 @@ public class ObserveI18nDecoratorHelper { n("observe.common.lightsticksPerBasketCount"); n("observe.common.lightsticksType"); n("observe.common.lineType"); + n("observe.common.parent"); + n("observe.common.legacyCode"); + n("observe.common.standardCode"); n("observe.common.locode"); n("observe.common.longitude"); n("observe.common.maturityStatus"); ===================================== services/src/main/resources/i18n/services_en_GB.properties ===================================== --- a/services/src/main/resources/i18n/services_en_GB.properties +++ b/services/src/main/resources/i18n/services_en_GB.properties @@ -103,6 +103,7 @@ observe.common.label3=Spanish label observe.common.landingHarbour=Landing harbour observe.common.lastName=Last name observe.common.latitude=Latitude +observe.common.legacyCode=Legacy code observe.common.length=Length observe.common.lengthWeightFormula=Length weight formula observe.common.lightsticksColor=Lightsticks color @@ -145,6 +146,7 @@ observe.common.ocean/label8=Ocean observe.common.organism=Organism observe.common.outputInputFormula=Output to Input formula observe.common.outputSizeMeasureType=Output size measure type +observe.common.parent=Parent observe.common.power=Power observe.common.previousFpaZone=Previous Fpa zone observe.common.program=Program @@ -193,6 +195,7 @@ observe.common.speciesGroupReleaseMode=Release mode observe.common.speciesGroupReleaseStatus=Release state observe.common.speciesStatus=Species status observe.common.speedRange=Speed range +observe.common.standardCode=Standard code observe.common.startDate=Start date observe.common.startLogValue=Start log value observe.common.startTime=Sart time @@ -249,6 +252,10 @@ observe.common.whenLeaving=When leaving observe.common.wind=Wind observe.common.wormsId=Worms id observe.common.yearService=Year service +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL=Longline +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL.description=Display Palangre's programs +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS=Seine +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS.description=Display Seine's programs observe.type.activityLongline=Activity observe.type.activityLonglineEncounter=Encounter observe.type.activityLonglineEncounters=Encounters ===================================== services/src/main/resources/i18n/services_es_ES.properties ===================================== --- a/services/src/main/resources/i18n/services_es_ES.properties +++ b/services/src/main/resources/i18n/services_es_ES.properties @@ -103,6 +103,7 @@ observe.common.label3=Nombre observe.common.landingHarbour=Puerto de desembarque observe.common.lastName=Nombre observe.common.latitude=Latitud +observe.common.legacyCode=Ancien code \#TODO observe.common.length=Longitud eslora total observe.common.lengthWeightFormula=Relación de peso observe.common.lightsticksColor=Color de barrita de luz @@ -145,6 +146,7 @@ observe.common.ocean/label8=Océano observe.common.organism=Organismo observe.common.outputInputFormula=Formule Sortie vers Entrée \#TODO observe.common.outputSizeMeasureType=Type de mensuration de sortie \#TODO +observe.common.parent=Parent \#TODO observe.common.power=Potencia del motor principal observe.common.previousFpaZone=La zona FPA de que se salió observe.common.program=Programa @@ -193,6 +195,7 @@ observe.common.speciesGroupReleaseMode=Mode de libération \#TODO observe.common.speciesGroupReleaseStatus=État à la libération \#TODO observe.common.speciesStatus=Estado de especie observe.common.speedRange=Texto velocidad del viento +observe.common.standardCode=Code standard \#TODO observe.common.startDate=Fecha de comienzo observe.common.startLogValue=Corredera de mañana (millas) observe.common.startTime=Fecha - Heuro de inicio de validez @@ -249,6 +252,10 @@ observe.common.whenLeaving=Au départ \#TODO observe.common.wind=Fuerza del viento observe.common.wormsId=Worms observe.common.yearService=año de entrada en servicio +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL=Palangre +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL.description=Voir les programmes Palangre \#TODO +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS=Senne +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS.description=Voir les programmes Senne \#TODO observe.type.activityLongline=Actividad observe.type.activityLonglineEncounter=Encuentro observe.type.activityLonglineEncounters=Encuentros ===================================== services/src/main/resources/i18n/services_fr_FR.properties ===================================== --- a/services/src/main/resources/i18n/services_fr_FR.properties +++ b/services/src/main/resources/i18n/services_fr_FR.properties @@ -103,6 +103,7 @@ observe.common.label3=Libellé espagnol observe.common.landingHarbour=Port d'arrivée observe.common.lastName=Nom observe.common.latitude=Latitude +observe.common.legacyCode=Ancien code observe.common.length=Longueur hors tout observe.common.lengthWeightFormula=Relation Poids observe.common.lightsticksColor=Couleur de cyalumes @@ -145,6 +146,7 @@ observe.common.ocean/label8=Océan observe.common.organism=Organisme observe.common.outputInputFormula=Formule sortie -> entrée observe.common.outputSizeMeasureType=Type de mensuration de sortie +observe.common.parent=Parent observe.common.power=Puissance moteur principal observe.common.previousFpaZone=Zone FPA quittée observe.common.program=Programme @@ -193,6 +195,7 @@ observe.common.speciesGroupReleaseMode=Mode de libération observe.common.speciesGroupReleaseStatus=État à la libération observe.common.speciesStatus=Statut faune observée observe.common.speedRange=Libellé vitesse vent +observe.common.standardCode=Code standard observe.common.startDate=Début de validité observe.common.startLogValue=Loch du matin (milles) observe.common.startTime=Date - Heure de début de validité @@ -249,6 +252,10 @@ observe.common.whenLeaving=Au départ observe.common.wind=Vent Beaufort observe.common.wormsId=Worms observe.common.yearService=Année de mise en service +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL=Palangre +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL.description=Voir les programmes Palangre +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS=Senne +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS.description=Voir les programmes Seine observe.type.activityLongline=Activité observe.type.activityLonglineEncounter=Rencontre observe.type.activityLonglineEncounters=Rencontres View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ef2526ae57ffb7ef5c3f23d1619… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ef2526ae57ffb7ef5c3f23d1619… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe :: Pom
by Tony CHEMIT 01 Aug '17

01 Aug '17

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: b8e6dc83 by 166231 at 2017-08-01T13:34:10+00:00 Site checkin for project ObServe :: Pom - - - - - 29 changed files: - administration-web.html - aggregate-third-party-report.html - architecture-logicielle.html - changelog.html - changes-report.html - config-report.html - dependency-convergence.html - dependency-info.html - dependency-management.html - dependency-updates-report.html - dev-activity.html - file-activity.html - index.html - install-serverPG.html - install.html - integration.html - issue-tracking.html - license.html - plugin-management.html - plugin-updates-report.html - plugins.html - project-info.html - project-reports.html - project-summary.html - property-updates-report.html - sitemap.html - source-repository.html - team-list.html - third-party-report.html Changes: ===================================== administration-web.html ===================================== --- a/administration-web.html +++ b/administration-web.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170725" /> + <meta name="Date-Revision-yyyymmdd" content="20170801" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation de lapplication web</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Installation de lapplication web</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-07-25</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-01</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -102,7 +102,7 @@ <div class="source"><pre class="prettyprint linenums"> /var/local/observeweb/ |-- databases.yml # configuration des bases de données |-- log - | `-- observeweb-7.0-RC-2.log # logs de l'application + | `-- observeweb-7.0-RC-3.log # logs de l'application |-- observeweb-log4j.conf # configuration des logs |-- temp # répertoire temporaire `-- users.yml # configuration des utilisateurs ===================================== aggregate-third-party-report.html ===================================== The diff for this file was not included because it is too large. ===================================== architecture-logicielle.html ===================================== --- a/architecture-logicielle.html +++ b/architecture-logicielle.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170725" /> + <meta name="Date-Revision-yyyymmdd" content="20170801" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Architecture logicielle dObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Architecture logicielle dObServe</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-07-25</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-01</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== changelog.html ===================================== The diff for this file was not included because it is too large. ===================================== changes-report.html ===================================== --- a/changes-report.html +++ b/changes-report.html @@ -1,6 +1,6 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> @@ -8,7 +8,7 @@ <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="author" content="Tony Chemit" /> - <meta name="Date-Revision-yyyymmdd" content="20170725" /> + <meta name="Date-Revision-yyyymmdd" content="20170801" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – ObServe changelog</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -28,8 +28,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">ObServe changelog</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-07-25</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-01</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -101,288 +101,339 @@ <th>Date</th> <th>Description</th></tr> <tr class="b"> +<td><a href="#a7.0-RC-3">7.0-RC-3</a></td> +<td>2017-08-01</td> +<td></td></tr> +<tr class="a"> <td><a href="#a7.0-RC-2">7.0-RC-2</a></td> <td>2017-07-25</td> <td></td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a7.0-RC-1">7.0-RC-1</a></td> <td>2017-06-15</td> <td></td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a5.4">5.4</a></td> <td>2017-06-13</td> <td></td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a5.3.7">5.3.7</a></td> <td>2017-03-29</td> <td></td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a5.3.6">5.3.6</a></td> <td>2017-03-22</td> <td></td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a5.3.5">5.3.5</a></td> <td>2017-03-19</td> <td></td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a5.3.4">5.3.4</a></td> <td>2017-03-15</td> <td></td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a5.3.3">5.3.3</a></td> <td>2017-03-10</td> <td></td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a5.3.2">5.3.2</a></td> <td>*In progress*</td> <td>*(from redmine: created on 2017-02-04)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a5.3.1">5.3.1</a></td> <td>2017-01-20</td> <td>*(from redmine: created on 2017-01-20)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a5.3">5.3</a></td> <td>2017-01-19</td> <td>*(from redmine: created on 2017-01-17)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a5.2.1">5.2.1</a></td> <td>2017-01-13</td> <td>*(from redmine: created on 2017-01-06)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a5.2">5.2</a></td> <td>2017-01-06</td> <td>*(from redmine: created on 2016-10-04)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a5.1.4">5.1.4</a></td> <td>2016-12-16</td> <td>*(from redmine: created on 2016-12-16)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a5.1.3">5.1.3</a></td> <td>2016-12-14</td> <td>*(from redmine: created on 2016-12-14)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a5.1.2">5.1.2</a></td> <td>2016-12-12</td> <td>*(from redmine: created on 2016-12-10)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a5.1.1">5.1.1</a></td> <td>2016-12-08</td> <td>*(from redmine: created on 2016-12-08)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a5.1">5.1</a></td> <td>2016-12-05</td> <td>*(from redmine: created on 2016-12-04)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a5.0.2">5.0.2</a></td> <td>2016-10-04</td> <td>*(from redmine: created on 2016-09-21)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a5.0.1">5.0.1</a></td> <td>2016-09-21</td> <td>*(from redmine: created on 2016-09-12)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a5.0">5.0</a></td> <td>2016-09-12</td> <td>Mise en place web services *(from redmine: created on 2014-02-05)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a4.0.6">4.0.6</a></td> <td>2016-01-13</td> <td>*(from redmine: created on 2015-11-04)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a4.0.5">4.0.5</a></td> <td>2015-11-04</td> <td>*(from redmine: created on 2015-11-03)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a4.0.4">4.0.4</a></td> <td>2015-11-03</td> <td>*(from redmine: created on 2015-08-27)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a4.0.3">4.0.3</a></td> <td>2015-08-27</td> <td>*(from redmine: created on 2015-08-27)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a4.0-2">4.0-2</a></td> <td>2015-06-08</td> <td>Contrat "Armateurs" *(from redmine: created on 2014-01-30)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a4.0.2">4.0.2</a></td> <td>2015-08-27</td> <td>*(from redmine: created on 2015-08-11)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a4.0.1.1">4.0.1.1</a></td> <td>2015-08-14</td> <td>*(from redmine: created on 2015-08-14)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a4.0.1">4.0.1</a></td> <td>2015-08-14</td> <td>*(from redmine: created on 2015-06-08)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a4.0">4.0</a></td> <td>2015-06-08</td> <td>ObserveLL *(from redmine: created on 2014-06-23)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a3.15.1">3.15.1</a></td> <td>2015-03-22</td> <td>*(from redmine: created on 2015-03-22)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a3.15">3.15</a></td> <td>2015-03-19</td> <td>*(from redmine: created on 2015-01-27)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a3.14">3.14</a></td> <td>2015-01-27</td> <td>*(from redmine: created on 2015-01-22)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a3.13">3.13</a></td> <td>2015-01-19</td> <td>*(from redmine: created on 2015-01-16)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a3.12">3.12</a></td> <td>2015-01-16</td> <td>*(from redmine: created on 2015-01-11)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a3.11">3.11</a></td> <td>2015-01-11</td> <td>*(from redmine: created on 2014-12-22)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a3.10">3.10</a></td> <td>2015-12-29</td> <td>*(from redmine: created on 2014-12-07)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a3.9">3.9</a></td> <td>2014-12-11</td> <td>*(from redmine: created on 2014-11-27)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a3.8">3.8</a></td> <td>2014-12-05</td> <td>*(from redmine: created on 2014-11-24)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a3.7.1">3.7.1</a></td> <td>2014-11-25</td> <td>*(from redmine: created on 2014-11-25)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a3.7">3.7</a></td> <td>2014-11-24</td> <td>*(from redmine: created on 2014-08-25)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a3.6">3.6</a></td> <td>2014-08-06</td> <td>Intégration des référentiels longline + diverses évolutions et corrections *(from redmine: created on 2014-07-24)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a3.5">3.5</a></td> <td>2014-07-06</td> <td>Traduction modèle + ajout modèle Longline *(from redmine: created on 2014-01-09)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a3.1.2">3.1.2</a></td> <td>2014-12-02</td> <td>*(from redmine: created on 2014-12-02)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a3.1.1">3.1.1</a></td> <td>2013-10-10</td> <td>*(from redmine: created on 2013-10-10)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a3.1">3.1</a></td> <td>2013-10-10</td> <td>*(from redmine: created on 2013-07-18)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a3.0">3.0</a></td> <td>2013-09-12</td> <td>*(from redmine: created on 2013-07-04)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a2.5">2.5</a></td> <td>2012-09-27</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a2.4">2.4</a></td> <td>2011-06-27</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a2.3">2.3</a></td> <td>2011-04-15</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a2.2">2.2</a></td> <td>2011-02-22</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a2.1">2.1</a></td> <td>2011-01-27</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a2.0.1">2.0.1</a></td> <td>2011-01-21</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a2.0">2.0</a></td> <td>2011-01-03</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a1.9.1">1.9.1</a></td> <td>2010-10-30</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a1.9">1.9</a></td> <td>2010-10-18</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a1.8">1.8</a></td> <td>2010-09-30</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a1.7">1.7</a></td> <td>2010-09-22</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a1.6.1">1.6.1</a></td> <td>2010-09-20</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a1.6">1.6</a></td> <td>2010-09-20</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a1.5">1.5</a></td> <td>2010-09-16</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a1.4">1.4</a></td> <td>2010-07-06</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a1.3.1">1.3.1</a></td> <td>2010-05-07</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a1.3">1.3</a></td> <td>2010-03-31</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a1.2">1.2</a></td> <td>2010-03-13</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a1.1.0">1.1.0</a></td> <td>2010-01-27</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a1.1">1.1</a></td> <td>2009-09-04</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a1.0">1.0</a></td> <td>2009-07-08</td> <td>*(from redmine: created on 2011-08-02)*</td></tr></table></div> <div class="section"> +<h3 id="a7.0-RC-3">Release 7.0-RC-3 – 2017-08-01</h3> +<table border="0" class="table table-striped"> +<tr class="a"> +<th>Type</th> +<th>Changements</th> +<th>Par</th></tr> +<tr class="b"> +<td><img src="images/fix.gif" alt="Fix" title="Fix" /></td> +<td>lors de l'ouverture d'une base, l'écran de la liste des marées n'est pas bien décoré. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/797">797</a>. Grâce â .</td> +<td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr> +<tr class="a"> +<td><img src="images/fix.gif" alt="Fix" title="Fix" /></td> +<td>Les formulaires ne sont pas bien organisé lors de leur ouverture. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/798">798</a>. Grâce â .</td> +<td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr> +<tr class="b"> +<td><img src="images/add.gif" alt="Add" title="Add" /></td> +<td>optimiser la détection des objets flottants de référence. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/796">796</a>. Grâce â .</td> +<td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr> +<tr class="a"> +<td><img src="images/add.gif" alt="Add" title="Add" /></td> +<td>Amélioration de l'organisation lors des action Open/Close. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/799">799</a>. Grâce â .</td> +<td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr> +<tr class="b"> +<td><img src="images/add.gif" alt="Add" title="Add" /></td> +<td>Ajouter une option pour ne pas demander une correspondance exacte entre la version du client et serveur. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/800">800</a>. Grâce â .</td> +<td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr> +<tr class="a"> +<td><img src="images/add.gif" alt="Add" title="Add" /></td> +<td>Revoir la gestion d'erreur sur l'api Rest. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/801">801</a>. Grâce â .</td> +<td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr> +<tr class="b"> +<td><img src="images/add.gif" alt="Add" title="Add" /></td> +<td>Assainissement des API. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/802">802</a>. Grâce â .</td> +<td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr> +<tr class="a"> +<td><img src="images/add.gif" alt="Add" title="Add" /></td> +<td>Speed up connection opening. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/805">805</a>. Grâce â .</td> +<td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr> +<tr class="b"> +<td><img src="images/update.gif" alt="Update" title="Update" /></td> +<td>Re-add SupportVesselName on FloatingObject. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/803">803</a>. Grâce â .</td> +<td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr> +<tr class="a"> +<td><img src="images/update.gif" alt="Update" title="Update" /></td> +<td>Remove application-swing-decoration module and move code to services module. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/804">804</a>. Grâce â .</td> +<td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr></table></div> +<div class="section"> <h3 id="a7.0-RC-2">Release 7.0-RC-2 – 2017-07-25</h3> <table border="0" class="table table-striped"> <tr class="b"> ===================================== config-report.html ===================================== --- a/config-report.html +++ b/config-report.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170725" /> + <meta name="Date-Revision-yyyymmdd" content="20170801" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Configuration</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Configuration</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-07-25</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-01</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -101,24 +101,228 @@ <th>Nombre d'options</th> <th>Nombre d'actions</th></tr> <tr class="b"> -<td><a href="./config-report.html#detail_ObserveSwingApplicationConfig">ObserveSwingApplicationConfig</a></td> -<td>Configuration d'ObServe</td> -<td>82</td> -<td>9</td></tr> -<tr class="a"> -<td><a href="./config-report.html#detail_ObserveWebApplicationConfig">ObserveWebApplicationConfig</a></td> +<td><a href="./config-report.html#detail_ServerConfig">ServerConfig</a></td> <td>Observe web Configuration</td> <td>17</td> -<td>0</td></tr></table></div> +<td>0</td></tr> +<tr class="a"> +<td><a href="./config-report.html#detail_ClientConfig">ClientConfig</a></td> +<td>Configuration d'ObServe</td> +<td>83</td> +<td>9</td></tr></table></div> <div class="section"> <h2><a name="Dtail_des_configurations"></a>Détail des configurations</h2><br /> <p>On détaille ici une par une les configurations définies pour le projet</p> <div class="section"> -<h3><a name="Configuration___ObserveSwingApplicationConfig"></a><a name="detail_ObserveSwingApplicationConfig">Configuration ObserveSwingApplicationConfig</a></h3> -<p>Nom de la configuration : <b>ObserveSwingApplicationConfig</b></p> +<h3><a name="Configuration___ServerConfig"></a><a name="detail_ServerConfig">Configuration ServerConfig</a></h3> +<p>Nom de la configuration : <b>ServerConfig</b></p> +<p>Description : <b>Observe web Configuration</b></p> +<div class="section"> +<h4><a name="Options_de_la_configuration"></a><a name="detail_options_ServerConfig">Options de la configuration</a></h4><br /> +<table border="0" class="table table-striped"> +<tr class="b"> +<th>Clef</th> +<th>Description</th> +<th>Valeur par défaut</th> +<th>Option modifiable</th> +<th>Option sauvegardable</th> +<th>Type</th></tr> +<tr class="a"> +<td>observeweb.build.version</td> +<td>Version de construction</td> +<td> +<div> +<pre style="monospaced">Pas de valeur par défaut</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">org.nuiton.version.Version</pre></div></td></tr> +<tr class="b"> +<td>observeweb.build.date</td> +<td>Date de construction</td> +<td> +<div> +<pre style="monospaced">Pas de valeur par défaut</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.lang.String</pre></div></td></tr> +<tr class="a"> +<td>observeweb.build.number</td> +<td>Numéro de construction</td> +<td> +<div> +<pre style="monospaced">Pas de valeur par défaut</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.lang.String</pre></div></td></tr> +<tr class="b"> +<td>observeweb.adminApiKey</td> +<td>Clé API Admin (À changer)</td> +<td> +<div> +<pre style="monospaced">changeme</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.lang.String</pre></div></td></tr> +<tr class="a"> +<td>observeweb.host</td> +<td>Hôte de l'application</td> +<td> +<div> +<pre style="monospaced">http://localhost:8080</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.net.URL</pre></div></td></tr> +<tr class="b"> +<td>observeweb.apiUrl</td> +<td>Url de l'api rest</td> +<td> +<div> +<pre style="monospaced">${observeweb.host}/${observeweb.contextPath}/api/v1</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.net.URL</pre></div></td></tr> +<tr class="a"> +<td>observeweb.model.version</td> +<td>Version du modèle</td> +<td> +<div> +<pre style="monospaced">Pas de valeur par défaut</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">org.nuiton.version.Version</pre></div></td></tr> +<tr class="b"> +<td>observeweb.devMode</td> +<td>Mode développeur</td> +<td> +<div> +<pre style="monospaced">true</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">boolean</pre></div></td></tr> +<tr class="a"> +<td>observeweb.contextPath</td> +<td>Contexte applicatif</td> +<td> +<div> +<pre style="monospaced">observe</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.lang.String</pre></div></td></tr> +<tr class="b"> +<td>observeweb.baseDirectory</td> +<td>Répertoire de l'application</td> +<td> +<div> +<pre style="monospaced">/var/local/observeweb/${observeweb.contextPath}</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.io.File</pre></div></td></tr> +<tr class="a"> +<td>observeweb.temporaryDirectory</td> +<td>Chemin vers le répertoire temporaire</td> +<td> +<div> +<pre style="monospaced">${observeweb.baseDirectory}/temp</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.io.File</pre></div></td></tr> +<tr class="b"> +<td>observeweb.log4jConfigurationFile</td> +<td>Chemin vers le fichier de configuration des logs</td> +<td> +<div> +<pre style="monospaced">${observeweb.baseDirectory}/observeweb-log4j.conf</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.io.File</pre></div></td></tr> +<tr class="a"> +<td>observeweb.databasesConfigurationFile</td> +<td>Chemin vers le fichier de configuration des bases</td> +<td> +<div> +<pre style="monospaced">${observeweb.baseDirectory}/databases.yml</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.io.File</pre></div></td></tr> +<tr class="b"> +<td>observeweb.usersConfigurationFile</td> +<td>Chemin vers le fichier de configuration des utilisateurs</td> +<td> +<div> +<pre style="monospaced">${observeweb.baseDirectory}/users.yml</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.io.File</pre></div></td></tr> +<tr class="a"> +<td>observeweb.sessionExpirationDelay</td> +<td>Temps maximum d'une session (en minutes)</td> +<td> +<div> +<pre style="monospaced">60</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">int</pre></div></td></tr> +<tr class="b"> +<td>observeweb.sessionMaximumSize</td> +<td>Taille maximum de session</td> +<td> +<div> +<pre style="monospaced">10000</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">int</pre></div></td></tr> +<tr class="a"> +<td>observeweb.httpTimeout</td> +<td>Temps maximum de tentative de connection http (en millisecondes)</td> +<td> +<div> +<pre style="monospaced">30000</pre></div></td> +<td>Oui</td> +<td>Oui</td> +<td> +<div> +<pre style="monospaced">int</pre></div></td></tr></table></div> +<div class="section"> +<h4><a name="Actions_de_la_configuration"></a><a name="detail_actions_ServerConfig">Actions de la configuration</a></h4><br /> +<p><b>Aucune action définie pour cette configuration</b></p></div></div> +<div class="section"> +<h3><a name="Configuration___ClientConfig"></a><a name="detail_ClientConfig">Configuration ClientConfig</a></h3> +<p>Nom de la configuration : <b>ClientConfig</b></p> <p>Description : <b>Configuration d'ObServe</b></p> <div class="section"> -<h4><a name="Options_de_la_configuration"></a><a name="detail_options_ObserveSwingApplicationConfig">Options de la configuration</a></h4><br /> +<h4><a name="Options_de_la_configuration"></a><a name="detail_options_ClientConfig">Options de la configuration</a></h4><br /> <table border="0" class="table table-striped"> <tr class="b"> <th>Clef</th> @@ -445,7 +649,7 @@ <td>Oui</td> <td> <div> -<pre style="monospaced">fr.ird.observe.application.swing.configuration.constants.DbMode</pre></div></td></tr> +<pre style="monospaced">fr.ird.observe.client.configuration.constants.DbMode</pre></div></td></tr> <tr class="b"> <td>defaultCreationMode</td> <td>Le mode de création de base locale par défaut</td> @@ -456,7 +660,7 @@ <td>Oui</td> <td> <div> -<pre style="monospaced">fr.ird.observe.application.swing.configuration.constants.CreationMode</pre></div></td></tr> +<pre style="monospaced">fr.ird.observe.client.configuration.constants.CreationMode</pre></div></td></tr> <tr class="a"> <td>ui.storeRemoteStorage</td> <td>Pour activer la sauvegarde de la configuration de la source distante</td> @@ -1028,257 +1232,64 @@ <td>Oui</td> <td> <div> -<pre style="monospaced">int</pre></div></td></tr></table></div> +<pre style="monospaced">int</pre></div></td></tr> +<tr class="a"> +<td>server.checkServerVersion</td> +<td>Vérifier la correspondance exacte entre les versions du client et serveur REST ?</td> +<td> +<div> +<pre style="monospaced">true</pre></div></td> +<td>Oui</td> +<td>Oui</td> +<td> +<div> +<pre style="monospaced">java.lang.Boolean</pre></div></td></tr></table></div> <div class="section"> -<h4><a name="Actions_de_la_configuration"></a><a name="detail_actions_ObserveSwingApplicationConfig">Actions de la configuration</a></h4><br /> +<h4><a name="Actions_de_la_configuration"></a><a name="detail_actions_ClientConfig">Actions de la configuration</a></h4><br /> <table border="0" class="table table-striped"> -<tr class="a"> +<tr class="b"> <th>Description</th> <th>Aliases</th> <th>Action</th></tr> -<tr class="b"> +<tr class="a"> <td>Afficher l'aide</td> <td>-h,--help</td> -<td>fr.ird.observe.application.swing.ObserveCLAction#help</td></tr> -<tr class="a"> +<td>fr.ird.observe.client.ObserveCLAction#help</td></tr> +<tr class="b"> <td>Afficher le manuel utilisateur (mode graphique)</td> <td>--help-ui</td> -<td>fr.ird.observe.application.swing.ObserveCLAction#helpUI</td></tr> -<tr class="b"> +<td>fr.ird.observe.client.ObserveCLAction#helpUI</td></tr> +<tr class="a"> <td>Ne pas lancer l'interface graphique</td> <td>-n,--no-main</td> -<td>fr.ird.observe.application.swing.ObserveCLAction#disableMainUI</td></tr> -<tr class="a"> +<td>fr.ird.observe.client.ObserveCLAction#disableMainUI</td></tr> +<tr class="b"> <td>Configurer l'application</td> <td>--configure</td> -<td>fr.ird.observe.application.swing.ObserveCLAction#configure</td></tr> -<tr class="b"> +<td>fr.ird.observe.client.ObserveCLAction#configure</td></tr> +<tr class="a"> <td>Lancer une opération d'administration</td> <td>-a,--admin</td> -<td>fr.ird.observe.application.swing.ObserveCLAction#launchAdminUI</td></tr> -<tr class="a"> +<td>fr.ird.observe.client.ObserveCLAction#launchAdminUI</td></tr> +<tr class="b"> <td>Lancer une opération d'administration sur Obstuna</td> <td>--obstuna-admin</td> -<td>fr.ird.observe.application.swing.ObserveCLAction#launchObstunaAdminUI</td></tr> -<tr class="b"> +<td>fr.ird.observe.client.ObserveCLAction#launchObstunaAdminUI</td></tr> +<tr class="a"> <td>Lancer ObServe en mode serveur</td> <td>--h2-server</td> -<td>fr.ird.observe.application.swing.ObserveCLAction#launchH2ServerMode</td></tr> -<tr class="a"> +<td>fr.ird.observe.client.ObserveCLAction#launchH2ServerMode</td></tr> +<tr class="b"> <td>Ajouter le support JMX</td> <td>--jmx</td> -<td>fr.ird.observe.application.swing.ObserveCLAction#useJMX</td></tr> -<tr class="b"> +<td>fr.ird.observe.client.ObserveCLAction#useJMX</td></tr> +<tr class="a"> <td>Générer des topiaIds. Deux paramètres sont nécessaires: Le FQN de la classe Le nombre d'id à générer.</td> <td>--create-id</td> -<td>fr.ird.observe.application.swing.ObserveCLAction#createId</td></tr></table></div></div> -<div class="section"> -<h3><a name="Configuration___ObserveWebApplicationConfig"></a><a name="detail_ObserveWebApplicationConfig">Configuration ObserveWebApplicationConfig</a></h3> -<p>Nom de la configuration : <b>ObserveWebApplicationConfig</b></p> -<p>Description : <b>Observe web Configuration</b></p> -<div class="section"> -<h4><a name="Options_de_la_configuration"></a><a name="detail_options_ObserveWebApplicationConfig">Options de la configuration</a></h4><br /> -<table border="0" class="table table-striped"> -<tr class="a"> -<th>Clef</th> -<th>Description</th> -<th>Valeur par défaut</th> -<th>Option modifiable</th> -<th>Option sauvegardable</th> -<th>Type</th></tr> -<tr class="b"> -<td>observeweb.build.version</td> -<td>Version de construction</td> -<td> -<div> -<pre style="monospaced">Pas de valeur par défaut</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">org.nuiton.version.Version</pre></div></td></tr> -<tr class="a"> -<td>observeweb.build.date</td> -<td>Date de construction</td> -<td> -<div> -<pre style="monospaced">Pas de valeur par défaut</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="b"> -<td>observeweb.build.number</td> -<td>Numéro de construction</td> -<td> -<div> -<pre style="monospaced">Pas de valeur par défaut</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="a"> -<td>observeweb.adminApiKey</td> -<td>Clé API Admin (À changer)</td> -<td> -<div> -<pre style="monospaced">changeme</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="b"> -<td>observeweb.host</td> -<td>Hôte de l'application</td> -<td> -<div> -<pre style="monospaced">http://localhost:8080</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.net.URL</pre></div></td></tr> -<tr class="a"> -<td>observeweb.apiUrl</td> -<td>Url de l'api rest</td> -<td> -<div> -<pre style="monospaced">${observeweb.host}/${observeweb.contextPath}/api/v1</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.net.URL</pre></div></td></tr> -<tr class="b"> -<td>observeweb.model.version</td> -<td>Version du modèle</td> -<td> -<div> -<pre style="monospaced">Pas de valeur par défaut</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">org.nuiton.version.Version</pre></div></td></tr> -<tr class="a"> -<td>observeweb.devMode</td> -<td>Mode développeur</td> -<td> -<div> -<pre style="monospaced">true</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">boolean</pre></div></td></tr> -<tr class="b"> -<td>observeweb.contextPath</td> -<td>Contexte applicatif</td> -<td> -<div> -<pre style="monospaced">observe</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="a"> -<td>observeweb.baseDirectory</td> -<td>Répertoire de l'application</td> -<td> -<div> -<pre style="monospaced">/var/local/observeweb/${observeweb.contextPath}</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> -<td>observeweb.temporaryDirectory</td> -<td>Chemin vers le répertoire temporaire</td> -<td> -<div> -<pre style="monospaced">${observeweb.baseDirectory}/temp</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> -<td>observeweb.log4jConfigurationFile</td> -<td>Chemin vers le fichier de configuration des logs</td> -<td> -<div> -<pre style="monospaced">${observeweb.baseDirectory}/observeweb-log4j.conf</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> -<td>observeweb.databasesConfigurationFile</td> -<td>Chemin vers le fichier de configuration des bases</td> -<td> -<div> -<pre style="monospaced">${observeweb.baseDirectory}/databases.yml</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> -<td>observeweb.usersConfigurationFile</td> -<td>Chemin vers le fichier de configuration des utilisateurs</td> -<td> -<div> -<pre style="monospaced">${observeweb.baseDirectory}/users.yml</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> -<td>observeweb.sessionExpirationDelay</td> -<td>Temps maximum d'une session (en minutes)</td> -<td> -<div> -<pre style="monospaced">60</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">int</pre></div></td></tr> -<tr class="a"> -<td>observeweb.sessionMaximumSize</td> -<td>Taille maximum de session</td> -<td> -<div> -<pre style="monospaced">10000</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">int</pre></div></td></tr> -<tr class="b"> -<td>observeweb.httpTimeout</td> -<td>Temps maximum de tentative de connection http (en millisecondes)</td> -<td> -<div> -<pre style="monospaced">30000</pre></div></td> -<td>Oui</td> -<td>Oui</td> -<td> -<div> -<pre style="monospaced">int</pre></div></td></tr></table></div> -<div class="section"> -<h4><a name="Actions_de_la_configuration"></a><a name="detail_actions_ObserveWebApplicationConfig">Actions de la configuration</a></h4><br /> -<p><b>Aucune action définie pour cette configuration</b></p></div></div></div> +<td>fr.ird.observe.client.ObserveCLAction#createId</td></tr></table></div></div></div> </div> </div> </div> ===================================== dependency-convergence.html ===================================== --- a/dependency-convergence.html +++ b/dependency-convergence.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170725" /> + <meta name="Date-Revision-yyyymmdd" content="20170801" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Reactor Dependency Convergence</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Reactor Dependency Convergence</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-07-25</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-01</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -104,13 +104,13 @@ </caption> <tr class="b"> <th>Nombre de sous-projets :</th> -<td>19</td></tr> +<td>18</td></tr> <tr class="a"> <th>Nombre de dépendances (NOD) :</th> -<td>195</td></tr> +<td>196</td></tr> <tr class="b"> <th>Nombre d'artefacts uniques (NOA) :</th> -<td>203</td></tr> +<td>204</td></tr> <tr class="a"> <th>Number of version-conflicting artifacts (NOC):</th> <td>4</td></tr> @@ -136,12 +136,12 @@ <td width="25%">3.3</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:application-web:war:7.0-RC-2<br />\- fr.ird.observe:services-topia:jar:7.0-RC-2:compile<br />   \- org.apache.struts.xwork:xwork-core:jar:2.3.33:compile<br />      \- asm:asm:jar:3.3:compile<br /></li><br /></ol></td></tr> +<li>fr.ird.observe:server:war:7.0-RC-3<br />\- fr.ird.observe:services-topia:jar:7.0-RC-3:compile<br />   \- org.apache.struts.xwork:xwork-core:jar:2.3.33:compile<br />      \- asm:asm:jar:3.3:compile<br /></li><br /></ol></td></tr> <tr class="a"> <td width="25%">3.3.1</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:application-web:war:7.0-RC-2<br />\- org.debux.webmotion:webmotion:jar:2.5.3:compile<br />   \- org.parboiled:parboiled-java:jar:1.0.2:compile<br />      +- (asm:asm:jar:3.3.1:compile - omitted for conflict with 3.3)<br />      \- asm:asm-tree:jar:3.3.1:compile<br />         \- (asm:asm:jar:3.3.1:compile - omitted for conflict with 3.3)<br /></li><br /></ol></td></tr></table></td></tr></table></div> +<li>fr.ird.observe:server:war:7.0-RC-3<br />\- org.debux.webmotion:webmotion:jar:2.5.3:compile<br />   \- org.parboiled:parboiled-java:jar:1.0.2:compile<br />      +- (asm:asm:jar:3.3.1:compile - omitted for conflict with 3.3)<br />      \- asm:asm-tree:jar:3.3.1:compile<br />         \- (asm:asm:jar:3.3.1:compile - omitted for conflict with 3.3)<br /></li><br /></ol></td></tr></table></td></tr></table></div> <div class="section"> <h4><a name="asm:asm-tree"></a>asm:asm-tree</h4> <table border="0" class="table table-striped"> @@ -153,12 +153,12 @@ <td width="25%">3.3</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:application-web:war:7.0-RC-2<br />\- fr.ird.observe:services-topia:jar:7.0-RC-2:compile<br />   \- org.apache.struts.xwork:xwork-core:jar:2.3.33:compile<br />      \- asm:asm-commons:jar:3.3:compile<br />         \- (asm:asm-tree:jar:3.3:compile - omitted for conflict with 3.3.1)<br /></li><br /></ol></td></tr> +<li>fr.ird.observe:server:war:7.0-RC-3<br />\- fr.ird.observe:services-topia:jar:7.0-RC-3:compile<br />   \- org.apache.struts.xwork:xwork-core:jar:2.3.33:compile<br />      \- asm:asm-commons:jar:3.3:compile<br />         \- (asm:asm-tree:jar:3.3:compile - omitted for conflict with 3.3.1)<br /></li><br /></ol></td></tr> <tr class="b"> <td width="25%">3.3.1</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:application-web:war:7.0-RC-2<br />\- org.debux.webmotion:webmotion:jar:2.5.3:compile<br />   \- org.parboiled:parboiled-java:jar:1.0.2:compile<br />      +- asm:asm-util:jar:3.3.1:compile<br />      |  \- (asm:asm-tree:jar:3.3.1:compile - omitted for conflict with 3.3)<br />      +- asm:asm-tree:jar:3.3.1:compile<br />      \- asm:asm-analysis:jar:3.3.1:compile<br />         \- (asm:asm-tree:jar:3.3.1:compile - omitted for duplicate)<br /></li><br /></ol></td></tr></table></td></tr></table></div> +<li>fr.ird.observe:server:war:7.0-RC-3<br />\- org.debux.webmotion:webmotion:jar:2.5.3:compile<br />   \- org.parboiled:parboiled-java:jar:1.0.2:compile<br />      +- asm:asm-util:jar:3.3.1:compile<br />      |  \- (asm:asm-tree:jar:3.3.1:compile - omitted for conflict with 3.3)<br />      +- asm:asm-tree:jar:3.3.1:compile<br />      \- asm:asm-analysis:jar:3.3.1:compile<br />         \- (asm:asm-tree:jar:3.3.1:compile - omitted for duplicate)<br /></li><br /></ol></td></tr></table></td></tr></table></div> <div class="section"> <h4><a name="org.codehaus.plexus:plexus-component-annotations"></a>org.codehaus.plexus:plexus-component-annotations</h4> <table border="0" class="table table-striped"> @@ -170,12 +170,12 @@ <td width="25%">1.5.5</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:7.0-RC-2<br />\- org.apache.maven:maven-plugin-api:jar:3.5.0:compile<br />   \- org.eclipse.sisu:org.eclipse.sisu.plexus:jar:0.3.3:compile<br />      \- (org.codehaus.plexus:plexus-component-annotations:jar:1.5.5:compile - omitted for conflict with 1.7.1)<br /></li><br /></ol></td></tr> +<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:7.0-RC-3<br />\- org.apache.maven:maven-plugin-api:jar:3.5.0:compile<br />   \- org.eclipse.sisu:org.eclipse.sisu.plexus:jar:0.3.3:compile<br />      \- (org.codehaus.plexus:plexus-component-annotations:jar:1.5.5:compile - omitted for conflict with 1.7.1)<br /></li><br /></ol></td></tr> <tr class="a"> <td width="25%">1.7.1</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:7.0-RC-2<br />+- org.nuiton:helper-maven-plugin-api:jar:2.3.2:compile<br />|  \- org.apache.maven.shared:maven-dependency-tree:jar:3.0:compile<br />|     \- org.codehaus.plexus:plexus-component-annotations:jar:1.7.1:compile<br />+- org.apache.maven:maven-core:jar:3.5.0:provided<br />|  +- org.apache.maven:maven-settings-builder:jar:3.5.0:provided<br />|  |  \- (org.codehaus.plexus:plexus-component-annotations:jar:1.7.1:provided - omitted for conflict with 1.7.1)<br />|  +- org.apache.maven:maven-model-builder:jar:3.5.0:provided<br />|  |  \- (org.codehaus.plexus:plexus-component-annotations:jar:1.7.1:provided - omitted for conflict with 1.7.1)<br />|  +- org.apache.maven:maven-resolver-provider:jar:3.5.0:provided<br />|  |  \- (org.codehaus.plexus:plexus-component-annotations:jar:1.7.1:provided - omitted for conflict with 1.7.1)<br />|  \- (org.codehaus.plexus:plexus-component-annotations:jar:1.7.1:compile - scope updated from provided; omitted for duplicate)<br />\- org.apache.maven:maven-compat:jar:3.5.0:provided<br />   \- (org.codehaus.plexus:plexus-component-annotations:jar:1.7.1:compile - scope updated from provided; omitted for duplicate)<br /></li><br /></ol></td></tr></table></td></tr></table></div> +<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:7.0-RC-3<br />+- org.nuiton:helper-maven-plugin-api:jar:2.3.2:compile<br />|  \- org.apache.maven.shared:maven-dependency-tree:jar:3.0:compile<br />|     \- org.codehaus.plexus:plexus-component-annotations:jar:1.7.1:compile<br />+- org.apache.maven:maven-core:jar:3.5.0:provided<br />|  +- org.apache.maven:maven-settings-builder:jar:3.5.0:provided<br />|  |  \- (org.codehaus.plexus:plexus-component-annotations:jar:1.7.1:provided - omitted for conflict with 1.7.1)<br />|  +- org.apache.maven:maven-model-builder:jar:3.5.0:provided<br />|  |  \- (org.codehaus.plexus:plexus-component-annotations:jar:1.7.1:provided - omitted for conflict with 1.7.1)<br />|  +- org.apache.maven:maven-resolver-provider:jar:3.5.0:provided<br />|  |  \- (org.codehaus.plexus:plexus-component-annotations:jar:1.7.1:provided - omitted for conflict with 1.7.1)<br />|  \- (org.codehaus.plexus:plexus-component-annotations:jar:1.7.1:compile - scope updated from provided; omitted for duplicate)<br />\- org.apache.maven:maven-compat:jar:3.5.0:provided<br />   \- (org.codehaus.plexus:plexus-component-annotations:jar:1.7.1:compile - scope updated from provided; omitted for duplicate)<br /></li><br /></ol></td></tr></table></td></tr></table></div> <div class="section"> <h4><a name="org.codehaus.plexus:plexus-utils"></a>org.codehaus.plexus:plexus-utils</h4> <table border="0" class="table table-striped"> @@ -187,22 +187,22 @@ <td width="25%">1.5.5</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:7.0-RC-2<br />\- org.apache.maven:maven-core:jar:3.5.0:provided<br />   \- org.sonatype.plexus:plexus-sec-dispatcher:jar:1.4:provided<br />      \- (org.codehaus.plexus:plexus-utils:jar:1.5.5:provided - omitted for conflict with 3.0.22)<br /></li><br /></ol></td></tr> +<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:7.0-RC-3<br />\- org.apache.maven:maven-core:jar:3.5.0:provided<br />   \- org.sonatype.plexus:plexus-sec-dispatcher:jar:1.4:provided<br />      \- (org.codehaus.plexus:plexus-utils:jar:1.5.5:provided - omitted for conflict with 3.0.22)<br /></li><br /></ol></td></tr> <tr class="b"> <td width="25%">3.0.17</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:7.0-RC-2<br />\- org.apache.maven:maven-plugin-api:jar:3.5.0:compile<br />   \- org.eclipse.sisu:org.eclipse.sisu.plexus:jar:0.3.3:compile<br />      \- (org.codehaus.plexus:plexus-utils:jar:3.0.17:compile - omitted for conflict with 3.0.22)<br /></li><br /></ol></td></tr> +<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:7.0-RC-3<br />\- org.apache.maven:maven-plugin-api:jar:3.5.0:compile<br />   \- org.eclipse.sisu:org.eclipse.sisu.plexus:jar:0.3.3:compile<br />      \- (org.codehaus.plexus:plexus-utils:jar:3.0.17:compile - omitted for conflict with 3.0.22)<br /></li><br /></ol></td></tr> <tr class="a"> <td width="25%">3.0.22</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:7.0-RC-2<br />\- org.nuiton:helper-maven-plugin-api:jar:2.3.2:compile<br />   \- org.codehaus.plexus:plexus-utils:jar:3.0.22:compile<br /></li><br /></ol></td></tr> +<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:7.0-RC-3<br />\- org.nuiton:helper-maven-plugin-api:jar:2.3.2:compile<br />   \- org.codehaus.plexus:plexus-utils:jar:3.0.22:compile<br /></li><br /></ol></td></tr> <tr class="b"> <td width="25%">3.0.24</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:7.0-RC-2<br />+- org.apache.maven:maven-core:jar:3.5.0:provided<br />|  +- org.apache.maven:maven-settings-builder:jar:3.5.0:provided<br />|  |  +- org.apache.maven:maven-builder-support:jar:3.5.0:provided<br />|  |  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br />|  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br />|  +- org.apache.maven:maven-repository-metadata:jar:3.5.0:provided<br />|  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br />|  +- org.apache.maven:maven-model-builder:jar:3.5.0:provided<br />|  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br />|  +- org.apache.maven:maven-resolver-provider:jar:3.5.0:provided<br />|  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br />|  \- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br />+- org.apache.maven:maven-compat:jar:3.5.0:provided<br />|  +- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br />|  \- org.apache.maven.wagon:wagon-provider-api:jar:2.12:provided<br />|     \- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br />+- org.apache.maven:maven-model:jar:3.5.0:provided<br />|  \- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br />+- org.apache.maven:maven-settings:jar:3.5.0:provided<br />|  \- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br />\- org.apache.maven:maven-artifact:jar:3.5.0:provided<br />   \- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br /></li><br /></ol></td></tr></table></td></tr></table></div></div> +<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:7.0-RC-3<br />+- org.apache.maven:maven-core:jar:3.5.0:provided<br />|  +- org.apache.maven:maven-settings-builder:jar:3.5.0:provided<br />|  |  +- org.apache.maven:maven-builder-support:jar:3.5.0:provided<br />|  |  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br />|  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br />|  +- org.apache.maven:maven-repository-metadata:jar:3.5.0:provided<br />|  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br />|  +- org.apache.maven:maven-model-builder:jar:3.5.0:provided<br />|  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br />|  +- org.apache.maven:maven-resolver-provider:jar:3.5.0:provided<br />|  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br />|  \- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br />+- org.apache.maven:maven-compat:jar:3.5.0:provided<br />|  +- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br />|  \- org.apache.maven.wagon:wagon-provider-api:jar:2.12:provided<br />|     \- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br />+- org.apache.maven:maven-model:jar:3.5.0:provided<br />|  \- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br />+- org.apache.maven:maven-settings:jar:3.5.0:provided<br />|  \- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br />\- org.apache.maven:maven-artifact:jar:3.5.0:provided<br />   \- (org.codehaus.plexus:plexus-utils:jar:3.0.24:provided - omitted for conflict with 3.0.22)<br /></li><br /></ol></td></tr></table></td></tr></table></div></div> </div> </div> </div> ===================================== dependency-info.html ===================================== --- a/dependency-info.html +++ b/dependency-info.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170725" /> + <meta name="Date-Revision-yyyymmdd" content="20170801" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Informations de dépendance</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Informations de dépendance</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-07-25</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-01</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -98,31 +98,31 @@ <div class="source"><pre class="prettyprint linenums"><dependency> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2</version> + <version>7.0-RC-3</version> <type>pom</type> </dependency></pre></div></div> <div class="section"> <h3><a name="Apache_Buildr"></a>Apache Buildr</h3><a name="Apache_Buildr"></a> -<div class="source"><pre class="prettyprint linenums">'fr.ird.observe:ird-observe:pom:7.0-RC-2'</pre></div></div> +<div class="source"><pre class="prettyprint linenums">'fr.ird.observe:ird-observe:pom:7.0-RC-3'</pre></div></div> <div class="section"> <h3><a name="Apache_Ivy"></a>Apache Ivy</h3><a name="Apache_Ivy"></a> -<div class="source"><pre class="prettyprint linenums"><dependency org="fr.ird.observe" name="ird-observe" rev="7.0-RC-2"> +<div class="source"><pre class="prettyprint linenums"><dependency org="fr.ird.observe" name="ird-observe" rev="7.0-RC-3"> <artifact name="ird-observe" type="pom" /> </dependency></pre></div></div> <div class="section"> <h3><a name="Groovy_Grape"></a>Groovy Grape</h3><a name="Groovy_Grape"></a> <div class="source"><pre class="prettyprint linenums">@Grapes( -@Grab(group='fr.ird.observe', module='ird-observe', version='7.0-RC-2') +@Grab(group='fr.ird.observe', module='ird-observe', version='7.0-RC-3') )</pre></div></div> <div class="section"> <h3><a name="GradleGrails"></a>Gradle/Grails</h3><a name="GradleGrails"></a> -<div class="source"><pre class="prettyprint linenums">compile 'fr.ird.observe:ird-observe:7.0-RC-2'</pre></div></div> +<div class="source"><pre class="prettyprint linenums">compile 'fr.ird.observe:ird-observe:7.0-RC-3'</pre></div></div> <div class="section"> <h3><a name="Scala_SBT"></a>Scala SBT</h3><a name="Scala_SBT"></a> -<div class="source"><pre class="prettyprint linenums">libraryDependencies += "fr.ird.observe" % "ird-observe" % "7.0-RC-2"</pre></div></div> +<div class="source"><pre class="prettyprint linenums">libraryDependencies += "fr.ird.observe" % "ird-observe" % "7.0-RC-3"</pre></div></div> <div class="section"> <h3><a name="Leiningen"></a>Leiningen</h3><a name="Leiningen"></a> -<div class="source"><pre class="prettyprint linenums">[fr.ird.observe/ird-observe "7.0-RC-2"]</pre></div></div></div> +<div class="source"><pre class="prettyprint linenums">[fr.ird.observe/ird-observe "7.0-RC-3"]</pre></div></div></div> </div> </div> </div> ===================================== dependency-management.html ===================================== --- a/dependency-management.html +++ b/dependency-management.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170725" /> + <meta name="Date-Revision-yyyymmdd" content="20170801" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Gestion des dépendances du project</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Gestion des dépendances du project</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-07-25</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-01</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -135,14 +135,14 @@ <td><a class="externalLink" href="http://www.gnu.org/copyleft/lesser.txt">Lesser General Public License (LGPL)</a></td></tr> <tr class="a"> <td>com.vladsch.flexmark</td> -<td><a class="externalLink" href="https://github.com/vladsch/flexmark-java/flexmark">flexmark</a></td> -<td>0.22.14</td> +<td><a class="externalLink" href="https://github.com/vsch/flexmark-java/flexmark">flexmark</a></td> +<td>0.22.18</td> <td>jar</td> <td><a class="externalLink" href="http://opensource.org/licenses/BSD-2-Clause">BSD 2-Clause License</a></td></tr> <tr class="b"> <td>com.vladsch.flexmark</td> -<td><a class="externalLink" href="https://github.com/vladsch/flexmark-java/flexmark-util">flexmark-util</a></td> -<td>0.22.14</td> +<td><a class="externalLink" href="https://github.com/vsch/flexmark-java/flexmark-util">flexmark-util</a></td> +<td>0.22.18</td> <td>jar</td> <td><a class="externalLink" href="http://opensource.org/licenses/BSD-2-Clause">BSD 2-Clause License</a></td></tr> <tr class="a"> @@ -190,7 +190,7 @@ <tr class="b"> <td>io.ultreia.java4all.http</td> <td><a class="externalLink" href="https://ultreiaio.gitlab.io/http/http-api">http-api</a></td> -<td>1.0.1</td> +<td>1.0.2</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="a"> @@ -208,91 +208,91 @@ <tr class="a"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-runtime">jaxx-runtime</a></td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="b"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-runtime-swing-application">jaxx-runtime-swing-application</a></td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="a"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-runtime-swing-session">jaxx-runtime-swing-session</a></td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="b"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-runtime-swing-wizard">jaxx-runtime-swing-wizard</a></td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="a"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-validator">jaxx-validator</a></td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="b"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-widgets-about">jaxx-widgets-about</a></td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="a"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-widgets-config">jaxx-widgets-config</a></td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="b"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-widgets-datetime">jaxx-widgets-datetime</a></td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="a"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-widgets-error">jaxx-widgets-error</a></td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="b"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-widgets-file">jaxx-widgets-file</a></td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="a"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-widgets-gis">jaxx-widgets-gis</a></td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="b"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-widgets-hidor">jaxx-widgets-hidor</a></td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="a"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-widgets-number">jaxx-widgets-number</a></td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="b"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-widgets-select">jaxx-widgets-select</a></td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="a"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-widgets-status">jaxx-widgets-status</a></td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td>jar</td> <td><a class="externalLink" href="http://www.gnu.org/licenses/lgpl-3.0.txt">Lesser General Public License (LGPL) v 3.0</a></td></tr> <tr class="b"> ===================================== dependency-updates-report.html ===================================== --- a/dependency-updates-report.html +++ b/dependency-updates-report.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170725" /> + <meta name="Date-Revision-yyyymmdd" content="20170801" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Dependency Updates Report</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Dependency Updates Report</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-07-25</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-01</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -193,7 +193,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>com.vladsch.flexmark</td> <td>flexmark</td> -<td>0.22.14</td> +<td>0.22.18</td> <td></td> <td></td> <td>jar</td> @@ -205,7 +205,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>com.vladsch.flexmark</td> <td>flexmark-util</td> -<td>0.22.14</td> +<td>0.22.18</td> <td></td> <td></td> <td>jar</td> @@ -301,7 +301,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.http</td> <td>http-api</td> -<td>1.0.1</td> +<td>1.0.2</td> <td></td> <td></td> <td>jar</td> @@ -337,7 +337,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-runtime</td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td>compile</td> <td></td> <td>jar</td> @@ -349,7 +349,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-runtime-swing-application</td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td>compile</td> <td></td> <td>jar</td> @@ -361,7 +361,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-runtime-swing-session</td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td>compile</td> <td></td> <td>jar</td> @@ -373,7 +373,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-runtime-swing-wizard</td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td>compile</td> <td></td> <td>jar</td> @@ -385,7 +385,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-validator</td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td>compile</td> <td></td> <td>jar</td> @@ -397,7 +397,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-widgets-about</td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td>compile</td> <td></td> <td>jar</td> @@ -409,7 +409,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-widgets-config</td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td>compile</td> <td></td> <td>jar</td> @@ -421,7 +421,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-widgets-datetime</td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td>compile</td> <td></td> <td>jar</td> @@ -433,7 +433,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-widgets-error</td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td>compile</td> <td></td> <td>jar</td> @@ -445,7 +445,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-widgets-file</td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td>compile</td> <td></td> <td>jar</td> @@ -457,7 +457,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-widgets-gis</td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td>compile</td> <td></td> <td>jar</td> @@ -469,7 +469,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-widgets-hidor</td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td>compile</td> <td></td> <td>jar</td> @@ -481,7 +481,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-widgets-number</td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td>compile</td> <td></td> <td>jar</td> @@ -493,7 +493,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-widgets-select</td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td>compile</td> <td></td> <td>jar</td> @@ -505,7 +505,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-widgets-status</td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td></td> <td></td> <td>jar</td> @@ -1199,7 +1199,7 @@ <td>flexmark</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>0.22.14</td></tr> +<td>0.22.18</td></tr> <tr class="a"> <th width="80%">Scope</th> <td></td></tr> @@ -1223,7 +1223,7 @@ <td>flexmark-util</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>0.22.14</td></tr> +<td>0.22.18</td></tr> <tr class="a"> <th width="80%">Scope</th> <td></td></tr> @@ -1418,7 +1418,7 @@ <td>http-api</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>1.0.1</td></tr> +<td>1.0.2</td></tr> <tr class="a"> <th width="80%">Scope</th> <td></td></tr> @@ -1490,7 +1490,7 @@ <td>jaxx-runtime</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-8</td></tr> +<td>3.0-alpha-9</td></tr> <tr class="a"> <th width="80%">Scope</th> <td>compile</td></tr> @@ -1514,7 +1514,7 @@ <td>jaxx-runtime-swing-application</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-8</td></tr> +<td>3.0-alpha-9</td></tr> <tr class="a"> <th width="80%">Scope</th> <td>compile</td></tr> @@ -1538,7 +1538,7 @@ <td>jaxx-runtime-swing-session</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-8</td></tr> +<td>3.0-alpha-9</td></tr> <tr class="a"> <th width="80%">Scope</th> <td>compile</td></tr> @@ -1562,7 +1562,7 @@ <td>jaxx-runtime-swing-wizard</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-8</td></tr> +<td>3.0-alpha-9</td></tr> <tr class="a"> <th width="80%">Scope</th> <td>compile</td></tr> @@ -1586,7 +1586,7 @@ <td>jaxx-validator</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-8</td></tr> +<td>3.0-alpha-9</td></tr> <tr class="a"> <th width="80%">Scope</th> <td>compile</td></tr> @@ -1610,7 +1610,7 @@ <td>jaxx-widgets-about</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-8</td></tr> +<td>3.0-alpha-9</td></tr> <tr class="a"> <th width="80%">Scope</th> <td>compile</td></tr> @@ -1634,7 +1634,7 @@ <td>jaxx-widgets-config</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-8</td></tr> +<td>3.0-alpha-9</td></tr> <tr class="a"> <th width="80%">Scope</th> <td>compile</td></tr> @@ -1658,7 +1658,7 @@ <td>jaxx-widgets-datetime</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-8</td></tr> +<td>3.0-alpha-9</td></tr> <tr class="a"> <th width="80%">Scope</th> <td>compile</td></tr> @@ -1682,7 +1682,7 @@ <td>jaxx-widgets-error</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-8</td></tr> +<td>3.0-alpha-9</td></tr> <tr class="a"> <th width="80%">Scope</th> <td>compile</td></tr> @@ -1706,7 +1706,7 @@ <td>jaxx-widgets-file</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-8</td></tr> +<td>3.0-alpha-9</td></tr> <tr class="a"> <th width="80%">Scope</th> <td>compile</td></tr> @@ -1730,7 +1730,7 @@ <td>jaxx-widgets-gis</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-8</td></tr> +<td>3.0-alpha-9</td></tr> <tr class="a"> <th width="80%">Scope</th> <td>compile</td></tr> @@ -1754,7 +1754,7 @@ <td>jaxx-widgets-hidor</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-8</td></tr> +<td>3.0-alpha-9</td></tr> <tr class="a"> <th width="80%">Scope</th> <td>compile</td></tr> @@ -1778,7 +1778,7 @@ <td>jaxx-widgets-number</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-8</td></tr> +<td>3.0-alpha-9</td></tr> <tr class="a"> <th width="80%">Scope</th> <td>compile</td></tr> @@ -1802,7 +1802,7 @@ <td>jaxx-widgets-select</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-8</td></tr> +<td>3.0-alpha-9</td></tr> <tr class="a"> <th width="80%">Scope</th> <td>compile</td></tr> @@ -1826,7 +1826,7 @@ <td>jaxx-widgets-status</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-8</td></tr> +<td>3.0-alpha-9</td></tr> <tr class="a"> <th width="80%">Scope</th> <td></td></tr> ===================================== dev-activity.html ===================================== --- a/dev-activity.html +++ b/dev-activity.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170725" /> + <meta name="Date-Revision-yyyymmdd" content="20170801" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Developer Activity Report</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Developer Activity Report</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-07-25</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-01</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -93,8 +93,8 @@ <div class="section"> <h2><a name="Developer_Activity_Report"></a>Developer Activity Report</h2> <div class="section"> -<h3><a name="Changes_between_2017-06-25_and_2017-07-26"></a>Changes between 2017-06-25 and 2017-07-26</h3> -<p>Total commits: 68<br />Total number of files changed: 1307</p> +<h3><a name="Changes_between_2017-07-02_and_2017-08-02"></a>Changes between 2017-07-02 and 2017-08-02</h3> +<p>Total commits: 94<br />Total number of files changed: 4003</p> <table border="0" class="table table-striped"> <tr class="a"> <th>Developer</th> @@ -102,12 +102,12 @@ <th>Total Number of Files Changed</th></tr> <tr class="b"> <td>166231 <dev(a)tchemit.fr></td> -<td>8</td> -<td>21</td></tr> +<td>10</td> +<td>26</td></tr> <tr class="a"> <td>Tony CHEMIT <dev(a)tchemit.fr></td> -<td>51</td> -<td>1272</td></tr> +<td>75</td> +<td>3975</td></tr> <tr class="b"> <td>Tony Chemit <dev(a)tchemit.fr></td> <td>9</td> ===================================== file-activity.html ===================================== The diff for this file was not included because it is too large. ===================================== index.html ===================================== --- a/index.html +++ b/index.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170725" /> + <meta name="Date-Revision-yyyymmdd" content="20170801" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – ObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">ObServe</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-07-25</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-01</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== install-serverPG.html ===================================== --- a/install-serverPG.html +++ b/install-serverPG.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170725" /> + <meta name="Date-Revision-yyyymmdd" content="20170801" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation du serveur Obstuna</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Installation du serveur Obstuna</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-07-25</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-01</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== install.html ===================================== --- a/install.html +++ b/install.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170725" /> + <meta name="Date-Revision-yyyymmdd" content="20170801" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation dObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Installation dObServe</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-07-25</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-01</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== integration.html ===================================== --- a/integration.html +++ b/integration.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170725" /> + <meta name="Date-Revision-yyyymmdd" content="20170801" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Intégration continue</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Intégration continue</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-07-25</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-01</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== issue-tracking.html ===================================== --- a/issue-tracking.html +++ b/issue-tracking.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170725" /> + <meta name="Date-Revision-yyyymmdd" content="20170801" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Contrôle des livraisons</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Contrôle des livraisons</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-07-25</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-01</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== license.html ===================================== --- a/license.html +++ b/license.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170725" /> + <meta name="Date-Revision-yyyymmdd" content="20170801" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Licence du projet</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Licence du projet</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-07-25</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-01</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== plugin-management.html ===================================== --- a/plugin-management.html +++ b/plugin-management.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170725" /> + <meta name="Date-Revision-yyyymmdd" content="20170801" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Gestion des plugins du projet</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Gestion des plugins du projet</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-07-25</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-01</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -113,7 +113,7 @@ <tr class="a"> <td>io.ultreia.java4all.http</td> <td><a class="externalLink" href="https://ultreiaio.gitlab.io/http/http-maven-plugin">http-maven-plugin</a></td> -<td>1.0.1</td></tr> +<td>1.0.2</td></tr> <tr class="b"> <td>io.ultreia.java4all.i18n</td> <td><a class="externalLink" href="http://i18n.nuiton.org/i18n-maven-plugin">i18n-maven-plugin</a></td> @@ -121,7 +121,7 @@ <tr class="a"> <td>io.ultreia.java4all.jaxx</td> <td><a class="externalLink" href="https://nuiton.gitlab.io/jaxx/jaxx-maven-plugin">jaxx-maven-plugin</a></td> -<td>3.0-alpha-8</td></tr> +<td>3.0-alpha-9</td></tr> <tr class="b"> <td>io.ultreia.maven</td> <td><a class="externalLink" href="https://ultreiaio.gitlab.io/gitlab-maven-plugin">gitlab-maven-plugin</a></td> ===================================== plugin-updates-report.html ===================================== --- a/plugin-updates-report.html +++ b/plugin-updates-report.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170725" /> + <meta name="Date-Revision-yyyymmdd" content="20170801" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Plugin Updates Report</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Plugin Updates Report</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-07-25</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-01</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -97,7 +97,7 @@ <tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /></td> <td># of plugins using the latest version available</td> -<td>56</td></tr> +<td>54</td></tr> <tr class="b"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td># of plugins where the next version available is smaller than an incremental version update</td> @@ -105,7 +105,7 @@ <tr class="a"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td># of plugins where the next version available is an incremental version update</td> -<td>1</td></tr> +<td>2</td></tr> <tr class="b"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td># of plugins where the next version available is a minor version update</td> @@ -113,7 +113,7 @@ <tr class="a"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td># of plugins where the next version available is a major version update</td> -<td>0</td></tr> +<td>1</td></tr> <tr class="b"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td># of plugins where a dependencies section containes a dependency with an updated version</td> @@ -165,7 +165,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.http</td> <td>http-maven-plugin</td> -<td><b>1.0.1</b></td> +<td><b>1.0.2</b></td> <td></td> <td></td> <td></td> @@ -185,7 +185,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-maven-plugin</td> -<td><b>3.0-alpha-8</b></td> +<td><b>3.0-alpha-9</b></td> <td></td> <td></td> <td></td> @@ -242,12 +242,12 @@ <td></td> <td><img src="images/icon_success_sml.gif" alt="" /></td></tr> <tr class="a"> -<td><img src="images/icon_success_sml.gif" alt="" /></td> +<td><img src="images/icon_warning_sml.gif" alt="" /></td> <td>org.apache.maven.plugins</td> <td>maven-compiler-plugin</td> -<td><b>3.6.1</b></td> -<td></td> +<td>3.6.1</td> <td></td> +<td><b>3.6.2</b></td> <td></td> <td></td> <td><img src="images/icon_success_sml.gif" alt="" /></td></tr> @@ -292,14 +292,14 @@ <td></td> <td><img src="images/icon_success_sml.gif" alt="" /></td></tr> <tr class="b"> -<td><img src="images/icon_success_sml.gif" alt="" /></td> +<td><img src="images/icon_warning_sml.gif" alt="" /></td> <td>org.apache.maven.plugins</td> <td>maven-enforcer-plugin</td> -<td><b>1.4.1</b></td> -<td></td> +<td>1.4.1</td> <td></td> <td></td> <td></td> +<td><b>3.0.0-M1</b></td> <td><img src="images/icon_success_sml.gif" alt="" /></td></tr> <tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /></td> @@ -786,7 +786,7 @@ <td>http-maven-plugin</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>1.0.1</td></tr></table></div> +<td>1.0.2</td></tr></table></div> <div class="section"> <h3><a name="Plugin_io.ultreia.java4all.i18n:i18n-maven-plugin"></a>Plugin io.ultreia.java4all.i18n:i18n-maven-plugin</h3> <table border="0" class="table table-striped"> @@ -816,7 +816,7 @@ <td>jaxx-maven-plugin</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-8</td></tr></table></div> +<td>3.0-alpha-9</td></tr></table></div> <div class="section"> <h3><a name="Plugin_io.ultreia.maven:gitlab-maven-plugin"></a>Plugin io.ultreia.maven:gitlab-maven-plugin</h3> <table border="0" class="table table-striped"> @@ -897,7 +897,7 @@ <table border="0" class="table table-striped"> <tr class="a"> <th width="80%">Status</th> -<td><img src="images/icon_success_sml.gif" alt="" /> No newer versions available.</td></tr> +<td><img src="images/icon_warning_sml.gif" alt="" /> There is at least one newer incremental version available. Incremental updates are typically passive.</td></tr> <tr class="b"> <th width="80%">Group Id</th> <td>org.apache.maven.plugins</td></tr> @@ -906,7 +906,10 @@ <td>maven-compiler-plugin</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.6.1</td></tr></table></div> +<td>3.6.1</td></tr> +<tr class="a"> +<th width="80%">Newer versions</th> +<td><b>3.6.2</b> <i>Next Incremental</i></td></tr></table></div> <div class="section"> <h3><a name="Plugin_org.apache.maven.plugins:maven-dependency-plugin"></a>Plugin org.apache.maven.plugins:maven-dependency-plugin</h3> <table border="0" class="table table-striped"> @@ -972,7 +975,7 @@ <table border="0" class="table table-striped"> <tr class="a"> <th width="80%">Status</th> -<td><img src="images/icon_success_sml.gif" alt="" /> No newer versions available.</td></tr> +<td><img src="images/icon_warning_sml.gif" alt="" /> There is at least one newer major version available. Major updates are rarely passive.</td></tr> <tr class="b"> <th width="80%">Group Id</th> <td>org.apache.maven.plugins</td></tr> @@ -981,7 +984,10 @@ <td>maven-enforcer-plugin</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>1.4.1</td></tr></table></div> +<td>1.4.1</td></tr> +<tr class="a"> +<th width="80%">Newer versions</th> +<td><b>3.0.0-M1</b> <i>Next Major</i></td></tr></table></div> <div class="section"> <h3><a name="Plugin_org.apache.maven.plugins:maven-gpg-plugin"></a>Plugin org.apache.maven.plugins:maven-gpg-plugin</h3> <table border="0" class="table table-striped"> @@ -1216,7 +1222,7 @@ <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>io.ultreia.java4all.jaxx</td> <td>jaxx-widgets-gis</td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td></td> <td>jar</td> <td></td> @@ -1281,7 +1287,7 @@ <td>jaxx-widgets-gis</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-8</td></tr> +<td>3.0-alpha-9</td></tr> <tr class="a"> <th width="80%">Classifier</th> <td></td></tr> ===================================== plugins.html ===================================== --- a/plugins.html +++ b/plugins.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170725" /> + <meta name="Date-Revision-yyyymmdd" content="20170801" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Project Plugins</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Project Plugins</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-07-25</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-01</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== project-info.html ===================================== --- a/project-info.html +++ b/project-info.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170725" /> + <meta name="Date-Revision-yyyymmdd" content="20170801" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Information générale du projet</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Information générale du projet</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-07-25</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-01</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== project-reports.html ===================================== --- a/project-reports.html +++ b/project-reports.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170725" /> + <meta name="Date-Revision-yyyymmdd" content="20170801" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Rapports générés par Maven</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Rapports générés par Maven</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-07-25</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-01</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== project-summary.html ===================================== --- a/project-summary.html +++ b/project-summary.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170725" /> + <meta name="Date-Revision-yyyymmdd" content="20170801" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Résumé du projet</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Résumé du projet</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-07-25</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-01</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -134,7 +134,7 @@ <td>ird-observe</td></tr> <tr class="b"> <td>Version</td> -<td>7.0-RC-2</td></tr> +<td>7.0-RC-3</td></tr> <tr class="a"> <td>Type</td> <td>pom</td></tr></table></div></div> ===================================== property-updates-report.html ===================================== --- a/property-updates-report.html +++ b/property-updates-report.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170725" /> + <meta name="Date-Revision-yyyymmdd" content="20170801" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Property Updates Report</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Property Updates Report</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-07-25</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-01</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -208,7 +208,7 @@ <tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>${httpVersion}</td> -<td>1.0.1</td> +<td>1.0.2</td> <td></td> <td></td> <td></td> @@ -224,7 +224,7 @@ <tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>${jaxxVersion}</td> -<td>3.0-alpha-8</td> +<td>3.0-alpha-9</td> <td></td> <td></td> <td></td> @@ -288,7 +288,7 @@ <tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /></td> <td>${flexmarkVersion}</td> -<td>0.22.14</td> +<td>0.22.18</td> <td></td> <td></td> <td></td> @@ -348,7 +348,7 @@ <td>com.vladsch.flexmark:flexmark<br />com.vladsch.flexmark:flexmark-util</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>0.22.14</td></tr> +<td>0.22.18</td></tr> <tr class="a"> <th width="80%">Allowed version range</th> <td>[,)</td></tr> @@ -474,7 +474,7 @@ <td>io.ultreia.java4all.http:http-api<br />io.ultreia.java4all.http:http-maven-plugin</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>1.0.1</td></tr> +<td>1.0.2</td></tr> <tr class="a"> <th width="80%">Allowed version range</th> <td>[,)</td></tr> @@ -504,7 +504,7 @@ <td>io.ultreia.java4all.jaxx:jaxx-maven-plugin<br />io.ultreia.java4all.jaxx:jaxx-runtime<br />io.ultreia.java4all.jaxx:jaxx-runtime-swing-application<br />io.ultreia.java4all.jaxx:jaxx-runtime-swing-session<br />io.ultreia.java4all.jaxx:jaxx-runtime-swing-wizard<br />io.ultreia.java4all.jaxx:jaxx-validator<br />io.ultreia.java4all.jaxx:jaxx-widgets-about<br />io.ultreia.java4all.jaxx:jaxx-widgets-config<br />io.ultreia.java4all.jaxx:jaxx-widgets-datetime<br />io.ultreia.java4all.jaxx:jaxx-widgets-error<br />io.ultreia.java4all.jaxx:jaxx-widgets-file<br />io.ultreia.java4all.jaxx:jaxx-widgets-gis<br />io.ultreia.java4all.jaxx:jaxx-widgets-gis<br />io.ultreia.java4all.jaxx:jaxx-widgets-hidor<br />io.ultreia.java4all.jaxx:jaxx-widgets-number<br />io.ultreia.java4all.jaxx:jaxx-widgets-select<br />io.ultreia.java4all.jaxx:jaxx-widgets-status</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0-alpha-8</td></tr> +<td>3.0-alpha-9</td></tr> <tr class="a"> <th width="80%">Allowed version range</th> <td>[,)</td></tr> ===================================== sitemap.html ===================================== --- a/sitemap.html +++ b/sitemap.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170725" /> + <meta name="Date-Revision-yyyymmdd" content="20170801" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Sitemap</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Sitemap</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-07-25</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-01</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== source-repository.html ===================================== --- a/source-repository.html +++ b/source-repository.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170725" /> + <meta name="Date-Revision-yyyymmdd" content="20170801" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Dépôt de sources</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Dépôt de sources</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-07-25</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-01</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== team-list.html ===================================== --- a/team-list.html +++ b/team-list.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170725" /> + <meta name="Date-Revision-yyyymmdd" content="20170801" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Liste des membres</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Liste des membres</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-07-25</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-01</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== third-party-report.html ===================================== --- a/third-party-report.html +++ b/third-party-report.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170725" /> + <meta name="Date-Revision-yyyymmdd" content="20170801" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Tierces parties</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Tierces parties</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-07-25</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-2</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-08-01</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0-RC-3</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b8e6dc83762e6ab2d4192cb72ec… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b8e6dc83762e6ab2d4192cb72ec… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] fix deploy demo build [skip ci]
by Tony CHEMIT 01 Aug '17

01 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 411070e6 by Tony CHEMIT at 2017-08-01T15:21:44+02:00 fix deploy demo build [skip ci] - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,7 +52,7 @@ stages: stage: Test script: - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/-Padd-git-commit-id-to-project-version -N/' | bash - - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/install -am -pl application-web -DskipTests -Pdeploy-demo -Dclassifier=latest/' | bash + - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/install -am -pl server -DskipTests -Pdeploy-demo -Dclassifier=latest/' | bash build: stage: Build @@ -139,7 +139,7 @@ nightly-demo: staging-demo: <<: *staging script: - - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/install -am -pl application-web -DskipTests -Pdeploy-demo -DperformRelease/' | bash + - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/install -am -pl server -DskipTests -Pdeploy-demo -DperformRelease/' | bash staging-site: <<: *staging View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/411070e6b7d187870edcaef0e0c… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/411070e6b7d187870edcaef0e0c… You're receiving this email because of your account on gitlab.com.

1 0