Console Output
[appng] Running shell script
+ git merge --ff origin/appng-1.18.x --strategy-option theirs
Updating 0e39aac..7e6fd10
Fast-forward
README.adoc | 2 +-
appng-api/pom.xml | 2 +-
.../java/org/appng/api/support/ElementHelper.java | 4 +
.../org/appng/api/support/FieldProcessorImpl.java | 10 +-
.../validation/DefaultValidationProvider.java | 195 +++++---
.../validation/LocalizedMessageInterpolator.java | 71 ++-
appng-api/src/test/java/org/appng/api/Person.java | 2 +
.../org/appng/api/support/FieldProcessorTest.java | 111 +++++
.../appng/api/support/ValidationProviderTest.java | 37 +-
.../LocalizedMessageInterpolatorTest.java | 76 +++
.../resources/ValidationMessages_en.properties | 1 +
...ationProviderTest-testAddValidationMetaData.xml | 33 +-
...roviderTest-testAddValidationMetaDataAsRule.xml | 237 ++++-----
...iderTest-testAddValidationMetaDataWithGroup.xml | 31 +-
...iderTest-testValidateWithChildFields-before.xml | 47 ++
...ionProviderTest-testValidateWithChildFields.xml | 60 +++
appng-application-assembly/pom.xml | 2 +-
appng-application-bom/pom.xml | 36 +-
appng-application-camunda/README.adoc | 2 +-
appng-application-camunda/pom.xml | 2 +-
appng-application-parent/pom.xml | 2 +-
appng-application/README.adoc | 2 +-
appng-application/pom.xml | 6 +-
.../main/webapp/WEB-INF/conf/platformContext.xml | 4 +-
appng-appngizer-jaxb/pom.xml | 2 +-
appng-appngizer-maven-plugin/pom.xml | 2 +-
appng-appngizer/pom.xml | 2 +-
.../src/main/asciidoc/appngizer-setup-guide.adoc | 2 +
.../src/main/webapp/WEB-INF/appNGizer-servlet.xml | 2 +-
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-cli/src/main/resources/cliContext.xml | 4 +-
appng-cli/src/test/resources/cliContext-test.xml | 4 +-
appng-core/pom.xml | 22 +-
.../core/controller/filter/PageCacheFilter.java | 86 +++-
.../filter/session/MongoSessionInitializer.java | 145 ++++++
.../filter/session/SessionFilterDelegate.java | 100 ++++
.../controller/filter/session/SessionUtils.java | 68 +++
.../core/controller/messaging/RabbitMQBase.java | 4 +-
.../controller/messaging/RabbitMQReceiver.java | 63 ++-
.../core/controller/messaging/RabbitMQSender.java | 2 +
.../appng/core/controller/rest/RestActionBase.java | 466 ++++++++++++++++++
.../core/controller/rest/RestDataSourceBase.java | 285 +++++++++++
.../appng/core/controller/rest/RestOperation.java | 261 ++++++++++
.../core/controller/rest/RestPostProcessor.java | 96 ++++
.../org/appng/core/model/ApplicationProvider.java | 40 +-
.../org/appng/core/service/InitializerService.java | 6 +
.../controller/filter/PageCacheFilterTest.java | 89 ++++
.../appng/core/controller/rest/RestActionTest.java | 92 ++++
.../core/controller/rest/RestDataSourceTest.java | 136 ++++++
.../core/controller/rest/RestOperationTest.java | 69 +++
.../appng/core/controller/rest/model/Payment.java | 122 +++++
.../core/controller/rest/model/PaymentItem.java | 116 +++++
.../appng/core/controller/rest/model/SiteForm.java | 52 ++
appng-core/src/test/resources/platformContext.xml | 4 +-
.../rest/action-get-childfields-result.json | 86 ++++
.../test/resources/rest/action-get-childfields.xml | 71 +++
.../src/test/resources/rest/action-get-result.json | 96 ++++
appng-core/src/test/resources/rest/action-get.xml | 87 ++++
.../rest/action-post-childfields-result.json | 86 ++++
.../resources/rest/action-post-childfields.json | 82 ++++
.../resources/rest/action-post-childfields.xml | 71 +++
.../test/resources/rest/action-post-result.json | 100 ++++
.../rest/action-post-validation-result.json | 75 +++
.../resources/rest/action-post-validation.json | 75 +++
.../src/test/resources/rest/action-post.json | 77 +++
appng-core/src/test/resources/rest/action-post.xml | 87 ++++
.../src/test/resources/rest/datasource-result.json | 68 +++
.../src/test/resources/rest/datasource-result.xml | 64 +++
.../test/resources/rest/datasource-resultset.json | 208 ++++++++
.../test/resources/rest/datasource-resultset.xml | 198 ++++++++
appng-documentation/pom.xml | 2 +-
.../asciidoc/images/application-processing.jpg | Bin 74667 -> 141222 bytes
.../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/README.adoc | 2 +-
appng-maven-plugin/pom.xml | 2 +-
appng-persistence/pom.xml | 2 +-
appng-rest-api/pom.xml | 146 ++++++
.../main/java/org/appng/api/rest/ActionHelper.java | 91 ++++
.../java/org/appng/api/rest/DataSourceHelper.java | 58 +++
.../main/java/org/appng/api/rest/RestClient.java | 253 ++++++++++
.../resources/org/appng/api/rest/appng-rest.yaml | 529 +++++++++++++++++++++
appng-rest-api/src/test/resources/log4j.properties | 7 +
.../src/test_/resources/log4j.properties | 6 +
appng-search/pom.xml | 2 +-
.../appng/search/indexer/FileSystemProvider.java | 19 +-
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 +-
appng-tomcat7/pom.xml | 2 +-
appng-tomcat8/pom.xml | 2 +-
appng-tools/pom.xml | 2 +-
appng-upngizr/README.adoc | 2 +-
appng-upngizr/pom.xml | 2 +-
appng-xmlapi/pom.xml | 2 +-
appng-xmlapi/src/main/xsd/appng-platform.xsd | 5 +
pom.xml | 8 +-
105 files changed, 5718 insertions(+), 310 deletions(-)
create mode 100644 appng-api/src/test/java/org/appng/api/support/FieldProcessorTest.java
create mode 100644 appng-api/src/test/java/org/appng/api/support/validation/LocalizedMessageInterpolatorTest.java
create mode 100644 appng-api/src/test/resources/ValidationMessages_en.properties
create mode 100644 appng-api/src/test/resources/xml/ValidationProviderTest-testValidateWithChildFields-before.xml
create mode 100644 appng-api/src/test/resources/xml/ValidationProviderTest-testValidateWithChildFields.xml
create mode 100644 appng-core/src/main/java/org/appng/core/controller/filter/session/MongoSessionInitializer.java
create mode 100644 appng-core/src/main/java/org/appng/core/controller/filter/session/SessionFilterDelegate.java
create mode 100644 appng-core/src/main/java/org/appng/core/controller/filter/session/SessionUtils.java
create mode 100644 appng-core/src/main/java/org/appng/core/controller/rest/RestActionBase.java
create mode 100644 appng-core/src/main/java/org/appng/core/controller/rest/RestDataSourceBase.java
create mode 100644 appng-core/src/main/java/org/appng/core/controller/rest/RestOperation.java
create mode 100644 appng-core/src/main/java/org/appng/core/controller/rest/RestPostProcessor.java
create mode 100644 appng-core/src/test/java/org/appng/core/controller/filter/PageCacheFilterTest.java
create mode 100644 appng-core/src/test/java/org/appng/core/controller/rest/RestActionTest.java
create mode 100644 appng-core/src/test/java/org/appng/core/controller/rest/RestDataSourceTest.java
create mode 100644 appng-core/src/test/java/org/appng/core/controller/rest/RestOperationTest.java
create mode 100644 appng-core/src/test/java/org/appng/core/controller/rest/model/Payment.java
create mode 100644 appng-core/src/test/java/org/appng/core/controller/rest/model/PaymentItem.java
create mode 100644 appng-core/src/test/java/org/appng/core/controller/rest/model/SiteForm.java
create mode 100644 appng-core/src/test/resources/rest/action-get-childfields-result.json
create mode 100644 appng-core/src/test/resources/rest/action-get-childfields.xml
create mode 100644 appng-core/src/test/resources/rest/action-get-result.json
create mode 100644 appng-core/src/test/resources/rest/action-get.xml
create mode 100644 appng-core/src/test/resources/rest/action-post-childfields-result.json
create mode 100644 appng-core/src/test/resources/rest/action-post-childfields.json
create mode 100644 appng-core/src/test/resources/rest/action-post-childfields.xml
create mode 100644 appng-core/src/test/resources/rest/action-post-result.json
create mode 100644 appng-core/src/test/resources/rest/action-post-validation-result.json
create mode 100644 appng-core/src/test/resources/rest/action-post-validation.json
create mode 100644 appng-core/src/test/resources/rest/action-post.json
create mode 100644 appng-core/src/test/resources/rest/action-post.xml
create mode 100644 appng-core/src/test/resources/rest/datasource-result.json
create mode 100644 appng-core/src/test/resources/rest/datasource-result.xml
create mode 100644 appng-core/src/test/resources/rest/datasource-resultset.json
create mode 100644 appng-core/src/test/resources/rest/datasource-resultset.xml
create mode 100644 appng-rest-api/pom.xml
create mode 100644 appng-rest-api/src/main/java/org/appng/api/rest/ActionHelper.java
create mode 100644 appng-rest-api/src/main/java/org/appng/api/rest/DataSourceHelper.java
create mode 100644 appng-rest-api/src/main/java/org/appng/api/rest/RestClient.java
create mode 100644 appng-rest-api/src/main/resources/org/appng/api/rest/appng-rest.yaml
create mode 100644 appng-rest-api/src/test/resources/log4j.properties
create mode 100644 appng-rest-api/src/test_/resources/log4j.properties