Console Output

+ git merge --ff appng-scheduler-1.13.x --strategy-option theirs
Removing src/test/resources/xml/TestJobRecordings-testGetRecords.xml
Auto-merging src/test/resources/beans-test.xml
Removing src/test/java/org/appng/application/scheduler/TestJobRecordings.java
Removing src/main/java/org/appng/application/scheduler/model/JobXmlModel.java
Merge made by the 'recursive' strategy.
 application-home/beans.xml                         |  10 +-
 application-home/conf/config.xml                   |  40 +--
 application-home/conf/datasource.xml               |  93 +++---
 application-home/conf/events.xml                   |   2 +-
 .../dictionary/messages-scheduler.properties       |  10 +-
 pom.xml                                            |  22 +-
 .../org/appng/application/scheduler/Constants.java |   3 +-
 .../application/scheduler/SchedulerUtils.java      |  73 +++--
 .../scheduler/business/CreateSchedulerAction.java  |   6 +-
 .../application/scheduler/business/Records.java    |  69 +++--
 .../scheduler/business/SchedulerAware.java         |   2 +-
 .../scheduler/business/SchedulerDataSource.java    |  55 ++--
 .../scheduler/business/SchedulingController.java   |  19 +-
 .../business/SetSchedulerStateAction.java          |   5 +-
 .../scheduler/business/UpdateSchedulerAction.java  |   2 +-
 .../appng/application/scheduler/job/IndexJob.java  |   2 +-
 .../scheduler/job/JobRecordHouseKeepingJob.java    |   7 +-
 .../appng/application/scheduler/model/JobForm.java |   5 +-
 .../application/scheduler/model/JobModel.java      | 187 +++++++-----
 .../application/scheduler/model/JobRecord.java     |  26 +-
 .../application/scheduler/model/JobResult.java     |   2 +-
 .../application/scheduler/model/JobXmlModel.java   | 101 -------
 .../scheduler/quartz/DriverDelegateWrapper.java    |   2 +-
 .../scheduler/quartz/RecordingJobListener.java     |   8 +-
 .../application/scheduler/quartz/RunJobEvent.java  |   2 +-
 .../scheduler/quartz/SchedulerFactoryBean.java     |   2 +-
 .../scheduler/quartz/SchedulerJobDetail.java       |   2 +-
 .../quartz/SpringQuartzSchedulerFactory.java       |  24 +-
 .../scheduler/service/JobRecordService.java        | 219 +++++---------
 .../scheduler/service/RecordsRestController.java   |  12 +-
 .../scheduler/DriverDelegateWrapperTest.java       |   2 +-
 .../application/scheduler/SchedulingTest.java      |  35 ++-
 .../application/scheduler/TestJobFactory.java      |   2 +-
 .../application/scheduler/TestJobRecordings.java   | 152 ----------
 .../scheduler/business/TestJobRecordings.java      | 171 +++++++++++
 .../application/scheduler/job/LongRunningJob.java  |  50 ++++
 src/test/resources/beans-test-core.xml             |  13 +
 src/test/resources/{beans.xml => beans-test.xml}   |  44 +--
 .../xml/SchedulingTest-testCreate-job1.xml         |   5 +-
 .../xml/SchedulingTest-testCreate-job2.xml         |   5 +-
 .../resources/xml/SchedulingTest-testDelete.xml    |   2 +-
 .../resources/xml/SchedulingTest-testSchedule.xml  |   3 +-
 .../resources/xml/SchedulingTest-testShowJob.xml   |  33 ++-
 .../resources/xml/SchedulingTest-testShowJobs.xml  | 324 ++++++++++++---------
 .../resources/xml/SchedulingTest-testStart.xml     |   2 +-
 .../xml/SchedulingTest-testUnschedule.xml          |   2 +-
 .../resources/xml/SchedulingTest-testUpdate.xml    |   2 +-
 .../xml/TestJobRecordings-testGetRecord.xml        |  84 ++++++
 .../xml/TestJobRecordings-testGetRecords.xml       |  76 -----
 .../TestJobRecordings-testGetRecordsForJobId.xml   | 122 +++++---
 .../TestJobRecordings-testGetRecordsWithFilter.xml | 150 +++++-----
 .../xml/TestJobRecordings-testJobDetails.xml       |  49 ++++
 52 files changed, 1232 insertions(+), 1108 deletions(-)
 delete mode 100644 src/main/java/org/appng/application/scheduler/model/JobXmlModel.java
 delete mode 100644 src/test/java/org/appng/application/scheduler/TestJobRecordings.java
 create mode 100644 src/test/java/org/appng/application/scheduler/business/TestJobRecordings.java
 create mode 100644 src/test/java/org/appng/application/scheduler/job/LongRunningJob.java
 create mode 100644 src/test/resources/beans-test-core.xml
 rename src/test/resources/{beans.xml => beans-test.xml} (50%)
 create mode 100644 src/test/resources/xml/TestJobRecordings-testGetRecord.xml
 delete mode 100644 src/test/resources/xml/TestJobRecordings-testGetRecords.xml
 create mode 100644 src/test/resources/xml/TestJobRecordings-testJobDetails.xml