You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by ku...@apache.org on 2024/02/05 02:39:13 UTC
(struts) branch master updated (ce2467522 -> 4aa1cbc56)
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
from ce2467522 Merge pull request #863 from sepe81/feature/dependency-updates
add 9328ae7ec WW-5391 Add interface for VelocityManager extension point
add ace6a713c WW-5391 Fix VelocityDecoratorServlet
add b5fca66ad WW-5391 Migrate other usages
add 93f0a5116 WW-5391 Fix bean definition
add 889a4180c WW-5391 Fix serialisation warnings
new 4aa1cbc56 Merge pull request #867 from apache/WW-5391-velocity-ext-point
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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 | 25 +-
.../views/velocity/result/VelocityResult.java | 37 +-
.../velocity/template/VelocityTemplateEngine.java | 17 +-
.../velocity/src/main/resources/struts-plugin.xml | 4 +
12 files changed, 699 insertions(+), 607 deletions(-)
copy core/src/main/java/org/apache/struts2/views/freemarker/tags/IfModel.java => plugins/velocity/src/main/java/org/apache/struts2/views/velocity/VelocityManagerInterface.java (70%)
(struts) 01/01: Merge pull request #867 from apache/WW-5391-velocity-ext-point
Posted by ku...@apache.org.
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 <gi...@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(-)