Merge branch 'master' of https://github.com/apache/incubator-griffin into apache-master
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/25cdce97 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/25cdce97 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/25cdce97 Branch: refs/heads/griffin-0.2.0-incubating-rc1 Commit: 25cdce972a3756e9eddc9c6cc45bb7528c53e195 Parents: e7a9c5d 4a9137d Author: Lionel Liu <bhlx3l...@163.com> Authored: Thu Mar 1 16:48:24 2018 +0800 Committer: Lionel Liu <bhlx3l...@163.com> Committed: Thu Mar 1 16:48:24 2018 +0800 ---------------------------------------------------------------------- .../core/info/GriffinInfoController.java | 2 +- .../apache/griffin/core/interceptor/Token.java | 28 ++++++++ .../core/interceptor/TokenInterceptor.java | 74 ++++++++++++++++++++ .../core/interceptor/WebAppConfigurer.java | 33 +++++++++ .../apache/griffin/core/job/JobController.java | 2 + .../apache/griffin/core/job/JobInstance.java | 2 + .../apache/griffin/core/job/JobServiceImpl.java | 2 + .../apache/griffin/core/job/SparkSubmitJob.java | 14 ++-- .../griffin/core/measure/MeasureController.java | 2 + .../measure/entity/AbstractAuditableEntity.java | 15 ++-- .../griffin/core/metric/MetricServiceImpl.java | 2 +- .../core/info/GriffinInfoControllerTest.java | 2 +- 12 files changed, 160 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
