Console Output
[appng] Running shell script
+ git merge --ff appng-1.15.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/pom.xml
Auto-merging appng-cli/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
Removing appng-application/src/main/webapp/readme.txt
Auto-merging appng-application/pom.xml
Auto-merging appng-application-parent/pom.xml
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 | 57 +++-
appng-api/pom.xml | 14 +-
.../src/main/java/org/appng/api/Environment.java | 2 +-
appng-api/src/main/java/org/appng/api/Option.java | 44 +++
appng-api/src/main/java/org/appng/api/Options.java | 54 +++-
.../src/main/java/org/appng/api/Platform.java | 22 +-
.../main/java/org/appng/api/SiteProperties.java | 22 +-
.../java/org/appng/api/messaging/Messaging.java | 25 +-
.../main/java/org/appng/api/model/Application.java | 17 +-
.../java/org/appng/api/model/ResourceType.java | 8 +-
.../api/support/ApplicationConfigProviderImpl.java | 31 +-
.../java/org/appng/api/support/CallableAction.java | 56 ++--
.../org/appng/api/support/ConfigValidator.java | 243 ++++++++++++++-
.../java/org/appng/api/support/ElementHelper.java | 18 +-
.../java/org/appng/api/support/OptionImpl.java | 24 ++
.../java/org/appng/api/support/OptionsImpl.java | 18 ++
.../org/appng/api/support/RequestFactoryBean.java | 9 +-
.../api/support/environment/EnvironmentKeys.java | 2 +
.../validation/DefaultValidationProvider.java | 62 +++-
.../src/main/resources/messages-core.properties | 1 +
.../src/main/resources/messages-core_de.properties | 1 +
.../java/org/appng/api/ConfigValidatorTest.java | 18 +-
.../test/java/org/appng/api/DataContainerTest.java | 2 -
appng-api/src/test/java/org/appng/api/Person.java | 10 +-
.../org/appng/api/support/ElementHelperTest.java | 16 +
.../java/org/appng/api/support/OptionData.java | 8 +
.../org/appng/api/support/OptionsImplTest.java | 25 +-
.../appng/api/support/ValidationProviderTest.java | 16 +-
.../test/resources/application/conf/datasource.xml | 340 +++++++++++----------
.../src/test/resources/application/conf/event.xml | 1 +
.../src/test/resources/application/conf/page.xml | 6 +-
appng-api/src/test/resources/configvalidator.txt | 12 +-
.../src/test/resources/configvalidatorDetails.txt | 33 +-
...ationProviderTest-testAddValidationMetaData.xml | 40 ++-
...roviderTest-testAddValidationMetaDataAsRule.xml | 76 +++--
...derTest-testAddValidationMetaDataInnerClass.xml | 2 +-
...iderTest-testAddValidationMetaDataWithGroup.xml | 112 +++----
appng-application-assembly/pom.xml | 2 +-
appng-application-bom/pom.xml | 328 +++++++++-----------
appng-application-bom/readme.txt | 2 +-
appng-application-parent/pom.xml | 142 +--------
appng-application/README.adoc | 76 +++++
appng-application/pom.xml | 18 +-
.../src/main/webapp/WEB-INF/conf/install.list | 8 +-
.../src/main/webapp/WEB-INF/conf/log4j.properties | 16 +-
.../main/webapp/WEB-INF/conf/platformContext.xml | 1 +
appng-application/src/main/webapp/readme.txt | 70 -----
appng-appngizer-jaxb/pom.xml | 2 +-
.../src/main/resources/appngizer.xsd | 22 +-
appng-appngizer-maven-plugin/pom.xml | 2 +-
appng-appngizer/pom.xml | 4 +-
.../appngizer-platform-installation-guide.adoc | 4 +-
.../src/main/asciidoc/parts/site-application.adoc | 33 ++
.../main/asciidoc/xml/site-application-grants.xml | 6 +
.../main/asciidoc/xml/site-application-show.xml | 8 +-
.../controller/ApplicationController.java | 2 +-
.../appng/appngizer/controller/ControllerBase.java | 25 +-
.../controller/SiteApplicationController.java | 51 +++-
.../org/appng/appngizer/model/Application.java | 4 +-
.../controller/ApplicationControllerTest.java | 2 +-
.../controller/PlatformPropertyControllerTest.java | 6 +-
.../controller/SiteApplicationControllerTest.java | 22 ++
.../src/test/resources/xml/application-list.xml | 2 +-
.../src/test/resources/xml/application-show.xml | 2 +-
.../src/test/resources/xml/application-update.xml | 2 +-
.../src/test/resources/xml/database-init.xml | 2 +-
.../src/test/resources/xml/database.xml | 2 +-
.../test/resources/xml/platform-property-list.xml | 5 +
.../test/resources/xml/site-application-grants.xml | 4 +
.../test/resources/xml/site-application-list.xml | 2 +-
.../test/resources/xml/site-application-show.xml | 3 +-
.../src/test/resources/xml/site-create2.xml | 13 +
appng-archetype-application/pom.xml | 2 +-
appng-archetype-application/readme.txt | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
appng-cli/pom.xml | 2 +-
.../commands/application/InstallApplication.java | 10 +-
.../cli/commands/application/ListApplications.java | 4 +-
.../org/appng/cli/prettytable/TableConstants.java | 2 +-
.../CommandListApplicationsForSiteTest.java | 2 +-
.../application/CommandListApplicationsTest.java | 2 +-
.../commands/permission/BasePermissionTest.java | 2 +-
.../property/CommandListPropertiesTest.java | 4 +-
appng-core/pom.xml | 21 +-
.../java/org/appng/core/controller/Controller.java | 27 +-
.../org/appng/core/controller/PlatformStartup.java | 14 +
.../appng/core/controller/RepositoryWatcher.java | 202 ++++++++++++
.../core/controller/filter/RedirectFilter.java | 139 ++++-----
.../appng/core/controller/filter/XSSFilter.java | 35 ++-
.../appng/core/controller/messaging/JedisBase.java | 19 +-
.../core/controller/messaging/JedisReceiver.java | 13 +-
.../core/controller/messaging/JedisSender.java | 16 +-
.../core/controller/messaging/MulticastSender.java | 2 +-
.../core/controller/messaging/RabbitMQBase.java | 44 ++-
.../controller/messaging/RabbitMQReceiver.java | 23 +-
.../core/controller/messaging/RabbitMQSender.java | 29 +-
.../org/appng/core/domain/ApplicationImpl.java | 19 +-
.../java/org/appng/core/domain/RepositoryImpl.java | 2 +-
.../main/java/org/appng/core/domain/SiteImpl.java | 20 +-
.../appng/core/model/AbstractRequestProcessor.java | 1 +
.../appng/core/model/AccessibleApplication.java | 2 +-
.../org/appng/core/model/ApplicationContext.java | 2 +-
.../org/appng/core/model/ApplicationProvider.java | 17 +-
.../java/org/appng/core/model/CacheProvider.java | 16 +-
.../org/appng/core/repository/SiteRepository.java | 2 +
.../core/repository/config/DataSourceFactory.java | 10 +
.../repository/config/DatasourceConfigurer.java | 5 +
.../core/repository/config/HikariCPConfigurer.java | 60 ++--
.../repository/config/TomcatJdbcConfigurer.java | 6 +-
.../java/org/appng/core/service/CoreService.java | 84 ++---
.../org/appng/core/service/DatabaseService.java | 68 +++--
.../org/appng/core/service/InitializerService.java | 195 ++++++++----
.../org/appng/core/service/PropertySupport.java | 38 ++-
.../migration/hsql/V1_0__appNG_initial_setup.sql | 2 +-
.../V2_9_3__rename_core_application_privileged.sql | 2 +
.../V2_9_3__rename_core_application_privileged.sql | 2 +
.../org/appng/core/application-context.xml | 1 +
.../org/appng/core/platform-config.properties | 1 +
.../org/appng/core/site-config.properties | 2 +
.../appng/core/controller/PlatformStartupTest.java | 5 +-
.../core/controller/RepositoryWatcherTest.java | 76 +++++
.../controller/filter/JspExtensionFilterTest.java | 5 +-
.../core/controller/filter/RedirectFilterTest.java | 6 +-
.../controller/messaging/AbstractMessagingIT.java | 140 +++++++++
.../controller/messaging/JedisMessagingIT.java | 38 +++
.../controller/messaging/MultiCastMessagingIT.java | 48 +++
.../controller/messaging/RabbitMQMessagingIT.java | 40 +++
.../appng/core/model/ApplicationProviderTest.java | 2 +-
.../appng/core/model/OutputFormatAndTypeTest.java | 21 ++
.../appng/core/service/AppNGTestDataProvider.java | 2 +-
.../org/appng/core/service/CoreServiceTest.java | 2 +-
.../appng/core/service/InitializerServiceTest.java | 16 +-
.../appng/core/service/PropertySupportTest.java | 73 +++++
.../test/resources/conf/urlrewrite-rules-fr.xml | 4 +
.../src/test/resources/conf/urlrewrite-rules.xml | 4 +
.../xml/ApplicationProviderTest-testCallAction.xml | 2 +-
.../xml/ApplicationProviderTest-testCreate.xml | 2 +-
.../ApplicationProviderTest-testUpdateExecute.xml | 2 +-
.../ApplicationProviderTest-testUpdateInclude.xml | 2 +-
...ationProviderTest-testUpdateValidationError.xml | 4 +-
appng-documentation/pom.xml | 214 +------------
.../src/main/asciidoc/developerguide.adoc | 2 +
.../src/main/asciidoc/listing/dependencies.txt | 8 +-
.../src/main/asciidoc/parts/actions.adoc | 2 +-
.../src/main/asciidoc/parts/structure.adoc | 2 +-
.../src/main/asciidoc/parts/urlrewriting.adoc | 97 ++++++
appng-forms/pom.xml | 2 +-
.../java/org/appng/el/ExpressionEvaluator.java | 21 +-
appng-formtags/pom.xml | 2 +-
appng-mail/pom.xml | 2 +-
appng-persistence/pom.xml | 4 +-
appng-search/pom.xml | 2 +-
appng-standalone/pom.xml | 21 +-
.../src/main/resources/auto-install.list | 12 +-
appng-taglib/pom.xml | 2 +-
.../src/main/java/org/appng/taglib/If.java | 4 +-
.../main/java/org/appng/taglib/TagletAdapter.java | 6 +-
.../test/java/org/appng/taglib/AttributeTest.java | 48 +--
.../src/test/java/org/appng/taglib/IfTest.java | 51 ++++
.../test/java/org/appng/taglib/TagletTestBase.java | 76 +++++
appng-template-assembly/pom.xml | 2 +-
appng-template-parent/pom.xml | 4 +-
appng-testsupport/pom.xml | 4 +-
.../main/java/org/appng/testsupport/TestBase.java | 7 +-
appng-tomcat7/pom.xml | 2 +-
appng-tomcat8/pom.xml | 3 +-
appng-tools/pom.xml | 2 +-
appng-xmlapi/pom.xml | 2 +-
pom.xml | 58 ++--
169 files changed, 3155 insertions(+), 1516 deletions(-)
create mode 100644 appng-application/README.adoc
delete mode 100644 appng-application/src/main/webapp/readme.txt
create mode 100644 appng-appngizer/src/main/asciidoc/xml/site-application-grants.xml
create mode 100644 appng-appngizer/src/test/resources/xml/site-application-grants.xml
create mode 100644 appng-appngizer/src/test/resources/xml/site-create2.xml
create mode 100644 appng-core/src/main/java/org/appng/core/controller/RepositoryWatcher.java
create mode 100644 appng-core/src/main/resources/db/migration/mssql/V2_9_3__rename_core_application_privileged.sql
create mode 100644 appng-core/src/main/resources/db/migration/mysql/V2_9_3__rename_core_application_privileged.sql
create mode 100644 appng-core/src/test/java/org/appng/core/controller/RepositoryWatcherTest.java
create mode 100644 appng-core/src/test/java/org/appng/core/controller/messaging/AbstractMessagingIT.java
create mode 100644 appng-core/src/test/java/org/appng/core/controller/messaging/JedisMessagingIT.java
create mode 100644 appng-core/src/test/java/org/appng/core/controller/messaging/MultiCastMessagingIT.java
create mode 100644 appng-core/src/test/java/org/appng/core/controller/messaging/RabbitMQMessagingIT.java
create mode 100644 appng-core/src/test/java/org/appng/core/service/PropertySupportTest.java
create mode 100644 appng-documentation/src/main/asciidoc/parts/urlrewriting.adoc
create mode 100644 appng-taglib/src/test/java/org/appng/taglib/IfTest.java
create mode 100644 appng-taglib/src/test/java/org/appng/taglib/TagletTestBase.java
![[Jenkins]](/jenkins/static/0ac95dd5/images/svgs/logo.svg){kind=logo}
