Skip to content

Console Output

[appng] Running shell script
+ git merge --ff appng-1.17.x --strategy-option theirs
Updating d14dd13..ff78552
Fast-forward
 CONTRIBUTING.adoc                                  |  35 ++
 README.adoc                                        |  14 +-
 appng-api/pom.xml                                  |   2 +-
 .../main/java/org/appng/api/FormDataBinder.java    | 154 +++++++
 .../java/org/appng/api/FormProcessProvider.java    |   3 +
 .../main/java/org/appng/api/RequestDataBinder.java | 110 +++++
 .../src/main/java/org/appng/api/Webservice.java    |   4 +-
 .../src/main/java/org/appng/api/model/Site.java    |   2 +-
 .../org/appng/api/support/SelectionFactory.java    |  21 +
 .../java/org/appng/api/ConsumerProducerTest.java   |   8 +-
 .../java/org/appng/api/FormDataBinderTest.java     | 104 +++++
 .../java/org/appng/api/RequestDataBinderTest.java  | 115 ++++++
 .../appng/api/support/SelectionFactoryTest.java    |  16 +
 appng-application-assembly/pom.xml                 |   2 +-
 appng-application-bom/pom.xml                      |  30 +-
 appng-application-camunda/README.adoc              |   4 +-
 appng-application-camunda/pom.xml                  |   2 +-
 appng-application-parent/pom.xml                   |   2 +-
 appng-application/README.adoc                      |  15 +-
 appng-application/pom.xml                          |   2 +-
 .../main/webapp/WEB-INF/conf/platformContext.xml   |   5 +
 appng-appngizer-jaxb/pom.xml                       |   2 +-
 .../src/main/resources/appngizer.xsd               |   4 +
 appng-appngizer-maven-plugin/pom.xml               |   2 +-
 appng-appngizer/pom.xml                            |   2 +-
 appng-appngizer/src/main/asciidoc/parts/home.adoc  |   6 +-
 .../appngizer/controller/DatabaseController.java   |  36 +-
 .../controller/SitePropertyController.java         |  66 ++-
 .../java/org/appng/appngizer/model/Database.java   |  12 +-
 .../src/main/webapp/WEB-INF/appNGizer-servlet.xml  |  11 +-
 .../appng/appngizer/controller/ControllerTest.java |  42 +-
 .../controller/DatabaseControllerTest.java         |  41 +-
 .../controller/SitePropertyControllerTest.java     |  18 +
 .../src/test/resources/test-context.xml            |   5 +
 .../test/resources/xml/database-init-managed.xml   |  36 ++
 .../src/test/resources/xml/database-init.xml       |   7 +-
 .../test/resources/xml/database-root-update.xml    |  35 ++
 .../src/test/resources/xml/database.xml            |   9 +-
 .../test/resources/xml/site-properties-create.xml  |   9 +
 .../test/resources/xml/site-properties-delete.xml  |   5 +
 .../test/resources/xml/site-properties-update.xml  |   9 +
 .../src/test/resources/xml/site-property-list.xml  |   5 +
 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 +-
 .../src/main/java/org/appng/cli/CliBootstrap.java  |  82 ++--
 .../main/java/org/appng/cli/CliEventProvider.java  |  39 ++
 .../java/org/appng/cli/commands/CommandMain.java   |   9 +-
 .../src/main/resources/META-INF/persistence.xml    |   3 +-
 appng-cli/src/main/resources/cliContext.xml        |   9 +-
 .../org/appng/cli/commands/CommandBatchTest.java   |  28 +-
 .../property/CommandListPropertiesTest.java        |   2 +-
 appng-cli/src/test/resources/cliContext-test.xml   |   7 +-
 appng-core/pom.xml                                 |   2 +-
 .../java/org/appng/core/controller/Controller.java |   6 +-
 .../appng/core/controller/RepositoryWatcher.java   |   8 +-
 .../core/controller/filter/JspExtensionFilter.java |  24 +-
 .../core/controller/filter/PageCacheFilter.java    |   2 +-
 .../core/controller/filter/RedirectFilter.java     |   2 +-
 .../appng/core/controller/filter/XSSFilter.java    |   2 +-
 .../core/controller/handler/ProxyHandler.java      | 224 -----------
 .../controller/handler/StaticContentHandler.java   |  19 +-
 .../controller/messaging/SiteDeletedEvent.java     |  55 +++
 .../core/controller/messaging/SiteStateEvent.java  |  10 +-
 .../org/appng/core/domain/ApplicationImpl.java     |   4 +-
 .../main/java/org/appng/core/domain/Auditable.java |  38 ++
 .../org/appng/core/domain/DatabaseConnection.java  | 121 +++++-
 .../main/java/org/appng/core/domain/GroupImpl.java |   4 +-
 .../java/org/appng/core/domain/PermissionImpl.java |   4 +-
 .../java/org/appng/core/domain/PlatformEvent.java  | 164 ++++++++
 .../appng/core/domain/PlatformEventListener.java   | 211 ++++++++++
 .../java/org/appng/core/domain/PropertyImpl.java   |   5 +-
 .../java/org/appng/core/domain/RepositoryImpl.java |   4 +-
 .../java/org/appng/core/domain/ResourceImpl.java   |   9 +-
 .../main/java/org/appng/core/domain/RoleImpl.java  |   4 +-
 .../main/java/org/appng/core/domain/SiteImpl.java  |   4 +-
 .../java/org/appng/core/domain/SubjectImpl.java    |   7 +-
 .../main/java/org/appng/core/domain/Template.java  |   4 +-
 .../java/org/appng/core/model/RepositoryUtils.java |  37 +-
 .../org/appng/core/model/ThymeleafProcessor.java   |  48 ++-
 .../core/repository/PlatformEventRepository.java   |  38 ++
 .../java/org/appng/core/service/CacheService.java  |  32 ++
 .../java/org/appng/core/service/CoreService.java   | 137 +++++--
 .../org/appng/core/service/DatabaseService.java    |  36 +-
 .../java/org/appng/core/service/HsqlStarter.java   |   9 +
 .../org/appng/core/service/InitializerService.java |  11 +-
 .../java/org/appng/core/service/LdapService.java   |   2 +-
 .../org/appng/core/service/MigrationService.java   |  31 +-
 .../org/appng/core/service/PropertySupport.java    |   1 +
 .../core/templating/AppNGThymeleafDialect.java     |  67 ++++
 .../appng/core/templating/ReplaceTagProcessor.java |  85 ++++
 .../templating/ThymeleafReplaceInterceptor.java    | 123 ++++++
 .../ThymeleafReplaceInterceptorBase.java           |  51 +++
 ...ThymeleafStandardReplaceTagProcessorCaller.java |  38 ++
 .../core/templating/ThymeleafTemplateEngine.java   |  36 ++
 .../src/main/resources/db/init/mssql/size.sql      |   1 +
 .../src/main/resources/db/init/mysql/size.sql      |   3 +
 .../migration/hsql/V2_0_0__add_platform_event.sql  |  14 +
 .../migration/mssql/V3_0_0__add_platform_event.sql |  14 +
 .../migration/mysql/V3_0_0__add_platform_event.sql |  14 +
 .../org/appng/core/site-config.properties          |   1 +
 .../java/org/appng/api/messaging/TestReceiver.java | 111 ++++++
 .../core/controller/RepositoryWatcherTest.java     |  11 +-
 .../org/appng/core/model/CacheProviderTest.java    |   2 +-
 .../org/appng/core/model/RepositoryUtilsTest.java  |  74 ++++
 .../java/org/appng/core/repository/SchemaGen.java  |   2 +-
 .../org/appng/core/service/CoreServiceTest.java    |  70 +++-
 .../appng/core/service/DatabaseServiceTest.java    |  32 +-
 .../org/appng/core/service/HsqlStarterTest.java    |  62 +++
 .../org/appng/core/service/LdapContextMock.java    |   4 +-
 .../org/appng/core/service/LdapServiceTest.java    |   2 +-
 .../src/test/resources/META-INF/persistence.xml    |  16 +-
 appng-core/src/test/resources/platformContext.xml  |   7 +-
 appng-documentation/pom.xml                        |   2 +-
 .../src/main/asciidoc/listing/dependencies.txt     |   8 +-
 .../src/main/asciidoc/parts/api.adoc               | 206 +++++++++-
 .../src/main/asciidoc/parts/application.adoc       |   4 +-
 .../src/main/asciidoc/parts/jsp.adoc               |   2 +-
 .../src/main/asciidoc/parts/testing.adoc           |  40 +-
 .../src/main/asciidoc/parts/urlrewriting.adoc      |   2 +-
 appng-forms/pom.xml                                |   2 +-
 appng-formtags/pom.xml                             |   2 +-
 appng-mail/pom.xml                                 |   2 +-
 appng-maven-plugin/README.adoc                     |  89 +++++
 appng-maven-plugin/README.md                       |  81 ----
 appng-maven-plugin/pom.xml                         |   7 +-
 appng-persistence/pom.xml                          |   2 +-
 appng-search/pom.xml                               |   2 +-
 .../appng/search/indexer/StandardSearcherTest.java |   3 +-
 appng-standalone/pom.xml                           |   2 +-
 appng-taglib/pom.xml                               |   2 +-
 .../org/appng/taglib/form/FormConfirmation.java    |  86 ++--
 .../appng/taglib/form/FormConfirmationTest.java    |  43 +-
 appng-template-assembly/pom.xml                    |   2 +-
 appng-template-parent/pom.xml                      |   4 +-
 appng-testsupport/pom.xml                          |   2 +-
 .../persistence/HsqlServerFactoryBean.java         |  21 +-
 .../validation/WritingJsonValidator.java           |  54 ++-
 .../testsupport/application-testcontext-core.xml   |  12 +-
 .../validation/WritingJsonValidatorTest.java       |  11 +-
 ...ritingJsonValidatorTest-testValidateObject.json |   4 +-
 ...alidatorTest-testValidateObjectStrictOrder.json |   5 +
 ...ValidatorTest-testValidateObjectWithMapper.json |   2 +-
 appng-tomcat7/pom.xml                              |   2 +-
 appng-tomcat8/pom.xml                              |   2 +-
 appng-tools/pom.xml                                |   2 +-
 .../java/org/appng/tools/os/OperatingSystem.java   |  50 ++-
 .../org/appng/tools/os/OperatingSystemTest.java    |  50 +++
 appng-upngizr/README.adoc                          |  84 ++++
 appng-upngizr/pom.xml                              | 175 ++++++++
 .../java/org/appng/upngizr/controller/UpNGizr.java |  71 ++++
 .../appng/upngizr/controller/UpNGizrConfig.java    |  53 +++
 .../java/org/appng/upngizr/controller/Updater.java | 442 +++++++++++++++++++++
 .../src/main/resources/assets/ajax-loader.gif      | Bin 0 -> 3951 bytes
 appng-upngizr/src/main/resources/assets/logo.png   | Bin 0 -> 10390 bytes
 appng-upngizr/src/main/resources/log4j.properties  |  14 +
 appng-upngizr/src/main/resources/updater.html      | 106 +++++
 appng-upngizr/src/main/webapp/META-INF/context.xml |   3 +
 .../src/main/webapp/WEB-INF/upNGizr-servlet.xml    |  18 +
 appng-upngizr/src/main/webapp/WEB-INF/web.xml      |  42 ++
 .../org/appng/upngizr/controller/UpdaterTest.java  |  39 ++
 appng-upngizr/src/test/resources/log4j.properties  |   6 +
 appng-xmlapi/pom.xml                               |   2 +-
 pom.xml                                            |   7 +-
 166 files changed, 4478 insertions(+), 754 deletions(-)
 create mode 100644 appng-api/src/main/java/org/appng/api/FormDataBinder.java
 create mode 100644 appng-api/src/main/java/org/appng/api/RequestDataBinder.java
 create mode 100644 appng-api/src/test/java/org/appng/api/FormDataBinderTest.java
 create mode 100644 appng-api/src/test/java/org/appng/api/RequestDataBinderTest.java
 create mode 100644 appng-appngizer/src/test/resources/xml/database-init-managed.xml
 create mode 100644 appng-appngizer/src/test/resources/xml/database-root-update.xml
 create mode 100644 appng-appngizer/src/test/resources/xml/site-properties-create.xml
 create mode 100644 appng-appngizer/src/test/resources/xml/site-properties-delete.xml
 create mode 100644 appng-appngizer/src/test/resources/xml/site-properties-update.xml
 create mode 100644 appng-cli/src/main/java/org/appng/cli/CliEventProvider.java
 delete mode 100644 appng-core/src/main/java/org/appng/core/controller/handler/ProxyHandler.java
 create mode 100644 appng-core/src/main/java/org/appng/core/controller/messaging/SiteDeletedEvent.java
 create mode 100644 appng-core/src/main/java/org/appng/core/domain/Auditable.java
 create mode 100644 appng-core/src/main/java/org/appng/core/domain/PlatformEvent.java
 create mode 100644 appng-core/src/main/java/org/appng/core/domain/PlatformEventListener.java
 create mode 100644 appng-core/src/main/java/org/appng/core/repository/PlatformEventRepository.java
 create mode 100644 appng-core/src/main/java/org/appng/core/templating/AppNGThymeleafDialect.java
 create mode 100644 appng-core/src/main/java/org/appng/core/templating/ReplaceTagProcessor.java
 create mode 100644 appng-core/src/main/java/org/appng/core/templating/ThymeleafReplaceInterceptor.java
 create mode 100644 appng-core/src/main/java/org/appng/core/templating/ThymeleafReplaceInterceptorBase.java
 create mode 100644 appng-core/src/main/java/org/appng/core/templating/ThymeleafStandardReplaceTagProcessorCaller.java
 create mode 100644 appng-core/src/main/java/org/appng/core/templating/ThymeleafTemplateEngine.java
 create mode 100644 appng-core/src/main/resources/db/init/mssql/size.sql
 create mode 100644 appng-core/src/main/resources/db/init/mysql/size.sql
 create mode 100644 appng-core/src/main/resources/db/migration/hsql/V2_0_0__add_platform_event.sql
 create mode 100644 appng-core/src/main/resources/db/migration/mssql/V3_0_0__add_platform_event.sql
 create mode 100644 appng-core/src/main/resources/db/migration/mysql/V3_0_0__add_platform_event.sql
 create mode 100644 appng-core/src/test/java/org/appng/api/messaging/TestReceiver.java
 create mode 100644 appng-core/src/test/java/org/appng/core/model/RepositoryUtilsTest.java
 create mode 100644 appng-core/src/test/java/org/appng/core/service/HsqlStarterTest.java
 create mode 100644 appng-maven-plugin/README.adoc
 delete mode 100644 appng-maven-plugin/README.md
 create mode 100644 appng-testsupport/src/test/resources/json/WritingJsonValidatorTest-testValidateObjectStrictOrder.json
 create mode 100644 appng-tools/src/test/java/org/appng/tools/os/OperatingSystemTest.java
 create mode 100644 appng-upngizr/README.adoc
 create mode 100644 appng-upngizr/pom.xml
 create mode 100644 appng-upngizr/src/main/java/org/appng/upngizr/controller/UpNGizr.java
 create mode 100644 appng-upngizr/src/main/java/org/appng/upngizr/controller/UpNGizrConfig.java
 create mode 100644 appng-upngizr/src/main/java/org/appng/upngizr/controller/Updater.java
 create mode 100644 appng-upngizr/src/main/resources/assets/ajax-loader.gif
 create mode 100644 appng-upngizr/src/main/resources/assets/logo.png
 create mode 100644 appng-upngizr/src/main/resources/log4j.properties
 create mode 100644 appng-upngizr/src/main/resources/updater.html
 create mode 100644 appng-upngizr/src/main/webapp/META-INF/context.xml
 create mode 100644 appng-upngizr/src/main/webapp/WEB-INF/upNGizr-servlet.xml
 create mode 100644 appng-upngizr/src/main/webapp/WEB-INF/web.xml
 create mode 100644 appng-upngizr/src/test/java/org/appng/upngizr/controller/UpdaterTest.java
 create mode 100644 appng-upngizr/src/test/resources/log4j.properties