Console Output
[appng] Running shell script
+ git merge --ff appng-1.16.x --strategy-option theirs
Merge made by the 'recursive' strategy.
README.adoc | 17 +-
appng-api/pom.xml | 2 +-
.../src/main/java/org/appng/api/FormValidator.java | 4 +-
.../src/main/java/org/appng/api/ScheduledJob.java | 2 +
.../org/appng/api/support/ConfigValidator.java | 88 ++-
.../java/org/appng/api/ConfigValidatorTest.java | 3 +-
.../src/test/resources/application/conf/event.xml | 8 +-
appng-api/src/test/resources/configvalidator.txt | 13 +-
.../src/test/resources/configvalidatorDetails.txt | 23 +-
appng-application-assembly/pom.xml | 2 +-
appng-application-bom/pom.xml | 34 +-
appng-application-camunda/README.adoc | 18 +
appng-application-camunda/pom.xml | 76 +++
appng-application-parent/pom.xml | 2 +-
appng-application/README.adoc | 4 +-
appng-application/pom.xml | 2 +-
.../src/main/webapp/WEB-INF/bin/appng-shell | 9 +
.../src/main/webapp/WEB-INF/bin/appng-shell.bat | 9 +
appng-appngizer-jaxb/pom.xml | 2 +-
appng-appngizer-maven-plugin/pom.xml | 2 +-
.../maven/plugins/appngizer/AppNGizerMojo.java | 57 +-
.../appng/maven/plugins/appngizer/InstallMojo.java | 14 +-
.../appng/maven/plugins/appngizer/UploadMojo.java | 3 +-
appng-appngizer/pom.xml | 2 +-
.../appngizer/controller/DatabaseController.java | 12 +-
.../appngizer/controller/RepositoryController.java | 80 ++-
.../appng/appngizer/controller/RoleController.java | 14 +-
.../appng/appngizer/controller/SiteController.java | 42 +-
.../controller/RepositoryControllerTest.java | 36 +-
.../appngizer/controller/RoleControllerTest.java | 1 +
.../src/test/resources/xml/archive-delete.xml | 24 +
appng-archetype-application/pom.xml | 2 +-
appng-archetype-application/readme.txt | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
appng-camunda/pom.xml | 73 +++
.../java/org/appng/camunda/bpm/TaskWrapper.java | 205 +++++++
.../org/appng/camunda/bpm/TaskWrapperTest.java | 98 ++++
appng-cli/pom.xml | 2 +-
.../src/main/java/org/appng/cli/CliBootstrap.java | 6 +-
appng-cli/src/main/java/org/appng/cli/CliCore.java | 2 +
.../src/main/java/org/appng/cli/CliShell.java | 117 ++++
.../org/appng/cli/commands/site/ReloadSite.java | 82 +++
appng-cli/src/main/resources/cli-shell.txt | 6 +
appng-core/pom.xml | 2 +-
.../java/org/appng/core/controller/Controller.java | 28 +
.../appng/core/controller/handler/RestService.java | 2 +-
.../core/controller/messaging/JedisSender.java | 2 +-
.../org/appng/core/domain/DatabaseConnection.java | 20 +-
.../org/appng/core/service/DatabaseService.java | 3 +-
.../org/appng/core/service/InitializerService.java | 42 +-
.../org/appng/core/service/MigrationService.java | 39 +-
.../org/appng/core/controller/ControllerTest.java | 77 ++-
.../application-home/application.xml | 14 +
appng-documentation/application-home/beans.xml | 17 +
.../application-home/conf/config.xml | 11 +
.../application-home/conf/datasources.xml | 37 ++
.../application-home/conf/events.xml | 16 +
appng-documentation/codeformatter.xml | 623 +++++++++++++++++++++
appng-documentation/pom.xml | 17 +-
.../src/main/asciidoc/developerguide.adoc | 21 +-
.../src/main/asciidoc/listing/dependencies.txt | 89 +--
.../src/main/asciidoc/listing/pom-archetype.xml | 112 ++++
.../src/main/asciidoc/parts/api.adoc | 60 +-
.../src/main/asciidoc/parts/camunda.adoc | 143 +++++
.../src/main/asciidoc/parts/jpa.adoc | 2 +-
.../src/main/asciidoc/parts/maven.adoc | 12 +
.../src/main/asciidoc/parts/testing.adoc | 46 +-
.../src/main/asciidoc/parts/urlrewriting.adoc | 6 +-
.../test/java/org/example/CalculatorService.java | 60 ++
.../src/test/java/org/example/Employee.java | 34 ++
.../src/test/java/org/example/Employees.java | 36 ++
.../src/test/java/org/example/EmployeesTest.java | 55 ++
.../src/test/resources/log4j.properties | 7 +
.../EmployeesTest-testCreateEmployee-action.xml | 28 +
.../EmployeesTest-testCreateEmployee-messages.xml | 4 +
.../xml/EmployeesTest-testShowEmployees.xml | 26 +
appng-forms/pom.xml | 2 +-
appng-formtags/pom.xml | 2 +-
appng-mail/pom.xml | 2 +-
appng-persistence/pom.xml | 2 +-
appng-search/pom.xml | 2 +-
appng-standalone/pom.xml | 2 +-
appng-standalone/readme.txt | 11 +-
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 | 89 ++-
appng-tomcat7/pom.xml | 2 +-
appng-tomcat8/pom.xml | 2 +-
appng-tools/pom.xml | 2 +-
.../appng/tools/file/PropertyConstantCreator.java | 6 +-
appng-xmlapi/pom.xml | 2 +-
pom.xml | 10 +-
94 files changed, 2712 insertions(+), 327 deletions(-)
create mode 100644 appng-application-camunda/README.adoc
create mode 100644 appng-application-camunda/pom.xml
create mode 100755 appng-application/src/main/webapp/WEB-INF/bin/appng-shell
create mode 100644 appng-application/src/main/webapp/WEB-INF/bin/appng-shell.bat
create mode 100644 appng-appngizer/src/test/resources/xml/archive-delete.xml
create mode 100644 appng-camunda/pom.xml
create mode 100644 appng-camunda/src/main/java/org/appng/camunda/bpm/TaskWrapper.java
create mode 100644 appng-camunda/src/test/java/org/appng/camunda/bpm/TaskWrapperTest.java
create mode 100644 appng-cli/src/main/java/org/appng/cli/CliShell.java
create mode 100644 appng-cli/src/main/java/org/appng/cli/commands/site/ReloadSite.java
create mode 100644 appng-cli/src/main/resources/cli-shell.txt
create mode 100644 appng-documentation/application-home/application.xml
create mode 100644 appng-documentation/application-home/beans.xml
create mode 100644 appng-documentation/application-home/conf/config.xml
create mode 100644 appng-documentation/application-home/conf/datasources.xml
create mode 100644 appng-documentation/application-home/conf/events.xml
create mode 100644 appng-documentation/codeformatter.xml
create mode 100644 appng-documentation/src/main/asciidoc/listing/pom-archetype.xml
create mode 100644 appng-documentation/src/main/asciidoc/parts/camunda.adoc
create mode 100644 appng-documentation/src/main/asciidoc/parts/maven.adoc
create mode 100644 appng-documentation/src/test/java/org/example/CalculatorService.java
create mode 100644 appng-documentation/src/test/java/org/example/Employee.java
create mode 100644 appng-documentation/src/test/java/org/example/Employees.java
create mode 100644 appng-documentation/src/test/java/org/example/EmployeesTest.java
create mode 100644 appng-documentation/src/test/resources/log4j.properties
create mode 100644 appng-documentation/src/test/resources/xml/EmployeesTest-testCreateEmployee-action.xml
create mode 100644 appng-documentation/src/test/resources/xml/EmployeesTest-testCreateEmployee-messages.xml
create mode 100644 appng-documentation/src/test/resources/xml/EmployeesTest-testShowEmployees.xml
![[Jenkins]](/jenkins/static/0ac95dd5/images/svgs/logo.svg){kind=logo}
