branch feature/fix_ftl_datasource updated (9276034 -> 53c33ca)
This is an automated email from the git hooks/post-receive script. New change to branch feature/fix_ftl_datasource in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git omits 9276034 Ajoute les templates traduits en anglais pour les wizzards de source de données (+ quelques corrections en français) omits 1a722be Traduit les chaines de configuration d observe web en espagnol adds 217c441 Use i1_n in snapshot + generate more enums adds 4600801 Use now enum constants generated by mojo even inside the compile path... adds c911649 Sépare les message d'avertissment concernant l'équipement non renseigné entre senne et palangre adds 996735b Add missing i18n adds 51036b6 to run application via maven adds 0df99f9 Suppression de GpsAble + assainissement du quadrant au niveau entite (en fait juste besoin de la lecture) adds 7a0d2a9 Correction de la validation (permettre d'invoquer des méthodestatistiques dans les validateurs + ajout des méthodes qui étaient avant sur les entités adds 081446b Assainissement de la gestion du quadrant adds 3e1e193 Fixes #8482 Merge branch 'feature/8482' into develop adds 8f83cfd Bien réinitialiser les champs calculé avant un nouveau calcul (Fixes #7705) adds c783db0 Use i18n 3.6.1 adds cada6c4 Fix dependencies pb adds 63c8799 clean pom adds e5e16fb Prepare next release \o/ adds 89ea155 Add missing validator adds 239a279 Add missing validator → Now fix tests... adds 80d2e02 Utilisation de SqlFileReader de nuiton-utils qui gère bien les statements sql (Fixes #8195) adds 245c408 Corrige une tipo adds ce126bd Corrige le decorateur de l'objet flottant adds 8eca327 Don't know what to do with this... adds c44d26f Migraion 4.905 pour supprimer les contraintes de nullité sur l'identifiant filage (See #7543) adds d5c551d Fix migrate test db adds f7cc7b9 Need to be able to auto-migrate some databases (such as test one) adds d83bf99 Add tree header^^ adds 2ef3dab Clean some code, remove unused adds c5340fb Review operations order adds b113a46 Fix save local database in export operation if referential was modified new 3c22ad1 Traduit les chaines de configuration d observe web en espagnol new 53c33ca Ajoute les templates traduits en anglais pour les wizzards de source de données (+ quelques corrections en français) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (9276034) \ N -- N -- N refs/heads/feature/fix_ftl_datasource (53c33ca) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 53c33caa5787086b61b81654ca35feb64231557f Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Thu Sep 1 17:34:57 2016 +0200 Ajoute les templates traduits en anglais pour les wizzards de source de données (+ quelques corrections en français) fixes #8486 commit 3c22ad184a99990ec705602b7d4c0139cea94546 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Thu Sep 1 16:43:21 2016 +0200 Traduit les chaines de configuration d observe web en espagnol fixes #8485 Summary of changes: .../src/license/THIRD-PARTY.properties | 5 +- .../ObserveSwingApplicationActionDefinition.java | 22 +++ .../configuration/constants/CreationMode.java | 71 +++------ .../swing/configuration/constants/DbMode.java | 39 +---- ...pplication-swing-configuration_en_GB.properties | 20 --- ...pplication-swing-configuration_es_ES.properties | 20 --- ...pplication-swing-configuration_fr_FR.properties | 20 --- .../src/main/resources/validators.xml | 3 +- .../swing/decoration/DecoratorService.java | 2 +- ...ivityLonglineDto-ui-create-error-validation.xml | 10 +- ...ivityLonglineDto-ui-update-error-validation.xml | 10 +- .../SetLonglineDto-ui-create-error-validation.xml | 148 ++++++++++++------ ...lineGearUseDto-ui-update-warning-validation.xml | 2 +- ...ActivitySeineDto-ui-create-error-validation.xml | 10 +- ...ActivitySeineDto-ui-update-error-validation.xml | 10 +- ...eineGearUseDto-ui-update-warning-validation.xml | 2 +- .../application-swing-validation_en_GB.properties | 9 +- .../application-swing-validation_es_ES.properties | 9 +- .../application-swing-validation_fr_FR.properties | 9 +- .../src/test/resources/validators.xml | 1 + .../validators/QuadrantFieldDtoValidator.java | 76 ++++++++++ application-swing/README.md | 9 +- application-swing/pom.xml | 75 ++++++---- .../application/swing/ObserveActionExecutor.java | 59 +------- .../observe/application/swing/ObserveCLAction.java | 3 - .../observe/application/swing/ObserveRunner.java | 11 -- .../swing/ObserveSwingApplicationContext.java | 37 +++-- .../swing/ObserveSwingBinderService.java | 50 ------- .../{ObserveAdminCLI.java => RunObserve.java} | 11 +- .../swing/db/constants/ConnexionStatus.java | 33 +--- .../swing/ui/actions/LaunchAdminAction.java | 3 +- .../application/swing/ui/admin/AdminStep.java | 45 +----- .../swing/ui/admin/AdminTabUIHandler.java | 5 +- .../application/swing/ui/admin/AdminUIHandler.java | 5 +- .../swing/ui/admin/config/ConfigUI.jaxx | 6 +- .../swing/ui/admin/resume/ShowResumeUIHandler.java | 5 +- .../swing/ui/admin/save/SaveLocalUIHandler.java | 18 +-- .../referential/ReferentialSynchronizeMode.java | 7 - .../swing/ui/admin/validate/ValidateConfigUI.jaxx | 1 + .../swing/ui/admin/validate/ValidateConfigUI.jcss | 4 +- .../ui/content/impl/longline/SetLonglineUI.jaxx | 4 + .../ui/content/impl/longline/SetLonglineUI.jcss | 8 + .../content/ref/impl/ProgramObservationEnum.java | 23 +-- .../ui/content/table/ContentTableUIModel.java | 8 +- .../table/impl/longline/CatchLonglineUIModel.java | 5 +- .../swing/ui/storage/ObstunaAdminAction.java | 60 ++------ .../application/swing/ui/storage/StorageStep.java | 56 ++----- .../swing/ui/storage/StorageUIHandler.java | 9 +- .../swing/ui/storage/StorageUIModel.java | 7 +- .../swing/ui/storage/tabs/ChooseDbModeUI.jaxx | 1 + .../swing/ui/storage/tabs/ChooseDbModeUI.jcss | 16 +- .../swing/ui/storage/tabs/ConfigReferentielUI.jaxx | 1 + .../swing/ui/storage/tabs/ConfigReferentielUI.jcss | 6 +- .../swing/ui/storage/tabs/ConfigUI.jaxx | 1 + .../swing/ui/storage/tabs/ConfigUI.jcss | 2 +- .../swing/ui/storage/tabs/SelectDataUI.jaxx | 5 +- .../swing/ui/storage/tabs/StorageTabUI.jaxx | 3 +- .../swing/ui/storage/tabs/StorageTabUIHandler.java | 12 +- .../swing/validation/ValidationModelMode.java | 35 +---- .../i18n/application-swing_en_GB.properties | 132 +++++++++------- .../i18n/application-swing_es_ES.properties | 132 +++++++++------- .../i18n/application-swing_fr_FR.properties | 136 ++++++++++------- .../src/license/THIRD-PARTY.properties | 3 +- .../src/main/resources/validators.xml | 14 ++ .../ObserveMigrationConfigurationProviderImpl.java | 1 + ...va => DataSourceMigrationForVersion_4_905.java} | 40 +---- ..._not_null_constraint_hauling_identifier-H2.sql} | 4 +- ..._not_null_constraint_hauling_identifier-PG.sql} | 4 +- .../java/fr/ird/observe/RunScriptTopiaSqlWork.java | 34 ++--- .../fr/ird/observe/RunScriptsTopiaSqlWork.java | 6 - .../java/fr/ird/observe/entities/Activity.java | 6 +- .../main/java/fr/ird/observe/entities/GPSAble.java | 59 -------- .../java/fr/ird/observe/entities/ObserveSet.java | 2 - .../entities/longline/ActivityLonglineImpl.java | 52 +++---- .../observe/entities/longline/SetLonglineImpl.java | 11 -- .../observe/entities/seine/ActivitySeineImpl.java | 62 +++----- .../ird/observe/entities/seine/SetSeineImpl.java | 4 - entities/src/main/xmi/observe-longline.properties | 5 - entities/src/main/xmi/observe-seine.zargo | Bin 84619 -> 83234 bytes .../src/test/resources/db/4.0.2/referentiel.sql.gz | Bin 138257 -> 0 bytes .../DataSourceMigrationForVersion_4_0_2.java | 75 ---------- .../resources/db/4.0.2/remove-gender-column-PG.sql | 22 --- pom.xml | 144 +++++++----------- .../ObserveDataSourceConfiguration.java | 5 + .../ObserveDataSourceConfigurationRest.java | 18 ++- .../ObserveDataSourceConfigurationTopiaH2.java | 25 ++-- .../ObserveDataSourceConfigurationTopiaPG.java | 17 ++- ...ObserveDataSourceConfigurationTopiaSupport.java | 17 ++- .../main/java/fr/ird/observe/util/ObserveUtil.java | 22 +++ .../main/xmi/observe-services-dto-longline.zargo | Bin 67306 -> 67504 bytes .../ActivityLongline-service-error-validation.xml | 12 +- .../SetLongline-service-error-validation.xml | 56 ++----- .../ActivitySeine-service-error-validation.xml | 12 +- .../seine/Route-service-error-validation.xml | 2 +- ...-service-gearUseFeatures-warning-validation.xml | 2 +- .../services-topia-validation_en_GB.properties | 12 +- .../services-topia-validation_es_ES.properties | 12 +- .../services-topia-validation_fr_FR.properties | 12 +- .../src/main/resources/xwork.xml | 20 ++- .../src/test/resources/validators.xml | 1 + .../topia/validators/QuadrantFieldValidator.java | 75 ++++++++++ .../topia/binder/data/ActivityLonglineBinder.java | 1 - .../topia/binder/data/ActivitySeineBinder.java | 1 - .../topia/service/DataSourceServiceTopia.java | 2 +- .../consolidate/ConsolidateDataServiceTopia.java | 68 +++++---- .../service/actions/validate/ObserveValidator.java | 166 --------------------- .../validate/ServiceValidationException.java | 16 +- .../actions/validate/ValidateServiceTopia.java | 130 ++++++++++------ .../actions/validate/ValidationDataContext.java | 65 ++++++-- .../validate/ValidationMessageDetector.java | 7 +- .../service/actions/validate/ValidatorsMap.java | 54 ++----- .../longline/ActivityLonglineServiceTopia.java | 17 +-- .../service/seine/ActivitySeineServiceTopia.java | 17 +-- .../topia/service/MigrateTestsDatabases.java | 8 +- .../actions/validate/ValidateServiceTopiaTest.java | 6 +- services-topia/src/test/resources/validators.xml | 1 + .../ird/observe/test/ObserveTestConfiguration.java | 1 + .../resources/db/4.905/dataForTestLongline.sql.gz | Bin 0 -> 1622096 bytes .../resources/db/4.905/dataForTestSeine.sql.gz | Bin 0 -> 451016 bytes ...aForTestUnidirectionalReferentialSynchro.sql.gz | Bin 0 -> 441248 bytes .../resources/db/{4.904 => 4.905}/empty_h2.sql.gz | Bin 6018 -> 6006 bytes test/src/main/resources/db/4.905/empty_pg.sql.gz | Bin 0 -> 6004 bytes .../src/main/resources/db/4.905/referentiel.sql.gz | Bin 0 -> 140214 bytes test/src/main/resources/observetest.properties | 1 + 124 files changed, 1228 insertions(+), 1748 deletions(-) copy {services-rest => application-swing-configuration}/src/license/THIRD-PARTY.properties (89%) create mode 100644 application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/QuadrantFieldDtoValidator.java delete mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingBinderService.java rename application-swing/src/main/java/fr/ird/observe/application/swing/{ObserveAdminCLI.java => RunObserve.java} (79%) copy {services-rest => application-web-configuration}/src/license/THIRD-PARTY.properties (93%) copy entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/{DataSourceMigrationForVersion_4_901.java => DataSourceMigrationForVersion_4_905.java} (53%) copy entities-migration/src/main/resources/db/migration/{V3_10_04_fix-sensorDataFormat-PG.sql => V4_905_01_drop_not_null_constraint_hauling_identifier-H2.sql} (75%) copy entities-migration/src/main/resources/db/migration/{V3_10_04_fix-sensorDataFormat-PG.sql => V4_905_01_drop_not_null_constraint_hauling_identifier-PG.sql} (75%) delete mode 100644 entities/src/main/java/fr/ird/observe/entities/GPSAble.java delete mode 100644 observe-business/src/test/resources/db/4.0.2/referentiel.sql.gz delete mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_2.java delete mode 100644 observe-entities/src/main/resources/db/4.0.2/remove-gender-column-PG.sql copy application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/package.html => services-topia-validation/src/main/resources/xwork.xml (69%) create mode 100644 services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/QuadrantFieldValidator.java delete mode 100644 services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ObserveValidator.java copy maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi/MissingMethodException.java => services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ServiceValidationException.java (73%) create mode 100644 test/src/main/resources/db/4.905/dataForTestLongline.sql.gz create mode 100644 test/src/main/resources/db/4.905/dataForTestSeine.sql.gz create mode 100644 test/src/main/resources/db/4.905/dataForTestUnidirectionalReferentialSynchro.sql.gz copy test/src/main/resources/db/{4.904 => 4.905}/empty_h2.sql.gz (61%) create mode 100644 test/src/main/resources/db/4.905/empty_pg.sql.gz create mode 100644 test/src/main/resources/db/4.905/referentiel.sql.gz -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/fix_ftl_datasource in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 3c22ad184a99990ec705602b7d4c0139cea94546 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Thu Sep 1 16:43:21 2016 +0200 Traduit les chaines de configuration d observe web en espagnol fixes #8485 --- .../ird/observe/application/swing/ui/storage/StorageUIHandler.java | 4 +++- .../fr/ird/observe/application/swing/ui/storage/StorageUIModel.java | 6 +++++- .../application/swing/ui/storage/tabs/StorageTabUIHandler.java | 3 +++ .../src/main/resources/ftl/dataSourceConnectionReport_es.ftl | 2 +- .../src/main/resources/ftl/dataSourceConnectionReport_fr.ftl | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java index 2f477d8..1069317 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java @@ -454,7 +454,9 @@ public class StorageUIHandler { } // suppression du storage local - if (localDataSource != null && localDataSource != currentDataSource) { + if (localDataSource != null + && localDataSource.isOpen() // Si la base a été détruite précédemment, elle n'est plus ouverte + && localDataSource != currentDataSource) { // ce cas peut arriver lorsque l'on fait juste une backup // sans vouloir supprimer la base locale if (log.isDebugEnabled()) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java index e1ca4ac..ea40922 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java @@ -223,7 +223,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { /** Les information de connextion a la base **/ protected ObserveDataSourceInformation h2DataSourceInformation; - /** le fichier d'import des donné */ + /** le fichier d'import des données */ protected File dumpFile; /** le mode de creation d'une base */ @@ -1160,6 +1160,10 @@ public class StorageUIModel extends WizardModel<StorageStep> { return ObserveSwingApplicationContext.get().getConfig().getModelVersion(); } + public File getInitialDbDump() { + return ObserveSwingApplicationContext.get().getConfig().getInitialDbDump(); + } + public DbMode getDbMode() { return dbMode; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java index edf34b1..62b9ac6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java @@ -35,6 +35,9 @@ import fr.ird.observe.application.swing.ui.storage.StorageUIModel; import fr.ird.observe.application.swing.ui.tree.DataSelectionTreeSelectionModel; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; +import fr.ird.observe.application.swing.db.ObserveSwingDataSource; +import fr.ird.observe.application.swing.db.constants.ConnexionStatus; +import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import jaxx.runtime.swing.editor.MyDefaultCellEditor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/resources/ftl/dataSourceConnectionReport_es.ftl b/application-swing/src/main/resources/ftl/dataSourceConnectionReport_es.ftl index f8258a0..16a6920 100644 --- a/application-swing/src/main/resources/ftl/dataSourceConnectionReport_es.ftl +++ b/application-swing/src/main/resources/ftl/dataSourceConnectionReport_es.ftl @@ -141,7 +141,7 @@ <h3>Importación con el último referencial cargado :</h3> <ul> - <li>${config.initialDbDump.absoluteFile.absolutePath}</li> + <li>${initialDbDump.absolutePath}</li> </ul> <#elseif creationMode.name() == "IMPORT_EXTERNAL_DUMP"> diff --git a/application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl b/application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl index f2bfae8..99c8902 100644 --- a/application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl +++ b/application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl @@ -141,7 +141,7 @@ <h3>Import depuis une le dernier référentiel téléchargé :</h3> <ul> - <li>${config.initialDbDump.absoluteFile.absolutePath}</li> + <li>${initialDbDump.absolutePath}</li> </ul> <#elseif creationMode.name() == "IMPORT_EXTERNAL_DUMP"> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/fix_ftl_datasource in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 53c33caa5787086b61b81654ca35feb64231557f Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Thu Sep 1 17:34:57 2016 +0200 Ajoute les templates traduits en anglais pour les wizzards de source de données (+ quelques corrections en français) fixes #8486 --- .../main/resources/ftl/connexionTestResult_en.ftl | 44 ++++++++ ...rt_fr.ftl => dataSourceConnectionReport_en.ftl} | 114 ++++++++++----------- .../ftl/dataSourceConnectionReport_fr.ftl | 6 +- .../resources/ftl/dataSourceInformation_en.ftl | 77 ++++++++++++++ .../src/main/resources/ftl/dataSourcePolicy_en.ftl | 53 ++++++++++ .../ftl/dataSourceSelectModeResume_en.ftl | 61 +++++++++++ .../ftl/storageModelDataSourceConfiguration_en.ftl | 76 ++++++++++++++ 7 files changed, 371 insertions(+), 60 deletions(-) diff --git a/application-swing/src/main/resources/ftl/connexionTestResult_en.ftl b/application-swing/src/main/resources/ftl/connexionTestResult_en.ftl new file mode 100644 index 0000000..0391e0e --- /dev/null +++ b/application-swing/src/main/resources/ftl/connexionTestResult_en.ftl @@ -0,0 +1,44 @@ +<#-- + #%L + ObServe :: Application Swing + %% + Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit + %% + 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% +--> +<html> +<body> + <#if connexionStatus.name() == "UNTESTED"> + + <h3>The connection is not valid or has been modified since the last connection test.</h3> + + <#elseif connexionStatus.name() == "FAILED"> + + <h3>the connection failed for the following reason :</h3> + + <ul> + <li>${connexionStatusError}</li> + </ul> + + <#elseif connexionStatus.name() == "SUCCESS"> + + Connection information : + <#import "storageModelDataSourceConfiguration_fr.ftl" as storageInfo> + <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> + + </#if> +</body> +</html> diff --git a/application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl b/application-swing/src/main/resources/ftl/dataSourceConnectionReport_en.ftl similarity index 66% copy from application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl copy to application-swing/src/main/resources/ftl/dataSourceConnectionReport_en.ftl index 99c8902..dd335f3 100644 --- a/application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl +++ b/application-swing/src/main/resources/ftl/dataSourceConnectionReport_en.ftl @@ -26,18 +26,18 @@ <h2> <#if local> - Sauvegarde de la base locale + Local database backup <#elseif remote> - Sauvegarde de la base distante + Remote database backup <#elseif server> - Sauvegarde du serveur + Server backup </#if> </h2> <hr/> <h3> - Emplacement de la sauvegarde : + Backup location : <ul> <li>${backupFile.absolutePath}</li> </ul> @@ -45,29 +45,29 @@ <#if useSelectData && selectDataModel??> - <h3>Données à exporter :</h3> + <h3>Data to export :</h3> <ul> <li> <#if selectDataModel.isDataEmpty()> - Pas de données observateur à exporter + No data to export <#elseif selectDataModel.isDataFull()> - Toutes les données observateur sont à exporter + All observed data have to be exported (<#if selectDataModel.selectDataSize() == 1> - 1 marée + 1 trip <#else> - ${selectDataModel.selectDataSize()} marées + ${selectDataModel.selectDataSize()} trips </#if>). <#else> <#if selectDataModel.selectDataSize() == 1> - 1 marée + 1 trip <#else> - ${selectDataModel.selectDataSize()} marées + ${selectDataModel.selectDataSize()} trips </#if> à exporter @@ -103,7 +103,7 @@ </li> - <li>Le référentiel sera exporté</li> + <li>The referential will be exported</li> </ul> </#if> @@ -112,10 +112,10 @@ <#if dbMode.name() == "USE_LOCAL"> - <h2>Connection à la base locale</h2> + <h2>Connection to the local database</h2> <hr/> - <h3>Emplacement de la base locale :</h3> + <h3>Local database location:</h3> <ul> <li>${h2Config.directory.absolutePath}</li> @@ -125,20 +125,20 @@ <#if doBackup> - <h2>Sauvegarde de la base locale</h2> + <h2>Local database backup</h2> <hr/> - <h3>Emplacement de la sauvegarde :</h3> + <h3>Backup location :</h3> <ul> <li>${backupFile.absolutePath}</li> </ul> </#if> - <h2>Création de la base locale</h2> + <h2>Local database creation</h2> <hr/> <#if creationMode.name() == "IMPORT_INTERNAL_DUMP"> - <h3>Import depuis une le dernier référentiel téléchargé :</h3> + <h3>Referential Import from the last imported referential :</h3> <ul> <li>${initialDbDump.absolutePath}</li> @@ -146,7 +146,7 @@ <#elseif creationMode.name() == "IMPORT_EXTERNAL_DUMP"> - <h3>Import depuis une sauvegarde :</h3> + <h3>Backup import :</h3> <ul> <li>${dumpFile.absolutePath}</li> @@ -154,13 +154,13 @@ <#elseif creationMode.name() == "IMPORT_REMOTE_STORAGE"> - <h3>Import du référentiel depuis une base distante :</h3> + <h3>Referential import from a remote database :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> <#elseif creationMode.name() == "IMPORT_SERVER_STORAGE"> - <h3>Import du référentiel depuis un serveur distant :</h3> + <h3>Referential import from a remote server :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -170,10 +170,10 @@ <#elseif dbMode.name() == "USE_REMOTE"> <#if !adminAction??> - <h2>Connexion à une base distante</h2> + <h2>Remote database connection</h2> <hr/> - <h3>Informations sur la base distante à utiliser :</h3> + <h3>Remote database informations :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -182,7 +182,7 @@ <h2>${adminActionLabel}</h2> <hr/> - <h3>Informations sur la connexion distance à utiliser :</h3> + <h3>Remote connection informations :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -192,7 +192,7 @@ <#if referentielImportMode.name() == "IMPORT_EXTERNAL_DUMP"> - <h3>Import du référentiel depuis une sauvegarde :</h3> + <h3>Referential import from a backup :</h3> <ul> <li>${centralSourceModel.dumpFile.absolutePath}</li> @@ -200,27 +200,27 @@ <#elseif referentielImportMode.name() == "IMPORT_REMOTE_STORAGE"> - <h3>Import du référentiel depuis une base distante :</h3> + <h3>Referential import from a remote database :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> <#elseif referentielImportMode.name() == "IMPORT_SERVER_STORAGE"> - <h3>Import du référentiel depuis un serveur distant :</h3> + <h3>Referential import from a remote server :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> </#if> <#else> - <h3>Pas d'import de référentiel</h3> + <h3>No referential import</h3> </#if> <#if importData> <#if dataImportMode.name() == "IMPORT_EXTERNAL_DUMP"> - <h3>Import de données depuis une sauvegarde :</h3> + <h3>Data import from a backup :</h3> <ul> <li>${dataSourceModel.dumpFile.absolutePath}</li> @@ -228,31 +228,31 @@ <#elseif dataImportMode.name() == "IMPORT_REMOTE_STORAGE"> - <h3>Import de données depuis une base distante :</h3> + <h3>Data import from a remote database :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=dataSourceModel /> <#elseif dataImportMode.name() == "IMPORT_SERVER_STORAGE"> - <h3>Import de données depuis un serveur distant :</h3> + <h3>Data import from a remote server :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=dataSourceModel /> </#if> <#else> - <h3>Pas d'import de données</h3> + <h3>No data import</h3> </#if> </#if> - <h3>Sécurité</h3> + <h3>Security</h3> <ul> - <li><strong>Propriétaire : </strong>${securityModel.administrateur.name}</li> - <li><strong>Techniciens : </strong>${securityModel.technicalUserNames?join(", ")}</li> - <li><strong>Lecteurs : </strong>${securityModel.dataUserNames?join(", ")}</li> - <li><strong>Référentiels : </strong>${securityModel.referentialUserNames?join(", ")}</li> + <li><strong>Owner : </strong>${securityModel.administrateur.name}</li> + <li><strong>Technicians : </strong>${securityModel.technicalUserNames?join(", ")}</li> + <li><strong>Readers : </strong>${securityModel.dataUserNames?join(", ")}</li> + <li><strong>Referentials : </strong>${securityModel.referentialUserNames?join(", ")}</li> </ul> @@ -261,10 +261,10 @@ <#elseif dbMode.name() == "USE_SERVER"> <#if !adminAction??> - <h2>Connexion à un serveur distant</h2> + <h2>Remote server connection</h2> <hr/> - <h3>Informations sur le serveur connexion distant à utiliser :</h3> + <h3>Remote server informations :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -273,7 +273,7 @@ <h2>${adminAction.label}</h2> <hr/> - <h3>Informations sur le serveur connexion distant à utiliser :</h3> + <h3>Remote server informations :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -283,7 +283,7 @@ <#if referentielImportMode.name() == "IMPORT_EXTERNAL_DUMP"> - <h3>Import du référentiel depuis une sauvegarde :</h3> + <h3>Referential import from a backup :</h3> <ul> <li>${centralSourceModel.dumpFile.absolutePath}</li> @@ -291,27 +291,27 @@ <#elseif referentielImportMode.name() == "IMPORT_REMOTE_STORAGE"> - <h3>Import du référentiel depuis une base distante :</h3> + <h3>Referential import from a remote database :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> <#elseif referentielImportMode.name() == "IMPORT_SERVER_STORAGE"> - <h3>Import du référentiel depuis un serveur distant :</h3> + <h3>Referential import from a remote server :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> </#if> <#else> - <h3>Pas d'import de référentiel</h3> + <h3>No referential import</h3> </#if> <#if importData> <#if referentielImportMode.name() == "IMPORT_EXTERNAL_DUMP"> - <h3>Import du référentiel depuis une sauvegarde :</h3> + <h3>Referential import from a backup :</h3> <ul> <li>${centralSourceModel.dumpFile.absolutePath}</li> @@ -319,20 +319,20 @@ <#elseif referentielImportMode.name() == "IMPORT_REMOTE_STORAGE"> - <h3>Import du référentiel depuis une base distante :</h3> + <h3>Referential import from a remote database :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> <#elseif referentielImportMode.name() == "IMPORT_SERVER_STORAGE"> - <h3>Import du référentiel depuis un serveur distant :</h3> + <h3>Referential import from a remote server :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> </#if> <#else> - <h3>Pas d'import de données</h3> + <h3>No data import</h3> </#if> @@ -340,39 +340,39 @@ <h3>Sécurité</h3> <ul> - <li><strong>Propriétaire : </strong>${securityModel.administrateur.name}</li> - <li><strong>Techniciens : </strong>${securityModel.technicalUserNames?join(", ")}</li> - <li><strong>Lecteurs : </strong>${securityModel.dataUserNames?join(", ")}</li> - <li><strong>Référentiels : </strong>${securityModel.referentialUserNames?join(", ")}</li> + <li><strong>Owner : </strong>${securityModel.administrateur.name}</li> + <li><strong>Technicians : </strong>${securityModel.technicalUserNames?join(", ")}</li> + <li><strong>Readers : </strong>${securityModel.dataUserNames?join(", ")}</li> + <li><strong>Referentials : </strong>${securityModel.referentialUserNames?join(", ")}</li> </ul> </#if> </#if> - <h3>Politique de mise à jour</h3> + <h3>Update policy</h3> <ul> <#if canMigrate> - <li>Mise à jour si nécessaire (version actuelle : ${modelVersion})</li> + <li>Update if required (actual version : ${modelVersion})</li> <#if showMigrationProgression> - <li>Afficher la progression lors des mises à jour</li> + <li>Show update progression</li> </#if> <#if showMigrationSql> - <li>Afficher les requêtes sql lors des mises à jour</li> + <li>Show sql update queries</li> </#if> <#else> - <li>Pas de mise à jour possible</li> + <li>No update available</li> </#if> diff --git a/application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl b/application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl index 99c8902..b2895de 100644 --- a/application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl +++ b/application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl @@ -138,7 +138,7 @@ <hr/> <#if creationMode.name() == "IMPORT_INTERNAL_DUMP"> - <h3>Import depuis une le dernier référentiel téléchargé :</h3> + <h3>Import depuis le dernier référentiel téléchargé :</h3> <ul> <li>${initialDbDump.absolutePath}</li> @@ -264,7 +264,7 @@ <h2>Connexion à un serveur distant</h2> <hr/> - <h3>Informations sur le serveur connexion distant à utiliser :</h3> + <h3>Informations sur le serveur distant à utiliser :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> @@ -273,7 +273,7 @@ <h2>${adminAction.label}</h2> <hr/> - <h3>Informations sur le serveur connexion distant à utiliser :</h3> + <h3>Informations sur le serveur distant à utiliser :</h3> <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> diff --git a/application-swing/src/main/resources/ftl/dataSourceInformation_en.ftl b/application-swing/src/main/resources/ftl/dataSourceInformation_en.ftl new file mode 100644 index 0000000..5cf99dd --- /dev/null +++ b/application-swing/src/main/resources/ftl/dataSourceInformation_en.ftl @@ -0,0 +1,77 @@ +<#-- + #%L + ObServe :: Application Swing + %% + Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit + %% + 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% +--> +<html> +<body> + +<#if configuration??> + <h3>${label}</h3> + <ul> + <#if isSqlDataSource() > + <#if configuration.h2Database??> + <li><strong>User : </strong>${configuration.username}</li> + <#elseif configuration.postgresDatabase??> + <li><strong>Jdbc url : </strong>${configuration.jdbcUrl}</li> + <li><strong>User : </strong>${configuration.username}</li> + <li><strong>SSL mode : </strong>${configuration.useSsl?then('Yes', 'No')}</li> + </#if> + <#else> + <li><strong>Server url : </strong>${configuration.serverUrl}</li> + <li><strong>User : </strong>${configuration.login}</li> + <#if configuration.optionalDatabaseName.present> + <li><strong>Database : </strong>${configuration.optionalDatabaseName.get()}</li> + </#if> + </#if> + </ul> + <h3>Rights</h3> + <li><strong>Referential : </strong> + <#if canReadReferential() > + Read + <#if canWriteReferential() > + / Write + </#if> + <#elseif canWriteReferential()> + Write + <#else> + No rights + </#if> + </li> + <li><strong>Données observateur : </strong> + <#if canReadData() > + Read + <#if canWriteData() > + / Write + </#if> + <#elseif canWriteData() > + Write + <#else> + No rights + </#if> + </li> + </ul> + <h3>Version</h3> + v ${connection.version} +<#else> + No datasource has been loaded +</#if> + +</body> +</html> diff --git a/application-swing/src/main/resources/ftl/dataSourcePolicy_en.ftl b/application-swing/src/main/resources/ftl/dataSourcePolicy_en.ftl new file mode 100644 index 0000000..eb18ef8 --- /dev/null +++ b/application-swing/src/main/resources/ftl/dataSourcePolicy_en.ftl @@ -0,0 +1,53 @@ +<#-- + #%L + ObServe :: Application Swing + %% + Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit + %% + 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% +--> +<html> +<body> +Droits : + +<strong> • Referential : </strong> +<#if canReadReferential() > + Read + <#if canWriteReferential() > + / Write + </#if> + <#elseif canWriteReferential()> + Write + <#else> + No rights +</#if> + +<strong> • Données observateur : </strong> +<#if canReadData() > + Read + <#if canWriteData() > + / Write + </#if> + <#elseif canWriteData() > + Write + <#else> + No rights +</#if> +<Strong> • Version : </Strong> + v ${version} + +</body> +</html> diff --git a/application-swing/src/main/resources/ftl/dataSourceSelectModeResume_en.ftl b/application-swing/src/main/resources/ftl/dataSourceSelectModeResume_en.ftl new file mode 100644 index 0000000..3a72026 --- /dev/null +++ b/application-swing/src/main/resources/ftl/dataSourceSelectModeResume_en.ftl @@ -0,0 +1,61 @@ +<#-- + #%L + ObServe :: Application Swing + %% + Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit + %% + 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% +--> +<html> +<body> + + <h3>Selected datasource type</h3> + + <#if dbMode.name() == "USE_LOCAL"> + Use a h2 local database + <#elseif dbMode.name() == "CREATE_LOCAL"> + Create a h2 local database + <#elseif dbMode.name() == "USE_REMOTE"> + Use a postgres remote database + <#elseif dbMode.name() == "USE_SERVER"> + Use a remote server + <#else> + No datasource type has been selected + </#if> + + <h3>Selected creation mode</h3> + + <#if dbMode.name() == "CREATE_LOCAL"> + <#if !creationMode??> + No creation mode has been selected + <#elseif creationMode.name() == "EMPTY"> + Generate a new empty local database. This database won't have referentials and you will have to import one after that... + <#elseif creationMode.name() == "IMPORT_INTERNAL_DUMP"> + Generate a new local database from the last version of the embedded database. + <#elseif creationMode.name() == "IMPORT_EXTERNAL_DUMP"> + Create a new local database from a previous backup. + <#elseif creationMode.name() == "IMPORT_LOCAL_STORAGE"> + Generate a new local database and import the referentials of another local database in it. + <#elseif creationMode.name() == "IMPORT_REMOTE_STORAGE"> + Generate a new local database and import the referentials of a remote database in it. + <#elseif creationMode.name() == "IMPORT_SERVER_STORAGE"> + Generate a new local database and import the referentials of a remote server in it. + </#if> + <#else> + Not required. + </#if> +</body> +</html> diff --git a/application-swing/src/main/resources/ftl/storageModelDataSourceConfiguration_en.ftl b/application-swing/src/main/resources/ftl/storageModelDataSourceConfiguration_en.ftl new file mode 100644 index 0000000..8261de5 --- /dev/null +++ b/application-swing/src/main/resources/ftl/storageModelDataSourceConfiguration_en.ftl @@ -0,0 +1,76 @@ +<#-- + #%L + ObServe :: Application Swing + %% + Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit + %% + 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% +--> +<#macro storageModelDataSourceInformation storageModel> +<#if storageModel??> + <ul> + <#if storageModel.editRemoteConfig> + <li><strong>Jdbc url : </strong>${storageModel.pgConfig.jdbcUrl}</li> + <li><strong>User : </strong>${storageModel.pgConfig.username}</li> + <li><strong>Password : </strong>*****</li> + <li><strong>SSL mode : </strong>${storageModel.pgConfig.useSsl?then('Yes', 'No')}</li> + <#elseif storageModel.editServerConfig> + <li><strong>Server url : </strong>${storageModel.restConfig.serverUrl}</li> + <li><strong>User : </strong>${storageModel.restConfig.login}</li> + <li><strong>Password : </strong>*****</li> + <#if storageModel.restConfig.optionalDatabaseName.present> + <li><strong>Database : </strong>${storageModel.restConfig.optionalDatabaseName.get()}</li> + </#if> + <#else> + <li><strong>User : </strong>${storageModel.h2Config.username}</li> + <li><strong>Password : </strong>*****</li> + </#if> + <li><strong>Rights : </strong> + <ul> + <li> + <em>Referential : </em> + <#if storageModel.dataSourceInformation.canReadReferential() > + Read + <#if storageModel.dataSourceInformation.canWriteReferential() > + / Write + </#if> + <#elseif storageModel.dataSourceInformation.canWriteReferential()> + Write + <#else> + No rights + </#if> + </li> + <li> + <em>Données observateur : </em> + <#if storageModel.dataSourceInformation.canReadData() > + Read + <#if storageModel.dataSourceInformation.canWriteData() > + / Write + </#if> + <#elseif storageModel.dataSourceInformation.canWriteData() > + Write + <#else> + No rights + </#if> + </li> + </ul> + </li> + </ul> + +<#else> + NO STORAGE MODEL +</#if> +</#macro> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm