This is an automated email from the ASF dual-hosted git repository. tv pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/turbine-core.git
commit 2a2337eb28a5f461d6743d3b36b40db057c8c1fe Merge: 3cdc9ee3 b7b84650 Author: Thomas Vandahl <[email protected]> AuthorDate: Fri Jul 8 09:53:05 2022 +0200 Merge branch 'trunk' of https://gitbox.apache.org/repos/asf/turbine-core.git into trunk .gitignore | 2 + README.md | 24 + conf/docker-resources/db/Dockerfile | 4 +- conf/test/CompleteTurbineResources.properties | 8 + conf/test/TurbineURLMapperServiceTest.properties | 2 +- .../CompleteTurbineResources.properties | 11 + conf/test/docker-manager/Torque4Test.xml | 25 + ...e.xml => turbine-classic-pipeline-extended.xml} | 0 conf/turbine-classic-pipeline.xml | 1 - pom.xml | 51 +- proposals/gk/log4j2/pom.xml | 1175 -------------------- src/changes/changes.xml | 2 +- src/java/org/apache/turbine/Turbine.java | 2 +- .../turbine/annotation/AnnotationProcessor.java | 141 ++- .../apache/turbine/annotation/TurbineService.java | 2 +- .../org/apache/turbine/modules/ActionEvent.java | 14 +- .../turbine/om/security/DefaultUserImpl.java | 2 +- .../apache/turbine/services/BaseServiceBroker.java | 13 +- .../turbine/services/jsp/TurbineJspService.java | 10 +- .../localization/DateTimeFormatterInterface.java | 83 ++ .../localization/DateTimeFormatterService.java | 177 +++ .../services/pull/util/DateTimeFormatterTool.java | 139 +++ .../apache/turbine/services/schedule/JobQueue.java | 2 +- .../services/security/DefaultUserManager.java | 12 +- .../services/template/TurbineTemplateService.java | 12 +- .../urlmapper/TurbineURLMapperService.java | 12 +- src/java/org/apache/turbine/util/ServletUtils.java | 4 +- .../org/apache/turbine/util/uri/TemplateURI.java | 25 +- src/site/site.xml | 24 +- .../turbine/annotation/AnnotatedMethodsTest.java | 99 ++ .../annotation/AnnotationProcessorTest.java | 3 + .../turbine/services/LoadingComponentsTest.java | 12 + .../localization/DateTimeFormatterServiceTest.java | 290 +++++ .../urlmapper/TurbineURLMapperServiceTest.java | 2 +- .../urlmapper/model/URLMappingContainerTest.java | 19 + .../model/YamlURLMappingContainerTest.java | 19 + .../services/velocity/PathConverterTest.java | 96 +- src/test/org/apache/turbine/test/HsqlDB.java | 19 + .../BuildContainerWithDockerfileTest.java | 36 +- .../UserManagerWithContainerTest.java | 19 + suppression-owasp-fp.xml | 79 +- xdocs/features.xml | 2 +- xdocs/how-to-help.xml | 2 +- xdocs/howto/index.xml | 2 +- xdocs/howto/url-mapper-howto.xml | 50 +- xdocs/index.xml | 10 +- xdocs/services/index.xml | 6 + xdocs/services/urlmapper-service.xml | 50 + xdocs/todo.xml | 9 +- 49 files changed, 1382 insertions(+), 1421 deletions(-)
