Console Output

[appng-scheduler] Running shell script
+ git merge --ff appng-scheduler-1.11.x --strategy-option theirs
Auto-merging src/main/java/org/appng/application/scheduler/model/JobXmlModel.java
Auto-merging src/main/java/org/appng/application/scheduler/model/JobModel.java
Auto-merging src/main/java/org/appng/application/scheduler/model/JobForm.java
Auto-merging src/main/java/org/appng/application/scheduler/job/IndexJob.java
Auto-merging src/main/java/org/appng/application/scheduler/business/UpdateSchedulerAction.java
Auto-merging src/main/java/org/appng/application/scheduler/business/SetSchedulerStateAction.java
Auto-merging src/main/java/org/appng/application/scheduler/business/SchedulingController.java
Auto-merging src/main/java/org/appng/application/scheduler/business/SchedulerDataSource.java
Auto-merging src/main/java/org/appng/application/scheduler/business/SchedulerAware.java
Auto-merging src/main/java/org/appng/application/scheduler/business/CreateSchedulerAction.java
Auto-merging src/main/java/org/appng/application/scheduler/MessageConstants.java
Auto-merging pom.xml
Auto-merging application-home/conf/config.xml
Merge made by the 'recursive' strategy.
 CODE_OF_CONDUCT.adoc                               |  71 ++++
 CONTRIBUTING.adoc                                  |   1 +
 README.adoc                                        |  14 +
 application-home/application.xml                   |  81 ++--
 application-home/beans.xml                         | 179 ++++-----
 application-home/conf/{plugin.xml => config.xml}   | 206 +++++-----
 application-home/conf/datasource.xml               | 245 ++++++------
 application-home/conf/events.xml                   | 190 ++++-----
 .../dictionary/messages-scheduler.properties       |  81 ++--
 .../dictionary/messages-scheduler_de.properties    |   1 +
 license-header.txt                                 |  13 +
 pom.xml                                            |  29 +-
 .../org/appng/application/scheduler/Constants.java |  46 ++-
 .../scheduler/{message => }/MessageConstants.java  |  49 ++-
 .../application/scheduler/SchedulerUtils.java      | 445 +++++++++++----------
 .../{ => business}/CreateSchedulerAction.java      | 141 +++----
 .../scheduler/{ => business}/SchedulerAware.java   |  34 +-
 .../{ => business}/SchedulerDataSource.java        | 257 ++++++------
 .../{ => business}/SchedulingController.java       |  52 ++-
 .../{ => business}/SetSchedulerStateAction.java    | 126 +++---
 .../{ => business}/UpdateSchedulerAction.java      | 112 +++---
 .../scheduler/{search => job}/IndexJob.java        |   4 +-
 .../scheduler/{form => model}/JobForm.java         | 136 +++----
 .../scheduler/{ => model}/JobModel.java            | 226 ++++++-----
 .../scheduler/{ => model}/JobXmlModel.java         | 170 ++++----
 .../scheduler/quartz/DriverDelegateWrapper.java    | 409 +++++++++++++++++++
 .../application/scheduler/quartz/RunJobEvent.java  |   6 +-
 .../scheduler/quartz/SchedulerJobDetail.java       | 105 +++++
 .../quartz/SpringQuartzSchedulerFactory.java       |  15 +-
 .../application/scheduler/SchedulingTest.java      | 257 ++++++------
 .../application/scheduler/TestJobFactory.java      |   2 +-
 src/test/resources/beans.xml                       | 146 +++----
 .../resources/xml/SchedulingTest-testShowJobs.xml  |  58 +--
 33 files changed, 2310 insertions(+), 1597 deletions(-)
 create mode 100644 CODE_OF_CONDUCT.adoc
 create mode 100644 CONTRIBUTING.adoc
 create mode 100644 README.adoc
 rename application-home/conf/{plugin.xml => config.xml} (95%)
 create mode 100644 license-header.txt
 rename src/main/java/org/appng/application/scheduler/{message => }/MessageConstants.java (87%)
 rename src/main/java/org/appng/application/scheduler/{ => business}/CreateSchedulerAction.java (79%)
 rename src/main/java/org/appng/application/scheduler/{ => business}/SchedulerAware.java (88%)
 rename src/main/java/org/appng/application/scheduler/{ => business}/SchedulerDataSource.java (83%)
 rename src/main/java/org/appng/application/scheduler/{ => business}/SchedulingController.java (72%)
 rename src/main/java/org/appng/application/scheduler/{ => business}/SetSchedulerStateAction.java (81%)
 rename src/main/java/org/appng/application/scheduler/{ => business}/UpdateSchedulerAction.java (76%)
 rename src/main/java/org/appng/application/scheduler/{search => job}/IndexJob.java (95%)
 rename src/main/java/org/appng/application/scheduler/{form => model}/JobForm.java (86%)
 rename src/main/java/org/appng/application/scheduler/{ => model}/JobModel.java (89%)
 rename src/main/java/org/appng/application/scheduler/{ => model}/JobXmlModel.java (67%)
 create mode 100644 src/main/java/org/appng/application/scheduler/quartz/DriverDelegateWrapper.java
 create mode 100644 src/main/java/org/appng/application/scheduler/quartz/SchedulerJobDetail.java