Console Output

+ git merge --ff appng-1.24.x --strategy-option theirs
Updating 4fab7f50..02529427
Fast-forward
 README.adoc                                        |   6 +-
 appng-api/pom.xml                                  |   2 +-
 .../main/java/org/appng/api/config/RestConfig.java | 208 +++++++++++++++++----
 appng-application-assembly/pom.xml                 |   2 +-
 appng-application-bom/pom.xml                      |   2 +-
 appng-application-camunda/README.adoc              |   4 +-
 appng-application-camunda/pom.xml                  |   2 +-
 appng-application-parent/pom.xml                   |   2 +-
 appng-application/README.adoc                      |   4 +-
 appng-application/pom.xml                          |   2 +-
 appng-appngizer-jaxb/pom.xml                       |   2 +-
 appng-appngizer-maven-plugin/pom.xml               |   2 +-
 appng-appngizer/pom.xml                            |   2 +-
 .../java/org/appng/appngizer/model/Property.java   |   8 +-
 .../org/appng/appngizer/model/PropertyTest.java    |  45 +++++
 appng-archetype-application/pom.xml                |   2 +-
 appng-camunda/pom.xml                              |   2 +-
 appng-cli/pom.xml                                  |   2 +-
 appng-core/pom.xml                                 |   2 +-
 .../org/appng/core/controller/SessionListener.java |   2 +-
 .../appng/core/controller/handler/RestService.java |  15 +-
 .../core/controller/rest/RestPostProcessor.java    |  26 +--
 .../org/appng/core/service/InitializerService.java |   6 +-
 .../appng/core/controller/SessionListenerTest.java |   2 +-
 .../handler/ServiceRequestHandlerTest.java         | 109 ++++-------
 .../src/test/resources/rest/restServiceResult.json |   8 +
 appng-documentation/pom.xml                        |   2 +-
 appng-forms/pom.xml                                |   2 +-
 appng-formtags/pom.xml                             |   2 +-
 appng-logo.png                                     | Bin 0 -> 4909 bytes
 appng-mail/pom.xml                                 |   2 +-
 appng-maven-plugin/README.adoc                     |   4 +-
 appng-maven-plugin/pom.xml                         |   2 +-
 appng-persistence/pom.xml                          |   2 +-
 appng-rest-api/pom.xml                             |   2 +-
 appng-search/pom.xml                               |   2 +-
 appng-standalone/pom.xml                           |   2 +-
 appng-taglib/pom.xml                               |   2 +-
 appng-template-assembly/pom.xml                    |   2 +-
 appng-template-parent/pom.xml                      |   4 +-
 appng-testsupport/pom.xml                          |   2 +-
 .../main/java/org/appng/testsupport/TestBase.java  |  61 ++----
 .../appng/testsupport/config/RestTestConfig.java   |  39 ++++
 .../java/org/appng/testsupport/TestBaseTest.java   |  10 +-
 appng-tools/pom.xml                                |   2 +-
 appng-upngizr/README.adoc                          |   4 +-
 appng-xmlapi/pom.xml                               |   2 +-
 pom.xml                                            |   2 +-
 48 files changed, 384 insertions(+), 237 deletions(-)
 create mode 100644 appng-appngizer/src/test/java/org/appng/appngizer/model/PropertyTest.java
 create mode 100644 appng-core/src/test/resources/rest/restServiceResult.json
 create mode 100644 appng-logo.png
 create mode 100644 appng-testsupport/src/main/java/org/appng/testsupport/config/RestTestConfig.java