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/f11c07ab Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/f11c07ab Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/f11c07ab Branch: refs/heads/griffin-0.2.0-incubating-rc2 Commit: f11c07ab8efb97c75746141f5abae4df88c5aaea Parents: 799c443 4aab9d5 Author: Lionel Liu <[email protected]> Authored: Wed Mar 28 17:41:47 2018 +0800 Committer: Lionel Liu <[email protected]> Committed: Wed Mar 28 17:41:47 2018 +0800 ---------------------------------------------------------------------- service/pom.xml | 60 +++++- .../core/config/EclipseLinkJpaConfig.java | 41 ++++ .../core/interceptor/TokenInterceptor.java | 38 ++-- .../apache/griffin/core/job/JobInstance.java | 31 +-- .../apache/griffin/core/job/JobServiceImpl.java | 27 ++- .../griffin/core/job/entity/AbstractJob.java | 6 +- .../griffin/core/job/entity/GriffinJob.java | 21 +- .../griffin/core/job/entity/JobDataSegment.java | 6 +- .../core/job/entity/JobInstanceBean.java | 25 ++- .../griffin/core/job/entity/JobSchedule.java | 41 ++-- .../core/job/entity/SegmentPredicate.java | 46 +++-- .../griffin/core/job/repo/JobInstanceRepo.java | 16 +- .../measure/entity/AbstractAuditableEntity.java | 2 +- .../core/measure/entity/DataConnector.java | 31 ++- .../core/measure/entity/EvaluateRule.java | 4 - .../core/measure/entity/GriffinMeasure.java | 40 ++-- .../griffin/core/measure/entity/Measure.java | 8 +- .../griffin/core/measure/entity/Rule.java | 113 ++++++----- .../core/measure/repo/DataConnectorRepo.java | 2 +- .../main/resources/application-dev.properties | 76 ++++--- .../main/resources/application-prod.properties | 63 ++++-- .../src/main/resources/application.properties | 15 +- .../src/main/resources/init_quartz_postgres.sql | 203 +++++++++++++++++++ service/src/main/resources/quartz.properties | 2 +- .../config/EclipseLinkJpaConfigForTest.java | 39 ++++ .../core/config/PropertiesConfigTest.java | 1 - .../core/job/JobInstanceBeanRepoTest.java | 28 ++- .../griffin/core/job/JobInstanceTest.java | 7 +- .../griffin/core/job/JobServiceImplTest.java | 43 ++-- .../core/job/repo/JobInstanceRepoTest.java | 23 ++- .../griffin/core/job/repo/JobRepoTest.java | 17 +- .../measure/repo/DataConnectorRepoTest.java | 24 ++- .../core/measure/repo/MeasureRepoTest.java | 3 + .../hive/HiveMetaStoreServiceImplTest.java | 2 +- .../apache/griffin/core/util/EntityHelper.java | 6 +- .../src/test/resources/application.properties | 14 +- service/src/test/resources/quartz.properties | 4 +- 37 files changed, 827 insertions(+), 301 deletions(-) ----------------------------------------------------------------------
