Console Output

+ git merge --ff appng-scheduler-1.12.x --strategy-option theirs
Removing src/main/java/org/appng/application/scheduler/MessageConstants.java
Merge made by the 'recursive' strategy.
 README.adoc                                        |  25 +++
 application-home/application.xml                   |   5 +
 application-home/beans.xml                         |  28 ++-
 application-home/conf/config.xml                   |  73 ++++++-
 application-home/conf/datasource.xml               | 108 +++++++++-
 application-home/conf/events.xml                   |  19 +-
 .../dictionary/messages-scheduler.properties       |  26 ++-
 .../dictionary/messages-scheduler_de.properties    |  24 +++
 pom.xml                                            |  74 ++++++-
 .../icinga/appng-check_scheduled_job_executions.py |  68 +++++++
 .../org/appng/application/scheduler/Constants.java |   4 +-
 .../application/scheduler/MessageConstants.java    |  38 ----
 .../application/scheduler/SchedulerUtils.java      |   6 +-
 .../scheduler/business/CreateSchedulerAction.java  |   2 +-
 .../application/scheduler/business/Records.java    | 135 +++++++++++++
 .../scheduler/business/SchedulerAware.java         |   2 +-
 .../scheduler/business/SchedulerDataSource.java    |   2 +-
 .../scheduler/business/SchedulingController.java   |  16 +-
 .../business/SetSchedulerStateAction.java          |   2 +-
 .../scheduler/business/UpdateSchedulerAction.java  |   2 +-
 .../appng/application/scheduler/job/IndexJob.java  |  22 +-
 .../scheduler/job/JobRecordHouseKeepingJob.java    |  53 +++++
 .../appng/application/scheduler/model/JobForm.java |   2 +-
 .../application/scheduler/model/JobModel.java      |   4 +-
 .../application/scheduler/model/JobRecord.java     |  47 +++++
 .../application/scheduler/model/JobResult.java     |  65 ++++++
 .../application/scheduler/model/JobXmlModel.java   |   3 +-
 .../scheduler/quartz/DriverDelegateWrapper.java    |   2 +-
 .../scheduler/quartz/RecordingJobListener.java     |  75 +++++++
 .../application/scheduler/quartz/RunJobEvent.java  |  11 +-
 .../scheduler/quartz/SchedulerJobDetail.java       |   2 +-
 .../quartz/SpringQuartzSchedulerFactory.java       |   6 +-
 .../scheduler/service/JobRecordService.java        | 225 +++++++++++++++++++++
 .../scheduler/service/RecordsRestController.java   |  78 +++++++
 .../application/scheduler/SchedulingTest.java      |   2 +
 .../application/scheduler/TestJobRecordings.java   | 152 ++++++++++++++
 src/test/resources/beans.xml                       |  13 +-
 .../xml/SchedulingTest-testCreate-job1.xml         |   4 +-
 .../xml/SchedulingTest-testCreate-job2.xml         |   4 +-
 .../resources/xml/SchedulingTest-testDelete.xml    |   2 +-
 .../resources/xml/SchedulingTest-testSchedule.xml  |   2 +-
 .../resources/xml/SchedulingTest-testShowJob.xml   |   6 +-
 .../resources/xml/SchedulingTest-testShowJobs.xml  |  47 ++++-
 .../resources/xml/SchedulingTest-testStart.xml     |   2 +-
 .../xml/SchedulingTest-testUnschedule.xml          |   2 +-
 .../resources/xml/SchedulingTest-testUpdate.xml    |   2 +-
 .../xml/TestJobRecordings-testGetRecords.xml       |  76 +++++++
 .../TestJobRecordings-testGetRecordsForJobId.xml   |  48 +++++
 .../TestJobRecordings-testGetRecordsWithFilter.xml |  76 +++++++
 49 files changed, 1575 insertions(+), 117 deletions(-)
 create mode 100644 scripts/icinga/appng-check_scheduled_job_executions.py
 delete mode 100644 src/main/java/org/appng/application/scheduler/MessageConstants.java
 create mode 100644 src/main/java/org/appng/application/scheduler/business/Records.java
 create mode 100644 src/main/java/org/appng/application/scheduler/job/JobRecordHouseKeepingJob.java
 create mode 100644 src/main/java/org/appng/application/scheduler/model/JobRecord.java
 create mode 100644 src/main/java/org/appng/application/scheduler/model/JobResult.java
 create mode 100644 src/main/java/org/appng/application/scheduler/quartz/RecordingJobListener.java
 create mode 100644 src/main/java/org/appng/application/scheduler/service/JobRecordService.java
 create mode 100644 src/main/java/org/appng/application/scheduler/service/RecordsRestController.java
 create mode 100644 src/test/java/org/appng/application/scheduler/TestJobRecordings.java
 create mode 100644 src/test/resources/xml/TestJobRecordings-testGetRecords.xml
 create mode 100644 src/test/resources/xml/TestJobRecordings-testGetRecordsForJobId.xml
 create mode 100644 src/test/resources/xml/TestJobRecordings-testGetRecordsWithFilter.xml