Console Output

+ git merge --ff appng-1.19.x --strategy-option theirs
Merge made by the 'recursive' strategy.
 README.adoc                                        |   4 +-
 appng-api/pom.xml                                  |   2 +-
 .../src/main/java/org/appng/api/RequestUtil.java   |  46 ++
 appng-application-assembly/pom.xml                 |   2 +-
 appng-application-bom/pom.xml                      |  30 +-
 appng-application-camunda/pom.xml                  |   2 +-
 appng-application-parent/pom.xml                   |   4 +-
 appng-application/pom.xml                          |   2 +-
 appng-appngizer-jaxb/pom.xml                       |  30 +-
 .../java/org/appng/appngizer/client/AppNGizer.java | 435 ++++++++++++
 .../appng/appngizer/client/AppNGizerClient.java    | 477 ++++++++++++++
 .../org/appng/appngizer/client/AppNGizerTest.java  | 121 ++++
 .../src/test/resources/config/platform.json        | 262 ++++++++
 .../src/test/resources/config/platform.yaml        | 238 +++++++
 .../src/test/resources/config/site.json            | 733 +++++++++++++++++++++
 .../src/test/resources/config/site.yaml            | 649 ++++++++++++++++++
 .../src/test/resources/log4j.properties            |   6 +
 appng-appngizer-maven-plugin/pom.xml               |   2 +-
 appng-appngizer/pom.xml                            |   2 +-
 .../src/main/asciidoc/parts/subject.adoc           |   2 +-
 .../src/main/asciidoc/xml/subject-create.xml       |   4 +-
 .../src/test/resources/xml/site-create.xml         |   1 +
 .../src/test/resources/xml/site-create2.xml        |   1 +
 .../src/test/resources/xml/site-property-list.xml  |   4 +-
 .../src/test/resources/xml/site-update.xml         |   1 +
 appng-archetype-application/pom.xml                |   2 +-
 appng-archetype-application/readme.txt             |   2 +-
 .../src/main/resources/archetype-resources/pom.xml |   2 +-
 appng-camunda/pom.xml                              |   2 +-
 appng-cli/pom.xml                                  |   2 +-
 appng-core/pom.xml                                 |   2 +-
 .../java/org/appng/core/controller/Controller.java |  60 +-
 .../java/org/appng/core/controller/Session.java    |   6 +-
 .../org/appng/core/controller/SessionListener.java |  41 +-
 .../core/controller/filter/PageCacheFilter.java    |   5 +
 .../controller/handler/ServiceRequestHandler.java  |  18 +-
 .../appng/core/model/AbstractRequestProcessor.java |  22 +-
 .../org/appng/core/service/InitializerService.java |   4 +-
 .../java/org/appng/core/service/LdapService.java   |  18 +-
 .../org/appng/core/service/PropertySupport.java    |   4 +-
 .../controller/filter/PageCacheFilterTest.java     |  23 +-
 .../handler/ServiceRequestHandlerTest.java         |  46 +-
 .../src/test/resources/META-INF/persistence.xml    |   4 +-
 .../src/test/resources/WEB-INF/conf/ehcache.xml    |  23 +-
 appng-core/src/test/resources/log4j.properties     |   4 +-
 appng-documentation/pom.xml                        |   2 +-
 .../src/main/asciidoc/listing/dependencies.txt     |   8 +-
 appng-forms/pom.xml                                |   2 +-
 appng-formtags/pom.xml                             |   2 +-
 appng-mail/pom.xml                                 |   2 +-
 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 +-
 .../java/org/appng/taglib/MultiSiteSupport.java    |   8 +-
 appng-template-assembly/pom.xml                    |   2 +-
 appng-template-parent/pom.xml                      |   4 +-
 appng-testsupport/pom.xml                          |   2 +-
 appng-tools/pom.xml                                |   2 +-
 appng-upngizr/README.adoc                          |   2 +-
 appng-upngizr/pom.xml                              |   2 +-
 appng-xmlapi/pom.xml                               |   2 +-
 changelog.txt                                      |  17 +-
 pom.xml                                            |   9 +-
 66 files changed, 3263 insertions(+), 165 deletions(-)
 create mode 100644 appng-appngizer-jaxb/src/main/java/org/appng/appngizer/client/AppNGizer.java
 create mode 100644 appng-appngizer-jaxb/src/main/java/org/appng/appngizer/client/AppNGizerClient.java
 create mode 100644 appng-appngizer-jaxb/src/test/java/org/appng/appngizer/client/AppNGizerTest.java
 create mode 100644 appng-appngizer-jaxb/src/test/resources/config/platform.json
 create mode 100644 appng-appngizer-jaxb/src/test/resources/config/platform.yaml
 create mode 100644 appng-appngizer-jaxb/src/test/resources/config/site.json
 create mode 100644 appng-appngizer-jaxb/src/test/resources/config/site.yaml
 create mode 100644 appng-appngizer-jaxb/src/test/resources/log4j.properties