This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit dd58708693aa0e18c8fb86466417a53c7543fceb Merge: 70d655b 9f49fbf Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Sep 3 16:19:32 2015 +0200 Merge sur develop (termine #7498) .../fr/ird/observe/AbstractObserveTopiaDao.java | 18 + observe-services-api/pom.xml | 24 +- .../src/main/filters/observe-reports.properties | 854 +++++++++++++++++++ .../service/actions/report/ReportBuilder.java | 489 +++++++++++ .../service/actions/report/ReportService.java | 20 + .../service/actions/report/model/DataMatrix.java | 259 ++++++ .../service/actions/report/model/Report.java | 157 ++++ .../actions/report/model/ReportOperation.java | 106 +++ .../actions/report/model/ReportRequest.java | 406 +++++++++ .../actions/report/model/ReportVariable.java | 80 ++ .../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 +++ ...es.service.actions.report.model.ReportOperation | 6 + .../service/actions/report/ReportBuilderTest.java | 130 +++ .../actions/report/observe-reports-test.properties | 27 + .../service/actions/report/ReportServiceTopia.java | 207 +++++ .../report/AbstractReportServiceTopiaTest.java | 242 ++++++ .../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 | 103 +++ .../service/actions/report/ReportDcpUsageTest.java | 142 ++++ .../report/ReportSetByAssociation2Test.java | 50 ++ .../actions/report/ReportSetByAssociationTest.java | 128 +++ .../report/ReportTargetCatchByAssociationTest.java | 116 +++ .../ReportTargetDiscardedByAssociationTest.java | 116 +++ 33 files changed, 6240 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.