This is an automated email from the git hooks/post-receive script. New change to branch feature/7463 in repository observe. See http://git.codelutin.com/observe.git discards f7490c6 controleur pour seine pour le serveur web (refs #7463) discards 073aaaf premier controleur pour le serveur web (refs #7463) adds c3a48f1 mise en place du service de validation (refs #7493) adds c97b146 ajout du test du service de validation (refs #7493) adds 9ff038a Ajout de propertyChange listener sur les entités (See #7493) adds 6c724df Implantation du service de validation (See #7493) adds 73d72d0 Debut d'intégration des validateurs d'entités (See #7493) adds fdaf365 Fix validation test (See #7493) adds e3c79cb recupération des différents types de dto adds ac1f0ff Renommage de certains objets Simplificiation du détecteur de messages (on n'utilise plus les références sur entités) See #7493 adds 70d655b Tout sur develop (mais il reste encore à gerer les traductions des messages) See #7493 Merge branch 'feature/7493' into develop adds 4a0089a implantation du service de generation des rapport + test (refs #7498) adds a43149f implantation du service de generation des rapport + test (refs #7498) adds 9f49fbf implantation du service de generation des rapport + test (refs #7498) adds dd58708 Merge sur develop (termine #7498) adds 0fcf540 Renommage services de consolidation adds 88e7990 Ajout d'un adapter Gson pour les Class adds 3ba643f Ajout de méthodes de création des différentes datasources new 6cf362b premier controleur pour le serveur web (refs #7463) new c579af1 controleur pour seine pour le serveur web (refs #7463) 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 (f7490c6) \ N -- N -- N refs/heads/feature/7463 (c579af1) 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 c579af126d7bb0ae06ba37f8449e87e1389e54de Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Sep 3 16:40:30 2015 +0200 controleur pour seine pour le serveur web (refs #7463) commit 6cf362b76f2d25baaf2648f3ed8201104f3d5c2f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Sep 3 16:18:08 2015 +0200 premier controleur pour le serveur web (refs #7463) Summary of changes: .../ObserveWebSecurityApplicationContext.java | 2 + .../fr/ird/observe/AbstractObserveTopiaDao.java | 18 + .../ird/observe/entities/seine/ActivitySeines.java | 160 ++++ .../src/main/xmi/observe-common.properties | 1 + .../src/main/xmi/observe-longline.properties | 1 + .../src/main/xmi/observe-seine.properties | 1 + observe-services-api/pom.xml | 29 +- .../src/main/filters/observe-reports.properties | 8 +- ...ataService.java => ConsolidateDataService.java} | 2 +- .../service/actions}/report/ReportBuilder.java | 17 +- .../service/actions/report/ReportService.java | 20 + .../service/actions}/report/model/DataMatrix.java | 2 +- .../service/actions}/report/model/Report.java | 15 +- .../actions}/report/model/ReportOperation.java | 20 +- .../actions}/report/model/ReportRequest.java | 63 +- .../actions}/report/model/ReportVariable.java | 27 +- .../report/model/operations/ExecuteRequests.java | 45 +- .../report/model/operations/GroupByLength.java | 20 +- .../report/model/operations/SumColumn.java | 25 +- .../report/model/operations/SumIntColumn.java | 25 +- .../report/model/operations/SumIntRow.java | 25 +- .../actions}/report/model/operations/SumRow.java | 25 +- .../actions/validate/ValidateDataRequest.java | 54 ++ .../actions/validate/ValidateDataResult.java | 32 + .../validate/ValidateReferentialsRequest.java | 55 ++ .../validate/ValidateReferentialsResult.java | 32 + .../actions/validate/ValidateResultForDtoType.java | 28 + .../service/actions/validate/ValidateService.java | 25 + .../actions/validate/ValidationMessage.java | 45 + .../actions/validate/ValidationResultForDto.java | 34 + ...es.service.actions.report.model.ReportOperation | 6 + .../service/actions/report/ReportBuilderTest.java | 130 +++ .../actions/report/observe-reports-test.properties | 27 + .../observe/services/dto/gson/ClassAdapter.java | 42 + .../services/dto/gson/ObserveDtoGsonSupplier.java | 1 + .../ObserveDataSourceConfigurationMainFactory.java | 52 +- observe-services-topia/pom.xml | 9 + .../ird/observe/services/ObserveServiceTopia.java | 33 + ...Topia.java => ConsolidateDataServiceTopia.java} | 4 +- .../service/actions/report/ReportServiceTopia.java | 207 +++++ .../service/actions/validate/ObserveValidator.java | 166 ++++ .../actions/validate/ValidateServiceTopia.java | 226 +++++ .../actions/validate/ValidationDataContext.java | 181 ++++ .../validate/ValidationMessageDetector.java | 489 +++++++++++ .../service/actions/validate}/ValidatorsMap.java | 24 +- ...t.java => ConsolidateDataServiceTopiaTest.java} | 6 +- .../report/AbstractReportServiceTopiaTest.java | 150 ++-- .../actions/report/ReportAccessoryCatch2Test.java | 199 +++++ .../report/ReportAccessoryCatchByGroup2Test.java | 68 ++ .../report/ReportAccessoryCatchByGroupTest.java | 100 +++ .../actions/report/ReportAccessoryCatchTest.java | 156 ++++ .../report/ReportActivityWithCommentTest.java | 348 ++++++++ .../actions/report/ReportAllActivitysTest.java | 943 +++++++++++++++++++++ .../actions/report/ReportDailySetAndCatchTest.java | 61 +- .../service/actions/report/ReportDcpUsageTest.java | 67 +- .../report/ReportSetByAssociation2Test.java | 14 +- .../actions/report/ReportSetByAssociationTest.java | 26 +- .../report/ReportTargetCatchByAssociationTest.java | 66 +- .../ReportTargetDiscardedByAssociationTest.java | 66 +- .../actions/validate/ValidateServiceTopiaTest.java | 207 +++++ observe-validation/pom.xml | 4 +- .../field/ActivityDebutDePecheSaneValidator.java | 9 +- .../field/ActivityFinDePecheSaneValidator.java | 11 +- .../field/ActivityFinDeVeilleExistsValidator.java | 3 +- .../field/ActivitySimpleSpeedValidator.java | 27 +- .../validation/field/ActivitySpeedValidator.java | 30 +- .../validation/field/OpenableFieldValidator.java | 138 --- .../field/RouteActivitysFieldValidator.java | 7 +- .../field/SetLonglineUniqueHomeIdValidator.java | 14 +- .../field/SetLonglineUniqueNumberValidator.java | 14 +- .../field/VesselActivityFieldValidator.java | 49 +- .../TripLongline-n1-update-warning-validation.xml | 10 +- .../seine/Route-n1-update-warning-validation.xml | 6 +- .../TripSeine-n1-update-warning-validation.xml | 6 +- .../src/main/resources/validators.xml | 2 +- .../validation/BeanValidatorDetectorTest.java | 4 +- .../field/ActivitySeineSpeedValidatorTest.java | 3 +- .../field/OpenableEntityFieldValidatorTest.java | 82 -- .../seine/TripSeine-testOpen-error-validation.xml | 32 - pom.xml | 2 +- 80 files changed, 4660 insertions(+), 723 deletions(-) create mode 100644 observe-entities/src/main/java/fr/ird/observe/AbstractObserveTopiaDao.java copy {observe-business => observe-services-api}/src/main/filters/observe-reports.properties (99%) rename observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/{ConsolidationDataService.java => ConsolidateDataService.java} (92%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/ReportBuilder.java (97%) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportService.java copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/DataMatrix.java (99%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/Report.java (88%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/ReportOperation.java (82%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/ReportRequest.java (86%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/ReportVariable.java (71%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/operations/ExecuteRequests.java (70%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/operations/GroupByLength.java (83%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/operations/SumColumn.java (84%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/operations/SumIntColumn.java (84%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/operations/SumIntRow.java (84%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/operations/SumRow.java (84%) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateDataRequest.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateDataResult.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateReferentialsRequest.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateReferentialsResult.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoType.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessage.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationResultForDto.java create mode 100644 observe-services-api/src/main/resources/META-INF/services/fr.ird.observe.services.service.actions.report.model.ReportOperation create mode 100644 observe-services-api/src/test/java/fr/ird/observe/services/service/actions/report/ReportBuilderTest.java create mode 100644 observe-services-api/src/test/resources/fr/ird/observe/services/service/actions/report/observe-reports-test.properties create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ClassAdapter.java rename observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/{ConsolidationDataServiceTopia.java => ConsolidateDataServiceTopia.java} (99%) create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/report/ReportServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ObserveValidator.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationDataContext.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessageDetector.java copy {observe-business/src/main/java/fr/ird/observe/validation => observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate}/ValidatorsMap.java (75%) rename observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/consolidate/{ConsolidationDataServiceTopiaTest.java => ConsolidateDataServiceTopiaTest.java} (88%) copy observe-business/src/test/java/fr/ird/observe/its/report/AbstractReportIT.java => observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java (60%) create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatch2Test.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchByGroup2Test.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchByGroupTest.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchTest.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportActivityWithCommentTest.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAllActivitysTest.java copy observe-business/src/test/java/fr/ird/observe/its/report/dailySetAndCatch/ReportIT.java => observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportDailySetAndCatchTest.java (53%) copy observe-business/src/test/java/fr/ird/observe/its/report/dcpUsage/ReportIT.java => observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportDcpUsageTest.java (55%) copy observe-business/src/test/java/fr/ird/observe/its/report/setByAssociation/Report2IT.java => observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportSetByAssociation2Test.java (85%) copy observe-business/src/test/java/fr/ird/observe/its/report/setByAssociation/ReportIT.java => observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportSetByAssociationTest.java (83%) copy observe-business/src/test/java/fr/ird/observe/its/report/targetCatchByAssociation/ReportIT.java => observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportTargetCatchByAssociationTest.java (56%) copy observe-business/src/test/java/fr/ird/observe/its/report/targetDiscardedByAssociation/ReportIT.java => observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportTargetDiscardedByAssociationTest.java (55%) create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopiaTest.java delete mode 100644 observe-validation/src/main/java/fr/ird/observe/validation/field/OpenableFieldValidator.java delete mode 100644 observe-validation/src/test/java/fr/ird/observe/validation/field/OpenableEntityFieldValidatorTest.java delete mode 100644 observe-validation/src/test/resources/fr/ird/observe/entities/seine/TripSeine-testOpen-error-validation.xml -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.