Console Output
[appng] Running shell script
+ git merge --ff origin/appng-1.18.x --strategy-option theirs
Auto-merging pom.xml
Auto-merging appng-xmlapi/pom.xml
Auto-merging appng-tools/pom.xml
Auto-merging appng-tomcat8/pom.xml
Auto-merging appng-tomcat7/pom.xml
Auto-merging appng-testsupport/pom.xml
Auto-merging appng-template-parent/pom.xml
Auto-merging appng-template-assembly/pom.xml
Auto-merging appng-taglib/pom.xml
Auto-merging appng-standalone/pom.xml
Auto-merging appng-search/pom.xml
Auto-merging appng-persistence/pom.xml
Auto-merging appng-mail/pom.xml
Auto-merging appng-formtags/pom.xml
Auto-merging appng-forms/pom.xml
Auto-merging appng-documentation/src/main/asciidoc/listing/dependencies.txt
Auto-merging appng-documentation/pom.xml
Auto-merging appng-core/src/main/java/org/appng/core/controller/filter/PageCacheFilter.java
Auto-merging appng-core/pom.xml
Auto-merging appng-cli/pom.xml
Auto-merging appng-camunda/pom.xml
Auto-merging appng-archetype-application/src/main/resources/archetype-resources/pom.xml
Auto-merging appng-archetype-application/readme.txt
Auto-merging appng-archetype-application/pom.xml
Auto-merging appng-appngizer/pom.xml
Auto-merging appng-appngizer-maven-plugin/pom.xml
Auto-merging appng-appngizer-jaxb/pom.xml
Auto-merging appng-application/pom.xml
Auto-merging appng-application/README.adoc
Auto-merging appng-application-parent/pom.xml
Auto-merging appng-application-camunda/pom.xml
Auto-merging appng-application-camunda/README.adoc
Auto-merging appng-application-bom/pom.xml
Auto-merging appng-application-assembly/pom.xml
Auto-merging appng-api/pom.xml
Auto-merging README.adoc
Merge made by the 'recursive' strategy.
README.adoc | 13 +-
appng-api/pom.xml | 2 +-
.../api/support/ApplicationResourceHolder.java | 2 +-
.../java/org/appng/api/support/ElementHelper.java | 5 +-
.../org/appng/api/support/FieldProcessorImpl.java | 10 +-
.../java/org/appng/api/support/OptionFactory.java | 37 +-
.../java/org/appng/api/support/OptionImpl.java | 20 +-
.../java/org/appng/api/support/OptionOwner.java | 29 +-
.../java/org/appng/api/support/OptionsBuilder.java | 249 +++++++++
.../java/org/appng/api/support/OptionsImpl.java | 2 +-
.../org/appng/api/support/SelectionBuilder.java | 157 ++++++
.../api/support/SiteAwareObjectInputStream.java | 9 +-
.../api/support/environment/AttributeWrapper.java | 8 +-
.../support/environment/DefaultEnvironment.java | 9 +-
.../support/environment/SessionEnvironment.java | 20 +-
.../api/support/field/DefaultFieldConverter.java | 2 +-
.../api/support/field/ListFieldConverter.java | 4 +-
.../api/support/field/ObjectFieldConverter.java | 25 +
.../validation/DefaultValidationProvider.java | 243 ++++++---
.../validation/LocalizedMessageInterpolator.java | 71 ++-
appng-api/src/test/java/org/appng/api/Person.java | 3 +
.../org/appng/api/support/ElementHelperTest.java | 34 +-
.../org/appng/api/support/FieldProcessorTest.java | 111 ++++
.../java/org/appng/api/support/OptionImplTest.java | 2 +-
.../appng/api/support/SelectionBuilderTest.java | 85 +++
.../appng/api/support/SelectionFactoryTest.java | 17 +
.../appng/api/support/ValidationProviderTest.java | 46 +-
.../api/support/environment/EnvironmentTest.java | 3 +-
.../api/support/field/ListFieldConverterTest.java | 51 +-
.../support/field/ObjectFieldConverterTest.java | 1 +
.../LocalizedMessageInterpolatorTest.java | 76 +++
.../resources/ValidationMessages_en.properties | 1 +
...eldConverterTest-testAddNestedFields-result.xml | 26 +
.../ListFieldConverterTest-testAddNestedFields.xml | 14 +
...oviderTest-testAddValidationMetaData-before.xml | 3 +-
...ationProviderTest-testAddValidationMetaData.xml | 78 ++-
...roviderTest-testAddValidationMetaDataAsRule.xml | 237 +++++----
...derTest-testAddValidationMetaDataInnerClass.xml | 22 +-
...iderTest-testAddValidationMetaDataWithGroup.xml | 39 +-
...iderTest-testValidateWithChildFields-before.xml | 47 ++
...ionProviderTest-testValidateWithChildFields.xml | 64 +++
appng-application-assembly/pom.xml | 2 +-
appng-application-bom/pom.xml | 36 +-
appng-application-camunda/README.adoc | 6 +-
appng-application-camunda/pom.xml | 2 +-
appng-application-parent/pom.xml | 2 +-
appng-application/README.adoc | 6 +-
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 +-
.../cli/commands/repository/CreateRepository.java | 17 +-
appng-cli/src/main/resources/cliContext.xml | 4 +-
.../repository/CommandCreateRepositoryTest.java | 25 +
appng-cli/src/test/resources/cliContext-test.xml | 4 +-
appng-core/pom.xml | 27 +-
.../appng/core/controller/RepositoryWatcher.java | 39 +-
.../org/appng/core/controller/SessionListener.java | 1 +
.../core/controller/filter/PageCacheFilter.java | 10 +-
.../core/controller/messaging/RabbitMQBase.java | 4 +-
.../controller/messaging/RabbitMQReceiver.java | 66 ++-
.../appng/core/controller/rest/RestActionBase.java | 559 ++++++++++++++++++++
.../core/controller/rest/RestDataSourceBase.java | 338 ++++++++++++
.../appng/core/controller/rest/RestOperation.java | 332 ++++++++++++
.../core/controller/rest/RestPostProcessor.java | 105 ++++
.../org/appng/core/model/ApplicationProvider.java | 40 +-
.../main/java/org/appng/core/model/JarInfo.java | 2 +-
.../org/appng/core/model/RepositoryCacheSoap.java | 2 +-
.../java/org/appng/core/model/RepositoryUtils.java | 20 +-
.../java/org/appng/core/service/CoreService.java | 14 +-
.../org/appng/core/service/InitializerService.java | 6 +
.../core/controller/RepositoryWatcherTest.java | 5 +-
.../appng/core/controller/rest/RestActionTest.java | 92 ++++
.../core/controller/rest/RestDataSourceTest.java | 138 +++++
.../core/controller/rest/RestOperationTest.java | 95 ++++
.../appng/core/controller/rest/model/Payment.java | 122 +++++
.../core/controller/rest/model/PaymentItem.java | 116 +++++
.../appng/core/controller/rest/model/SiteForm.java | 52 ++
.../org/appng/core/model/RepositoryUtilsTest.java | 36 +-
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 | 97 ++++
appng-core/src/test/resources/rest/action-get.xml | 87 ++++
.../rest/action-post-childfields-result.json | 95 ++++
.../resources/rest/action-post-childfields.json | 91 ++++
.../resources/rest/action-post-childfields.xml | 74 +++
.../test/resources/rest/action-post-result.json | 101 ++++
.../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 | 94 ++++
.../src/test/resources/rest/datasource-result.json | 106 ++++
.../src/test/resources/rest/datasource-result.xml | 64 +++
.../test/resources/rest/datasource-resultset.json | 270 ++++++++++
.../test/resources/rest/datasource-resultset.xml | 198 +++++++
.../xml/ApplicationProviderTest-testCallAction.xml | 4 +-
.../xml/ApplicationProviderTest-testCreate.xml | 44 +-
.../ApplicationProviderTest-testUpdateExecute.xml | 66 +--
.../ApplicationProviderTest-testUpdateInclude.xml | 58 +--
...ationProviderTest-testUpdateValidationError.xml | 60 +--
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 +-
.../persistence/repository/SearchRepository.java | 25 +-
.../repository/SearchRepositoryImpl.java | 10 +
.../repository/SearchRepositoryTest.java | 8 +
appng-rest-api/pom.xml | 144 ++++++
.../main/java/org/appng/api/rest/ActionHelper.java | 118 +++++
.../java/org/appng/api/rest/DataSourceHelper.java | 95 ++++
.../main/java/org/appng/api/rest/RestClient.java | 576 +++++++++++++++++++++
.../org/appng/api/rest/RestResponseEntity.java | 74 +++
.../resources/org/appng/api/rest/appng-rest.yaml | 543 +++++++++++++++++++
.../java/org/appng/api/rest/ActionHelperTest.java | 151 ++++++
.../org/appng/api/rest/DataSourceHelperTest.java | 75 +++
.../java/org/appng/api/rest/RestClientTest.java | 85 +++
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 +-
.../validation/WritingJsonValidator.java | 1 -
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 +-
.../xml/transformation/StyleSheetProvider.java | 2 +-
appng-xmlapi/src/main/xsd/appng-platform.xsd | 27 +
pom.xml | 8 +-
149 files changed, 7599 insertions(+), 552 deletions(-)
create mode 100644 appng-api/src/main/java/org/appng/api/support/OptionsBuilder.java
create mode 100644 appng-api/src/main/java/org/appng/api/support/SelectionBuilder.java
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/SelectionBuilderTest.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/ListFieldConverterTest-testAddNestedFields-result.xml
create mode 100644 appng-api/src/test/resources/xml/ListFieldConverterTest-testAddNestedFields.xml
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/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/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/java/org/appng/api/rest/RestResponseEntity.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/java/org/appng/api/rest/ActionHelperTest.java
create mode 100644 appng-rest-api/src/test/java/org/appng/api/rest/DataSourceHelperTest.java
create mode 100644 appng-rest-api/src/test/java/org/appng/api/rest/RestClientTest.java
create mode 100644 appng-rest-api/src/test/resources/log4j.properties
create mode 100644 appng-rest-api/src/test_/resources/log4j.properties
![[Jenkins]](/jenkins/static/0ac95dd5/images/svgs/logo.svg){kind=logo}
