This is an automated email from the git hooks/post-receive script. New change to branch master in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from fcc1e04 Fix site generation adds 434d56e [jgitflow-maven-plugin]updating poms for 5.0-RC-2-SNAPSHOT development adds 6b35bf0 No stay on 5.0-SNAPSHOt version... adds 423eca4 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds f60d2b8 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 5c64a44 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 5156aa7 on doit deployer sur le nexus le plugin maven adds 4e822a9 Fix site generation adds 331ea8d Clean poms adds 885de27 Optimisation des dépendances adds b81e539 Séparation du module de configuration adds b8fb777 Déplacement de certains objets adds c400c19 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 adds 3c22ad1 Traduit les chaines de configuration d observe web en espagnol adds 53c33ca Ajoute les templates traduits en anglais pour les wizzards de source de données (+ quelques corrections en français) adds 52d3219 Merge branch 'feature/fix_ftl_datasource' into develop adds 99791e4 Corrige les chaines i18n manquantes dans les messages d'information adds 8524f50 Merge branch 'feature/8490_i18n_manquantes' into 'develop' adds f274559 At last remove any logic from application context adds 609b7af Ajout méthode pour faire une backup de base H2 adds fe94fbc Construire une base intermédiaire avec toutes les données si besoin, puis utiliser un instruction sql H2 pour sauver la base adds f831c86 Fix point names in styles file (Fixes #8488) adds ba09131 Correction du problème de rendu des cartes (Fixes #8494) adds fd005ba Fix build adds 2e56306 Optimize more dependencies + use codelutinpom 10.3 adds 0d4c133 Shade application swing (See #8483)" adds c3bfc76 On peut minimiser le jar generer adds 942fc4e Des updates de lib et encore des exclusions adds 3623cf7 Rename module otherwise maven cries... + add new i18n generator for type and their plurals :) adds fa50dd5 Fix typo adds f8c65d8 Introduce ObserveI18nDecoratorHelper + use new type i18n keys generator adds d5ffd61 Ne plus coupler services-model avec le plugin mavan adds 82e08ad Ajout de nouveaux dto qui reflete ce qui est utilisé dans l'ui adds b1e9505 update lib adds 47744bd Use now observe.type instead of observe.common, clean up then decoration module adds 23449e8 Use observe.type i18n instead of observe.tree, clean up a lots of code... + use new decorator api + refactor i18n (-400 trads \o/) adds 37d9dc9 Improve show technical informations (make text selectable) adds b6395ae Ajout des informations techniques sur tous les écrans de saisie adds 46cb72c Fix content mapping + show technical informations adds bfe2d35 Optimize dependencies adds c78d96b Amélioration de l'affichage des données techniques + quelques corrections I18n adds ba76193 Clean log configurations adds c250821 mLe poids est obligatoire sur un rejet de thon (Fixes #6528) adds 8b432cc Fix typo adds b6eb6f2 Remove lazy tag values in entities adds 438b52a improve code adds c8eeb25 [PS] Rajouter la contrainte de clé étrangère de nontargetlength.sex vers la table sex (Fixes #8387) adds 54ede23 Readd none lazy stuff, needed by validation adds 60a57ee Ajoute les traductions espagnoles manquantes adds 84826cf Fix build adds 312ec72 Amélioration documentation de configuration de l'application web adds 3172445 Amélioration documentation de configuration de l'application web adds b90c46b mFix loader init adds c38a9d9 Open temporary data source while backup adds 6097c21 Ne pas fermer la source lors d'une création de base dans un cas particulier... adds 5e02a5b Corrige une tipo adds d59f972 [jgitflow-maven-plugin]updating poms for 5.0-RC-2 branch with snapshot versions adds 3331766 Add missing license headers adds 53e4905 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC-2' with non-snapshot versions adds 6bb6c0b Merge branch 'release/5.0-RC-2' No new revisions were added by this update. Summary of changes: .../LICENSE.txt | 0 .../README.md | 0 .../pom.xml | 57 +- .../src/license/THIRD-PARTY.properties | 13 +- .../ObserveSwingApplicationActionDefinition.java | 139 ++++ .../ObserveSwingApplicationConfig.java | 309 +++------ .../ObserveSwingApplicationConfigOption.java | 8 +- .../ObserveSwingApplicationConfigProvider.java | 5 +- .../configuration}/constants/CreationMode.java | 73 +- .../swing/configuration/constants/DbMode.java | 34 +- .../org.nuiton.config.ApplicationConfigProvider | 0 ...pplication-swing-configuration_en_GB.properties | 84 +++ ...pplication-swing-configuration_es_ES.properties | 84 +++ ...pplication-swing-configuration_fr_FR.properties | 84 +++ .../src/main/resources/log4j.properties | 5 +- .../src/main/resources/observe-log4j.properties | 4 - .../src/main/resources/observeSwing.conf | 0 .../src/main/resources/validators.xml | 3 +- application-swing-decoration/pom.xml | 41 +- .../swing/decoration/DecoratorService.java | 436 ++++++------ .../decoration/ObserveI18nDecoratorHelper.java | 110 +++ .../application-swing-decoration_en_GB.properties | 331 ++++++--- .../application-swing-decoration_es_ES.properties | 329 ++++++--- .../application-swing-decoration_fr_FR.properties | 329 ++++++--- application-swing-validation/pom.xml | 8 +- ...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 +- ...-ui-update-targetDiscarded-error-validation.xml | 9 + ...i-update-targetDiscarded-warning-validation.xml | 5 - ...eineGearUseDto-ui-update-warning-validation.xml | 2 +- .../application-swing-validation_en_GB.properties | 11 +- .../application-swing-validation_es_ES.properties | 11 +- .../application-swing-validation_fr_FR.properties | 11 +- .../src/test/resources/validators.xml | 1 + application-swing-validators/pom.xml | 2 +- .../validators/QuadrantFieldDtoValidator.java | 76 ++ application-swing/README.md | 9 +- application-swing/pom.xml | 334 ++++++++- .../src/license/THIRD-PARTY.properties | 42 +- application-swing/src/main/assembly/bin.xml | 14 - .../application/swing/ObserveActionExecutor.java | 59 +- .../observe/application/swing/ObserveCLAction.java | 123 +--- .../observe/application/swing/ObserveRunner.java | 62 +- .../swing/ObserveSwingApplicationContext.java | 305 +------- .../ObserveSwingApplicationDataSourcesManager.java | 332 ++++++++- .../swing/ObserveSwingBinderService.java | 50 -- .../{ObserveAdminCLI.java => RunObserve.java} | 11 +- .../swing/db/ObserveSwingDataSource.java | 2 +- .../swing/db/constants/ConnexionStatus.java | 33 +- .../application/swing/db/constants/DbMode.java | 70 -- .../application/swing/ui/ObserveMainUIHandler.java | 3 +- .../ird/observe/application/swing/ui/UIHelper.java | 31 +- .../swing/ui/actions/ChangeStorageAction.java | 2 +- .../ui/actions/ImportStorageFromFileAction.java | 4 +- .../swing/ui/actions/LaunchAdminAction.java | 3 +- .../swing/ui/actions/ReloadStorageAction.java | 2 +- .../shared/MoveActivityLonglinesUIAction.java | 13 +- .../actions/shared/MoveActivitySeinesUIAction.java | 13 +- .../ui/actions/shared/MoveRoutesUIAction.java | 13 +- .../application/swing/ui/admin/AdminStep.java | 47 +- .../swing/ui/admin/AdminTabUIHandler.java | 5 +- .../application/swing/ui/admin/AdminUIHandler.java | 5 +- .../swing/ui/admin/AdminUILauncher.java | 2 +- .../application/swing/ui/admin/AdminUIModel.java | 8 +- .../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 - ...soleteReferentialReferenceListCellRenderer.java | 3 +- .../referential/legacy/SynchronizeUIHandler.java | 4 +- .../ng/action/RegisterTasksActionSupport.java | 9 +- .../ng/task/ReferentialSynchronizeTaskSupport.java | 4 +- .../ReferentialSynchronizeTreeCellRenderer.java | 6 +- .../swing/ui/admin/validate/ValidateConfigUI.jaxx | 1 + .../swing/ui/admin/validate/ValidateConfigUI.jcss | 4 +- .../validate/ValidateEntityListCellRenderer.java | 3 +- .../swing/ui/admin/validate/ValidateUI.jaxx | 2 +- .../swing/ui/admin/validate/ValidateUIHandler.java | 35 +- .../application/swing/ui/content/ContentUI.jaxx | 3 + .../application/swing/ui/content/ContentUI.jcss | 9 + .../swing/ui/content/ContentUIHandler.java | 181 ++++- .../swing/ui/content/ContentUIInitializer.java | 13 +- .../swing/ui/content/ContentUIManager.java | 271 ++++---- .../LonglineDetailCompositionUIHandler.java | 2 +- ...LonglineDetailCompositionValidationContext.java | 3 +- .../LonglineGlobalCompositionUIHandler.java | 2 +- .../ui/content/impl/longline/SetLonglineUI.jaxx | 4 + .../ui/content/impl/longline/SetLonglineUI.jcss | 8 + .../impl/longline/SetLonglineUIHandler.java | 2 +- .../ActivitySeineObservedSystemUIHandler.java | 20 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 14 +- .../impl/seine/FloatingObjectUIHandler.java | 6 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 2 +- .../ui/content/list/ContentListUIHandler.java | 41 +- .../ui/content/open/ContentOpenableUIHandler.java | 42 +- .../impl/longline/ActivityLonglineUIHandler.java | 54 +- .../open/impl/longline/TripLonglineUIHandler.java | 6 +- .../open/impl/seine/ActivitySeineUIHandler.java | 16 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 105 ++- .../open/impl/seine/TripSeineUIHandler.java | 8 +- .../swing/ui/content/ref/ContentReferenceUI.jaxx | 30 +- .../swing/ui/content/ref/ContentReferenceUI.jcss | 4 - .../ui/content/ref/ContentReferenceUIHandler.java | 129 ++-- .../ui/content/ref/ContentReferenceUIModel.java | 47 +- .../swing/ui/content/ref/UniqueKeyTableModel.java | 3 +- .../swing/ui/content/ref/impl/CountryUI.jaxx | 12 +- .../swing/ui/content/ref/impl/FpaZoneUI.jaxx | 12 +- .../content/ref/impl/GearCaracteristicTypeUI.jaxx | 10 +- .../ui/content/ref/impl/GearCaracteristicUI.jaxx | 10 +- .../swing/ui/content/ref/impl/GearUI.jaxx | 10 +- .../swing/ui/content/ref/impl/HarbourUI.jaxx | 12 +- .../content/ref/impl/LengthWeightParameterUI.jaxx | 12 +- .../swing/ui/content/ref/impl/OceanUI.jaxx | 12 +- .../swing/ui/content/ref/impl/OrganismUI.jaxx | 12 +- .../swing/ui/content/ref/impl/PersonUI.jaxx | 12 +- .../content/ref/impl/ProgramObservationEnum.java | 23 +- .../swing/ui/content/ref/impl/ProgramUI.jaxx | 12 +- .../swing/ui/content/ref/impl/SexUI.jaxx | 12 +- .../swing/ui/content/ref/impl/SpeciesGroupUI.jaxx | 12 +- .../swing/ui/content/ref/impl/SpeciesListUI.jaxx | 12 +- .../swing/ui/content/ref/impl/SpeciesUI.jaxx | 12 +- .../ui/content/ref/impl/VesselSizeCategoryUI.jaxx | 12 +- .../swing/ui/content/ref/impl/VesselTypeUI.jaxx | 12 +- .../swing/ui/content/ref/impl/VesselUI.jaxx | 12 +- .../ref/impl/longline/BaitHaulingStatusUI.jaxx | 12 +- .../ref/impl/longline/BaitSettingStatusUI.jaxx | 12 +- .../ui/content/ref/impl/longline/BaitTypeUI.jaxx | 12 +- .../ref/impl/longline/CatchFateLonglineUI.jaxx | 12 +- .../content/ref/impl/longline/EncounterTypeUI.jaxx | 12 +- .../ui/content/ref/impl/longline/HealthnessUI.jaxx | 12 +- .../content/ref/impl/longline/HookPositionUI.jaxx | 12 +- .../ui/content/ref/impl/longline/HookSizeUI.jaxx | 12 +- .../ui/content/ref/impl/longline/HookTypeUI.jaxx | 12 +- .../impl/longline/ItemHorizontalPositionUI.jaxx | 12 +- .../ref/impl/longline/ItemVerticalPositionUI.jaxx | 12 +- .../ref/impl/longline/LightsticksColorUI.jaxx | 12 +- .../ref/impl/longline/LightsticksTypeUI.jaxx | 12 +- .../ui/content/ref/impl/longline/LineTypeUI.jaxx | 12 +- .../ref/impl/longline/MaturityStatusUI.jaxx | 12 +- .../ref/impl/longline/MitigationTypeUI.jaxx | 12 +- .../content/ref/impl/longline/SensorBrandUI.jaxx | 12 +- .../ref/impl/longline/SensorDataFormatUI.jaxx | 12 +- .../ui/content/ref/impl/longline/SensorTypeUI.jaxx | 12 +- .../content/ref/impl/longline/SettingShapeUI.jaxx | 12 +- .../ref/impl/longline/SizeMeasureTypeUI.jaxx | 12 +- .../ref/impl/longline/StomacFullnessUI.jaxx | 12 +- .../ui/content/ref/impl/longline/TripTypeUI.jaxx | 12 +- .../impl/longline/VesselActivityLonglineUI.jaxx | 12 +- .../ref/impl/longline/WeightMeasureTypeUI.jaxx | 12 +- .../ui/content/ref/impl/seine/DetectionModeUI.jaxx | 12 +- .../ui/content/ref/impl/seine/ObjectFateUI.jaxx | 12 +- .../content/ref/impl/seine/ObjectOperationUI.jaxx | 12 +- .../ui/content/ref/impl/seine/ObjectTypeUI.jaxx | 12 +- .../content/ref/impl/seine/ObservedSystemUI.jaxx | 12 +- .../content/ref/impl/seine/ReasonForDiscardUI.jaxx | 12 +- .../ref/impl/seine/ReasonForNoFishingUI.jaxx | 12 +- .../content/ref/impl/seine/ReasonForNullSetUI.jaxx | 12 +- .../ui/content/ref/impl/seine/SpeciesFateUI.jaxx | 12 +- .../ui/content/ref/impl/seine/SpeciesStatusUI.jaxx | 12 +- .../ref/impl/seine/SurroundingActivityUI.jaxx | 12 +- .../impl/seine/TransmittingBuoyOperationUI.jaxx | 12 +- .../ref/impl/seine/TransmittingBuoyTypeUI.jaxx | 12 +- .../ref/impl/seine/VesselActivitySeineUI.jaxx | 12 +- .../content/ref/impl/seine/WeightCategoryUI.jaxx | 12 +- .../swing/ui/content/ref/impl/seine/WindUI.jaxx | 12 +- .../ui/content/table/ContentTableUIHandler.java | 15 +- .../ui/content/table/ContentTableUIModel.java | 8 +- .../table/impl/longline/CatchLonglineUIModel.java | 5 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 16 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 14 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 2 +- .../table/impl/seine/TargetSampleUIHandler.java | 2 +- .../swing/ui/storage/ObstunaAdminAction.java | 60 +- .../swing/ui/storage/RemoteUILauncher.java | 2 +- .../swing/ui/storage/StorageBackupUILauncher.java | 98 ++- .../application/swing/ui/storage/StorageStep.java | 56 +- .../swing/ui/storage/StorageUIHandler.java | 62 +- .../swing/ui/storage/StorageUILauncher.java | 2 +- .../swing/ui/storage/StorageUIModel.java | 50 +- .../swing/ui/storage/tabs/ChooseDbModeUI.jaxx | 5 +- .../swing/ui/storage/tabs/ChooseDbModeUI.jcss | 16 +- .../swing/ui/storage/tabs/ConfigDataUI.jaxx | 2 +- .../swing/ui/storage/tabs/ConfigReferentielUI.jaxx | 3 +- .../swing/ui/storage/tabs/ConfigReferentielUI.jcss | 6 +- .../swing/ui/storage/tabs/ConfigUI.jaxx | 2 +- .../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 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 35 +- .../swing/ui/tree/ObserveTreeBridge.java | 2 +- .../swing/ui/tree/ObserveTreeHelper.java | 132 +--- .../actions/ChangeActivityRouteActionListener.java | 9 +- .../actions/ChangeActivityTripActionListener.java | 9 +- .../actions/ChangeRouteTripActionListener.java | 9 +- .../loadors/AbstractDataReferenceChildLoador.java | 4 +- .../ui/tree/loadors/AbstractNodeChildLoador.java | 40 ++ .../loadors/ActivityLonglineNodeChildLoador.java | 61 +- .../loadors/ActivityLonglinesNodeChildLoador.java | 18 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 48 +- .../loadors/ActivitySeinesNodeChildLoador.java | 14 +- .../loadors/FloatingObjectNodeChildLoador.java | 38 +- .../loadors/ProgramLonglineNodeChildLoador.java | 58 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 49 +- .../loadors/ReferenceLonglineNodeChildLoador.java | 100 --- ...ldLoador.java => ReferenceNodeChildLoador.java} | 72 +- .../loadors/ReferenceSeineNodeChildLoador.java | 91 --- .../swing/ui/tree/loadors/RootNodeChildLoador.java | 64 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 32 +- .../tree/loadors/SetLonglineNodeChildLoador.java | 45 +- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 62 +- .../swing/ui/usage/UsagesUIHandler.java | 4 +- .../ObserveValidationMessageTableRenderer.java | 62 +- .../util/ObserveValidatorMessageTableRenderer.java | 48 +- .../swing/validation/ValidationModelMode.java | 35 +- application-swing/src/main/map/style.xml | 22 +- .../main/resources/ftl/connexionTestResult_en.ftl | 44 ++ ...rt_fr.ftl => dataSourceConnectionReport_en.ftl} | 116 ++-- .../ftl/dataSourceConnectionReport_es.ftl | 2 +- .../ftl/dataSourceConnectionReport_fr.ftl | 8 +- .../resources/ftl/dataSourceInformation_en.ftl | 77 +++ .../src/main/resources/ftl/dataSourcePolicy_en.ftl | 53 ++ .../ftl/dataSourceSelectModeResume_en.ftl | 61 ++ .../ftl/storageModelDataSourceConfiguration_en.ftl | 76 ++ .../i18n/application-swing_en_GB.properties | 758 +++----------------- .../i18n/application-swing_es_ES.properties | 758 +++----------------- .../i18n/application-swing_fr_FR.properties | 766 +++------------------ .../LICENSE.txt | 0 .../README.md | 0 .../pom.xml | 55 +- .../src/license/THIRD-PARTY.properties | 11 +- .../ObserveWebApplicationConfiguration.java | 12 +- ...veWebApplicationConfigurationInitException.java | 0 .../ObserveWebApplicationConfigurationOption.java | 0 ...ObserveWebApplicationConfigurationProvider.java | 0 .../db/InvalidObserveWebDatabaseException.java | 0 .../db/InvalidObserveWebDatabaseRoleException.java | 0 .../db/InvalidObserveWebDatabasesException.java | 0 .../web/configuration/db/ObserveWebDatabase.java | 0 .../configuration/db/ObserveWebDatabaseRole.java | 0 .../web/configuration/db/ObserveWebDatabases.java | 0 .../db/ObserveWebDatabasesHelper.java | 0 .../db/impl/ObserveWebDatabaseBean.java | 0 .../db/impl/ObserveWebDatabaseImmutable.java | 0 .../db/impl/ObserveWebDatabaseRoleBean.java | 0 .../db/impl/ObserveWebDatabaseRoleImmutable.java | 0 .../db/impl/ObserveWebDatabasesBean.java | 0 .../db/impl/ObserveWebDatabasesImmutable.java | 0 .../user/InvalidObserveWebUserException.java | 0 .../InvalidObserveWebUserPermissionException.java | 0 .../user/InvalidObserveWebUsersException.java | 0 .../web/configuration/user/ObserveWebUser.java | 0 .../user/ObserveWebUserPermission.java | 0 .../web/configuration/user/ObserveWebUsers.java | 0 .../configuration/user/ObserveWebUsersHelper.java | 0 .../user/impl/ObserveWebUserBean.java | 0 .../user/impl/ObserveWebUserImmutable.java | 0 .../user/impl/ObserveWebUserPermissionBean.java | 0 .../impl/ObserveWebUserPermissionImmutable.java | 0 .../user/impl/ObserveWebUsersBean.java | 0 .../user/impl/ObserveWebUsersImmutable.java | 0 .../org.nuiton.config.ApplicationConfigProvider | 0 .../application-web-configuration_en_GB.properties | 15 + .../application-web-configuration_es_ES.properties | 15 + .../application-web-configuration_fr_FR.properties | 15 + .../src/main/resources/log4j.properties | 0 .../src/main/resources/observeweb-log4j.conf | 0 .../src/main/resources/observeweb.conf | 0 .../src/main/resources/validators.xml | 14 + application-web/pom.xml | 62 +- .../application/web/ObserveWebMotionFilter.java | 2 +- .../controller/v1/DataSourceServiceController.java | 6 + .../web/request/ObserveWebRequestContext.java | 2 +- entities-migration/pom.xml | 2 +- .../ObserveMigrationConfigurationProviderImpl.java | 2 + .../DataSourceMigrationForVersion_4_905.java | 46 +- .../DataSourceMigrationForVersion_4_906.java | 81 +++ ...p_not_null_constraint_hauling_identifier-H2.sql | 8 +- ...p_not_null_constraint_hauling_identifier-PG.sql | 8 +- .../V4_906_01_add_non_target_length_sex_fk-H2.sql | 6 +- .../V4_906_01_add_non_target_length_sex_fk-PG.sql | 6 +- entities/pom.xml | 2 +- .../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 pom.xml | 449 ++++++------ services-api/pom.xml | 2 +- .../services/ObserveServiceInitializer.java | 1 + .../services/service/DataSourceService.java | 2 + services-configuration-api/pom.xml | 2 +- .../ObserveDataSourceConfiguration.java | 5 + services-configuration-rest/pom.xml | 2 +- .../ObserveDataSourceConfigurationRest.java | 18 +- services-configuration-topia/pom.xml | 2 +- .../ObserveDataSourceConfigurationTopiaH2.java | 25 +- .../ObserveDataSourceConfigurationTopiaPG.java | 17 +- ...ObserveDataSourceConfigurationTopiaSupport.java | 17 +- services-model/pom.xml | 6 +- .../dto/DataSourceCreateConfigurationDto.java | 10 + .../dto}/ObserveSpeciesListConfiguration.java | 2 +- .../services/dto/constants/TripMapPointType.java | 3 + .../dto/seine/DiscardedTargetCatchDto.java | 16 +- .../dto/seine/DiscardedTargetSampleDto.java | 16 +- .../services/dto/seine/KeptTargetCatchDto.java | 16 +- .../services/dto/seine/KeptTargetSampleDto.java | 16 +- .../main/java/fr/ird/observe/util/ObserveUtil.java | 98 +++ .../main/xmi/observe-services-dto-longline.zargo | Bin 67306 -> 67504 bytes services-rest/pom.xml | 2 +- .../services/rest/RestTestClassResource.java | 2 +- services-runner/pom.xml | 8 +- services-topia-validation/pom.xml | 7 +- .../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 +- ...ch-service-targetDiscarded-error-validation.xml | 9 + ...-service-targetDiscarded-warning-validation.xml | 5 - ...-service-gearUseFeatures-warning-validation.xml | 2 +- .../services-topia-validation_en_GB.properties | 14 +- .../services-topia-validation_es_ES.properties | 14 +- .../services-topia-validation_fr_FR.properties | 14 +- ...seFeatures-warning-validation.xml => xwork.xml} | 27 +- .../src/test/resources/validators.xml | 1 + services-topia-validators/pom.xml | 2 +- .../topia/validators/QuadrantFieldValidator.java | 75 ++ services-topia/pom.xml | 2 +- .../topia/binder/data/ActivityLonglineBinder.java | 1 - .../topia/binder/data/ActivitySeineBinder.java | 1 - .../services/topia/entity/EntitiesSetFactory.java | 2 +- .../topia/service/DataSourceServiceTopia.java | 65 +- .../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 +- .../services/topia/TopiaTestClassResource.java | 2 +- .../topia/service/MigrateTestsDatabases.java | 8 +- .../actions/validate/ValidateServiceTopiaTest.java | 6 +- services-topia/src/test/resources/validators.xml | 1 + src/site/rst/administration-web.rst.vm | 68 +- src/site/rst/index.rst | 1 + test/pom.xml | 2 +- .../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 test/src/main/resources/db/4.905/empty_h2.sql.gz | Bin 0 -> 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 .../resources/db/4.906/dataForTestLongline.sql.gz | Bin 0 -> 1622154 bytes .../resources/db/4.906/dataForTestSeine.sql.gz | Bin 0 -> 451054 bytes ...aForTestUnidirectionalReferentialSynchro.sql.gz | Bin 0 -> 441255 bytes test/src/main/resources/db/4.906/empty_h2.sql.gz | Bin 0 -> 6012 bytes test/src/main/resources/db/4.906/empty_pg.sql.gz | Bin 0 -> 6006 bytes .../src/main/resources/db/4.906/referentiel.sql.gz | Bin 0 -> 140211 bytes test/src/main/resources/observetest.properties | 1 + .../LICENSE.txt | 0 {maven-plugin => toolbox-maven-plugin}/README.md | 0 {maven-plugin => toolbox-maven-plugin}/pom.xml | 21 +- .../src/license/THIRD-PARTY.properties | 0 .../maven/plugins/toolbox}/CheckApiMojo.java | 2 +- .../plugins/toolbox/GenerateI18nTypesMojo.java | 227 ++++++ .../toolbox}/GenerateI18nValidatorFieldsMojo.java | 30 +- .../toolbox}/GenerateValidatorMojoSupport.java | 45 +- .../toolbox}/GenerateValidatorsDescriptorMojo.java | 10 +- .../MismatchMethodParameterNameException.java | 2 +- .../plugins/toolbox}/MissingClassException.java | 2 +- .../plugins/toolbox}/MissingMethodException.java | 2 +- .../maven/plugins/toolbox/ToolboxMojoSupport.java | 79 +-- .../plugins/toolbox}/ValidatorCacheRequest.java | 2 +- .../maven/plugins/toolbox}/ValidatorsCache.java | 2 +- .../src/main/resources/log4j.properties | 0 topia-extension/pom.xml | 2 +- topia-templates-extension/pom.xml | 2 +- 391 files changed, 5988 insertions(+), 7329 deletions(-) rename {maven-plugin => application-swing-configuration}/LICENSE.txt (100%) copy {services-topia => application-swing-configuration}/README.md (100%) copy {application-swing-decoration => application-swing-configuration}/pom.xml (73%) copy {maven-plugin => application-swing-configuration}/src/license/THIRD-PARTY.properties (76%) create mode 100644 application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationActionDefinition.java rename {application-swing => application-swing-configuration}/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java (70%) rename {application-swing => application-swing-configuration}/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigOption.java (98%) rename {application-swing => application-swing-configuration}/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigProvider.java (88%) rename {application-swing/src/main/java/fr/ird/observe/application/swing/db => application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration}/constants/CreationMode.java (52%) copy application-web/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUser.java => application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/constants/DbMode.java (60%) rename {application-swing => application-swing-configuration}/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider (100%) create mode 100644 application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties create mode 100644 application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties create mode 100644 application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties rename {application-swing => application-swing-configuration}/src/main/resources/log4j.properties (90%) rename {application-swing => application-swing-configuration}/src/main/resources/observe-log4j.properties (91%) rename {application-swing => application-swing-configuration}/src/main/resources/observeSwing.conf (100%) rename {application-swing => application-swing-configuration}/src/main/resources/validators.xml (96%) create mode 100644 application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/ObserveI18nDecoratorHelper.java 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%) delete mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/db/constants/DbMode.java delete mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/{ReferenceCommonNodeChildLoador.java => ReferenceNodeChildLoador.java} (51%) delete mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceSeineNodeChildLoador.java create mode 100644 application-swing/src/main/resources/ftl/connexionTestResult_en.ftl copy application-swing/src/main/resources/ftl/{dataSourceConnectionReport_fr.ftl => dataSourceConnectionReport_en.ftl} (66%) create mode 100644 application-swing/src/main/resources/ftl/dataSourceInformation_en.ftl create mode 100644 application-swing/src/main/resources/ftl/dataSourcePolicy_en.ftl create mode 100644 application-swing/src/main/resources/ftl/dataSourceSelectModeResume_en.ftl create mode 100644 application-swing/src/main/resources/ftl/storageModelDataSourceConfiguration_en.ftl copy {topia-templates-extension => application-web-configuration}/LICENSE.txt (100%) copy {services-topia => application-web-configuration}/README.md (100%) copy {application-swing-decoration => application-web-configuration}/pom.xml (69%) copy {maven-plugin => application-web-configuration}/src/license/THIRD-PARTY.properties (82%) rename {application-web => application-web-configuration}/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java (96%) rename {application-web => application-web-configuration}/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfigurationInitException.java (100%) rename {application-web => application-web-configuration}/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfigurationOption.java (100%) rename {application-web => application-web-configuration}/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfigurationProvider.java (100%) rename {application-web => application-web-configuration}/src/main/java/fr/ird/observe/application/web/configuration/db/InvalidObserveWebDatabaseException.java (100%) rename {application-web => application-web-configuration}/src/main/java/fr/ird/observe/application/web/configuration/db/InvalidObserveWebDatabaseRoleException.java (100%) rename {application-web => application-web-configuration}/src/main/java/fr/ird/observe/application/web/configuration/db/InvalidObserveWebDatabasesException.java (100%) rename {application-web => application-web-configuration}/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabase.java (100%) copy {application-web => application-web-configuration}/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabaseRole.java (100%) rename {application-web => application-web-configuration}/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabases.java (100%) rename {application-web => application-web-configuration}/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelper.java (100%) rename {application-web => application-web-configuration}/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseBean.java (100%) rename {application-web => application-web-configuration}/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseImmutable.java (100%) rename {application-web => application-web-configuration}/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseRoleBean.java (100%) rename {application-web => application-web-configuration}/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseRoleImmutable.java (100%) rename {application-web => application-web-configuration}/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabasesBean.java (100%) rename {application-web => application-web-configuration}/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabasesImmutable.java (100%) rename {application-web => application-web-configuration}/src/main/java/fr/ird/observe/application/web/configuration/user/InvalidObserveWebUserException.java (100%) rename {application-web => application-web-configuration}/src/main/java/fr/ird/observe/application/web/configuration/user/InvalidObserveWebUserPermissionException.java (100%) rename {application-web => application-web-configuration}/src/main/java/fr/ird/observe/application/web/configuration/user/InvalidObserveWebUsersException.java (100%) rename {application-web => application-web-configuration}/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUser.java (100%) rename {application-web => application-web-configuration}/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUserPermission.java (100%) rename {application-web => application-web-configuration}/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsers.java (100%) rename {application-web => application-web-configuration}/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelper.java (100%) rename {application-web => application-web-configuration}/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUserBean.java (100%) rename {application-web => application-web-configuration}/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUserImmutable.java (100%) rename {application-web => application-web-configuration}/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUserPermissionBean.java (100%) rename {application-web => application-web-configuration}/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUserPermissionImmutable.java (100%) rename {application-web => application-web-configuration}/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUsersBean.java (100%) rename {application-web => application-web-configuration}/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUsersImmutable.java (100%) rename {application-web => application-web-configuration}/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider (100%) create mode 100644 application-web-configuration/src/main/resources/i18n/application-web-configuration_en_GB.properties create mode 100644 application-web-configuration/src/main/resources/i18n/application-web-configuration_es_ES.properties create mode 100644 application-web-configuration/src/main/resources/i18n/application-web-configuration_fr_FR.properties rename {application-web => application-web-configuration}/src/main/resources/log4j.properties (100%) rename {application-web => application-web-configuration}/src/main/resources/observeweb-log4j.conf (100%) rename {application-web => application-web-configuration}/src/main/resources/observeweb.conf (100%) rename {application-web => application-web-configuration}/src/main/resources/validators.xml (74%) rename observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_2.java => entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_905.java (59%) create mode 100644 entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_906.java copy observe-entities/src/main/resources/db/4.0.2/remove-gender-column-PG.sql => entities-migration/src/main/resources/db/migration/V4_905_01_drop_not_null_constraint_hauling_identifier-H2.sql (67%) copy observe-entities/src/main/resources/db/4.0.2/remove-gender-column-PG.sql => entities-migration/src/main/resources/db/migration/V4_905_01_drop_not_null_constraint_hauling_identifier-PG.sql (67%) copy observe-entities/src/main/resources/db/4.0.2/remove-gender-column-PG.sql => entities-migration/src/main/resources/db/migration/V4_906_01_add_non_target_length_sex_fk-H2.sql (75%) rename observe-entities/src/main/resources/db/4.0.2/remove-gender-column-PG.sql => entities-migration/src/main/resources/db/migration/V4_906_01_add_non_target_length_sex_fk-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 rename {services-api/src/main/java/fr/ird/observe/services => services-model/src/main/java/fr/ird/observe/services/dto}/ObserveSpeciesListConfiguration.java (99%) copy application-web/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabaseRole.java => services-model/src/main/java/fr/ird/observe/services/dto/seine/DiscardedTargetCatchDto.java (79%) copy application-web/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabaseRole.java => services-model/src/main/java/fr/ird/observe/services/dto/seine/DiscardedTargetSampleDto.java (79%) copy application-web/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabaseRole.java => services-model/src/main/java/fr/ird/observe/services/dto/seine/KeptTargetCatchDto.java (79%) rename application-web/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabaseRole.java => services-model/src/main/java/fr/ird/observe/services/dto/seine/KeptTargetSampleDto.java (79%) create mode 100644 services-model/src/main/java/fr/ird/observe/util/ObserveUtil.java copy services-topia-validation/src/main/resources/{fr/ird/observe/entities/seine/TripSeine-service-gearUseFeatures-warning-validation.xml => xwork.xml} (57%) 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 create mode 100644 test/src/main/resources/db/4.905/empty_h2.sql.gz 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 create mode 100644 test/src/main/resources/db/4.906/dataForTestLongline.sql.gz create mode 100644 test/src/main/resources/db/4.906/dataForTestSeine.sql.gz create mode 100644 test/src/main/resources/db/4.906/dataForTestUnidirectionalReferentialSynchro.sql.gz create mode 100644 test/src/main/resources/db/4.906/empty_h2.sql.gz create mode 100644 test/src/main/resources/db/4.906/empty_pg.sql.gz create mode 100644 test/src/main/resources/db/4.906/referentiel.sql.gz copy {topia-templates-extension => toolbox-maven-plugin}/LICENSE.txt (100%) rename {maven-plugin => toolbox-maven-plugin}/README.md (100%) rename {maven-plugin => toolbox-maven-plugin}/pom.xml (87%) rename {maven-plugin => toolbox-maven-plugin}/src/license/THIRD-PARTY.properties (100%) rename {maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi => toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox}/CheckApiMojo.java (99%) create mode 100644 toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateI18nTypesMojo.java rename {maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi => toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox}/GenerateI18nValidatorFieldsMojo.java (80%) copy {maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi => toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox}/GenerateValidatorMojoSupport.java (65%) rename {maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi => toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox}/GenerateValidatorsDescriptorMojo.java (95%) rename {maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi => toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox}/MismatchMethodParameterNameException.java (98%) rename {maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi => toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox}/MissingClassException.java (96%) rename {maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi => toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox}/MissingMethodException.java (95%) rename maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi/GenerateValidatorMojoSupport.java => toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/ToolboxMojoSupport.java (62%) rename {maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi => toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox}/ValidatorCacheRequest.java (96%) rename {maven-plugin/src/main/java/fr/ird/observe/maven/plugins/checkapi => toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox}/ValidatorsCache.java (99%) rename {maven-plugin => toolbox-maven-plugin}/src/main/resources/log4j.properties (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.