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/a89291ed Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/a89291ed Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/a89291ed Branch: refs/heads/griffin-0.2.0-incubating-rc2 Commit: a89291eda1c50975a98513548982120e7749cc8e Parents: a4f573a e704da6 Author: Lionel Liu <bhlx3l...@163.com> Authored: Mon Jan 15 14:01:16 2018 +0800 Committer: Lionel Liu <bhlx3l...@163.com> Committed: Mon Jan 15 14:01:16 2018 +0800 ---------------------------------------------------------------------- .../apache/griffin/core/config/LoginConfig.java | 56 +++++++ .../griffin/core/login/LoginController.java | 7 - .../apache/griffin/core/login/LoginService.java | 6 - .../core/login/LoginServiceDefaultImpl.java | 44 ++++++ .../griffin/core/login/LoginServiceImpl.java | 157 ------------------- .../core/login/LoginServiceLdapImpl.java | 107 +++++++++++++ .../griffin/core/metric/MetricController.java | 7 +- .../griffin/core/metric/MetricService.java | 3 +- .../griffin/core/metric/MetricServiceImpl.java | 57 +++++-- .../griffin/core/metric/MetricStoreImpl.java | 26 ++- .../griffin/core/metric/model/Metric.java | 22 +-- .../core/util/GriffinOperationMessage.java | 6 +- .../src/main/resources/application.properties | 17 +- 13 files changed, 286 insertions(+), 229 deletions(-) ----------------------------------------------------------------------
