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>.