Console Output

+ git merge --ff appng-scheduler-1.14.x --strategy-option theirs
Removing src/test/java/org/appng/application/scheduler/TestJobFactory.java
Removing src/main/java/org/appng/application/scheduler/quartz/SchedulerFactoryBean.java
Merge made by the 'recursive' strategy.
 README.adoc                                        |   4 +-
 application-home/application.xml                   |   2 -
 application-home/beans.xml                         |  88 +---------
 pom.xml                                            |  42 ++++-
 .../org/appng/application/scheduler/Constants.java |   4 +
 .../scheduler/business/CreateSchedulerAction.java  |  12 +-
 .../scheduler/business/SchedulerAware.java         |   8 +-
 .../scheduler/business/SchedulerDataSource.java    |  14 +-
 .../scheduler/business/SchedulingController.java   |  33 ++--
 .../business/SetSchedulerStateAction.java          |  14 +-
 .../scheduler/business/UpdateSchedulerAction.java  |  14 +-
 .../scheduler/configuration/SchedulerConfig.java   | 181 +++++++++++++++++++
 .../scheduler/job/JobRecordHouseKeepingJob.java    |   2 +-
 .../scheduler/quartz/DriverDelegateWrapper.java    |   3 +-
 .../scheduler/quartz/RecordingJobListener.java     |   1 -
 .../scheduler/quartz/SchedulerFactoryBean.java     |  52 ------
 .../scheduler/quartz/SchedulerJobDetail.java       |   1 -
 .../quartz/SpringQuartzSchedulerFactory.java       |  16 +-
 .../scheduler/service/JobRecordService.java        |  35 +++-
 .../scheduler/service/JobStateRestController.java  | 191 +++++++++++++++++++++
 src/main/resources/scheduler-api.yaml              | 120 +++++++++++++
 .../scheduler/DriverDelegateWrapperTest.java       |   1 -
 .../scheduler/SchedulingProperties.java            |  41 +++++
 .../application/scheduler/SchedulingTest.java      |  22 +--
 .../application/scheduler/TestJobFactory.java      |  45 -----
 .../scheduler/business/TestJobRecordings.java      |  60 +++----
 .../application/scheduler/job/LongRunningJob.java  |  10 +-
 .../service/JobStateRestControllerTest.java        |  96 +++++++++++
 src/test/resources/beans-test-core.xml             |  11 +-
 src/test/resources/beans-test.xml                  |  33 ++--
 .../json/RecordsRestControllerTest-indexJob.json   |  12 ++
 .../RecordsRestControllerTest-longRunningJob.json  |  12 ++
 .../resources/xml/SchedulingTest-testShowJob.xml   |  72 +++++---
 .../xml/TestJobRecordings-testJobDetails.xml       |  24 +--
 34 files changed, 914 insertions(+), 362 deletions(-)
 create mode 100644 src/main/java/org/appng/application/scheduler/configuration/SchedulerConfig.java
 delete mode 100644 src/main/java/org/appng/application/scheduler/quartz/SchedulerFactoryBean.java
 create mode 100644 src/main/java/org/appng/application/scheduler/service/JobStateRestController.java
 create mode 100644 src/main/resources/scheduler-api.yaml
 create mode 100644 src/test/java/org/appng/application/scheduler/SchedulingProperties.java
 delete mode 100644 src/test/java/org/appng/application/scheduler/TestJobFactory.java
 create mode 100644 src/test/java/org/appng/application/scheduler/service/JobStateRestControllerTest.java
 create mode 100644 src/test/resources/json/RecordsRestControllerTest-indexJob.json
 create mode 100644 src/test/resources/json/RecordsRestControllerTest-longRunningJob.json