September 2015 - Observe-commits - mailman.cloud.codelutin.com

branch feature/7523 updated (e212c6f -> 305c368)
by codelutin.com scm Sept. 15, 2015

Sept. 15, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7523 in repository observe. See http://git.codelutin.com/observe.git from e212c6f recuperation des permission à partir de la BD, et verification de ces permissions à l'execution des service (refs #7523) new 305c368 gestion des permissions dans la couche serveur REST et client (refs #7523) The 1 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 305c368a7afa5644ca80a987ecf0879204497ae4 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Sep 15 10:10:22 2015 +0200 gestion des permissions dans la couche serveur REST et client (refs #7523) Summary of changes: .../web/controller/v1/ConfigurationController.java | 14 ++++++------ .../controller/v1/DataSourceServiceController.java | 12 +++++++---- .../v1/ObserveServiceControllerSupport.java | 5 +++-- .../controller/v1/ObserveWebErrorController.java | 7 +++++- .../web/request/ObserveWebRequestContext.java | 13 +++++++++++ .../ObserveWebSecurityApplicationContext.java | 15 +++++++------ ...ObserveWebSecurityAuthenticationTokenCache.java | 25 ++++++++++++---------- .../services/ObserveServiceInitializer.java | 17 +++++++++++++++ ...bserveDataSourceConfigurationAndConnection.java | 24 +++++++++++++++++++++ 9 files changed, 100 insertions(+), 32 deletions(-) create mode 100644 observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationAndConnection.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch feature/7519 updated (3efb3e6 -> 2f4af8b)
by codelutin.com scm Sept. 14, 2015

Sept. 14, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7519 in repository observe. See http://git.codelutin.com/observe.git from 3efb3e6 ca build toujours pas, mais ça avance... reste plus que les packages list, ref et table dans ui.content new 2f4af8b Ca build enfin ! C'est plein de fixme et les tests passent pas mais ca build (refs #7519) The 1 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 2f4af8b4f90db19f78cf32ab3db3939f76fc1acf Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Sep 14 19:35:33 2015 +0200 Ca build enfin ! C'est plein de fixme et les tests passent pas mais ca build (refs #7519) Summary of changes: .../main/java/fr/ird/observe/ObserveContext.java | 373 ++++++------ .../observe/business}/LonglinePositionAware.java | 27 +- .../observe/business/db/DataSourceProvider.java | 3 +- .../report/model/operations/GroupByLength.java | 103 ---- .../report/model/operations/SumColumn.java | 132 ----- .../report/model/operations/SumIntColumn.java | 128 ---- .../report/model/operations/SumIntRow.java | 132 ----- .../business/report/model/operations/SumRow.java | 128 ---- .../validation/ValidationMessageDetector.java | 647 +++++++++++---------- .../main/java/fr/ird/observe/ui/ObserveMainUI.css | 6 +- .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 27 +- .../fr/ird/observe/ui/ObserveMainUIHandler.java | 18 +- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 2 +- .../observe/ui/actions/ChangeDbLanguageAction.java | 6 +- .../observe/ui/actions/ReloadStorageAction.java | 72 +-- .../ui/actions/SaveStorageToFileAction.java | 22 +- .../ird/observe/ui/actions/ShowConfigAction.java | 199 +++---- .../observe/ui/actions/StartH2WebServerAction.java | 14 +- .../observe/ui/actions/StartServerModeAction.java | 72 +-- .../observe/ui/actions/StopH2WebServerAction.java | 11 +- .../observe/ui/actions/StopServerModeAction.java | 19 +- .../ui/actions/shared/CloseAndCreateUIAction.java | 4 +- .../ui/actions/shared/CloseOpenUIAction.java | 4 +- .../observe/ui/actions/shared/ReOpenUIAction.java | 7 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 9 +- .../fr/ird/observe/ui/admin/AdminUIHandler.java | 3 + .../fr/ird/observe/ui/admin/AdminUILauncher.java | 1 + .../ird/observe/ui/admin/config/SelectDataUI.css | 2 +- .../ird/observe/ui/admin/config/SelectDataUI.jaxx | 8 +- .../observe/ui/admin/gps/ImportGPSUIHandler.java | 3 +- .../observe/ui/admin/report/ReportUIHandler.java | 41 +- .../ObsoleteEntityListCellRenderer.java | 11 +- .../synchronize/ObsoleteEntityTableModel.java | 51 +- .../ui/admin/synchronize/SynchronizeModel.java | 103 ++-- .../ui/admin/synchronize/SynchronizeUI.jaxx | 9 +- .../ui/admin/synchronize/SynchronizeUIHandler.java | 27 +- .../validate/ValidateEntityListCellRenderer.java | 18 +- .../ui/admin/validate/ValidateUIHandler.java | 40 +- .../main/java/fr/ird/observe/ui/content/Common.css | 2 +- .../java/fr/ird/observe/ui/content/ContentUI.jaxx | 12 +- .../ird/observe/ui/content/ContentUIHandler.java | 34 +- .../ird/observe/ui/content/ContentUIManager.java | 35 ++ .../ui/content/impl/longline/BranchlineUI.css | 42 +- .../content/impl/longline/BranchlineUIHandler.java | 5 +- .../LonglineDetailCompositionUIHandler.java | 49 +- ...onglineDetailCompositionUIValidationHelper.java | 18 +- .../impl/longline/LonglineGlobalCompositionUI.css | 6 +- .../LonglineGlobalCompositionUIHandler.java | 4 + .../impl/longline/SectionTemplatesTableModel.java | 129 ++-- .../content/impl/longline/SectionsTableModel.java | 173 +++--- .../ui/content/impl/longline/SetLonglineUI.css | 106 ++-- .../ui/content/impl/longline/SetLonglineUI.jaxx | 9 +- .../impl/longline/SetLonglineUIHandler.java | 8 +- .../impl/seine/ActivitySeineObservedSystemUI.css | 8 +- .../impl/seine/ActivitySeineObservedSystemUI.jaxx | 13 +- .../ActivitySeineObservedSystemUIHandler.java | 6 +- .../seine/ActivitySeineObservedSystemUIModel.java | 21 +- .../FloatingObjectTransmittingBuoyOperationUI.css | 37 +- .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 15 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 57 +- .../ui/content/impl/seine/FloatingObjectUI.css | 12 +- .../observe/ui/content/impl/seine/SetSeineUI.css | 40 +- .../observe/ui/content/impl/seine/SetSeineUI.jaxx | 2 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 8 - .../ird/observe/ui/content/list/ContentListUI.jaxx | 4 +- .../ui/content/list/ContentListUIHandler.java | 16 +- .../impl/longline/ActivityLonglinesUIHandler.java | 29 +- .../ui/content/list/impl/longline/CommonListUI.css | 8 +- .../list/impl/longline/TripLonglinesUIHandler.java | 31 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 30 +- .../ui/content/list/impl/seine/CommonListUI.css | 12 +- .../content/list/impl/seine/RoutesUIHandler.java | 33 +- .../list/impl/seine/TripSeinesUIHandler.java | 34 +- .../observe/ui/content/open/ContentOpenableUI.jaxx | 2 +- .../open/impl/longline/ActivityLonglineUI.css | 23 +- .../open/impl/longline/ActivityLonglineUI.jaxx | 7 +- .../impl/longline/ActivityLonglineUIHandler.java | 5 +- .../content/open/impl/longline/TripLonglineUI.css | 40 +- .../content/open/impl/longline/TripLonglineUI.jaxx | 7 +- .../open/impl/longline/TripLonglineUIHandler.java | 11 +- .../ui/content/open/impl/seine/ActivitySeineUI.css | 44 +- .../content/open/impl/seine/ActivitySeineUI.jaxx | 6 +- .../open/impl/seine/ActivitySeineUIHandler.java | 5 +- .../observe/ui/content/open/impl/seine/RouteUI.css | 6 +- .../ui/content/open/impl/seine/RouteUI.jaxx | 3 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 10 +- .../ui/content/open/impl/seine/TripSeineUI.css | 45 +- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 7 +- .../open/impl/seine/TripSeineUIHandler.java | 4 +- .../observe/ui/content/ref/ContentReferenceUI.css | 2 +- .../observe/ui/content/ref/ContentReferenceUI.jaxx | 4 +- .../ui/content/ref/ContentReferenceUIHandler.java | 644 ++++++++++---------- .../observe/ui/content/ref/ReferenceHomeUI.jaxx | 2 +- .../ui/content/ref/ReferenceHomeUIHandler.java | 3 +- .../ref/ReferentialContentUIInitializer.java | 17 +- .../ui/content/ref/impl/GearCaracteristicUI.css | 2 +- .../fr/ird/observe/ui/content/ref/impl/GearUI.css | 6 +- .../observe/ui/content/ref/impl/GearUIHandler.java | 6 +- .../ird/observe/ui/content/ref/impl/HarbourUI.css | 6 +- .../ui/content/ref/impl/HarbourUIModel.java | 2 +- .../ref/impl/LengthWeightParameterUIHandler.java | 6 +- .../ird/observe/ui/content/ref/impl/PersonUI.css | 2 +- .../ui/content/ref/impl/ProgramUIHandler.java | 6 +- .../fr/ird/observe/ui/content/ref/impl/SexUI.jaxx | 2 +- .../observe/ui/content/ref/impl/SpeciesListUI.css | 6 +- .../ui/content/ref/impl/SpeciesListUIHandler.java | 6 +- .../ird/observe/ui/content/ref/impl/SpeciesUI.css | 3 +- .../ui/content/ref/impl/SpeciesUIHandler.java | 6 +- .../ui/content/ref/impl/VesselUIHandler.java | 6 +- .../content/ref/impl/seine/ObservedSystemUI.jaxx | 2 +- .../ref/impl/seine/TransmittingBuoyTypeUI.jaxx | 8 +- .../content/ref/impl/seine/WeightCategoryUI.jaxx | 2 +- .../ird/observe/ui/content/table/CommonTable.css | 2 +- .../ui/content/table/ContentTableModel.java | 49 +- .../observe/ui/content/table/ContentTableUI.jaxx | 5 +- .../ui/content/table/ContentTableUIHandler.java | 359 ++++++------ .../content/table/ContentTableUIInitializer.java | 24 +- .../ui/content/table/ContentTableUIModel.java | 5 +- .../ui/content/table/ObserveContentTableUI.java | 3 +- .../table/impl/longline/BaitsCompositionUI.css | 13 +- .../table/impl/longline/BaitsCompositionUI.jaxx | 3 +- .../impl/longline/BaitsCompositionUIHandler.java | 42 +- .../impl/longline/BaitsCompositionUIModel.java | 6 +- .../impl/longline/BranchlinesCompositionUI.css | 11 +- .../impl/longline/BranchlinesCompositionUI.jaxx | 3 +- .../longline/BranchlinesCompositionUIHandler.java | 50 +- .../CatchLonglineContentTableUIInitializer.java | 4 +- .../table/impl/longline/CatchLonglineUI.css | 70 +-- .../table/impl/longline/CatchLonglineUI.jaxx | 11 +- .../impl/longline/CatchLonglineUIHandler.java | 548 ++++++++--------- .../ui/content/table/impl/longline/EncounterUI.css | 8 +- .../content/table/impl/longline/EncounterUI.jaxx | 2 +- .../table/impl/longline/EncounterUIHandler.java | 22 +- .../impl/longline/FloatlinesCompositionUI.css | 8 +- .../impl/longline/FloatlinesCompositionUI.jaxx | 5 +- .../longline/FloatlinesCompositionUIHandler.java | 49 +- .../GearUseFeaturesLonglineTableModel.java | 16 +- .../impl/longline/GearUseFeaturesLonglineUI.css | 15 +- .../impl/longline/GearUseFeaturesLonglineUI.jaxx | 3 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 231 ++++---- .../longline/GearUseFeaturesLonglineUIModel.java | 6 +- ...rUseFeaturesMeasurementLonglinesTableModel.java | 26 +- .../table/impl/longline/HooksCompositionUI.css | 11 +- .../table/impl/longline/HooksCompositionUI.jaxx | 3 +- .../impl/longline/HooksCompositionUIHandler.java | 50 +- .../impl/longline/LonglinePositionHelper.java | 117 ++-- .../content/table/impl/longline/SensorUsedUI.css | 14 +- .../content/table/impl/longline/SensorUsedUI.jaxx | 2 +- .../table/impl/longline/SensorUsedUIHandler.java | 46 +- .../impl/longline/SizeMeasuresTableModel.java | 25 +- .../ui/content/table/impl/longline/TdrUI.css | 74 +-- .../content/table/impl/longline/TdrUIHandler.java | 103 ++-- .../impl/longline/WeightMeasuresTableModel.java | 22 +- .../seine/GearUseFeatureMeasurementCellEditor.java | 12 +- .../GearUseFeatureMeasurementCellRenderer.java | 15 +- ...GearUseFeaturesMeasurementSeinesTableModel.java | 12 +- .../impl/seine/GearUseFeaturesSeineTableModel.java | 7 +- .../table/impl/seine/GearUseFeaturesSeineUI.css | 8 +- .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 5 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 232 ++++---- .../impl/seine/GearUseFeaturesSeineUIModel.java | 17 +- .../content/table/impl/seine/NonTargetCatchUI.css | 21 +- .../content/table/impl/seine/NonTargetCatchUI.jaxx | 17 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 391 ++++++------- .../content/table/impl/seine/NonTargetSampleUI.css | 18 +- .../table/impl/seine/NonTargetSampleUI.jaxx | 8 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 305 +++++----- .../table/impl/seine/ObjectObservedSpeciesUI.css | 6 +- .../table/impl/seine/ObjectObservedSpeciesUI.jaxx | 8 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 24 +- .../table/impl/seine/ObjectSchoolEstimateUI.css | 4 +- .../table/impl/seine/ObjectSchoolEstimateUI.jaxx | 4 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 21 +- .../content/table/impl/seine/SchoolEstimateUI.css | 6 +- .../content/table/impl/seine/SchoolEstimateUI.jaxx | 7 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 130 +++-- .../ui/content/table/impl/seine/TargetCatchUI.css | 8 +- .../ui/content/table/impl/seine/TargetCatchUI.jaxx | 11 +- .../table/impl/seine/TargetCatchUIHandler.java | 397 +++++++------ .../table/impl/seine/TargetDiscardCatchUI.css | 8 +- .../table/impl/seine/TargetDiscardCatchUI.jaxx | 15 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 538 ++++++++--------- .../content/table/impl/seine/TargetSampleUI.jaxx | 2 +- .../table/impl/seine/TargetSampleUIHandler.java | 289 ++++----- .../ui/storage/StorageBackupUILauncher.java | 14 +- .../ird/observe/ui/storage/StorageUIHandler.java | 18 +- .../observe/ui/storage/tabs/ChooseDbModeUI.jaxx | 4 +- .../ird/observe/ui/storage/tabs/ConfigDataUI.jaxx | 2 +- .../ui/storage/tabs/ConfigReferentielUI.jaxx | 2 +- .../fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx | 2 +- .../fr/ird/observe/ui/storage/tabs/RolesUI.jaxx | 2 +- .../ird/observe/ui/storage/tabs/SelectDataUI.jaxx | 2 +- .../ui/storage/tabs/StorageTabUIHandler.java | 28 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 1 - .../fr/ird/observe/ui/tree/DtoNodeSupport.java | 5 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 1 + .../ui/tree/loadors/RoutesNodeChildLoador.java | 4 +- .../java/fr/ird/observe/ui/usage/UsagesUI.jaxx | 2 +- .../fr/ird/observe/ui/usage/UsagesUIHandler.java | 20 +- .../EditableTableWithCacheTableModelSupport.java | 21 +- .../observe-application-swing_en_GB.properties | 181 ++++++ .../observe-application-swing_es_ES.properties | 181 ++++++ .../observe-application-swing_fr_FR.properties | 181 ++++++ ...glineDetailCompositionValidatorServiceTest.java | 139 ++--- 204 files changed, 5089 insertions(+), 4837 deletions(-) copy {observe-entities/src/main/java/fr/ird/observe/entities/longline => observe-application-swing/src/main/java/fr/ird/observe/business}/LonglinePositionAware.java (56%) delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/GroupByLength.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/SumColumn.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/SumIntColumn.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/SumIntRow.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/SumRow.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch feature/7523 created (now e212c6f)
by codelutin.com scm Sept. 14, 2015

Sept. 14, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7523 in repository observe. See http://git.codelutin.com/observe.git at e212c6f recuperation des permission à partir de la BD, et verification de ces permissions à l'execution des service (refs #7523) This branch includes the following new commits: new e212c6f recuperation des permission à partir de la BD, et verification de ces permissions à l'execution des service (refs #7523) The 1 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 e212c6f787d007d31c10db4f35002ba20a59a935 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Sep 14 16:57:48 2015 +0200 recuperation des permission à partir de la BD, et verification de ces permissions à l'execution des service (refs #7523) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch feature/7519 created (now 3efb3e6)
by codelutin.com scm Sept. 11, 2015

Sept. 11, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7519 in repository observe. See http://git.codelutin.com/observe.git at 3efb3e6 ca build toujours pas, mais ça avance... reste plus que les packages list, ref et table dans ui.content This branch includes the following new commits: new c79340d remplacement des entités par les dto (refs #7519) new 3efb3e6 ca build toujours pas, mais ça avance... reste plus que les packages list, ref et table dans ui.content 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 3efb3e691bc016c521a1ed4224e89fad96d1aee6 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Sep 11 17:50:53 2015 +0200 ca build toujours pas, mais ça avance... reste plus que les packages list, ref et table dans ui.content commit c79340d4b135b9de9a0c5c92e8963d3e07e260d7 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Sep 10 18:04:15 2015 +0200 remplacement des entités par les dto (refs #7519) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 2

branch feature/7520 updated (c8e08f0 -> 5b64f73)
by codelutin.com scm Sept. 11, 2015

Sept. 11, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7520 in repository observe. See http://git.codelutin.com/observe.git discards c8e08f0 fix npe (refs #7470 #7520) discards ed448f1 lever un execption en cas de modification concurent d'une entité siuvie en modif (refs #7470 #7520) discards f78d367 ajout de la date de mise a jour dans les DTO (refs #7470 #7520) discards 63cea72 ajout de la date de mise a jour pour les Trip, Route, Activity, Set (refs #7470) discards 8b62ca0 ajout de la date de mise a jour pour les entité dans le référentiel (refs #7520) adds 8b8c125 Optimise dependencies adds 385baef Ajout des headers de license adds cbf55f5 renommage des classes de test pour le module client Rest new ac7c587 ajout de la date de mise a jour pour les entité dans le référentiel (refs #7520) new 7407fcd ajout de la date de mise a jour pour les Trip, Route, Activity, Set (refs #7470) new 35481cc ajout de la date de mise a jour dans les DTO (refs #7470 #7520) new a78bd4e lever un execption en cas de modification concurent d'une entité siuvie en modif (refs #7470 #7520) new 5b64f73 fix npe (refs #7470 #7520) 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 (c8e08f0) \ N -- N -- N refs/heads/feature/7520 (5b64f73) 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 5 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 5b64f735b90cbe9baa4dd8aab5a4f77c12466af0 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Sep 11 11:20:59 2015 +0200 fix npe (refs #7470 #7520) commit a78bd4e97e995e91b8df5908873bec7230d7d735 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Sep 11 11:09:27 2015 +0200 lever un execption en cas de modification concurent d'une entité siuvie en modif (refs #7470 #7520) commit 35481cc6bcb3471ad7eb800162cf39ffc63f74ce Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Sep 11 10:21:39 2015 +0200 ajout de la date de mise a jour dans les DTO (refs #7470 #7520) commit 7407fcdbb3c0fe80c6ffcf53dd0edb098ee451d1 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Sep 10 16:08:39 2015 +0200 ajout de la date de mise a jour pour les Trip, Route, Activity, Set (refs #7470) commit ac7c5874a591a2e323906c69273dafda6d990c0e Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Sep 10 15:18:33 2015 +0200 ajout de la date de mise a jour pour les entité dans le référentiel (refs #7520) Summary of changes: observe-application-web/pom.xml | 8 ++------ .../src/jetty/jetty-context.xml | 22 ++++++++++++++++++++ .../web/ObserveWebApplicationContext.java | 22 ++++++++++++++++++++ .../ObserveWebApplicationContextInitException.java | 22 ++++++++++++++++++++ .../web/ObserveWebApplicationListener.java | 22 ++++++++++++++++++++ .../application/web/ObserveWebMainHandler.java | 22 ++++++++++++++++++++ .../application/web/ObserveWebMotionFilter.java | 22 ++++++++++++++++++++ .../application/web/ObserveWebMotionRender.java | 22 ++++++++++++++++++++ .../ObserveWebApplicationConfiguration.java | 22 ++++++++++++++++++++ ...veWebApplicationConfigurationInitException.java | 22 ++++++++++++++++++++ .../ObserveWebApplicationConfigurationOption.java | 22 ++++++++++++++++++++ ...ObserveWebApplicationConfigurationProvider.java | 22 ++++++++++++++++++++ .../db/InvalidObserveWebDatabaseException.java | 22 ++++++++++++++++++++ .../db/InvalidObserveWebDatabaseRoleException.java | 22 ++++++++++++++++++++ .../db/InvalidObserveWebDatabasesException.java | 22 ++++++++++++++++++++ .../web/configuration/db/ObserveWebDatabase.java | 22 ++++++++++++++++++++ .../configuration/db/ObserveWebDatabaseRole.java | 22 ++++++++++++++++++++ .../web/configuration/db/ObserveWebDatabases.java | 22 ++++++++++++++++++++ .../db/ObserveWebDatabasesHelper.java | 22 ++++++++++++++++++++ .../db/impl/ObserveWebDatabaseBean.java | 22 ++++++++++++++++++++ .../db/impl/ObserveWebDatabaseImmutable.java | 22 ++++++++++++++++++++ .../db/impl/ObserveWebDatabaseRoleBean.java | 22 ++++++++++++++++++++ .../db/impl/ObserveWebDatabaseRoleImmutable.java | 22 ++++++++++++++++++++ .../db/impl/ObserveWebDatabasesBean.java | 22 ++++++++++++++++++++ .../db/impl/ObserveWebDatabasesImmutable.java | 22 ++++++++++++++++++++ .../user/InvalidObserveWebUserException.java | 22 ++++++++++++++++++++ .../InvalidObserveWebUserPermissionException.java | 22 ++++++++++++++++++++ .../user/InvalidObserveWebUsersException.java | 22 ++++++++++++++++++++ .../web/configuration/user/ObserveWebUser.java | 22 ++++++++++++++++++++ .../user/ObserveWebUserPermission.java | 22 ++++++++++++++++++++ .../web/configuration/user/ObserveWebUsers.java | 22 ++++++++++++++++++++ .../configuration/user/ObserveWebUsersHelper.java | 22 ++++++++++++++++++++ .../user/impl/ObserveWebUserBean.java | 22 ++++++++++++++++++++ .../user/impl/ObserveWebUserImmutable.java | 22 ++++++++++++++++++++ .../user/impl/ObserveWebUserPermissionBean.java | 22 ++++++++++++++++++++ .../impl/ObserveWebUserPermissionImmutable.java | 22 ++++++++++++++++++++ .../user/impl/ObserveWebUsersBean.java | 22 ++++++++++++++++++++ .../user/impl/ObserveWebUsersImmutable.java | 22 ++++++++++++++++++++ .../web/controller/ObserveWebMotionController.java | 22 ++++++++++++++++++++ .../web/controller/v1/ConfigurationController.java | 22 ++++++++++++++++++++ .../controller/v1/DataSourceServiceController.java | 22 ++++++++++++++++++++ ...serveAuthenticatedServiceControllerSupport.java | 22 ++++++++++++++++++++ .../v1/ObserveServiceControllerSupport.java | 22 ++++++++++++++++++++ .../controller/v1/ObserveWebErrorController.java | 22 ++++++++++++++++++++ .../web/controller/v1/PingServiceController.java | 22 ++++++++++++++++++++ .../v1/ReferentialServiceController.java | 22 ++++++++++++++++++++ .../ConsolidateDataServiceController.java | 22 ++++++++++++++++++++ .../v1/actions/report/ReportServiceController.java | 22 ++++++++++++++++++++ .../validate/ValidateServiceController.java | 22 ++++++++++++++++++++ .../ActivityLongLineEncouterServiceController.java | 22 ++++++++++++++++++++ ...ctivityLongLineSensorUsedServiceController.java | 22 ++++++++++++++++++++ .../ActivityLonglineServiceController.java | 22 ++++++++++++++++++++ .../GearUseFeaturesLonglineServiceController.java | 22 ++++++++++++++++++++ .../SetLonglineCatchServiceController.java | 22 ++++++++++++++++++++ ...LonglineDetailCompositionServiceController.java | 22 ++++++++++++++++++++ ...LonglineGlobalCompositionServiceController.java | 22 ++++++++++++++++++++ .../v1/longline/SetLonglineServiceController.java | 22 ++++++++++++++++++++ .../v1/longline/TdrServiceController.java | 22 ++++++++++++++++++++ .../v1/longline/TripLonglineServiceController.java | 22 ++++++++++++++++++++ ...tivitySeineObservedSystemServiceController.java | 22 ++++++++++++++++++++ .../v1/seine/ActivitySeineServiceController.java | 22 ++++++++++++++++++++ .../v1/seine/FloatingObjectServiceController.java | 22 ++++++++++++++++++++ .../GearUseFeaturesSeineServiceController.java | 22 ++++++++++++++++++++ .../v1/seine/NonTargetCatchServiceController.java | 22 ++++++++++++++++++++ .../v1/seine/NonTargetSampleServiceController.java | 22 ++++++++++++++++++++ .../ObjectObservedSpeciesServiceController.java | 22 ++++++++++++++++++++ .../ObjectSchoolEstimateServiceController.java | 22 ++++++++++++++++++++ .../v1/seine/RouteServiceController.java | 22 ++++++++++++++++++++ .../v1/seine/SchoolEstimateServiceController.java | 22 ++++++++++++++++++++ .../v1/seine/SetSeineServiceController.java | 22 ++++++++++++++++++++ .../v1/seine/TargetCatchServiceController.java | 22 ++++++++++++++++++++ .../v1/seine/TargetSampleServiceController.java | 22 ++++++++++++++++++++ ...TransmittingBuoyOperationServiceController.java | 22 ++++++++++++++++++++ .../v1/seine/TripSeineServiceController.java | 22 ++++++++++++++++++++ .../ObserveDataSourceConfigurationInjector.java | 22 ++++++++++++++++++++ .../web/injector/ObserveDtoInjector.java | 22 ++++++++++++++++++++ .../web/request/ObserveWebRequestContext.java | 22 ++++++++++++++++++++ .../web/security/AdminApiKeyNotFoundException.java | 22 ++++++++++++++++++++ .../AuthenticationTokenNotFoundException.java | 22 ++++++++++++++++++++ .../BadObserveWebUserPasswordException.java | 22 ++++++++++++++++++++ .../web/security/InvalidAdminKeyApiException.java | 22 ++++++++++++++++++++ .../InvalidAuthenticationTokenException.java | 22 ++++++++++++++++++++ .../ObserveWebSecurityApplicationContext.java | 22 ++++++++++++++++++++ ...ObserveWebSecurityAuthenticationTokenCache.java | 22 ++++++++++++++++++++ .../ObserveWebSecurityExceptionSupport.java | 22 ++++++++++++++++++++ .../SecurityRequestContextNotFoundException.java | 22 ++++++++++++++++++++ .../security/UnknownObserveWebUserException.java | 22 ++++++++++++++++++++ .../UnknownObserveWebUserForDatabaseException.java | 22 ++++++++++++++++++++ .../web/security/UserLoginNotFoundException.java | 22 ++++++++++++++++++++ .../security/UserPasswordNotFoundException.java | 22 ++++++++++++++++++++ .../src/main/resources/log4j.properties | 21 +++++++++++++++++++ .../src/main/webapp/WEB-INF/web.xml | 21 +++++++++++++++++++ .../db/ObserveWebDatabasesHelperTest.java | 22 ++++++++++++++++++++ .../user/ObserveWebUsersHelperTest.java | 22 ++++++++++++++++++++ .../fr/ird/observe/AbstractObserveTopiaDao.java | 22 ++++++++++++++++++++ .../observe/ObserveTopiaApplicationContext.java | 22 ++++++++++++++++++++ .../fr/ird/observe/ObserveTopiaConfiguration.java | 22 ++++++++++++++++++++ .../observe/ObserveTopiaConfigurationFactory.java | 22 ++++++++++++++++++++ .../java/fr/ird/observe/ObserveTopiaIdFactory.java | 22 ++++++++++++++++++++ .../observe/ObserveTopiaPersistenceContext.java | 22 ++++++++++++++++++++ .../ird/observe/entities/longline/TdrTopiaDao.java | 22 ++++++++++++++++++++ .../entities/migration/ObserveMigrationEngine.java | 22 ++++++++++++++++++++ .../DataSourceMigrationForVersion_5_0.java | 22 ++++++++++++++++++++ .../DuplicateLengthWeightParameterException.java | 22 ++++++++++++++++++++ .../referentiel/I18nReferenceEntities.java | 22 ++++++++++++++++++++ .../LengthWeightParameterNotFoundException.java | 22 ++++++++++++++++++++ .../referentiel/LengthWeightParameters.java | 22 ++++++++++++++++++++ .../observe/entities/seine/NonTargetCatches.java | 22 ++++++++++++++++++++ .../fr/ird/observe/entities/seine/SetSeines.java | 22 ++++++++++++++++++++ .../fr/ird/observe/entities/seine/TripSeines.java | 22 ++++++++++++++++++++ .../main/resources/db/5.0/remove_open_field-H2.sql | 21 +++++++++++++++++++ .../main/resources/db/5.0/remove_open_field-PG.sql | 21 +++++++++++++++++++ .../ObserveTopiaApplicationContextTest.java | 22 ++++++++++++++++++++ .../test/java/fr/ird/observe/util/NumbersTest.java | 22 ++++++++++++++++++++ observe-services-api/pom.xml | 8 -------- .../fr/ird/observe/services/ObserveService.java | 22 ++++++++++++++++++++ .../observe/services/ObserveServiceFactory.java | 22 ++++++++++++++++++++ .../services/ObserveServiceFactorySupport.java | 22 ++++++++++++++++++++ .../services/ObserveServiceInitializer.java | 22 ++++++++++++++++++++ .../services/service/DataNotFoundException.java | 22 ++++++++++++++++++++ .../service/DataSourceDumpProducerService.java | 22 ++++++++++++++++++++ .../services/service/DataSourceService.java | 22 ++++++++++++++++++++ .../DatabaseConnexionNotAuthorizedException.java | 22 ++++++++++++++++++++ .../service/DatabaseNotFoundException.java | 22 ++++++++++++++++++++ .../ird/observe/services/service/PingService.java | 22 ++++++++++++++++++++ .../services/service/ReferentialService.java | 22 ++++++++++++++++++++ .../ConsolidateActivitySeineDataResult.java | 22 ++++++++++++++++++++ .../consolidate/ConsolidateDataService.java | 22 ++++++++++++++++++++ .../ConsolidateTripSeineDataRequest.java | 22 ++++++++++++++++++++ .../ConsolidateTripSeineDataResult.java | 22 ++++++++++++++++++++ .../service/actions/report/ReportService.java | 22 ++++++++++++++++++++ .../actions/validate/ValidateDataRequest.java | 22 ++++++++++++++++++++ .../actions/validate/ValidateDataResult.java | 22 ++++++++++++++++++++ .../validate/ValidateReferentialsRequest.java | 22 ++++++++++++++++++++ .../validate/ValidateReferentialsResult.java | 22 ++++++++++++++++++++ .../actions/validate/ValidateResultForDto.java | 22 ++++++++++++++++++++ .../actions/validate/ValidateResultForDtoType.java | 22 ++++++++++++++++++++ .../service/actions/validate/ValidateService.java | 22 ++++++++++++++++++++ .../actions/validate/ValidationMessage.java | 22 ++++++++++++++++++++ .../longline/ActivityLongLineEncouterService.java | 22 ++++++++++++++++++++ .../ActivityLongLineSensorUsedService.java | 22 ++++++++++++++++++++ .../service/longline/ActivityLonglineService.java | 22 ++++++++++++++++++++ .../longline/GearUseFeaturesLonglineService.java | 22 ++++++++++++++++++++ .../service/longline/SetLonglineCatchService.java | 22 ++++++++++++++++++++ .../SetLonglineDetailCompositionService.java | 22 ++++++++++++++++++++ .../SetLonglineGlobalCompositionService.java | 22 ++++++++++++++++++++ .../service/longline/SetLonglineService.java | 22 ++++++++++++++++++++ .../services/service/longline/TdrService.java | 22 ++++++++++++++++++++ .../service/longline/TripLonglineService.java | 22 ++++++++++++++++++++ .../seine/ActivitySeineObservedSystemService.java | 22 ++++++++++++++++++++ .../service/seine/ActivitySeineService.java | 22 ++++++++++++++++++++ .../service/seine/FloatingObjectService.java | 22 ++++++++++++++++++++ .../service/seine/GearUseFeaturesSeineService.java | 22 ++++++++++++++++++++ .../service/seine/NonTargetCatchService.java | 22 ++++++++++++++++++++ .../service/seine/NonTargetSampleService.java | 22 ++++++++++++++++++++ .../seine/ObjectObservedSpeciesService.java | 22 ++++++++++++++++++++ .../service/seine/ObjectSchoolEstimateService.java | 22 ++++++++++++++++++++ .../services/service/seine/RouteService.java | 22 ++++++++++++++++++++ .../service/seine/SchoolEstimateService.java | 22 ++++++++++++++++++++ .../services/service/seine/SetSeineService.java | 22 ++++++++++++++++++++ .../services/service/seine/TargetCatchService.java | 22 ++++++++++++++++++++ .../service/seine/TargetSampleService.java | 22 ++++++++++++++++++++ .../seine/TransmittingBuoyOperationService.java | 22 ++++++++++++++++++++ .../services/service/seine/TripSeineService.java | 22 ++++++++++++++++++++ .../fr/ird/observe/services/spi/DeleteRequest.java | 22 ++++++++++++++++++++ .../fr/ird/observe/services/spi/NoDataAccess.java | 22 ++++++++++++++++++++ .../fr/ird/observe/services/spi/PostRequest.java | 22 ++++++++++++++++++++ .../observe/services/spi/ReadDataPermission.java | 22 ++++++++++++++++++++ .../services/spi/ReadReferentialPermission.java | 22 ++++++++++++++++++++ .../java/fr/ird/observe/services/spi/Write.java | 22 ++++++++++++++++++++ .../observe/services/spi/WriteDataPermission.java | 22 ++++++++++++++++++++ .../services/spi/WriteReferentialPermission.java | 22 ++++++++++++++++++++ .../service/actions/report/ReportBuilderTest.java | 22 ++++++++++++++++++++ .../actions/report/observe-reports-test.properties | 21 +++++++++++++++++++ .../ObserveDataSourceConfiguration.java | 22 ++++++++++++++++++++ .../configuration/ObserveDataSourceConnection.java | 22 ++++++++++++++++++++ .../ObserveDataSourceConnectionSupport.java | 22 ++++++++++++++++++++ .../ObserveDataSourceConfigurationRest.java | 22 ++++++++++++++++++++ ...bserveDataSourceConfigurationRestConstants.java | 22 ++++++++++++++++++++ .../ObserveDataSourceConnectionRest.java | 22 ++++++++++++++++++++ .../ObserveDataSourceConfigurationTopiaH2.java | 22 ++++++++++++++++++++ .../ObserveDataSourceConfigurationTopiaPG.java | 22 ++++++++++++++++++++ ...ObserveDataSourceConfigurationTopiaSupport.java | 22 ++++++++++++++++++++ .../ObserveDataSourceConnectionTopia.java | 22 ++++++++++++++++++++ observe-services-model/pom.xml | 4 ++++ .../observe/services/dto/AbstractObserveDto.java | 22 ++++++++++++++++++++ .../dto/DataSourceCreateConfigurationDto.java | 22 ++++++++++++++++++++ ...urceCreateWithNoReferentialImportException.java | 22 ++++++++++++++++++++ .../java/fr/ird/observe/services/dto/FormDto.java | 22 ++++++++++++++++++++ .../java/fr/ird/observe/services/dto/FormDtos.java | 22 ++++++++++++++++++++ .../java/fr/ird/observe/services/dto/IdDto.java | 22 ++++++++++++++++++++ .../java/fr/ird/observe/services/dto/IdDtos.java | 22 ++++++++++++++++++++ ...ibleDataSourceCreateConfigurationException.java | 22 ++++++++++++++++++++ .../fr/ird/observe/services/dto/ObserveDto.java | 22 ++++++++++++++++++++ .../fr/ird/observe/services/dto/ReferenceDto.java | 22 ++++++++++++++++++++ .../fr/ird/observe/services/dto/ReferenceDtos.java | 22 ++++++++++++++++++++ .../ird/observe/services/dto/ReferenceSetDto.java | 22 ++++++++++++++++++++ .../ird/observe/services/dto/ReferenceSetDtos.java | 22 ++++++++++++++++++++ .../dto/ReferenceSetNotFoundException.java | 22 ++++++++++++++++++++ .../dto/ReferenceValueNotFoundException.java | 22 ++++++++++++++++++++ .../services/dto/constants/ReferenceStatus.java | 22 ++++++++++++++++++++ .../observe/services/dto/gson/ClassAdapter.java | 22 ++++++++++++++++++++ .../ird/observe/services/dto/gson/DateAdapter.java | 22 ++++++++++++++++++++ .../services/dto/gson/ImmutableListAdapter.java | 22 ++++++++++++++++++++ .../services/dto/gson/ImmutableMapAdapter.java | 22 ++++++++++++++++++++ .../services/dto/gson/ImmutableSetAdapter.java | 22 ++++++++++++++++++++ .../observe/services/dto/gson/IntegerAdapter.java | 22 ++++++++++++++++++++ .../services/dto/gson/ObserveDtoGsonSupplier.java | 22 ++++++++++++++++++++ .../services/dto/gson/ReferenceDtoAdapter.java | 22 ++++++++++++++++++++ .../dto/gson/ReferentialReferenceDtoAdapter.java | 22 ++++++++++++++++++++ .../services/dto/gson/ReportVariableAdapter.java | 22 ++++++++++++++++++++ .../dto/referential/ReferentialReferenceDto.java | 22 ++++++++++++++++++++ .../dto/referential/ReferentialReferenceDtos.java | 22 ++++++++++++++++++++ .../xmi/observe-services-dto-common.properties | 21 +++++++++++++++++++ .../xmi/observe-services-dto-longline.properties | 21 +++++++++++++++++++ .../main/xmi/observe-services-dto-seine.properties | 21 +++++++++++++++++++ observe-services-rest/pom.xml | 4 ++++ .../ObserveDataSourceConnectionAdapter.java | 22 ++++++++++++++++++++ .../services/ObserveServiceFactoryRest.java | 22 ++++++++++++++++++++ .../ObserveServiceRestNotAvailableException.java | 22 ++++++++++++++++++++ .../ird/observe/services/http/ObserveRequest.java | 22 ++++++++++++++++++++ .../services/http/ObserveRequestBuilder.java | 22 ++++++++++++++++++++ .../services/http/ObserveRequestMethod.java | 22 ++++++++++++++++++++ .../ird/observe/services/http/ObserveResponse.java | 22 ++++++++++++++++++++ .../services/http/ObserveResponseBuilder.java | 22 ++++++++++++++++++++ .../fr/ird/observe/services/TestClassResource.java | 22 ++++++++++++++++++++ .../ird/observe/services/TestMethodResource.java | 22 ++++++++++++++++++++ .../services/service/AbstractServiceRestTest.java | 22 ++++++++++++++++++++ .../service/DataSourceServiceRestTest.java | 22 ++++++++++++++++++++ .../services/service/PingServiceRestTest.java | 22 ++++++++++++++++++++ .../ConsolidateDataServiceRestTest.java | 22 ++++++++++++++++++++ ...rviceTest.java => ValidateServiceRestTest.java} | 24 +++++++++++++++++++++- ...va => GearUseFeaturesSeineServiceRestTest.java} | 24 +++++++++++++++++++++- ...viceTest.java => TripSeineServiceRestTest.java} | 24 +++++++++++++++++++++- .../ObserveDataSourceConfigurationMainFactory.java | 22 ++++++++++++++++++++ .../services/ObserveServiceMainFactory.java | 22 ++++++++++++++++++++ .../observe/services/AbstractObserveService.java | 22 ++++++++++++++++++++ .../ObserveServiceFactoryProviderTopia.java | 22 ++++++++++++++++++++ .../observe/services/ReplicationServiceImpl.java | 22 ++++++++++++++++++++ .../observe/services/data/OpenableServiceImpl.java | 22 ++++++++++++++++++++ .../ird/observe/services/data/TripServiceImpl.java | 22 ++++++++++++++++++++ .../data/longline/ActivityLonglineServiceImpl.java | 22 ++++++++++++++++++++ .../data/longline/BaitsCompositionServiceImpl.java | 22 ++++++++++++++++++++ .../BranchlinesCompositionServiceImpl.java | 22 ++++++++++++++++++++ .../data/longline/CatchLonglineServiceImpl.java | 22 ++++++++++++++++++++ .../data/longline/EncounterServiceImpl.java | 22 ++++++++++++++++++++ .../longline/FloatlinesCompositionServiceImpl.java | 22 ++++++++++++++++++++ .../GearUseFeaturesLonglineServiceImpl.java | 22 ++++++++++++++++++++ .../data/longline/HooksCompositionServiceImpl.java | 22 ++++++++++++++++++++ .../LonglineDetailCompositionServiceImpl.java | 22 ++++++++++++++++++++ .../LonglineGlobalCompositionServiceImpl.java | 22 ++++++++++++++++++++ .../data/longline/SensorUsedServiceImpl.java | 22 ++++++++++++++++++++ .../data/longline/SetLonglineServiceImpl.java | 22 ++++++++++++++++++++ .../services/data/longline/TdrServiceImpl.java | 22 ++++++++++++++++++++ .../data/longline/TripLonglineServiceImpl.java | 22 ++++++++++++++++++++ .../data/seine/ActivitySeineServiceImpl.java | 22 ++++++++++++++++++++ .../data/seine/FloatingObjectServiceImpl.java | 22 ++++++++++++++++++++ .../seine/GearUseFeaturesSeineServiceImpl.java | 22 ++++++++++++++++++++ .../data/seine/NonTargetCatchServiceImpl.java | 22 ++++++++++++++++++++ .../data/seine/NonTargetSampleServiceImpl.java | 22 ++++++++++++++++++++ .../seine/ObjectObservedSpeciesServiceImpl.java | 22 ++++++++++++++++++++ .../seine/ObjectSchoolEstimateServiceImpl.java | 22 ++++++++++++++++++++ .../services/data/seine/RouteServiceImpl.java | 22 ++++++++++++++++++++ .../data/seine/SchoolEstimateServiceImpl.java | 22 ++++++++++++++++++++ .../services/data/seine/SetSeineServiceImpl.java | 22 ++++++++++++++++++++ .../data/seine/TargetCatchServiceImpl.java | 22 ++++++++++++++++++++ .../data/seine/TargetSampleServiceImpl.java | 22 ++++++++++++++++++++ .../services/data/seine/TripSeineServiceImpl.java | 22 ++++++++++++++++++++ .../services/operation/ComputeDataServiceImpl.java | 22 ++++++++++++++++++++ .../services/operation/GpsImportServiceImpl.java | 22 ++++++++++++++++++++ .../services/operation/SynchronizeServiceImpl.java | 22 ++++++++++++++++++++ .../services/operation/ValidationServiceImpl.java | 22 ++++++++++++++++++++ .../referential/ReferentialServiceImpl.java | 22 ++++++++++++++++++++ .../services/ObserveServiceContextTopia.java | 22 ++++++++++++++++++++ .../services/ObserveServiceFactoryTopia.java | 22 ++++++++++++++++++++ .../ird/observe/services/ObserveServiceTopia.java | 22 ++++++++++++++++++++ .../ObserveTopiaApplicationContextFactory.java | 22 ++++++++++++++++++++ .../services/builder/DtoToEntityBuilder.java | 22 ++++++++++++++++++++ .../services/builder/EntityToDtoBuilder.java | 22 ++++++++++++++++++++ .../builder/EntityToReferenceDtoBuilder.java | 22 ++++++++++++++++++++ .../EntityToReferentialReferenceDtoBuilder.java | 22 ++++++++++++++++++++ .../observe/services/dto/ObserveDtoBinders.java | 22 ++++++++++++++++++++ .../services/dto/ObserveDtosInitializer.java | 22 ++++++++++++++++++++ .../DataSourceDumpProducerServiceTopia.java | 22 ++++++++++++++++++++ .../services/service/DataSourceServiceTopia.java | 22 ++++++++++++++++++++ .../services/service/ReferentialServiceTopia.java | 22 ++++++++++++++++++++ .../ConsolidateActivitySeineDataResultBuilder.java | 22 ++++++++++++++++++++ .../consolidate/ConsolidateDataServiceTopia.java | 22 ++++++++++++++++++++ .../service/actions/report/ReportServiceTopia.java | 22 ++++++++++++++++++++ .../actions/validate/ValidateServiceTopia.java | 22 ++++++++++++++++++++ .../ActivityLongLineEncouterServiceTopia.java | 22 ++++++++++++++++++++ .../ActivityLongLineSensorUsedServiceTopia.java | 22 ++++++++++++++++++++ .../longline/ActivityLonglineServiceTopia.java | 22 ++++++++++++++++++++ .../GearUseFeaturesLonglineServiceTopia.java | 22 ++++++++++++++++++++ .../longline/SetLonglineCatchServiceTopia.java | 22 ++++++++++++++++++++ .../SetLonglineDetailCompositionServiceTopia.java | 22 ++++++++++++++++++++ .../SetLonglineGlobalCompositionServiceTopia.java | 22 ++++++++++++++++++++ .../service/longline/SetLonglineServiceTopia.java | 22 ++++++++++++++++++++ .../services/service/longline/TdrServiceTopia.java | 22 ++++++++++++++++++++ .../service/longline/TripLonglineServiceTopia.java | 22 ++++++++++++++++++++ .../ActivitySeineObservedSystemServiceTopia.java | 22 ++++++++++++++++++++ .../service/seine/ActivitySeineServiceTopia.java | 22 ++++++++++++++++++++ .../service/seine/FloatingObjectServiceTopia.java | 22 ++++++++++++++++++++ .../seine/GearUseFeaturesSeineServiceTopia.java | 22 ++++++++++++++++++++ .../service/seine/NonTargetCatchServiceTopia.java | 22 ++++++++++++++++++++ .../service/seine/NonTargetSampleServiceTopia.java | 22 ++++++++++++++++++++ .../seine/ObjectObservedSpeciesServiceTopia.java | 22 ++++++++++++++++++++ .../seine/ObjectSchoolEstimateServiceTopia.java | 22 ++++++++++++++++++++ .../services/service/seine/RouteServiceTopia.java | 22 ++++++++++++++++++++ .../service/seine/SchoolEstimateServiceTopia.java | 22 ++++++++++++++++++++ .../service/seine/SetSeineServiceTopia.java | 22 ++++++++++++++++++++ .../service/seine/TargetSampleServiceTopia.java | 22 ++++++++++++++++++++ .../TransmittingBuoyOperationServiceTopia.java | 22 ++++++++++++++++++++ .../service/seine/TripSeineServiceTopia.java | 22 ++++++++++++++++++++ .../services/ApplicationContextResource.java | 22 ++++++++++++++++++++ .../ird/observe/services/DataSourceResource.java | 22 ++++++++++++++++++++ .../services/ObserveServiceContextTopiaTaiste.java | 22 ++++++++++++++++++++ .../services/builder/DtoToEntityBuilderTest.java | 22 ++++++++++++++++++++ .../services/builder/EntityToDtoBuilderTest.java | 22 ++++++++++++++++++++ .../services/service/AbstractServiceTopiaTest.java | 22 ++++++++++++++++++++ .../DataSourceDumpProducerServiceTopiaTest.java | 22 ++++++++++++++++++++ .../service/DataSourceServiceTopiaTest.java | 22 ++++++++++++++++++++ .../service/ReferentialServiceTopiaTest.java | 22 ++++++++++++++++++++ .../ConsolidateDataServiceTopiaTest.java | 22 ++++++++++++++++++++ .../actions/validate/ValidateServiceTopiaTest.java | 22 ++++++++++++++++++++ ...tLonglineDetailCompositionServiceTopiaTest.java | 22 ++++++++++++++++++++ .../GearUseFeaturesSeineServiceTopiaTest.java | 22 ++++++++++++++++++++ .../service/seine/RouteServiceTopiaTest.java | 22 ++++++++++++++++++++ .../seine/TargetSampleServiceTopiaTest.java | 22 ++++++++++++++++++++ .../service/seine/TripSeineServiceTopiaTest.java | 22 ++++++++++++++++++++ 330 files changed, 7177 insertions(+), 17 deletions(-) rename observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/validate/{ValidateServiceTest.java => ValidateServiceRestTest.java} (94%) rename observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/{GearUseFeaturesSeineServiceTest.java => GearUseFeaturesSeineServiceRestTest.java} (94%) rename observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/{TripSeineServiceTest.java => TripSeineServiceRestTest.java} (93%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 5

branch develop updated (385baef -> cbf55f5)
by codelutin.com scm Sept. 11, 2015

Sept. 11, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 385baef Ajout des headers de license new cbf55f5 renommage des classes de test pour le module client Rest The 1 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 cbf55f5bf1f0055911140531faf4a01a8a5b4398 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Sep 11 14:46:41 2015 +0200 renommage des classes de test pour le module client Rest Summary of changes: .../validate/{ValidateServiceTest.java => ValidateServiceRestTest.java} | 2 +- ...esSeineServiceTest.java => GearUseFeaturesSeineServiceRestTest.java} | 2 +- .../seine/{TripSeineServiceTest.java => TripSeineServiceRestTest.java} | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/validate/{ValidateServiceTest.java => ValidateServiceRestTest.java} (99%) rename observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/{GearUseFeaturesSeineServiceTest.java => GearUseFeaturesSeineServiceRestTest.java} (99%) rename observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/{TripSeineServiceTest.java => TripSeineServiceRestTest.java} (99%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch feature/7520 updated (f78d367 -> c8e08f0)
by codelutin.com scm Sept. 11, 2015

Sept. 11, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7520 in repository observe. See http://git.codelutin.com/observe.git from f78d367 ajout de la date de mise a jour dans les DTO (refs #7470 #7520) new ed448f1 lever un execption en cas de modification concurent d'une entité siuvie en modif (refs #7470 #7520) new c8e08f0 fix npe (refs #7470 #7520) 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 c8e08f0b9be83dd9c2b64d7f7a4a1871fe054905 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Sep 11 11:20:59 2015 +0200 fix npe (refs #7470 #7520) commit ed448f184e12d42c1eddc95a669fe259c58d35aa Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Sep 11 11:09:27 2015 +0200 lever un execption en cas de modification concurent d'une entité siuvie en modif (refs #7470 #7520) Summary of changes: .../service/ConcurrentModificationException.java | 26 +++++++++++++++ .../ird/observe/services/ObserveServiceTopia.java | 17 +++++++++- .../service/seine/TripSeineServiceTopiaTest.java | 38 ++++++++++++++++++++++ 3 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/ConcurrentModificationException.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 2

branch feature/7520 updated (63cea72 -> f78d367)
by codelutin.com scm Sept. 11, 2015

Sept. 11, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7520 in repository observe. See http://git.codelutin.com/observe.git from 63cea72 ajout de la date de mise a jour pour les Trip, Route, Activity, Set (refs #7470) new f78d367 ajout de la date de mise a jour dans les DTO (refs #7470 #7520) The 1 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 f78d3679aaf67840bf901a85a224af052f467140 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Sep 11 10:21:39 2015 +0200 ajout de la date de mise a jour dans les DTO (refs #7470 #7520) Summary of changes: .../observe/services/dto/FollowedUpdateDto.java | 14 +++++ .../src/main/xmi/observe-services-dto-common.zargo | Bin 33934 -> 35328 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 59030 -> 61407 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 56972 -> 59029 bytes .../services/dto/ObserveDtosInitializer.java | 57 ++++++++++++++------- .../service/seine/TripSeineServiceTopiaTest.java | 6 +++ 6 files changed, 58 insertions(+), 19 deletions(-) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/FollowedUpdateDto.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch develop updated (8b8c125 -> 385baef)
by codelutin.com scm Sept. 11, 2015

Sept. 11, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 8b8c125 Optimise dependencies new 385baef Ajout des headers de license The 1 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 385baeff0e48378a384b6e11a25e96b0a306292e Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Sep 11 08:59:42 2015 +0200 Ajout des headers de license Summary of changes: .../src/jetty/jetty-context.xml | 22 ++++++++++++++++++++++ .../web/ObserveWebApplicationContext.java | 22 ++++++++++++++++++++++ .../ObserveWebApplicationContextInitException.java | 22 ++++++++++++++++++++++ .../web/ObserveWebApplicationListener.java | 22 ++++++++++++++++++++++ .../application/web/ObserveWebMainHandler.java | 22 ++++++++++++++++++++++ .../application/web/ObserveWebMotionFilter.java | 22 ++++++++++++++++++++++ .../application/web/ObserveWebMotionRender.java | 22 ++++++++++++++++++++++ .../ObserveWebApplicationConfiguration.java | 22 ++++++++++++++++++++++ ...veWebApplicationConfigurationInitException.java | 22 ++++++++++++++++++++++ .../ObserveWebApplicationConfigurationOption.java | 22 ++++++++++++++++++++++ ...ObserveWebApplicationConfigurationProvider.java | 22 ++++++++++++++++++++++ .../db/InvalidObserveWebDatabaseException.java | 22 ++++++++++++++++++++++ .../db/InvalidObserveWebDatabaseRoleException.java | 22 ++++++++++++++++++++++ .../db/InvalidObserveWebDatabasesException.java | 22 ++++++++++++++++++++++ .../web/configuration/db/ObserveWebDatabase.java | 22 ++++++++++++++++++++++ .../configuration/db/ObserveWebDatabaseRole.java | 22 ++++++++++++++++++++++ .../web/configuration/db/ObserveWebDatabases.java | 22 ++++++++++++++++++++++ .../db/ObserveWebDatabasesHelper.java | 22 ++++++++++++++++++++++ .../db/impl/ObserveWebDatabaseBean.java | 22 ++++++++++++++++++++++ .../db/impl/ObserveWebDatabaseImmutable.java | 22 ++++++++++++++++++++++ .../db/impl/ObserveWebDatabaseRoleBean.java | 22 ++++++++++++++++++++++ .../db/impl/ObserveWebDatabaseRoleImmutable.java | 22 ++++++++++++++++++++++ .../db/impl/ObserveWebDatabasesBean.java | 22 ++++++++++++++++++++++ .../db/impl/ObserveWebDatabasesImmutable.java | 22 ++++++++++++++++++++++ .../user/InvalidObserveWebUserException.java | 22 ++++++++++++++++++++++ .../InvalidObserveWebUserPermissionException.java | 22 ++++++++++++++++++++++ .../user/InvalidObserveWebUsersException.java | 22 ++++++++++++++++++++++ .../web/configuration/user/ObserveWebUser.java | 22 ++++++++++++++++++++++ .../user/ObserveWebUserPermission.java | 22 ++++++++++++++++++++++ .../web/configuration/user/ObserveWebUsers.java | 22 ++++++++++++++++++++++ .../configuration/user/ObserveWebUsersHelper.java | 22 ++++++++++++++++++++++ .../user/impl/ObserveWebUserBean.java | 22 ++++++++++++++++++++++ .../user/impl/ObserveWebUserImmutable.java | 22 ++++++++++++++++++++++ .../user/impl/ObserveWebUserPermissionBean.java | 22 ++++++++++++++++++++++ .../impl/ObserveWebUserPermissionImmutable.java | 22 ++++++++++++++++++++++ .../user/impl/ObserveWebUsersBean.java | 22 ++++++++++++++++++++++ .../user/impl/ObserveWebUsersImmutable.java | 22 ++++++++++++++++++++++ .../web/controller/ObserveWebMotionController.java | 22 ++++++++++++++++++++++ .../web/controller/v1/ConfigurationController.java | 22 ++++++++++++++++++++++ .../controller/v1/DataSourceServiceController.java | 22 ++++++++++++++++++++++ ...serveAuthenticatedServiceControllerSupport.java | 22 ++++++++++++++++++++++ .../v1/ObserveServiceControllerSupport.java | 22 ++++++++++++++++++++++ .../controller/v1/ObserveWebErrorController.java | 22 ++++++++++++++++++++++ .../web/controller/v1/PingServiceController.java | 22 ++++++++++++++++++++++ .../v1/ReferentialServiceController.java | 22 ++++++++++++++++++++++ .../ConsolidateDataServiceController.java | 22 ++++++++++++++++++++++ .../v1/actions/report/ReportServiceController.java | 22 ++++++++++++++++++++++ .../validate/ValidateServiceController.java | 22 ++++++++++++++++++++++ .../ActivityLongLineEncouterServiceController.java | 22 ++++++++++++++++++++++ ...ctivityLongLineSensorUsedServiceController.java | 22 ++++++++++++++++++++++ .../ActivityLonglineServiceController.java | 22 ++++++++++++++++++++++ .../GearUseFeaturesLonglineServiceController.java | 22 ++++++++++++++++++++++ .../SetLonglineCatchServiceController.java | 22 ++++++++++++++++++++++ ...LonglineDetailCompositionServiceController.java | 22 ++++++++++++++++++++++ ...LonglineGlobalCompositionServiceController.java | 22 ++++++++++++++++++++++ .../v1/longline/SetLonglineServiceController.java | 22 ++++++++++++++++++++++ .../v1/longline/TdrServiceController.java | 22 ++++++++++++++++++++++ .../v1/longline/TripLonglineServiceController.java | 22 ++++++++++++++++++++++ ...tivitySeineObservedSystemServiceController.java | 22 ++++++++++++++++++++++ .../v1/seine/ActivitySeineServiceController.java | 22 ++++++++++++++++++++++ .../v1/seine/FloatingObjectServiceController.java | 22 ++++++++++++++++++++++ .../GearUseFeaturesSeineServiceController.java | 22 ++++++++++++++++++++++ .../v1/seine/NonTargetCatchServiceController.java | 22 ++++++++++++++++++++++ .../v1/seine/NonTargetSampleServiceController.java | 22 ++++++++++++++++++++++ .../ObjectObservedSpeciesServiceController.java | 22 ++++++++++++++++++++++ .../ObjectSchoolEstimateServiceController.java | 22 ++++++++++++++++++++++ .../v1/seine/RouteServiceController.java | 22 ++++++++++++++++++++++ .../v1/seine/SchoolEstimateServiceController.java | 22 ++++++++++++++++++++++ .../v1/seine/SetSeineServiceController.java | 22 ++++++++++++++++++++++ .../v1/seine/TargetCatchServiceController.java | 22 ++++++++++++++++++++++ .../v1/seine/TargetSampleServiceController.java | 22 ++++++++++++++++++++++ ...TransmittingBuoyOperationServiceController.java | 22 ++++++++++++++++++++++ .../v1/seine/TripSeineServiceController.java | 22 ++++++++++++++++++++++ .../ObserveDataSourceConfigurationInjector.java | 22 ++++++++++++++++++++++ .../web/injector/ObserveDtoInjector.java | 22 ++++++++++++++++++++++ .../web/request/ObserveWebRequestContext.java | 22 ++++++++++++++++++++++ .../web/security/AdminApiKeyNotFoundException.java | 22 ++++++++++++++++++++++ .../AuthenticationTokenNotFoundException.java | 22 ++++++++++++++++++++++ .../BadObserveWebUserPasswordException.java | 22 ++++++++++++++++++++++ .../web/security/InvalidAdminKeyApiException.java | 22 ++++++++++++++++++++++ .../InvalidAuthenticationTokenException.java | 22 ++++++++++++++++++++++ .../ObserveWebSecurityApplicationContext.java | 22 ++++++++++++++++++++++ ...ObserveWebSecurityAuthenticationTokenCache.java | 22 ++++++++++++++++++++++ .../ObserveWebSecurityExceptionSupport.java | 22 ++++++++++++++++++++++ .../SecurityRequestContextNotFoundException.java | 22 ++++++++++++++++++++++ .../security/UnknownObserveWebUserException.java | 22 ++++++++++++++++++++++ .../UnknownObserveWebUserForDatabaseException.java | 22 ++++++++++++++++++++++ .../web/security/UserLoginNotFoundException.java | 22 ++++++++++++++++++++++ .../security/UserPasswordNotFoundException.java | 22 ++++++++++++++++++++++ .../src/main/resources/log4j.properties | 21 +++++++++++++++++++++ .../src/main/webapp/WEB-INF/web.xml | 21 +++++++++++++++++++++ .../db/ObserveWebDatabasesHelperTest.java | 22 ++++++++++++++++++++++ .../user/ObserveWebUsersHelperTest.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/AbstractObserveTopiaDao.java | 22 ++++++++++++++++++++++ .../observe/ObserveTopiaApplicationContext.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/ObserveTopiaConfiguration.java | 22 ++++++++++++++++++++++ .../observe/ObserveTopiaConfigurationFactory.java | 22 ++++++++++++++++++++++ .../java/fr/ird/observe/ObserveTopiaIdFactory.java | 22 ++++++++++++++++++++++ .../observe/ObserveTopiaPersistenceContext.java | 22 ++++++++++++++++++++++ .../ird/observe/entities/longline/TdrTopiaDao.java | 22 ++++++++++++++++++++++ .../entities/migration/ObserveMigrationEngine.java | 22 ++++++++++++++++++++++ .../DataSourceMigrationForVersion_5_0.java | 22 ++++++++++++++++++++++ .../DuplicateLengthWeightParameterException.java | 22 ++++++++++++++++++++++ .../referentiel/I18nReferenceEntities.java | 22 ++++++++++++++++++++++ .../LengthWeightParameterNotFoundException.java | 22 ++++++++++++++++++++++ .../referentiel/LengthWeightParameters.java | 22 ++++++++++++++++++++++ .../observe/entities/seine/NonTargetCatches.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/entities/seine/SetSeines.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/entities/seine/TripSeines.java | 22 ++++++++++++++++++++++ .../main/resources/db/5.0/remove_open_field-H2.sql | 21 +++++++++++++++++++++ .../main/resources/db/5.0/remove_open_field-PG.sql | 21 +++++++++++++++++++++ .../ObserveTopiaApplicationContextTest.java | 22 ++++++++++++++++++++++ .../test/java/fr/ird/observe/util/NumbersTest.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/services/ObserveService.java | 22 ++++++++++++++++++++++ .../observe/services/ObserveServiceFactory.java | 22 ++++++++++++++++++++++ .../services/ObserveServiceFactorySupport.java | 22 ++++++++++++++++++++++ .../services/ObserveServiceInitializer.java | 22 ++++++++++++++++++++++ .../services/service/DataNotFoundException.java | 22 ++++++++++++++++++++++ .../service/DataSourceDumpProducerService.java | 22 ++++++++++++++++++++++ .../services/service/DataSourceService.java | 22 ++++++++++++++++++++++ .../DatabaseConnexionNotAuthorizedException.java | 22 ++++++++++++++++++++++ .../service/DatabaseNotFoundException.java | 22 ++++++++++++++++++++++ .../ird/observe/services/service/PingService.java | 22 ++++++++++++++++++++++ .../services/service/ReferentialService.java | 22 ++++++++++++++++++++++ .../ConsolidateActivitySeineDataResult.java | 22 ++++++++++++++++++++++ .../consolidate/ConsolidateDataService.java | 22 ++++++++++++++++++++++ .../ConsolidateTripSeineDataRequest.java | 22 ++++++++++++++++++++++ .../ConsolidateTripSeineDataResult.java | 22 ++++++++++++++++++++++ .../service/actions/report/ReportService.java | 22 ++++++++++++++++++++++ .../actions/validate/ValidateDataRequest.java | 22 ++++++++++++++++++++++ .../actions/validate/ValidateDataResult.java | 22 ++++++++++++++++++++++ .../validate/ValidateReferentialsRequest.java | 22 ++++++++++++++++++++++ .../validate/ValidateReferentialsResult.java | 22 ++++++++++++++++++++++ .../actions/validate/ValidateResultForDto.java | 22 ++++++++++++++++++++++ .../actions/validate/ValidateResultForDtoType.java | 22 ++++++++++++++++++++++ .../service/actions/validate/ValidateService.java | 22 ++++++++++++++++++++++ .../actions/validate/ValidationMessage.java | 22 ++++++++++++++++++++++ .../longline/ActivityLongLineEncouterService.java | 22 ++++++++++++++++++++++ .../ActivityLongLineSensorUsedService.java | 22 ++++++++++++++++++++++ .../service/longline/ActivityLonglineService.java | 22 ++++++++++++++++++++++ .../longline/GearUseFeaturesLonglineService.java | 22 ++++++++++++++++++++++ .../service/longline/SetLonglineCatchService.java | 22 ++++++++++++++++++++++ .../SetLonglineDetailCompositionService.java | 22 ++++++++++++++++++++++ .../SetLonglineGlobalCompositionService.java | 22 ++++++++++++++++++++++ .../service/longline/SetLonglineService.java | 22 ++++++++++++++++++++++ .../services/service/longline/TdrService.java | 22 ++++++++++++++++++++++ .../service/longline/TripLonglineService.java | 22 ++++++++++++++++++++++ .../seine/ActivitySeineObservedSystemService.java | 22 ++++++++++++++++++++++ .../service/seine/ActivitySeineService.java | 22 ++++++++++++++++++++++ .../service/seine/FloatingObjectService.java | 22 ++++++++++++++++++++++ .../service/seine/GearUseFeaturesSeineService.java | 22 ++++++++++++++++++++++ .../service/seine/NonTargetCatchService.java | 22 ++++++++++++++++++++++ .../service/seine/NonTargetSampleService.java | 22 ++++++++++++++++++++++ .../seine/ObjectObservedSpeciesService.java | 22 ++++++++++++++++++++++ .../service/seine/ObjectSchoolEstimateService.java | 22 ++++++++++++++++++++++ .../services/service/seine/RouteService.java | 22 ++++++++++++++++++++++ .../service/seine/SchoolEstimateService.java | 22 ++++++++++++++++++++++ .../services/service/seine/SetSeineService.java | 22 ++++++++++++++++++++++ .../services/service/seine/TargetCatchService.java | 22 ++++++++++++++++++++++ .../service/seine/TargetSampleService.java | 22 ++++++++++++++++++++++ .../seine/TransmittingBuoyOperationService.java | 22 ++++++++++++++++++++++ .../services/service/seine/TripSeineService.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/services/spi/DeleteRequest.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/services/spi/NoDataAccess.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/services/spi/PostRequest.java | 22 ++++++++++++++++++++++ .../observe/services/spi/ReadDataPermission.java | 22 ++++++++++++++++++++++ .../services/spi/ReadReferentialPermission.java | 22 ++++++++++++++++++++++ .../java/fr/ird/observe/services/spi/Write.java | 22 ++++++++++++++++++++++ .../observe/services/spi/WriteDataPermission.java | 22 ++++++++++++++++++++++ .../services/spi/WriteReferentialPermission.java | 22 ++++++++++++++++++++++ .../service/actions/report/ReportBuilderTest.java | 22 ++++++++++++++++++++++ .../actions/report/observe-reports-test.properties | 21 +++++++++++++++++++++ .../ObserveDataSourceConfiguration.java | 22 ++++++++++++++++++++++ .../configuration/ObserveDataSourceConnection.java | 22 ++++++++++++++++++++++ .../ObserveDataSourceConnectionSupport.java | 22 ++++++++++++++++++++++ .../ObserveDataSourceConfigurationRest.java | 22 ++++++++++++++++++++++ ...bserveDataSourceConfigurationRestConstants.java | 22 ++++++++++++++++++++++ .../ObserveDataSourceConnectionRest.java | 22 ++++++++++++++++++++++ .../ObserveDataSourceConfigurationTopiaH2.java | 22 ++++++++++++++++++++++ .../ObserveDataSourceConfigurationTopiaPG.java | 22 ++++++++++++++++++++++ ...ObserveDataSourceConfigurationTopiaSupport.java | 22 ++++++++++++++++++++++ .../ObserveDataSourceConnectionTopia.java | 22 ++++++++++++++++++++++ .../observe/services/dto/AbstractObserveDto.java | 22 ++++++++++++++++++++++ .../dto/DataSourceCreateConfigurationDto.java | 22 ++++++++++++++++++++++ ...urceCreateWithNoReferentialImportException.java | 22 ++++++++++++++++++++++ .../java/fr/ird/observe/services/dto/FormDto.java | 22 ++++++++++++++++++++++ .../java/fr/ird/observe/services/dto/FormDtos.java | 22 ++++++++++++++++++++++ .../java/fr/ird/observe/services/dto/IdDto.java | 22 ++++++++++++++++++++++ .../java/fr/ird/observe/services/dto/IdDtos.java | 22 ++++++++++++++++++++++ ...ibleDataSourceCreateConfigurationException.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/services/dto/ObserveDto.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/services/dto/ReferenceDto.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/services/dto/ReferenceDtos.java | 22 ++++++++++++++++++++++ .../ird/observe/services/dto/ReferenceSetDto.java | 22 ++++++++++++++++++++++ .../ird/observe/services/dto/ReferenceSetDtos.java | 22 ++++++++++++++++++++++ .../dto/ReferenceSetNotFoundException.java | 22 ++++++++++++++++++++++ .../dto/ReferenceValueNotFoundException.java | 22 ++++++++++++++++++++++ .../services/dto/constants/ReferenceStatus.java | 22 ++++++++++++++++++++++ .../observe/services/dto/gson/ClassAdapter.java | 22 ++++++++++++++++++++++ .../ird/observe/services/dto/gson/DateAdapter.java | 22 ++++++++++++++++++++++ .../services/dto/gson/ImmutableListAdapter.java | 22 ++++++++++++++++++++++ .../services/dto/gson/ImmutableMapAdapter.java | 22 ++++++++++++++++++++++ .../services/dto/gson/ImmutableSetAdapter.java | 22 ++++++++++++++++++++++ .../observe/services/dto/gson/IntegerAdapter.java | 22 ++++++++++++++++++++++ .../services/dto/gson/ObserveDtoGsonSupplier.java | 22 ++++++++++++++++++++++ .../services/dto/gson/ReferenceDtoAdapter.java | 22 ++++++++++++++++++++++ .../dto/gson/ReferentialReferenceDtoAdapter.java | 22 ++++++++++++++++++++++ .../services/dto/gson/ReportVariableAdapter.java | 22 ++++++++++++++++++++++ .../dto/referential/ReferentialReferenceDto.java | 22 ++++++++++++++++++++++ .../dto/referential/ReferentialReferenceDtos.java | 22 ++++++++++++++++++++++ .../xmi/observe-services-dto-common.properties | 21 +++++++++++++++++++++ .../xmi/observe-services-dto-longline.properties | 21 +++++++++++++++++++++ .../main/xmi/observe-services-dto-seine.properties | 21 +++++++++++++++++++++ .../ObserveDataSourceConnectionAdapter.java | 22 ++++++++++++++++++++++ .../services/ObserveServiceFactoryRest.java | 22 ++++++++++++++++++++++ .../ObserveServiceRestNotAvailableException.java | 22 ++++++++++++++++++++++ .../ird/observe/services/http/ObserveRequest.java | 22 ++++++++++++++++++++++ .../services/http/ObserveRequestBuilder.java | 22 ++++++++++++++++++++++ .../services/http/ObserveRequestMethod.java | 22 ++++++++++++++++++++++ .../ird/observe/services/http/ObserveResponse.java | 22 ++++++++++++++++++++++ .../services/http/ObserveResponseBuilder.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/services/TestClassResource.java | 22 ++++++++++++++++++++++ .../ird/observe/services/TestMethodResource.java | 22 ++++++++++++++++++++++ .../services/service/AbstractServiceRestTest.java | 22 ++++++++++++++++++++++ .../service/DataSourceServiceRestTest.java | 22 ++++++++++++++++++++++ .../services/service/PingServiceRestTest.java | 22 ++++++++++++++++++++++ .../ConsolidateDataServiceRestTest.java | 22 ++++++++++++++++++++++ .../actions/validate/ValidateServiceTest.java | 22 ++++++++++++++++++++++ .../seine/GearUseFeaturesSeineServiceTest.java | 22 ++++++++++++++++++++++ .../service/seine/TripSeineServiceTest.java | 22 ++++++++++++++++++++++ .../ObserveDataSourceConfigurationMainFactory.java | 22 ++++++++++++++++++++++ .../services/ObserveServiceMainFactory.java | 22 ++++++++++++++++++++++ .../observe/services/AbstractObserveService.java | 22 ++++++++++++++++++++++ .../ObserveServiceFactoryProviderTopia.java | 22 ++++++++++++++++++++++ .../observe/services/ReplicationServiceImpl.java | 22 ++++++++++++++++++++++ .../observe/services/data/OpenableServiceImpl.java | 22 ++++++++++++++++++++++ .../ird/observe/services/data/TripServiceImpl.java | 22 ++++++++++++++++++++++ .../data/longline/ActivityLonglineServiceImpl.java | 22 ++++++++++++++++++++++ .../data/longline/BaitsCompositionServiceImpl.java | 22 ++++++++++++++++++++++ .../BranchlinesCompositionServiceImpl.java | 22 ++++++++++++++++++++++ .../data/longline/CatchLonglineServiceImpl.java | 22 ++++++++++++++++++++++ .../data/longline/EncounterServiceImpl.java | 22 ++++++++++++++++++++++ .../longline/FloatlinesCompositionServiceImpl.java | 22 ++++++++++++++++++++++ .../GearUseFeaturesLonglineServiceImpl.java | 22 ++++++++++++++++++++++ .../data/longline/HooksCompositionServiceImpl.java | 22 ++++++++++++++++++++++ .../LonglineDetailCompositionServiceImpl.java | 22 ++++++++++++++++++++++ .../LonglineGlobalCompositionServiceImpl.java | 22 ++++++++++++++++++++++ .../data/longline/SensorUsedServiceImpl.java | 22 ++++++++++++++++++++++ .../data/longline/SetLonglineServiceImpl.java | 22 ++++++++++++++++++++++ .../services/data/longline/TdrServiceImpl.java | 22 ++++++++++++++++++++++ .../data/longline/TripLonglineServiceImpl.java | 22 ++++++++++++++++++++++ .../data/seine/ActivitySeineServiceImpl.java | 22 ++++++++++++++++++++++ .../data/seine/FloatingObjectServiceImpl.java | 22 ++++++++++++++++++++++ .../seine/GearUseFeaturesSeineServiceImpl.java | 22 ++++++++++++++++++++++ .../data/seine/NonTargetCatchServiceImpl.java | 22 ++++++++++++++++++++++ .../data/seine/NonTargetSampleServiceImpl.java | 22 ++++++++++++++++++++++ .../seine/ObjectObservedSpeciesServiceImpl.java | 22 ++++++++++++++++++++++ .../seine/ObjectSchoolEstimateServiceImpl.java | 22 ++++++++++++++++++++++ .../services/data/seine/RouteServiceImpl.java | 22 ++++++++++++++++++++++ .../data/seine/SchoolEstimateServiceImpl.java | 22 ++++++++++++++++++++++ .../services/data/seine/SetSeineServiceImpl.java | 22 ++++++++++++++++++++++ .../data/seine/TargetCatchServiceImpl.java | 22 ++++++++++++++++++++++ .../data/seine/TargetSampleServiceImpl.java | 22 ++++++++++++++++++++++ .../services/data/seine/TripSeineServiceImpl.java | 22 ++++++++++++++++++++++ .../services/operation/ComputeDataServiceImpl.java | 22 ++++++++++++++++++++++ .../services/operation/GpsImportServiceImpl.java | 22 ++++++++++++++++++++++ .../services/operation/SynchronizeServiceImpl.java | 22 ++++++++++++++++++++++ .../services/operation/ValidationServiceImpl.java | 22 ++++++++++++++++++++++ .../referential/ReferentialServiceImpl.java | 22 ++++++++++++++++++++++ .../services/ObserveServiceContextTopia.java | 22 ++++++++++++++++++++++ .../services/ObserveServiceFactoryTopia.java | 22 ++++++++++++++++++++++ .../ird/observe/services/ObserveServiceTopia.java | 22 ++++++++++++++++++++++ .../ObserveTopiaApplicationContextFactory.java | 22 ++++++++++++++++++++++ .../services/builder/DtoToEntityBuilder.java | 22 ++++++++++++++++++++++ .../services/builder/EntityToDtoBuilder.java | 22 ++++++++++++++++++++++ .../builder/EntityToReferenceDtoBuilder.java | 22 ++++++++++++++++++++++ .../EntityToReferentialReferenceDtoBuilder.java | 22 ++++++++++++++++++++++ .../observe/services/dto/ObserveDtoBinders.java | 22 ++++++++++++++++++++++ .../services/dto/ObserveDtosInitializer.java | 22 ++++++++++++++++++++++ .../DataSourceDumpProducerServiceTopia.java | 22 ++++++++++++++++++++++ .../services/service/DataSourceServiceTopia.java | 22 ++++++++++++++++++++++ .../services/service/ReferentialServiceTopia.java | 22 ++++++++++++++++++++++ .../ConsolidateActivitySeineDataResultBuilder.java | 22 ++++++++++++++++++++++ .../consolidate/ConsolidateDataServiceTopia.java | 22 ++++++++++++++++++++++ .../service/actions/report/ReportServiceTopia.java | 22 ++++++++++++++++++++++ .../actions/validate/ValidateServiceTopia.java | 22 ++++++++++++++++++++++ .../ActivityLongLineEncouterServiceTopia.java | 22 ++++++++++++++++++++++ .../ActivityLongLineSensorUsedServiceTopia.java | 22 ++++++++++++++++++++++ .../longline/ActivityLonglineServiceTopia.java | 22 ++++++++++++++++++++++ .../GearUseFeaturesLonglineServiceTopia.java | 22 ++++++++++++++++++++++ .../longline/SetLonglineCatchServiceTopia.java | 22 ++++++++++++++++++++++ .../SetLonglineDetailCompositionServiceTopia.java | 22 ++++++++++++++++++++++ .../SetLonglineGlobalCompositionServiceTopia.java | 22 ++++++++++++++++++++++ .../service/longline/SetLonglineServiceTopia.java | 22 ++++++++++++++++++++++ .../services/service/longline/TdrServiceTopia.java | 22 ++++++++++++++++++++++ .../service/longline/TripLonglineServiceTopia.java | 22 ++++++++++++++++++++++ .../ActivitySeineObservedSystemServiceTopia.java | 22 ++++++++++++++++++++++ .../service/seine/ActivitySeineServiceTopia.java | 22 ++++++++++++++++++++++ .../service/seine/FloatingObjectServiceTopia.java | 22 ++++++++++++++++++++++ .../seine/GearUseFeaturesSeineServiceTopia.java | 22 ++++++++++++++++++++++ .../service/seine/NonTargetCatchServiceTopia.java | 22 ++++++++++++++++++++++ .../service/seine/NonTargetSampleServiceTopia.java | 22 ++++++++++++++++++++++ .../seine/ObjectObservedSpeciesServiceTopia.java | 22 ++++++++++++++++++++++ .../seine/ObjectSchoolEstimateServiceTopia.java | 22 ++++++++++++++++++++++ .../services/service/seine/RouteServiceTopia.java | 22 ++++++++++++++++++++++ .../service/seine/SchoolEstimateServiceTopia.java | 22 ++++++++++++++++++++++ .../service/seine/SetSeineServiceTopia.java | 22 ++++++++++++++++++++++ .../service/seine/TargetSampleServiceTopia.java | 22 ++++++++++++++++++++++ .../TransmittingBuoyOperationServiceTopia.java | 22 ++++++++++++++++++++++ .../service/seine/TripSeineServiceTopia.java | 22 ++++++++++++++++++++++ .../services/ApplicationContextResource.java | 22 ++++++++++++++++++++++ .../ird/observe/services/DataSourceResource.java | 22 ++++++++++++++++++++++ .../services/ObserveServiceContextTopiaTaiste.java | 22 ++++++++++++++++++++++ .../services/builder/DtoToEntityBuilderTest.java | 22 ++++++++++++++++++++++ .../services/builder/EntityToDtoBuilderTest.java | 22 ++++++++++++++++++++++ .../services/service/AbstractServiceTopiaTest.java | 22 ++++++++++++++++++++++ .../DataSourceDumpProducerServiceTopiaTest.java | 22 ++++++++++++++++++++++ .../service/DataSourceServiceTopiaTest.java | 22 ++++++++++++++++++++++ .../service/ReferentialServiceTopiaTest.java | 22 ++++++++++++++++++++++ .../ConsolidateDataServiceTopiaTest.java | 22 ++++++++++++++++++++++ .../actions/validate/ValidateServiceTopiaTest.java | 22 ++++++++++++++++++++++ ...tLonglineDetailCompositionServiceTopiaTest.java | 22 ++++++++++++++++++++++ .../GearUseFeaturesSeineServiceTopiaTest.java | 22 ++++++++++++++++++++++ .../service/seine/RouteServiceTopiaTest.java | 22 ++++++++++++++++++++++ .../seine/TargetSampleServiceTopiaTest.java | 22 ++++++++++++++++++++++ .../service/seine/TripSeineServiceTopiaTest.java | 22 ++++++++++++++++++++++ 326 files changed, 7164 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch feature/7520 updated (5dce55c -> 63cea72)
by codelutin.com scm Sept. 11, 2015

Sept. 11, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7520 in repository observe. See http://git.codelutin.com/observe.git discards 5dce55c ajout de la date de mise a jour pour les Trip, Route, Activity, Set (refs #7470) discards 1f5c293 ajout de la date de mise a jour pour les entité dans le référentiel (refs #7520) adds 7a69101 test sauvegard de trip seine (refs #7463) adds 27f0d09 ajout la traduction (refs #7463) adds 6608e8e Ajout d'injecteurs pour récuperer les paramètres dans les controlleurs adds 5c0958d Rendre les configuration clonable adds 9a90711 Suppression d'un converter non utilisé adds 0ccce26 Ajout d'un test pour le service de Ping adds 148a817 Vérifier si le host existe bien adds 04279d6 L'injecteur de configuration de sources de données utilise le parametre de la requete adds cc0f39c Revue injecteurs de configuration adds 0f8b763 revue des configuration de test (j'ai remis les valeurs par defaut adds 49833e6 Changement d'api adds 3ddbb24 Changement d'api adds 0197833 Ajout de FIXME à corriger plus tard adds 8efc6af Revue de l'init d'une base sur l'application web adds b6555d5 Possibilité d'utiliser la connexion pour obtenir un service adds fd42767 Le test de ping refonctionne adds 01b2a88 Ajout de fixme sur le test de DatasourceService car la gestion d'esxception n'est pas encore gérée au niveau du serveur web adds e1754fe On ne soumet dans le header que le jeton de securite adds 2b4cab6 Simplification de la sécurité + Gestion des erreurs au niveau du serveur web (reste à gérer le retour dans le client REST) adds 4e74ded Test de validation et des équipements + correction (refs #7463) adds 250042d renommer les propriétées dans le context de validation (refs #7463) adds d6e11a2 ajout de la traduction des messages de validation côté serveur (refs #7463) adds 841c7c4 optimisation des tests topia (refs #7463) adds 5eeab8c Tout les objets transferables sur le web hérite de ObserveDto poour faclilité l'injection des paramètres (refs #7463) adds dee5817 Test de generation des rapports en mode REST + correction Ajout des annotayions @PostRequest et @DeleteRequest pour utiliser les méthodes POST ou DELETE dans les requêtes REST (refs #7463) adds 30aa0b1 Test de consilidation des données en mode REST (refs #7463) adds b7cff03 Test de consilidation des données en mode REST (refs #7463) adds 43cab37 Ajout de javadoc adds 01c67c9 Renommage aussi de editingReferentielList en editingReferentielListEntity adds c586f6f Ajout aussi de la méthode DELETE sur le mapping adds 6ceca24 Retour sur develop Merge branch 'feature/7463-3' into develop new 8b62ca0 ajout de la date de mise a jour pour les entité dans le référentiel (refs #7520) new 63cea72 ajout de la date de mise a jour pour les Trip, Route, Activity, Set (refs #7470) 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 (5dce55c) \ N -- N -- N refs/heads/feature/7520 (63cea72) 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 63cea729061a15fe4f46b43c2b511bf8d5ebc797 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Sep 10 16:08:39 2015 +0200 ajout de la date de mise a jour pour les Trip, Route, Activity, Set (refs #7470) commit 8b62ca0cb7373042998854d2030c03bf69f3725d Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Sep 10 15:18:33 2015 +0200 ajout de la date de mise a jour pour les entité dans le référentiel (refs #7520) Summary of changes: observe-application-web/pom.xml | 7 + .../ObserveDataSourceConfigurationConverter.java | 47 --- .../web/ObserveWebApplicationListener.java | 34 +- .../application/web/ObserveWebMotionFilter.java | 60 +-- .../web/controller/ObserveWebMotionController.java | 13 +- .../web/controller/v1/ConfigurationController.java | 2 +- .../controller/v1/DataSourceServiceController.java | 49 ++- ...serveAuthenticatedServiceControllerSupport.java | 30 ++ .../v1/ObserveServiceControllerSupport.java | 54 ++- .../controller/v1/ObserveWebErrorController.java | 97 +++++ .../v1/ReferentialServiceController.java | 9 +- .../ConsolidateDataServiceController.java | 4 +- .../v1/actions/report/ReportServiceController.java | 16 +- .../validate/ValidateServiceController.java | 12 +- .../ActivityLongLineEncouterServiceController.java | 4 +- ...ctivityLongLineSensorUsedServiceController.java | 4 +- .../ActivityLonglineServiceController.java | 4 +- .../GearUseFeaturesLonglineServiceController.java | 4 +- .../SetLonglineCatchServiceController.java | 4 +- ...LonglineDetailCompositionServiceController.java | 4 +- ...LonglineGlobalCompositionServiceController.java | 4 +- .../v1/longline/SetLonglineServiceController.java | 4 +- .../v1/longline/TdrServiceController.java | 4 +- .../v1/longline/TripLonglineServiceController.java | 4 +- ...tivitySeineObservedSystemServiceController.java | 4 +- .../v1/seine/ActivitySeineServiceController.java | 4 +- .../v1/seine/FloatingObjectServiceController.java | 4 +- .../GearUseFeaturesSeineServiceController.java | 4 +- .../v1/seine/NonTargetCatchServiceController.java | 4 +- .../v1/seine/NonTargetSampleServiceController.java | 4 +- .../ObjectObservedSpeciesServiceController.java | 4 +- .../ObjectSchoolEstimateServiceController.java | 4 +- .../v1/seine/RouteServiceController.java | 4 +- .../v1/seine/SchoolEstimateServiceController.java | 4 +- .../v1/seine/SetSeineServiceController.java | 4 +- .../v1/seine/TargetCatchServiceController.java | 4 +- .../v1/seine/TargetSampleServiceController.java | 4 +- ...TransmittingBuoyOperationServiceController.java | 4 +- .../v1/seine/TripSeineServiceController.java | 4 +- .../ObserveDataSourceConfigurationInjector.java | 57 +++ .../web/injector/ObserveDtoInjector.java | 50 +++ .../web/request/ObserveWebRequestContext.java | 70 ++-- .../request/ObserveWebRequestSecurityContext.java | 62 --- .../web/security/AdminApiKeyNotFoundException.java | 11 + .../AuthenticationTokenNotFoundException.java | 11 + .../BadObserveWebUserPasswordException.java | 5 +- .../InvalidAdminKeyApiException.java | 4 +- .../InvalidAuthenticationTokenException.java | 2 +- .../ObserveWebSecurityApplicationContext.java | 13 +- .../ObserveWebSecurityExceptionSupport.java | 26 ++ .../SecurityRequestContextNotFoundException.java | 11 + .../security/UnknownObserveWebUserException.java | 4 +- .../UnknownObserveWebUserForDatabaseException.java | 3 +- .../web/security/UserLoginNotFoundException.java | 11 + .../security/UserPasswordNotFoundException.java | 11 + observe-application-web/src/main/resources/mapping | 10 +- .../field/ActivityDebutDePecheSaneValidator.java | 4 +- .../field/ActivityFinDePecheSaneValidator.java | 4 +- .../field/ActivityFinDeVeilleExistsValidator.java | 4 +- .../field/ActivitySimpleSpeedValidator.java | 2 +- .../field/RouteActivitysFieldValidator.java | 4 +- .../field/SetLonglineUniqueHomeIdValidator.java | 2 +- .../field/SetLonglineUniqueNumberValidator.java | 2 +- .../field/VesselActivityFieldValidator.java | 8 +- ...ActivityLongline-n1-create-error-validation.xml | 12 +- ...ActivityLongline-n1-update-error-validation.xml | 10 +- .../SetLongline-n1-create-error-validation.xml | 40 +- .../SetLongline-n1-update-error-validation.xml | 40 +- .../Country-n1-create-error-validation.xml | 8 +- .../Country-n1-update-error-validation.xml | 8 +- .../FpaZone-n1-create-error-validation.xml | 4 +- .../FpaZone-n1-update-error-validation.xml | 4 +- .../Gear-n1-create-error-validation.xml | 4 +- .../Gear-n1-update-error-validation.xml | 4 +- ...earCaracteristic-n1-create-error-validation.xml | 4 +- ...earCaracteristic-n1-update-error-validation.xml | 4 +- ...aracteristicType-n1-create-error-validation.xml | 4 +- ...aracteristicType-n1-update-error-validation.xml | 4 +- .../Harbour-n1-create-error-validation.xml | 4 +- .../Harbour-n1-update-error-validation.xml | 4 +- ...hWeightParameter-n1-create-error-validation.xml | 10 +- ...hWeightParameter-n1-update-error-validation.xml | 10 +- .../Ocean-n1-create-error-validation.xml | 4 +- .../Ocean-n1-update-error-validation.xml | 4 +- .../Organism-n1-create-error-validation.xml | 4 +- .../Organism-n1-update-error-validation.xml | 4 +- .../Person-n1-create-error-validation.xml | 4 +- .../Person-n1-update-error-validation.xml | 4 +- .../Program-n1-create-error-validation.xml | 4 +- .../Program-n1-update-error-validation.xml | 4 +- .../referentiel/Sex-n1-create-error-validation.xml | 4 +- .../referentiel/Sex-n1-update-error-validation.xml | 4 +- .../Species-n1-create-error-validation.xml | 12 +- .../Species-n1-update-error-validation.xml | 12 +- .../SpeciesGroup-n1-create-error-validation.xml | 4 +- .../SpeciesGroup-n1-update-error-validation.xml | 4 +- .../SpeciesList-n1-create-error-validation.xml | 4 +- .../SpeciesList-n1-update-error-validation.xml | 4 +- .../Vessel-n1-create-error-validation.xml | 4 +- .../Vessel-n1-update-error-validation.xml | 4 +- ...sselSizeCategory-n1-create-error-validation.xml | 4 +- ...sselSizeCategory-n1-update-error-validation.xml | 4 +- .../VesselType-n1-create-error-validation.xml | 4 +- .../VesselType-n1-update-error-validation.xml | 4 +- ...aitHaulingStatus-n1-create-error-validation.xml | 4 +- ...aitHaulingStatus-n1-update-error-validation.xml | 4 +- ...aitSettingStatus-n1-create-error-validation.xml | 4 +- ...aitSettingStatus-n1-update-error-validation.xml | 4 +- .../BaitType-n1-create-error-validation.xml | 4 +- .../BaitType-n1-update-error-validation.xml | 4 +- ...atchFateLongline-n1-create-error-validation.xml | 4 +- ...atchFateLongline-n1-update-error-validation.xml | 4 +- .../EncounterType-n1-create-error-validation.xml | 4 +- .../EncounterType-n1-update-error-validation.xml | 4 +- .../Healthness-n1-create-error-validation.xml | 4 +- .../Healthness-n1-update-error-validation.xml | 4 +- .../HookPosition-n1-create-error-validation.xml | 4 +- .../HookPosition-n1-update-error-validation.xml | 4 +- .../HookSize-n1-create-error-validation.xml | 4 +- .../HookSize-n1-update-error-validation.xml | 4 +- .../HookType-n1-create-error-validation.xml | 4 +- .../HookType-n1-update-error-validation.xml | 4 +- ...rizontalPosition-n1-create-error-validation.xml | 4 +- ...rizontalPosition-n1-update-error-validation.xml | 4 +- ...VerticalPosition-n1-create-error-validation.xml | 4 +- ...VerticalPosition-n1-update-error-validation.xml | 4 +- ...LightsticksColor-n1-create-error-validation.xml | 4 +- ...LightsticksColor-n1-update-error-validation.xml | 4 +- .../LightsticksType-n1-create-error-validation.xml | 4 +- .../LightsticksType-n1-update-error-validation.xml | 4 +- .../LineType-n1-create-error-validation.xml | 4 +- .../LineType-n1-update-error-validation.xml | 4 +- .../MaturityStatus-n1-create-error-validation.xml | 4 +- .../MaturityStatus-n1-update-error-validation.xml | 4 +- .../MitigationType-n1-create-error-validation.xml | 4 +- .../MitigationType-n1-update-error-validation.xml | 4 +- .../SensorBrand-n1-create-error-validation.xml | 4 +- .../SensorBrand-n1-update-error-validation.xml | 4 +- ...SensorDataFormat-n1-create-error-validation.xml | 4 +- ...SensorDataFormat-n1-update-error-validation.xml | 4 +- .../SensorType-n1-create-error-validation.xml | 4 +- .../SensorType-n1-update-error-validation.xml | 4 +- .../SettingShape-n1-create-error-validation.xml | 4 +- .../SettingShape-n1-update-error-validation.xml | 4 +- .../SizeMeasureType-n1-create-error-validation.xml | 4 +- .../SizeMeasureType-n1-update-error-validation.xml | 4 +- .../StomacFullness-n1-create-error-validation.xml | 4 +- .../StomacFullness-n1-update-error-validation.xml | 4 +- .../TripType-n1-create-error-validation.xml | 4 +- .../TripType-n1-update-error-validation.xml | 4 +- ...ActivityLongline-n1-create-error-validation.xml | 4 +- ...ActivityLongline-n1-update-error-validation.xml | 4 +- ...eightMeasureType-n1-create-error-validation.xml | 4 +- ...eightMeasureType-n1-update-error-validation.xml | 4 +- .../DetectionMode-n1-create-error-validation.xml | 4 +- .../DetectionMode-n1-update-error-validation.xml | 4 +- .../ObjectFate-n1-create-error-validation.xml | 4 +- .../ObjectFate-n1-update-error-validation.xml | 4 +- .../ObjectOperation-n1-create-error-validation.xml | 4 +- .../ObjectOperation-n1-update-error-validation.xml | 4 +- .../ObjectType-n1-create-error-validation.xml | 4 +- .../ObjectType-n1-update-error-validation.xml | 4 +- .../ObservedSystem-n1-create-error-validation.xml | 4 +- .../ObservedSystem-n1-update-error-validation.xml | 4 +- ...ReasonForDiscard-n1-create-error-validation.xml | 4 +- ...ReasonForDiscard-n1-update-error-validation.xml | 4 +- ...asonForNoFishing-n1-create-error-validation.xml | 4 +- ...asonForNoFishing-n1-update-error-validation.xml | 4 +- ...ReasonForNullSet-n1-create-error-validation.xml | 4 +- ...ReasonForNullSet-n1-update-error-validation.xml | 4 +- .../SpeciesFate-n1-create-error-validation.xml | 4 +- .../SpeciesFate-n1-update-error-validation.xml | 4 +- .../SpeciesStatus-n1-create-error-validation.xml | 4 +- .../SpeciesStatus-n1-update-error-validation.xml | 4 +- ...roundingActivity-n1-create-error-validation.xml | 4 +- ...roundingActivity-n1-update-error-validation.xml | 4 +- ...ingBuoyOperation-n1-create-error-validation.xml | 4 +- ...ingBuoyOperation-n1-update-error-validation.xml | 4 +- ...smittingBuoyType-n1-create-error-validation.xml | 4 +- ...smittingBuoyType-n1-update-error-validation.xml | 4 +- ...selActivitySeine-n1-create-error-validation.xml | 4 +- ...selActivitySeine-n1-update-error-validation.xml | 4 +- .../WeightCategory-n1-create-error-validation.xml | 4 +- .../WeightCategory-n1-update-error-validation.xml | 4 +- .../seine/Wind-n1-create-error-validation.xml | 4 +- .../seine/Wind-n1-update-error-validation.xml | 4 +- .../ActivitySeine-n1-create-error-validation.xml | 12 +- .../ActivitySeine-n1-update-error-validation.xml | 12 +- .../seine/Route-n1-create-error-validation.xml | 6 +- .../seine/Route-n1-create-warning-validation.xml | 2 +- .../seine/Route-n1-update-error-validation.xml | 16 +- .../seine/Route-n1-update-warning-validation.xml | 2 +- .../seine/SetSeine-n1-create-error-validation.xml | 6 +- .../seine/SetSeine-n1-update-error-validation.xml | 8 +- ...> observe-entities-validation_es_ES.properties} | 0 .../src/main/filters/observe-reports.properties | 10 +- .../services/service/ReferentialService.java | 5 + .../ConsolidateActivitySeineDataResult.java | 3 +- .../consolidate/ConsolidateDataService.java | 2 + .../ConsolidateTripSeineDataRequest.java | 3 +- .../ConsolidateTripSeineDataResult.java | 3 +- .../service/actions/report/ReportBuilder.java | 49 +-- .../service/actions/report/ReportService.java | 14 +- .../actions/report/model/ReportOperation.java | 106 ----- .../actions/report/model/ReportRequest.java | 406 ------------------- .../report/model/operations/ExecuteRequests.java | 120 ------ .../report/model/operations/GroupByLength.java | 111 ------ .../actions/report/model/operations/SumColumn.java | 129 ------ .../report/model/operations/SumIntColumn.java | 129 ------ .../actions/report/model/operations/SumIntRow.java | 129 ------ .../actions/report/model/operations/SumRow.java | 129 ------ .../actions/validate/ValidateDataRequest.java | 3 +- .../actions/validate/ValidateDataResult.java | 3 +- .../validate/ValidateReferentialsRequest.java | 3 +- .../validate/ValidateReferentialsResult.java | 3 +- .../actions/validate/ValidateResultForDto.java | 3 +- .../actions/validate/ValidateResultForDtoType.java | 3 +- .../service/actions/validate/ValidateService.java | 7 +- .../actions/validate/ValidationMessage.java | 3 +- .../longline/ActivityLongLineEncouterService.java | 2 + .../ActivityLongLineSensorUsedService.java | 2 + .../service/longline/ActivityLonglineService.java | 4 + .../longline/GearUseFeaturesLonglineService.java | 4 + .../service/longline/SetLonglineCatchService.java | 2 + .../SetLonglineDetailCompositionService.java | 2 + .../SetLonglineGlobalCompositionService.java | 2 + .../service/longline/SetLonglineService.java | 4 + .../services/service/longline/TdrService.java | 2 + .../service/longline/TripLonglineService.java | 4 + .../seine/ActivitySeineObservedSystemService.java | 2 + .../service/seine/ActivitySeineService.java | 4 + .../service/seine/FloatingObjectService.java | 4 + .../service/seine/GearUseFeaturesSeineService.java | 4 + .../service/seine/NonTargetCatchService.java | 2 + .../service/seine/NonTargetSampleService.java | 2 + .../seine/ObjectObservedSpeciesService.java | 2 + .../service/seine/ObjectSchoolEstimateService.java | 2 + .../services/service/seine/RouteService.java | 4 + .../service/seine/SchoolEstimateService.java | 2 + .../services/service/seine/SetSeineService.java | 4 + .../services/service/seine/TargetCatchService.java | 2 + .../service/seine/TargetSampleService.java | 2 + .../seine/TransmittingBuoyOperationService.java | 2 + .../services/service/seine/TripSeineService.java | 4 + .../spi/{NoDataAccess.java => DeleteRequest.java} | 9 +- .../spi/{NoDataAccess.java => PostRequest.java} | 8 +- .../service/actions/report/ReportBuilderTest.java | 11 +- .../ObserveDataSourceConfigurationRest.java | 26 +- ...bserveDataSourceConfigurationRestConstants.java | 6 - .../ObserveDataSourceConfigurationTopiaH2.java | 8 +- .../ObserveDataSourceConfigurationTopiaPG.java | 8 +- .../java/fr/ird/observe/services/dto/IdDtos.java | 11 + .../fr/ird/observe/services/dto/ObserveDto.java | 7 + .../fr/ird/observe/services/dto/ReferenceDto.java | 7 + .../services/dto/actions/report}/DataMatrix.java | 5 +- .../services/dto/actions/report}/Report.java | 5 +- .../dto/actions/report/ReportOperation.java | 17 +- .../services/dto/actions/report/ReportRequest.java | 187 +++++++++ .../dto/actions/report}/ReportVariable.java | 34 +- .../services/dto/gson/ImmutableListAdapter.java | 21 +- .../services/dto/gson/ImmutableMapAdapter.java | 39 ++ .../services/dto/gson/ImmutableSetAdapter.java | 37 ++ .../services/dto/gson/ObserveDtoGsonSupplier.java | 7 + .../services/dto/gson/ReferenceDtoAdapter.java | 21 +- .../dto/gson/ReferentialReferenceDtoAdapter.java | 10 +- .../services/dto/gson/ReportVariableAdapter.java | 55 +++ .../services/ObserveServiceFactoryRest.java | 26 +- .../services/http/ObserveResponseBuilder.java | 3 +- .../fr/ird/observe/services/TestClassResource.java | 16 +- .../ird/observe/services/TestMethodResource.java | 17 +- .../services/service/AbstractServiceRestTest.java | 57 +++ .../service/DataSourceServiceRestTest.java | 10 +- .../services/service/PingServiceRestTest.java | 51 +++ .../ConsolidateDataServiceRestTest.java | 22 +- .../report/AbstractReportServiceRestTest.java | 28 +- .../report/ReportAccessoryCatchRestTest.java | 9 +- .../actions/validate/ValidateServiceTest.java | 60 ++- .../seine/GearUseFeaturesSeineServiceTest.java | 273 +++++++++++++ .../service/seine/TripSeineServiceTest.java | 197 ++++----- .../ObserveDataSourceConfigurationMainFactory.java | 3 +- .../services/ObserveServiceMainFactory.java | 16 +- .../ird/observe/services/ObserveServiceTopia.java | 2 +- .../EntityToReferentialReferenceDtoBuilder.java | 17 + .../service/actions/report/ReportServiceTopia.java | 441 ++++++++++++++++++++- .../actions/validate/ValidateServiceTopia.java | 13 +- .../actions/validate/ValidationDataContext.java | 136 +++---- .../validate/ValidationMessageDetector.java | 64 ++- .../services/ApplicationContextResource.java | 29 ++ .../ird/observe/services/DataSourceResource.java | 31 +- .../services/service/AbstractServiceTopiaTest.java | 30 +- .../report/AbstractReportServiceTopiaTest.java | 8 +- .../actions/report/ReportAccessoryCatch2Test.java | 2 +- .../report/ReportAccessoryCatchByGroup2Test.java | 2 +- .../report/ReportAccessoryCatchByGroupTest.java | 7 +- .../actions/report/ReportAccessoryCatchTest.java | 7 +- .../report/ReportActivityWithCommentTest.java | 6 +- .../actions/report/ReportAllActivitysTest.java | 7 +- .../actions/report/ReportDailySetAndCatchTest.java | 6 +- .../service/actions/report/ReportDcpUsageTest.java | 6 +- .../report/ReportSetByAssociation2Test.java | 2 +- .../actions/report/ReportSetByAssociationTest.java | 6 +- .../report/ReportTargetCatchByAssociationTest.java | 6 +- .../ReportTargetDiscardedByAssociationTest.java | 6 +- .../actions/validate/ValidateServiceTopiaTest.java | 6 +- 304 files changed, 2719 insertions(+), 2493 deletions(-) delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveDataSourceConfigurationConverter.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveAuthenticatedServiceControllerSupport.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDataSourceConfigurationInjector.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDtoInjector.java delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestSecurityContext.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/security/AdminApiKeyNotFoundException.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/security/AuthenticationTokenNotFoundException.java rename observe-application-web/src/main/java/fr/ird/observe/application/web/{ => security}/InvalidAdminKeyApiException.java (72%) create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityExceptionSupport.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/security/SecurityRequestContextNotFoundException.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/security/UserLoginNotFoundException.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/security/UserPasswordNotFoundException.java rename observe-entities-validation/src/main/resources/i18n/{observe-entities-validation_es_ES_.properties => observe-entities-validation_es_ES.properties} (100%) delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/ReportOperation.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/ReportRequest.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/ExecuteRequests.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/GroupByLength.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/SumColumn.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/SumIntColumn.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/SumIntRow.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model/operations/SumRow.java copy observe-services-api/src/main/java/fr/ird/observe/services/spi/{NoDataAccess.java => DeleteRequest.java} (51%) copy observe-services-api/src/main/java/fr/ird/observe/services/spi/{NoDataAccess.java => PostRequest.java} (51%) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDtos.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/ObserveDto.java rename {observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model => observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report}/DataMatrix.java (97%) rename {observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model => observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report}/Report.java (96%) copy observe-business/src/main/java/fr/ird/observe/db/util/TopiaExecutor.java => observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportOperation.java (73%) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report/ReportRequest.java rename {observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/model => observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/report}/ReportVariable.java (63%) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMapAdapter.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableSetAdapter.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ReportVariableAdapter.java create mode 100644 observe-services-rest/src/test/java/fr/ird/observe/services/service/AbstractServiceRestTest.java create mode 100644 observe-services-rest/src/test/java/fr/ird/observe/services/service/PingServiceRestTest.java copy observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java => observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataServiceRestTest.java (61%) copy observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java => observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceRestTest.java (89%) copy observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchTest.java => observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchRestTest.java (95%) copy observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopiaTest.java => observe-services-rest/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java (88%) create mode 100644 observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/GearUseFeaturesSeineServiceTest.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 2