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

branch feature/7458-dto-services updated (0576d84 -> b6083fc)
by codelutin.com scm Aug. 20, 2015

Aug. 20, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7458-dto-services in repository observe. See http://git.codelutin.com/observe.git from 0576d84 add tdr longline service adn fix dtos longline (refs #7458). new b6083fc init dto and fix model (refs #7458). 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 b6083fc98faedee6ae94c3ab76ff8149fc99cbad Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 20 15:20:18 2015 +0200 init dto and fix model (refs #7458). Summary of changes: .../main/xmi/observe-services-dto-longline.zargo | Bin 58140 -> 57827 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 54397 -> 54397 bytes .../services/topia/ObserveDtosInitializer.java | 545 ++++++++++++++++++--- 3 files changed, 468 insertions(+), 77 deletions(-) -- 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/7458-dto-services created (now 0576d84)
by codelutin.com scm Aug. 20, 2015

Aug. 20, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7458-dto-services in repository observe. See http://git.codelutin.com/observe.git at 0576d84 add tdr longline service adn fix dtos longline (refs #7458). This branch includes the following new commits: new 0576d84 add tdr longline service adn fix dtos longline (refs #7458). 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 0576d845b3be5fe0e6e3874772890c3cc26cf759 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 20 11:23:50 2015 +0200 add tdr longline service adn fix dtos longline (refs #7458). -- 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 (0b1e832 -> a4bb288)
by codelutin.com scm Aug. 20, 2015

Aug. 20, 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 0b1e832 Mise en place des modules de service (termine #7457) Merge branch 'feature/7457' into develop new ec6bbe3 Modèle Seine : remplacer les associations vers les objets du referentiel par des associations vers des objets de type referentialLabel (refs #7458). new 6f6346e Renommage en dto + génération du modèle Longline new a19edd4 Modèle Seine : correction de la generation des DTO (refs #7458). new 24ae978 fix tag values new 7a163b9 Dto décrivant les formulaire (refs #7458). new c432553 fix properties (refs #7458). new 80044c4 Simplification des configurations de modele + correction de certains noms de dtos new 6827738 Ajout d'un constructeur de ReferentielLabelDto mais ausii pour les FormDto new 01bfc95 Deplacement d'un test new bf2a9f7 Ajout d'un builder de ReferentialDto à partir d'une entité new ffa3d72 Suppression des traductions sur les constantes + prise en compte dans le builder de Dto new 4086edc add activitySeine Services (refs #7458). new a7d0bd5 typage du labelset new ad485d1 Ajout dun premier binding pour les RTP new 8683d26 Premiers tests pour ReferentialServiceTopia new fe6cdca on desactive pour le moment le module rest) new 497ba00 Gestion de la locale des référentiels new 6c688a1 Ajout commentaires sur un test new 5eda038 Correction d'un test + optimisation des dépendances new c6e7300 Correction des liens sur certains référentiels + tester le chargement de tous les référentiels new 6e008ba Pour les référentiels en lecture seule, on ne prend que la label des références rencontrées new ea86ae6 Ajout d'une exception lorsqu'on a pas pas trouvé une donnée + test de suppression new d457cd3 update model seine dto (refs #7458). new dc03b68 update model longline dto (refs #7458). new 2f63e0b On retourne des universes de références vides en mode lecture new a5f7ff9 Renommage Label en Reference, introduction de Reference ReferentialReference new ccd5a13 add seine services dto (refs #7458). new 13e7ada add commentable dto (refs #7458). new 0d3aee4 add set seine service and fix floating Object (refs #7458). new 1a129f2 add school estimate service (refs #7458). new 9536321 Suppression d'une entité non voulue (booleanDto) new a8f3901 Mise en place d'une classe pour initialiser tous les dto du modèle new 92c92c9 Utilisation des binders pour effectuer les créations de dto new 72ad572 Réorganisation ordre des méthodes new 655d35c add target catch service (refs #7458). new aedcaa3 add non target catch service (refs #7458). new f276030 add taget and non target sample service (refs #7458). new 7f8a9fc add route service (refs #7458). new 983991b Correction to context to binder new 1068bbd Ajout du type sur une référence new bd5b868 Création d'un paquetage builder pour y mettre tous les types de builders new ebf58da Deplacement de code réutilisable dans le service de base + mise en place de la transformation dto vers entite (à finir) new 65741be add openable entity and start dtosInitializer (refs #7458). new d07d9b2 Permettre de générer des binders avec des types différents new 3ae2785 Utilisation de la nouvelle API sur les binder pour faire les transformations de type new c0295ec correction du nom d'une propriété new 6609e00 add some service for longline (refs #7458). new 57c39cc debut de services rest + restructuration des paquetages new fb5a769 add catche longline service (refs #7458). new a4bb288 Merge branch 'feature/7458' into develop The 50 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 a4bb28877abea83f3b676d21775a6f7f01f4a3e0 Merge: 0b1e832 fb5a769 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 20 09:43:51 2015 +0200 Merge branch 'feature/7458' into develop commit fb5a769f95f8622289ff3a0d0a69b4bc84fad95e Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 20 09:42:07 2015 +0200 add catche longline service (refs #7458). commit 57c39cc277aba366fc6dd24cae60f3a41a01903a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Aug 20 09:25:53 2015 +0200 debut de services rest + restructuration des paquetages commit 6609e00fa0130dfccd104dd32fd44a78518209ea Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Aug 19 17:34:02 2015 +0200 add some service for longline (refs #7458). commit c0295ec93fb6a26ac63c0c1e328b5f2f2851e9f2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 19 16:06:42 2015 +0200 correction du nom d'une propriété commit 3ae2785dbe55ef96db002e542a2e36d7685446d5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 19 16:06:16 2015 +0200 Utilisation de la nouvelle API sur les binder pour faire les transformations de type commit d07d9b2d5c8b0c4e593bdfe5651759b33d036830 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 19 14:56:47 2015 +0200 Permettre de générer des binders avec des types différents commit 65741bea8d0b85c598b59bfa4479d760d6fc12c1 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Aug 19 14:39:48 2015 +0200 add openable entity and start dtosInitializer (refs #7458). commit ebf58daf77949cafa19b3d75218277d58a9f6f4a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 19 14:05:04 2015 +0200 Deplacement de code réutilisable dans le service de base + mise en place de la transformation dto vers entite (à finir) commit bd5b868e25ff6701fda79304400ca9b168bfcd59 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 19 14:04:15 2015 +0200 Création d'un paquetage builder pour y mettre tous les types de builders commit 1068bbd0eb79acf93ef121598cdf2a6aabbd9403 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 19 14:03:14 2015 +0200 Ajout du type sur une référence commit 983991baaf9f300841899eb6d327739abd967a5d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 19 14:02:09 2015 +0200 Correction to context to binder commit 7f8a9fc43a95be3b88b90da78c92827fec28fcde Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Aug 19 13:42:00 2015 +0200 add route service (refs #7458). commit f27603058c768fb368d6ce571e3a6dcc697b851f Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Aug 19 12:16:01 2015 +0200 add taget and non target sample service (refs #7458). commit aedcaa30783bb84631a8874e6be8580bbee60f1c Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Aug 19 11:21:43 2015 +0200 add non target catch service (refs #7458). commit 655d35cbcf0eabd62e55a3a31dca53306a4bcc69 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Aug 19 10:52:26 2015 +0200 add target catch service (refs #7458). commit 72ad572dafd1f5184f10c24a3e5ed2f42a10ad76 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 19 10:48:18 2015 +0200 Réorganisation ordre des méthodes commit 92c92c9ab2a7406f1e4752a2ca4bd198ef78683a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 19 10:33:56 2015 +0200 Utilisation des binders pour effectuer les créations de dto commit a8f3901d865d49b26668c1f17eaacefa173da4d4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 19 10:33:32 2015 +0200 Mise en place d'une classe pour initialiser tous les dto du modèle commit 9536321da00442bd6fffac738d1cf809bb6bbe68 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 19 10:32:28 2015 +0200 Suppression d'une entité non voulue (booleanDto) commit 1a129f2c1eddabdbee342aabca9c8c96b8955aed Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Aug 19 10:27:16 2015 +0200 add school estimate service (refs #7458). commit 0d3aee4ced8a1065685eddf9939c7c59434d6c32 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Aug 19 10:09:22 2015 +0200 add set seine service and fix floating Object (refs #7458). commit 13e7ada90bd1fb51ad5818e95e620f0f1fad3a2d Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Aug 19 09:25:10 2015 +0200 add commentable dto (refs #7458). commit ccd5a13386d0597c618c43ed9a168aad0f6fbf34 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Aug 18 18:09:29 2015 +0200 add seine services dto (refs #7458). commit a5f7ff953c6110db69e554518274f93666133884 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 16:36:49 2015 +0200 Renommage Label en Reference, introduction de Reference ReferentialReference commit 2f63e0b41cfc83a31580c4796d4f4c7b3cc0d2df Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 15:01:47 2015 +0200 On retourne des universes de références vides en mode lecture commit dc03b68ee60f7bf2382db4e0ab5bd4463f51d549 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Aug 18 16:31:28 2015 +0200 update model longline dto (refs #7458). commit d457cd30d07e42ec980aacb343fff5cb5156cf15 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Aug 18 16:19:05 2015 +0200 update model seine dto (refs #7458). commit ea86ae6913b46c64f4b9be640feb55014525a710 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 14:22:47 2015 +0200 Ajout d'une exception lorsqu'on a pas pas trouvé une donnée + test de suppression commit 6e008ba2a5289fe5b65130cb15598b8bbebe6dae Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 13:36:19 2015 +0200 Pour les référentiels en lecture seule, on ne prend que la label des références rencontrées commit c6e7300cad250e52f3a0e038dacef38745d730af Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 13:18:53 2015 +0200 Correction des liens sur certains référentiels + tester le chargement de tous les référentiels commit 5eda0387cd3024c01eeba176fb3c30db5dcbc347 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 12:28:55 2015 +0200 Correction d'un test + optimisation des dépendances commit 6c688a16bb382ff3a04948153893f30c8cd18dce Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 12:23:13 2015 +0200 Ajout commentaires sur un test commit 497ba0087fc05db383796d1ad532ce409989b592 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 12:19:42 2015 +0200 Gestion de la locale des référentiels commit fe6cdca8f7d7b60c23345c4a518705e88f8b7421 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 11:07:32 2015 +0200 on desactive pour le moment le module rest) commit 8683d266283c84244fde46a57b5693f6f2cd7534 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 10:57:13 2015 +0200 Premiers tests pour ReferentialServiceTopia commit ad485d156bb9d1342776560332a118203a667593 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 10:56:36 2015 +0200 Ajout dun premier binding pour les RTP commit a7d0bd51fbe8e816aa62025cf3687fc2ba774b29 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 09:59:18 2015 +0200 typage du labelset commit 4086edc66eba55e764634f449f607d6830fc6388 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Aug 18 10:48:55 2015 +0200 add activitySeine Services (refs #7458). commit ffa3d7213f8d389129bdce70cb5cc29d40abd4ef Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 09:16:35 2015 +0200 Suppression des traductions sur les constantes + prise en compte dans le builder de Dto commit bf2a9f7af94bd58e294ba09f101c9927ac22cf5b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 08:39:23 2015 +0200 Ajout d'un builder de ReferentialDto à partir d'une entité commit 01bfc953183ea34ca1dafcc7dc08c5d89fbf7633 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 08:38:12 2015 +0200 Deplacement d'un test commit 682773800442901e3c98af3b2c6084aa2e9c9960 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 08:37:19 2015 +0200 Ajout d'un constructeur de ReferentielLabelDto mais ausii pour les FormDto commit 80044c4cfe3b4bacf378d0c77caaf12ca0f3377a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 08:33:47 2015 +0200 Simplification des configurations de modele + correction de certains noms de dtos commit c432553eec78ca869fa2662834e7dd5fa659c36d Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Aug 17 18:26:21 2015 +0200 fix properties (refs #7458). commit 7a163b9cf9f1a2c9dd8fcfab81a7f3762a28ecce Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Aug 17 18:25:36 2015 +0200 Dto décrivant les formulaire (refs #7458). commit 24ae978df8a3e972b0a39eb9f9f410bf715e87e0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Aug 17 16:43:45 2015 +0200 fix tag values commit a19edd40a9439e85db460f7769b7d83ee6622ee3 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Aug 17 16:38:41 2015 +0200 Modèle Seine : correction de la generation des DTO (refs #7458). commit 6f6346e068dca2ad0040e7d392b475dd26b1c13f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Aug 17 16:12:45 2015 +0200 Renommage en dto + génération du modèle Longline commit ec6bbe32b7aacf805d847afe48c776239dbf85f4 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Aug 17 15:57:00 2015 +0200 Modèle Seine : remplacer les associations vers les objets du referentiel par des associations vers des objets de type referentialLabel (refs #7458). Summary of changes: observe-services-api/pom.xml | 18 + .../observe/services/ObserveServiceContext.java | 4 +- .../observe/services/ObserveServiceFactory.java | 4 +- ...xt.java => ObserveDataSourceConfiguration.java} | 4 +- .../services/ObserveServiceApplicationContext.java | 24 + .../observe/services/ObserveServiceContext.java | 8 + .../observe/services/ObserveServiceFactory.java | 4 +- .../services/ObserveServiceFactorySupport.java | 4 +- .../services/ObserveServiceMainFactory.java | 30 +- .../services/service/DataNotFoundException.java | 30 + .../services/service/ReferentialService.java | 20 +- .../longline/ActivityLongLineEncouterService.java | 20 + .../ActivityLongLineSensorUsedService.java | 21 + .../service/longline/ActivitySeineService.java | 29 + .../service/longline/CatchLonglineService.java | 23 + .../longline/GearUseFeaturesLonglineService.java | 30 + .../SetLonglineDetailCompositionService.java | 20 + .../SetLonglineGlobalCompositionService.java | 20 + .../service/longline/SetLonglineService.java | 28 + .../service/longline/TripLonglineService.java | 30 + .../seine/ActivitySeineObservedSystemService.java | 20 + .../service/seine/ActivitySeineService.java | 29 + .../service/seine/FloatingObjectService.java | 30 + .../service/seine/GearUseFeaturesSeineService.java | 30 + .../service/seine/NonTargetCatchService.java | 19 + .../service/seine/NonTargetSampleService.java | 19 + .../seine/ObjectObservedSpeciesService.java | 20 + .../service/seine/ObjectSchoolEstimateService.java | 19 + .../services/service/seine/RouteService.java | 30 + .../service/seine/SchoolEstimateService.java | 20 + .../services/service/seine/SetSeineService.java | 28 + .../services/service/seine/TargetCatchService.java | 19 + .../service/seine/TargetSampleService.java | 20 + .../seine/TransmittingBuoyOperationService.java | 20 + .../services/service/seine/TripSeineService.java | 30 + .../services/FakeObserveServiceContext.java | 10 - .../services/FakeObserveServiceFactory.java | 19 - .../services/ObserveServiceMainFactoryTest.java | 23 - .../fr.ird.observe.services.ObserveServiceFactory | 1 - observe-services-model/pom.xml | 24 +- .../{model => dto}/AbstractObserveDto.java | 2 +- .../ReferentialFormDto.java => dto/FormDto.java} | 12 +- .../java/fr/ird/observe/services/dto/FormDtos.java | 24 + .../fr/ird/observe/services/dto/ReferenceDto.java | 51 + .../fr/ird/observe/services/dto/ReferenceDtos.java | 11 + .../ird/observe/services/dto/ReferenceSetDto.java | 17 + .../ird/observe/services/dto/ReferenceSetDtos.java | 20 + .../dto/ReferenceValueNotFoundException.java | 28 + .../{model => dto}/constants/GearType.java | 2 +- .../{model => dto}/constants/ReferenceStatus.java | 2 +- .../services/dto/constants/ReferentialLocale.java | 124 ++ .../seine/NonTargetCatchComputedValueSource.java | 52 + .../services/dto/constants/seine/Ownership.java | 51 + .../constants/seine/SchoolType.java} | 35 +- .../seine/TypeTransmittingBuoyOperation.java | 68 ++ .../dto/referential/ReferentialReferenceDto.java | 65 + .../dto/referential/ReferentialReferenceDtos.java | 18 + .../model/referential/ReferentialFormDtos.java | 15 - .../xmi/observe-services-dto-common.properties | 13 + .../src/main/xmi/observe-services-dto-common.zargo | Bin 0 -> 34074 bytes ...es => observe-services-dto-longline.properties} | 4 +- .../main/xmi/observe-services-dto-longline.zargo | Bin 0 -> 77309 bytes ...rties => observe-services-dto-seine.properties} | 4 +- .../src/main/xmi/observe-services-dto-seine.zargo | Bin 0 -> 54397 bytes .../xmi/observe-services-model-common.properties | 13 - .../main/xmi/observe-services-model-common.zargo | Bin 32880 -> 0 bytes .../main/xmi/observe-services-model-longline.zargo | Bin 96124 -> 0 bytes .../main/xmi/observe-services-model-seine.zargo | Bin 85518 -> 0 bytes .../LICENSE.txt | 0 .../README.txt | 0 .../pom.xml | 43 +- .../ObserveRestClientDataSourceConfiguration.java | 39 + .../rest/client/ObserveRestClientService.java | 23 + .../client/ObserveRestClientServiceContext.java | 38 + .../client/ObserveRestClientServiceFactory.java | 46 + .../service/ReferentialServiceRestClient.java | 54 + .../fr.ird.observe.services.ObserveServiceFactory | 1 + .../client/service/ReferentialServiceRestTest.java | 45 + .../src/test/resources/log4j.properties | 0 .../LICENSE.txt | 0 .../README.txt | 0 .../pom.xml | 59 +- .../wm/ObserveRestWebMotionApplicationContext.java | 81 ++ .../ObserveRestWebMotionApplicationListener.java | 42 + .../rest/wm/ObserveRestWebMotionController.java | 11 + .../rest/wm/ObserveRestWebMotionFilter.java | 55 + .../rest/wm/ObserveRestWebMotionJsonHelper.java | 130 ++ .../rest/wm/ObserveRestWebMotionRender.java | 52 + .../rest/wm/service/ReferentialServiceRest.java | 66 + .../src/main/resources/mapping | 12 + .../src/main/webapp/WEB-INF/web.xml | 25 + .../services/ObserveServiceContextRest.java | 10 - .../services/ObserveServiceFactoryRest.java | 33 - .../ird/observe/services/ObserveServiceRest.java | 17 - .../rest/wm/ObserveRestApplicationContext.java | 42 + .../rest/wm/ObserveRestApplicationListener.java | 42 + .../rest/wm/ObserveRestWebMotionFilter.java | 62 + .../services/service/ReferentialServiceRest.java | 58 - .../fr.ird.observe.services.ObserveServiceFactory | 1 - observe-services-rest/src/main/resources/mapping | 28 + .../src/main/webapp/WEB-INF/web.xml | 36 + .../referential/ReferentialServiceRestTest.java | 37 - observe-services-topia/pom.xml | 35 +- .../observe/services/AbstractObserveService.java | 5 +- .../services/ObserveServiceContextTopia.java | 33 - .../ird/observe/services/ObserveServiceTopia.java | 20 - .../services/service/ReferentialDtoBuilder.java | 171 --- .../services/service/ReferentialServiceTopia.java | 220 ---- .../observe/services/topia/ObserveDtoBinders.java | 39 + .../services/topia/ObserveDtosInitializer.java | 1262 ++++++++++++++++++++ .../services/topia/ObserveServiceTopia.java | 117 ++ .../topia/ObserveTopiaDataSourceConfiguration.java | 22 + .../services/topia/ObserveTopiaServiceContext.java | 54 + .../ObserveTopiaServiceFactory.java} | 44 +- .../services/topia/builder/DtoToEntityBuilder.java | 184 +++ .../services/topia/builder/EntityToDtoBuilder.java | 198 +++ .../topia/builder/EntityToReferenceDtoBuilder.java | 49 + .../EntityToReferentialReferenceDtoBuilder.java | 49 + .../topia/service/ReferentialServiceTopia.java | 138 +++ .../ActivitySeineObservedSystemServiceTopia.java | 27 + .../service/seine/ActivitySeineServiceTopia.java | 46 + .../service/seine/FloatingObjectServiceTopia.java | 46 + .../fr.ird.observe.services.ObserveServiceFactory | 2 +- .../service/ReferentialDtoBuilderTest.java | 72 -- .../referential/ReferentialServiceTopiaTest.java | 37 - .../service/topia/ApplicationContextResource.java | 83 ++ .../services/service/topia/DataSourceResource.java | 126 ++ .../topia/service/ReferentialServiceTopiaTest.java | 232 ++++ .../topia/builder/DtoToEntityBuilderTest.java | 117 ++ .../topia/builder/EntityToDtoBuilderTest.java | 130 ++ pom.xml | 53 +- 131 files changed, 5238 insertions(+), 993 deletions(-) copy observe-services-api/src/main/java/fr/ird/observe/services/{ObserveServiceContext.java => ObserveDataSourceConfiguration.java} (55%) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceApplicationContext.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/DataNotFoundException.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivitySeineService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/longline/CatchLonglineService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/longline/GearUseFeaturesLonglineService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/GearUseFeaturesSeineService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetSampleService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java delete mode 100644 observe-services-api/src/test/java/fr/ird/observe/services/FakeObserveServiceContext.java delete mode 100644 observe-services-api/src/test/java/fr/ird/observe/services/FakeObserveServiceFactory.java delete mode 100644 observe-services-api/src/test/java/fr/ird/observe/services/ObserveServiceMainFactoryTest.java delete mode 100644 observe-services-api/src/test/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory rename observe-services-model/src/main/java/fr/ird/observe/services/{model => dto}/AbstractObserveDto.java (95%) rename observe-services-model/src/main/java/fr/ird/observe/services/{model/referential/ReferentialFormDto.java => dto/FormDto.java} (61%) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDtos.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceDto.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceDtos.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetDto.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetDtos.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceValueNotFoundException.java copy observe-services-model/src/main/java/fr/ird/observe/services/{model => dto}/constants/GearType.java (96%) rename observe-services-model/src/main/java/fr/ird/observe/services/{model => dto}/constants/ReferenceStatus.java (85%) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferentialLocale.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/NonTargetCatchComputedValueSource.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/Ownership.java rename observe-services-model/src/main/java/fr/ird/observe/services/{model/constants/GearType.java => dto/constants/seine/SchoolType.java} (55%) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/TypeTransmittingBuoyOperation.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceDto.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceDtos.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/model/referential/ReferentialFormDtos.java create mode 100644 observe-services-model/src/main/xmi/observe-services-dto-common.properties create mode 100644 observe-services-model/src/main/xmi/observe-services-dto-common.zargo rename observe-services-model/src/main/xmi/{observe-services-model-longline.properties => observe-services-dto-longline.properties} (71%) create mode 100644 observe-services-model/src/main/xmi/observe-services-dto-longline.zargo rename observe-services-model/src/main/xmi/{observe-services-model-seine.properties => observe-services-dto-seine.properties} (71%) create mode 100644 observe-services-model/src/main/xmi/observe-services-dto-seine.zargo delete mode 100644 observe-services-model/src/main/xmi/observe-services-model-common.properties delete mode 100644 observe-services-model/src/main/xmi/observe-services-model-common.zargo delete mode 100644 observe-services-model/src/main/xmi/observe-services-model-longline.zargo delete mode 100644 observe-services-model/src/main/xmi/observe-services-model-seine.zargo rename {observe-services-rest => observe-services-rest-client}/LICENSE.txt (100%) rename {observe-services-rest => observe-services-rest-client}/README.txt (100%) copy {observe-services-rest => observe-services-rest-client}/pom.xml (61%) create mode 100644 observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientDataSourceConfiguration.java create mode 100644 observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientService.java create mode 100644 observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceContext.java create mode 100644 observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceFactory.java create mode 100644 observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/service/ReferentialServiceRestClient.java create mode 100644 observe-services-rest-client/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory create mode 100644 observe-services-rest-client/src/test/java/fr/ird/observe/services/rest/client/service/ReferentialServiceRestTest.java rename {observe-services-rest => observe-services-rest-client}/src/test/resources/log4j.properties (100%) copy {observe-validation => observe-services-rest-wm}/LICENSE.txt (100%) copy {observe-validation => observe-services-rest-wm}/README.txt (100%) rename {observe-services-rest => observe-services-rest-wm}/pom.xml (67%) create mode 100644 observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionApplicationContext.java create mode 100644 observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionApplicationListener.java create mode 100644 observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionController.java create mode 100644 observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionFilter.java create mode 100644 observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionJsonHelper.java create mode 100644 observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionRender.java create mode 100644 observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/service/ReferentialServiceRest.java create mode 100644 observe-services-rest-wm/src/main/resources/mapping create mode 100644 observe-services-rest-wm/src/main/webapp/WEB-INF/web.xml delete mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceContextRest.java delete mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java delete mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRest.java create mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestApplicationContext.java create mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestApplicationListener.java create mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionFilter.java delete mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/service/ReferentialServiceRest.java delete mode 100644 observe-services-rest/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory create mode 100644 observe-services-rest/src/main/resources/mapping create mode 100644 observe-services-rest/src/main/webapp/WEB-INF/web.xml delete mode 100644 observe-services-rest/src/test/java/fr/ird/observe/services/service/referential/ReferentialServiceRestTest.java delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveDtoBinders.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveDtosInitializer.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaDataSourceConfiguration.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaServiceContext.java rename observe-services-topia/src/main/java/fr/ird/observe/services/{ObserveServiceFactoryTopia.java => topia/ObserveTopiaServiceFactory.java} (64%) create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/topia/builder/DtoToEntityBuilder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/topia/builder/EntityToDtoBuilder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/topia/builder/EntityToReferenceDtoBuilder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/topia/builder/EntityToReferentialReferenceDtoBuilder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/topia/service/ReferentialServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineObservedSystemServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/FloatingObjectServiceTopia.java delete mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialDtoBuilderTest.java delete mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/referential/ReferentialServiceTopiaTest.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/topia/ApplicationContextResource.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/topia/DataSourceResource.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/topia/service/ReferentialServiceTopiaTest.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/topia/builder/DtoToEntityBuilderTest.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/topia/builder/EntityToDtoBuilderTest.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 23

branch feature/7458 deleted (was fb5a769)
by codelutin.com scm Aug. 20, 2015

Aug. 20, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7458 in repository observe. See http://git.codelutin.com/observe.git was fb5a769 add catche longline service (refs #7458). This change permanently discards the following revisions: discards fb5a769 add catche longline service (refs #7458). discards 57c39cc debut de services rest + restructuration des paquetages discards 6609e00 add some service for longline (refs #7458). discards c0295ec correction du nom d'une propriété discards 3ae2785 Utilisation de la nouvelle API sur les binder pour faire les transformations de type discards d07d9b2 Permettre de générer des binders avec des types différents discards 65741be add openable entity and start dtosInitializer (refs #7458). discards ebf58da Deplacement de code réutilisable dans le service de base + mise en place de la transformation dto vers entite (à finir) discards bd5b868 Création d'un paquetage builder pour y mettre tous les types de builders discards 1068bbd Ajout du type sur une référence discards 983991b Correction to context to binder discards 7f8a9fc add route service (refs #7458). discards f276030 add taget and non target sample service (refs #7458). discards aedcaa3 add non target catch service (refs #7458). discards 655d35c add target catch service (refs #7458). discards 72ad572 Réorganisation ordre des méthodes discards 92c92c9 Utilisation des binders pour effectuer les créations de dto discards a8f3901 Mise en place d'une classe pour initialiser tous les dto du modèle discards 9536321 Suppression d'une entité non voulue (booleanDto) discards 1a129f2 add school estimate service (refs #7458). discards 0d3aee4 add set seine service and fix floating Object (refs #7458). discards 13e7ada add commentable dto (refs #7458). discards ccd5a13 add seine services dto (refs #7458). discards a5f7ff9 Renommage Label en Reference, introduction de Reference ReferentialReference discards 2f63e0b On retourne des universes de références vides en mode lecture discards dc03b68 update model longline dto (refs #7458). discards d457cd3 update model seine dto (refs #7458). discards ea86ae6 Ajout d'une exception lorsqu'on a pas pas trouvé une donnée + test de suppression discards 6e008ba Pour les référentiels en lecture seule, on ne prend que la label des références rencontrées discards c6e7300 Correction des liens sur certains référentiels + tester le chargement de tous les référentiels discards 5eda038 Correction d'un test + optimisation des dépendances discards 6c688a1 Ajout commentaires sur un test discards 497ba00 Gestion de la locale des référentiels discards fe6cdca on desactive pour le moment le module rest) discards 8683d26 Premiers tests pour ReferentialServiceTopia discards ad485d1 Ajout dun premier binding pour les RTP discards a7d0bd5 typage du labelset discards 4086edc add activitySeine Services (refs #7458). discards ffa3d72 Suppression des traductions sur les constantes + prise en compte dans le builder de Dto discards bf2a9f7 Ajout d'un builder de ReferentialDto à partir d'une entité discards 01bfc95 Deplacement d'un test discards 6827738 Ajout d'un constructeur de ReferentielLabelDto mais ausii pour les FormDto discards 80044c4 Simplification des configurations de modele + correction de certains noms de dtos discards c432553 fix properties (refs #7458). discards 7a163b9 Dto décrivant les formulaire (refs #7458). discards 24ae978 fix tag values discards a19edd4 Modèle Seine : correction de la generation des DTO (refs #7458). discards 6f6346e Renommage en dto + génération du modèle Longline discards ec6bbe3 Modèle Seine : remplacer les associations vers les objets du referentiel par des associations vers des objets de type referentialLabel (refs #7458). -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch feature/7458 updated (57c39cc -> fb5a769)
by codelutin.com scm Aug. 20, 2015

Aug. 20, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7458 in repository observe. See http://git.codelutin.com/observe.git from 57c39cc debut de services rest + restructuration des paquetages new fb5a769 add catche longline service (refs #7458). 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 fb5a769f95f8622289ff3a0d0a69b4bc84fad95e Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 20 09:42:07 2015 +0200 add catche longline service (refs #7458). Summary of changes: .../service/longline/CatchLonglineService.java | 23 +++++++++++++++++++++ .../main/xmi/observe-services-dto-longline.zargo | Bin 77315 -> 77309 bytes .../rest/client/ObserveRestClientService.java | 6 ++++++ .../services/topia/ObserveDtosInitializer.java | 5 +++++ 4 files changed, 34 insertions(+) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/longline/CatchLonglineService.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/7458 updated (6609e00 -> 57c39cc)
by codelutin.com scm Aug. 20, 2015

Aug. 20, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7458 in repository observe. See http://git.codelutin.com/observe.git from 6609e00 add some service for longline (refs #7458). new 57c39cc debut de services rest + restructuration des paquetages 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 57c39cc277aba366fc6dd24cae60f3a41a01903a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Aug 20 09:25:53 2015 +0200 debut de services rest + restructuration des paquetages Summary of changes: observe-services-api/pom.xml | 18 +++ .../observe/services/ObserveServiceContext.java | 4 +- .../observe/services/ObserveServiceFactory.java | 4 +- .../services/ObserveDataSourceConfiguration.java | 10 ++ .../services/ObserveServiceApplicationContext.java | 8 +- .../observe/services/ObserveServiceContext.java | 4 + .../observe/services/ObserveServiceFactory.java | 4 +- .../services/ObserveServiceFactorySupport.java | 4 +- .../services/ObserveServiceMainFactory.java | 30 ++--- .../services/FakeObserveServiceContext.java | 22 ---- .../services/FakeObserveServiceFactory.java | 19 --- .../services/ObserveServiceMainFactoryTest.java | 23 ---- .../fr.ird.observe.services.ObserveServiceFactory | 1 - .../LICENSE.txt | 0 .../README.txt | 0 .../pom.xml | 46 ++------ .../ObserveRestClientDataSourceConfiguration.java | 39 +++++++ .../rest/client/ObserveRestClientService.java | 17 +++ .../client/ObserveRestClientServiceContext.java | 38 ++++++ .../client/ObserveRestClientServiceFactory.java | 46 ++++++++ .../service/ReferentialServiceRestClient.java | 14 +-- .../fr.ird.observe.services.ObserveServiceFactory | 1 + .../client/service/ReferentialServiceRestTest.java | 45 +++++++ .../src/test/resources/log4j.properties | 0 .../LICENSE.txt | 0 .../README.txt | 0 .../pom.xml | 59 +++++----- .../wm/ObserveRestWebMotionApplicationContext.java | 81 +++++++++++++ .../ObserveRestWebMotionApplicationListener.java | 42 +++++++ .../rest/wm/ObserveRestWebMotionController.java | 11 ++ .../rest/wm/ObserveRestWebMotionFilter.java | 55 +++++++++ .../rest/wm/ObserveRestWebMotionJsonHelper.java | 130 +++++++++++++++++++++ .../rest/wm/ObserveRestWebMotionRender.java | 52 +++++++++ .../rest/wm/service/ReferentialServiceRest.java | 66 +++++++++++ .../src/main/resources/mapping | 12 ++ .../src/main/webapp/WEB-INF/web.xml | 25 ++++ .../services/ObserveServiceFactoryRest.java | 33 ------ .../ird/observe/services/ObserveServiceRest.java | 17 --- .../rest/wm/ObserveRestApplicationContext.java | 42 +++++++ .../rest/wm/ObserveRestApplicationListener.java | 42 +++++++ .../rest/wm/ObserveRestWebMotionFilter.java | 62 ++++++++++ .../fr.ird.observe.services.ObserveServiceFactory | 1 - observe-services-rest/src/main/resources/mapping | 28 +++++ .../src/main/webapp/WEB-INF/web.xml | 36 ++++++ .../referential/ReferentialServiceRestTest.java | 37 ------ .../observe/services/AbstractObserveService.java | 5 +- .../services/ObserveServiceContextTopia.java | 45 ------- .../services/{dto => topia}/ObserveDtoBinders.java | 3 +- .../{dto => topia}/ObserveDtosInitializer.java | 4 +- .../services/{ => topia}/ObserveServiceTopia.java | 11 +- .../topia/ObserveTopiaDataSourceConfiguration.java | 22 ++++ .../services/topia/ObserveTopiaServiceContext.java | 54 +++++++++ .../ObserveTopiaServiceFactory.java} | 41 ++++--- .../{ => topia}/builder/DtoToEntityBuilder.java | 6 +- .../{ => topia}/builder/EntityToDtoBuilder.java | 6 +- .../builder/EntityToReferenceDtoBuilder.java | 4 +- .../EntityToReferentialReferenceDtoBuilder.java | 4 +- .../service/ReferentialServiceTopia.java | 9 +- .../ActivitySeineObservedSystemServiceTopia.java | 8 +- .../service/seine/ActivitySeineServiceTopia.java | 5 +- .../service/seine/FloatingObjectServiceTopia.java | 7 +- .../fr.ird.observe.services.ObserveServiceFactory | 2 +- .../{ => topia}/ApplicationContextResource.java | 17 ++- .../service/{ => topia}/DataSourceResource.java | 2 +- .../service}/ReferentialServiceTopiaTest.java | 24 ++-- .../builder/DtoToEntityBuilderTest.java | 4 +- .../builder/EntityToDtoBuilderTest.java | 4 +- pom.xml | 53 +++++++-- 68 files changed, 1199 insertions(+), 369 deletions(-) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/ObserveDataSourceConfiguration.java rename observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceContextRest.java => observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceApplicationContext.java (78%) delete mode 100644 observe-services-api/src/test/java/fr/ird/observe/services/FakeObserveServiceContext.java delete mode 100644 observe-services-api/src/test/java/fr/ird/observe/services/FakeObserveServiceFactory.java delete mode 100644 observe-services-api/src/test/java/fr/ird/observe/services/ObserveServiceMainFactoryTest.java delete mode 100644 observe-services-api/src/test/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory rename {observe-services-rest => observe-services-rest-client}/LICENSE.txt (100%) rename {observe-services-rest => observe-services-rest-client}/README.txt (100%) copy {observe-services-topia => observe-services-rest-client}/pom.xml (64%) create mode 100644 observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientDataSourceConfiguration.java create mode 100644 observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientService.java create mode 100644 observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceContext.java create mode 100644 observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceFactory.java rename observe-services-rest/src/main/java/fr/ird/observe/services/service/ReferentialServiceRest.java => observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/service/ReferentialServiceRestClient.java (77%) create mode 100644 observe-services-rest-client/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory create mode 100644 observe-services-rest-client/src/test/java/fr/ird/observe/services/rest/client/service/ReferentialServiceRestTest.java rename {observe-services-rest => observe-services-rest-client}/src/test/resources/log4j.properties (100%) copy {observe-validation => observe-services-rest-wm}/LICENSE.txt (100%) copy {observe-validation => observe-services-rest-wm}/README.txt (100%) rename {observe-services-rest => observe-services-rest-wm}/pom.xml (67%) create mode 100644 observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionApplicationContext.java create mode 100644 observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionApplicationListener.java create mode 100644 observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionController.java create mode 100644 observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionFilter.java create mode 100644 observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionJsonHelper.java create mode 100644 observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionRender.java create mode 100644 observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/service/ReferentialServiceRest.java create mode 100644 observe-services-rest-wm/src/main/resources/mapping create mode 100644 observe-services-rest-wm/src/main/webapp/WEB-INF/web.xml delete mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java delete mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRest.java create mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestApplicationContext.java create mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestApplicationListener.java create mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionFilter.java delete mode 100644 observe-services-rest/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory create mode 100644 observe-services-rest/src/main/resources/mapping create mode 100644 observe-services-rest/src/main/webapp/WEB-INF/web.xml delete mode 100644 observe-services-rest/src/test/java/fr/ird/observe/services/service/referential/ReferentialServiceRestTest.java delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java rename observe-services-topia/src/main/java/fr/ird/observe/services/{dto => topia}/ObserveDtoBinders.java (94%) rename observe-services-topia/src/main/java/fr/ird/observe/services/{dto => topia}/ObserveDtosInitializer.java (99%) rename observe-services-topia/src/main/java/fr/ird/observe/services/{ => topia}/ObserveServiceTopia.java (92%) create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaDataSourceConfiguration.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaServiceContext.java rename observe-services-topia/src/main/java/fr/ird/observe/services/{ObserveServiceFactoryTopia.java => topia/ObserveTopiaServiceFactory.java} (65%) rename observe-services-topia/src/main/java/fr/ird/observe/services/{ => topia}/builder/DtoToEntityBuilder.java (97%) rename observe-services-topia/src/main/java/fr/ird/observe/services/{ => topia}/builder/EntityToDtoBuilder.java (97%) rename observe-services-topia/src/main/java/fr/ird/observe/services/{ => topia}/builder/EntityToReferenceDtoBuilder.java (94%) rename observe-services-topia/src/main/java/fr/ird/observe/services/{ => topia}/builder/EntityToReferentialReferenceDtoBuilder.java (95%) rename observe-services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/ReferentialServiceTopia.java (94%) rename observe-services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/seine/ActivitySeineObservedSystemServiceTopia.java (78%) rename observe-services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/seine/ActivitySeineServiceTopia.java (84%) rename observe-services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/seine/FloatingObjectServiceTopia.java (82%) rename observe-services-topia/src/test/java/fr/ird/observe/services/service/{ => topia}/ApplicationContextResource.java (76%) rename observe-services-topia/src/test/java/fr/ird/observe/services/service/{ => topia}/DataSourceResource.java (98%) rename observe-services-topia/src/test/java/fr/ird/observe/services/service/{ => topia/service}/ReferentialServiceTopiaTest.java (88%) rename observe-services-topia/src/test/java/fr/ird/observe/services/{ => topia}/builder/DtoToEntityBuilderTest.java (98%) rename observe-services-topia/src/test/java/fr/ird/observe/services/{ => topia}/builder/EntityToDtoBuilderTest.java (98%) -- 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/7458 updated (c0295ec -> 6609e00)
by codelutin.com scm Aug. 19, 2015

Aug. 19, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7458 in repository observe. See http://git.codelutin.com/observe.git from c0295ec correction du nom d'une propriété new 6609e00 add some service for longline (refs #7458). 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 6609e00fa0130dfccd104dd32fd44a78518209ea Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Aug 19 17:34:02 2015 +0200 add some service for longline (refs #7458). Summary of changes: .../longline/ActivityLongLineEncouterService.java | 20 ++++++++++++++ .../ActivityLongLineSensorUsedService.java | 21 +++++++++++++++ .../{seine => longline}/ActivitySeineService.java | 2 +- .../longline/GearUseFeaturesLonglineService.java | 30 +++++++++++++++++++++ .../SetLonglineDetailCompositionService.java | 20 ++++++++++++++ .../SetLonglineGlobalCompositionService.java | 20 ++++++++++++++ .../service/longline/SetLonglineService.java | 28 +++++++++++++++++++ .../service/longline/TripLonglineService.java | 30 +++++++++++++++++++++ .../main/xmi/observe-services-dto-longline.zargo | Bin 75789 -> 77315 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 57866 -> 54397 bytes .../services/dto/ObserveDtosInitializer.java | 20 ++++++++++++++ 11 files changed, 190 insertions(+), 1 deletion(-) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java copy observe-services-api/src/main/java/fr/ird/observe/services/service/{seine => longline}/ActivitySeineService.java (94%) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/longline/GearUseFeaturesLonglineService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.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/7458 updated (d07d9b2 -> c0295ec)
by codelutin.com scm Aug. 19, 2015

Aug. 19, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7458 in repository observe. See http://git.codelutin.com/observe.git from d07d9b2 Permettre de générer des binders avec des types différents new 3ae2785 Utilisation de la nouvelle API sur les binder pour faire les transformations de type new c0295ec correction du nom d'une propriété 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 c0295ec93fb6a26ac63c0c1e328b5f2f2851e9f2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 19 16:06:42 2015 +0200 correction du nom d'une propriété commit 3ae2785dbe55ef96db002e542a2e36d7685446d5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 19 16:06:16 2015 +0200 Utilisation de la nouvelle API sur les binder pour faire les transformations de type Summary of changes: .../services/builder/DtoToEntityBuilder.java | 54 ++------ .../services/builder/EntityToDtoBuilder.java | 37 +---- .../services/dto/ObserveDtosInitializer.java | 153 +++++++++++++++++---- 3 files changed, 138 insertions(+), 106 deletions(-) -- 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/7458 updated (65741be -> d07d9b2)
by codelutin.com scm Aug. 19, 2015

Aug. 19, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7458 in repository observe. See http://git.codelutin.com/observe.git from 65741be add openable entity and start dtosInitializer (refs #7458). new d07d9b2 Permettre de générer des binders avec des types différents 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 d07d9b2d5c8b0c4e593bdfe5651759b33d036830 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 19 14:56:47 2015 +0200 Permettre de générer des binders avec des types différents Summary of changes: .../java/fr/ird/observe/services/dto/ObserveDtosInitializer.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) -- 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/7458 updated (ebf58da -> 65741be)
by codelutin.com scm Aug. 19, 2015

Aug. 19, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7458 in repository observe. See http://git.codelutin.com/observe.git from ebf58da Deplacement de code réutilisable dans le service de base + mise en place de la transformation dto vers entite (à finir) new 65741be add openable entity and start dtosInitializer (refs #7458). 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 65741bea8d0b85c598b59bfa4479d760d6fc12c1 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Aug 19 14:39:48 2015 +0200 add openable entity and start dtosInitializer (refs #7458). Summary of changes: .../src/main/xmi/observe-services-dto-common.zargo | Bin 33741 -> 34074 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 57438 -> 57866 bytes .../services/dto/ObserveDtosInitializer.java | 38 +++++++++++++++++++++ 3 files changed, 38 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1