[46/50] incubator-griffin git commit: Merge branch 'master' of https://github.com/apache/incubator-griffin into apache-master

2018-03-29 Thread guoyp 
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/b6caae1b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/b6caae1b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/b6caae1b

Branch: refs/heads/griffin-0.2.0-incubating-rc2
Commit: b6caae1b72a0880b5c6a0e5b98a1270008ac68b1
Parents: f11c07a 5a92b65
Author: Lionel Liu 
Authored: Wed Mar 28 19:10:47 2018 +0800
Committer: Lionel Liu 
Committed: Wed Mar 28 19:10:47 2018 +0800

--
 KEYS|  58 +++
 LICENSE | 356 +---
 NOTICE  |   4 +-
 licenses/BSD-2-Clause   |  22 +
 licenses/BSD-3-Clause   |  26 ++
 licenses/CDDL-1.0   | 363 
 licenses/CDDL-1.1   | 362 
 licenses/EPL|  86 
 licenses/JSON   |  26 ++
 licenses/MIT|  19 +
 licenses/PostgreSQL |  12 +
 licenses/SIL-OFL-1.1|  84 
 licenses/WTFPL  |  13 +
 measure/src/main/resources/META-INF/LICENSE | 256 
 pom.xml | 117 +++---
 .../core/config/EclipseLinkJpaConfig.java   |  19 +
 service/src/main/resources/Init_quartz.sql  | 190 -
 .../src/main/resources/Init_quartz_derby.sql| 343 +++
 .../main/resources/Init_quartz_derby.sql.bak| 187 +
 .../src/main/resources/Init_quartz_mysql.sql| 190 +
 .../src/main/resources/Init_quartz_postgres.sql | 203 +
 service/src/main/resources/META-INF/LICENSE | 414 +++
 .../src/main/resources/init_quartz_postgres.sql | 203 -
 .../config/EclipseLinkJpaConfigForTest.java |  19 +
 ui/LICENSE  | 310 ++
 25 files changed, 3104 insertions(+), 778 deletions(-)
--

[46/50] incubator-griffin git commit: Merge branch 'master' of https://github.com/apache/incubator-griffin into apache-master

2018-03-29 Thread guoyp 
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/b6caae1b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/b6caae1b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/b6caae1b

Branch: refs/heads/griffin-0.2.0-incubating-rc2
Commit: b6caae1b72a0880b5c6a0e5b98a1270008ac68b1
Parents: f11c07a 5a92b65
Author: Lionel Liu 
Authored: Wed Mar 28 19:10:47 2018 +0800
Committer: Lionel Liu 
Committed: Wed Mar 28 19:10:47 2018 +0800

--
 KEYS|  58 +++
 LICENSE | 356 +---
 NOTICE  |   4 +-
 licenses/BSD-2-Clause   |  22 +
 licenses/BSD-3-Clause   |  26 ++
 licenses/CDDL-1.0   | 363 
 licenses/CDDL-1.1   | 362 
 licenses/EPL|  86 
 licenses/JSON   |  26 ++
 licenses/MIT|  19 +
 licenses/PostgreSQL |  12 +
 licenses/SIL-OFL-1.1|  84 
 licenses/WTFPL  |  13 +
 measure/src/main/resources/META-INF/LICENSE | 256 
 pom.xml | 117 +++---
 .../core/config/EclipseLinkJpaConfig.java   |  19 +
 service/src/main/resources/Init_quartz.sql  | 190 -
 .../src/main/resources/Init_quartz_derby.sql| 343 +++
 .../main/resources/Init_quartz_derby.sql.bak| 187 +
 .../src/main/resources/Init_quartz_mysql.sql| 190 +
 .../src/main/resources/Init_quartz_postgres.sql | 203 +
 service/src/main/resources/META-INF/LICENSE | 414 +++
 .../src/main/resources/init_quartz_postgres.sql | 203 -
 .../config/EclipseLinkJpaConfigForTest.java |  19 +
 ui/LICENSE  | 310 ++
 25 files changed, 3104 insertions(+), 778 deletions(-)
--

[46/50] incubator-griffin git commit: Merge branch 'master' of https://github.com/apache/incubator-griffin into apache-master

2018-03-29 Thread guoyp 
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/b6caae1b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/b6caae1b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/b6caae1b

Branch: refs/heads/griffin-0.2.0-incubating-rc2
Commit: b6caae1b72a0880b5c6a0e5b98a1270008ac68b1
Parents: f11c07a 5a92b65
Author: Lionel Liu 
Authored: Wed Mar 28 19:10:47 2018 +0800
Committer: Lionel Liu 
Committed: Wed Mar 28 19:10:47 2018 +0800

--
 KEYS|  58 +++
 LICENSE | 356 +---
 NOTICE  |   4 +-
 licenses/BSD-2-Clause   |  22 +
 licenses/BSD-3-Clause   |  26 ++
 licenses/CDDL-1.0   | 363 
 licenses/CDDL-1.1   | 362 
 licenses/EPL|  86 
 licenses/JSON   |  26 ++
 licenses/MIT|  19 +
 licenses/PostgreSQL |  12 +
 licenses/SIL-OFL-1.1|  84 
 licenses/WTFPL  |  13 +
 measure/src/main/resources/META-INF/LICENSE | 256 
 pom.xml | 117 +++---
 .../core/config/EclipseLinkJpaConfig.java   |  19 +
 service/src/main/resources/Init_quartz.sql  | 190 -
 .../src/main/resources/Init_quartz_derby.sql| 343 +++
 .../main/resources/Init_quartz_derby.sql.bak| 187 +
 .../src/main/resources/Init_quartz_mysql.sql| 190 +
 .../src/main/resources/Init_quartz_postgres.sql | 203 +
 service/src/main/resources/META-INF/LICENSE | 414 +++
 .../src/main/resources/init_quartz_postgres.sql | 203 -
 .../config/EclipseLinkJpaConfigForTest.java |  19 +
 ui/LICENSE  | 310 ++
 25 files changed, 3104 insertions(+), 778 deletions(-)
--

[46/50] incubator-griffin git commit: Merge branch 'master' of https://github.com/apache/incubator-griffin into apache-master

2018-03-06 Thread guoyp 
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/d7281386
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/d7281386
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/d7281386

Branch: refs/heads/griffin-0.2.0-incubating-rc1
Commit: d7281386589c1f39a6a0bde0499d8028a637c9be
Parents: 25cdce9 d6854bb
Author: Lionel Liu 
Authored: Mon Mar 5 14:44:26 2018 +0800
Committer: Lionel Liu 
Committed: Mon Mar 5 14:44:26 2018 +0800

--
 README.md   |  51 
 griffin-doc/FSD.md  | 103 +++
 griffin-doc/docker/measure-demo-docker.md   |  63 --
 griffin-doc/img/fsd/image2016-6-30 13-19-2.png  | Bin 1488742 -> 0 bytes
 griffin-doc/img/fsd/image2016-6-30 16-16-21.png | Bin 20438 -> 0 bytes
 griffin-doc/img/fsd/image2016-6-30 16-17-5.png  | Bin 19039 -> 0 bytes
 griffin-doc/img/fsd/image2016-6-30 16-17-52.png | Bin 21143 -> 0 bytes
 griffin-doc/img/fsd/image2016-6-30 16-18-20.png | Bin 22061 -> 0 bytes
 griffin-doc/img/fsd/image2016-6-30 16-18-52.png | Bin 22155 -> 0 bytes
 griffin-doc/img/fsd/image2016-6-30 16-20-34.png | Bin 20628 -> 0 bytes
 griffin-doc/img/fsd/image2016-6-30 16-20-53.png | Bin 27396 -> 0 bytes
 griffin-doc/img/fsd/image2016-6-30 16-21-16.png | Bin 20685 -> 0 bytes
 griffin-doc/img/fsd/image2016-6-30 16-21-49.png | Bin 15985 -> 0 bytes
 griffin-doc/img/fsd/image2016-6-30 16-22-53.png | Bin 20997 -> 0 bytes
 griffin-doc/img/fsd/image2016-6-30 16-23-11.png | Bin 98790 -> 0 bytes
 griffin-doc/img/fsd/image2016-6-30 16-23-32.png | Bin 20743 -> 0 bytes
 griffin-doc/img/fsd/image2016-6-30 16-24-7.png  | Bin 49240 -> 0 bytes
 griffin-doc/img/fsd/image2016-6-30 16-25-12.png | Bin 30162 -> 0 bytes
 griffin-doc/img/fsd/image2016-6-30 16-25-42.png | Bin 26276 -> 0 bytes
 griffin-doc/img/fsd/image2016-6-30 16-31-26.png | Bin 27621 -> 0 bytes
 griffin-doc/img/fsd/image2016-6-30 16-33-44.png | Bin 34354 -> 0 bytes
 griffin-doc/img/fsd/image2016-6-30 16-34-58.png | Bin 11806 -> 0 bytes
 griffin-doc/img/fsd/image2016-6-30 16-35-18.png | Bin 17774 -> 0 bytes
 griffin-doc/img/fsd/image2016-6-30 16-35-57.png | Bin 23956 -> 0 bytes
 griffin-doc/img/fsd/image2016-6-30 16-36-48.png | Bin 14428 -> 0 bytes
 griffin-doc/img/fsd/image2016-6-30 16-37-48.png | Bin 22925 -> 0 bytes
 griffin-doc/img/fsd/image2016-6-30 16-39-17.png | Bin 13047 -> 0 bytes
 griffin-doc/img/fsd/image2016-6-30 16-39-37.png | Bin 64162 -> 0 bytes
 griffin-doc/img/fsd/image2016-6-30 16-40-14.png | Bin 10365 -> 0 bytes
 griffin-doc/img/fsd/image2016-6-30 16-41-5.png  | Bin 12937 -> 0 bytes
 griffin-doc/img/fsd/image2016-6-30 16-41-57.png | Bin 34047 -> 0 bytes
 griffin-doc/img/fsd/image2016-6-30 16-42-16.png | Bin 66432 -> 0 bytes
 griffin-doc/img/fsd/image2016-6-30 16-44-15.png | Bin 47475 -> 0 bytes
 griffin-doc/img/fsd/image2018-1-8 12-27-53.png  | Bin 0 -> 180417 bytes
 griffin-doc/img/fsd/image2018-1-8 12-33-2.png   | Bin 0 -> 108413 bytes
 griffin-doc/img/fsd/image2018-1-8 12-38-12.png  | Bin 0 -> 120481 bytes
 griffin-doc/img/fsd/image2018-1-8 12-44-30.png  | Bin 0 -> 152061 bytes
 griffin-doc/img/fsd/image2018-1-8 12-48-20.png  | Bin 0 -> 186633 bytes
 griffin-doc/img/fsd/image2018-1-8 12-51-13.png  | Bin 0 -> 160405 bytes
 griffin-doc/img/fsd/image2018-1-8 13-02-15.png  | Bin 0 -> 272258 bytes
 griffin-doc/img/fsd/image2018-1-8 13-07-16.png  | Bin 0 -> 120708 bytes
 griffin-doc/img/fsd/image2018-1-8 13-10-28.png  | Bin 0 -> 120358 bytes
 griffin-doc/img/fsd/image2018-1-8 13-12-10.png  | Bin 0 -> 143090 bytes
 griffin-doc/img/fsd/image2018-1-8 13-13-40.png  | Bin 0 -> 155166 bytes
 griffin-doc/img/fsd/image2018-1-8 13-15-30.png  | Bin 0 -> 160387 bytes
 griffin-doc/img/fsd/image2018-2-5 14-44-20.png  | Bin 0 -> 279001 bytes
 griffin-doc/img/fsd/image2018-2-5 14-45-10.png  | Bin 0 -> 111384 bytes
 griffin-doc/img/fsd/image2018-2-5 14-46-26.png  | Bin 0 -> 124723 bytes
 griffin-doc/img/fsd/image2018-2-5 14-50-10.png  | Bin 0 -> 85916 bytes
 griffin-doc/img/fsd/image2018-2-6 10-10-15.png  | Bin 0 -> 82679 bytes
 griffin-doc/img/fsd/image2018-2-6 10-48-10.png  | Bin 0 -> 59232 bytes
 griffin-doc/img/fsd/image2018-2-6 10-50-10.png  | Bin 0 -> 144805 bytes
 griffin-doc/img/fsd/image2018-2-6 10-51-16.png  | Bin 0 -> 118094 bytes
 griffin-doc/img/fsd/image2018-2-6 10-54-15.png  | Bin 0 -> 139184 bytes
 griffin-doc/img/fsd/image2018-2-6 10-57-20.png  | Bin 0 -> 264629 bytes
 griffin-doc/img/fsd/image2018-2-6 10-58-24.png  | Bin 0 -> 92768 bytes
 griffin-doc/img/fsd/image2018-2-6 11-1-10.png   | Bin 0 -> 214914 bytes
 griffin-doc/img/fsd/image2018-2-6 11-3-19.png   | Bin 0 -> 97741 bytes
 griffin-doc/img/userguide/1.PNG | Bin 12742 -> 0 bytes
 griffin-doc/img/userguide/1

[46/50] incubator-griffin git commit: Merge branch 'master' of https://github.com/apache/incubator-griffin into apache-master

2018-03-06 Thread guoyp 
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 
Authored: Thu Mar 1 16:48:24 2018 +0800
Committer: Lionel Liu 
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(-)
--