This is an automated email from the ASF dual-hosted git repository.
kusal pushed a change to branch release/struts-7-0-x
in repository https://gitbox.apache.org/repos/asf/struts.git
from 6265455d1 Merge pull request #1004 from
apache/7.0.x/WW-5411-delete-deprecated-3
add 015544abd WW-5449 Make Velocity Tools dependency optional for Velocity
plugin
add 902dca06c WW-5449 Minor clean up
add ac860d3bb WW-5449 Include Velocity Tools dependencies explicitly in
Showcase app
add ca358c57d WW-5449 Increase coverage
add 817b0cd6e Merge pull request #1005 from
apache/7.0.x/WW-5449-remove-vel-tools
No new revisions were added by this update.
Summary of changes:
apps/showcase/pom.xml | 8 +
plugins/sitemesh/pom.xml | 10 +
plugins/velocity/pom.xml | 3 +-
.../struts2/views/velocity/VelocityManager.java | 360 ++++++++-------------
.../struts2/views/velocity/VelocityTools.java | 59 ++++
.../views/velocity/VelocityManagerTest.java | 64 +++-
.../resources/WEB-INF/webinf-velocity.properties | 2 +
.../src/test/resources/test-velocity.properties | 2 +
8 files changed, 274 insertions(+), 234 deletions(-)
create mode 100644
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/VelocityTools.java
copy
core/src/test/resources/com/opensymphony/xwork2/SimpleAnnotationAction_en.properties
=> plugins/velocity/src/test/resources/WEB-INF/webinf-velocity.properties (98%)
copy
core/src/test/resources/com/opensymphony/xwork2/SimpleAnnotationAction_en.properties
=> plugins/velocity/src/test/resources/test-velocity.properties (98%)
