This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 4aa1cbc56bf1154385acf6413c69a94976b29f61
Merge: ce2467522 889a4180c
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Mon Feb 5 13:39:08 2024 +1100
Merge pull request #867 from apache/WW-5391-velocity-ext-point
WW-5391 Add interface for VelocityManager extension point
.../struts2/config_browser/ShowBeansAction.java | 4 +-
.../struts2/osgi/OsgiConfigurationProvider.java | 24 +-
.../portlet/result/PortletVelocityResult.java | 564 +++++++++++----------
.../OldDecorator2NewStrutsVelocityDecorator.java | 211 ++++----
.../struts2/sitemesh/VelocityDecoratorServlet.java | 389 +++++++-------
.../struts2/sitemesh/VelocityPageFilter.java | 24 +-
.../velocity/VelocityBeanSelectionProvider.java | 2 +-
.../struts2/views/velocity/VelocityManager.java | 5 +-
.../views/velocity/VelocityManagerInterface.java | 39 ++
.../views/velocity/result/VelocityResult.java | 37 +-
.../velocity/template/VelocityTemplateEngine.java | 17 +-
.../velocity/src/main/resources/struts-plugin.xml | 4 +
12 files changed, 727 insertions(+), 593 deletions(-)
