This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
from 87f80f473 Merge pull request #728 from apache/feature/codeowners
add 2d6fe8430 WW-5334 Remove unused imports ContextUtil
add f4daeb3ea WW-5334 Clean up VelocityStrutsUtil
add 114b6e4f2 WW-5334 Clean up VelocityManager#applyDefaultConfiguration
add 2abf8677b WW-5334 Clean up VelocityManager context creation
add 6d9bfb6af WW-5334 Remove unused import XWorkTestCase
add 225063960 WW-5334 Modernise VelocityResultTest
add 2fa9d60a2 WW-5334 Add basic unit tests for VelocityManager
add d70ad5b73 WW-5334 Fix license for VelocityManagerTest
add 94c1b2a29 WW-5334 Add AssertJ as default plugin test dependency
add 22a6ae9d6 WW-5334 Add further unit tests to VelocityManagerTest
new 0ef086c89 Merge pull request #731 from apache/WW-5334-velocity-manager
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:
.../com/opensymphony/xwork2/XWorkTestCase.java | 7 +-
.../org/apache/struts2/views/util/ContextUtil.java | 2 -
plugins/json/pom.xml | 6 -
plugins/pom.xml | 5 +
plugins/rest/pom.xml | 6 -
.../struts2/views/velocity/VelocityManager.java | 186 +++++++--------------
.../struts2/views/velocity/VelocityStrutsUtil.java | 16 +-
.../views/velocity/VelocityManagerTest.java | 116 +++++++++++++
.../views/velocity/result/VelocityResultTest.java | 102 +++++------
.../main => velocity/src/test}/resources/tools.xml | 6 +-
10 files changed, 249 insertions(+), 203 deletions(-)
create mode 100644
plugins/velocity/src/test/java/org/apache/struts2/views/velocity/VelocityManagerTest.java
copy plugins/{tiles/src/main => velocity/src/test}/resources/tools.xml (84%)
