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 3267a1ace Merge pull request #1010 from 
apache/7.0.x/WW-5454-log-security-warnings
     add 1b540c288 WW-5453 Rename VelocityManager interface and default 
implementation
     add 46797922e Merge pull request #1009 from 
apache/7.0.x/WW-5453-rename-velocity

No new revisions were added by this update.

Summary of changes:
 .../struts2/config_browser/ShowBeansAction.java    |   4 +-
 .../OldDecorator2NewStrutsVelocityDecorator.java   |   6 +-
 .../struts2/sitemesh/VelocityDecoratorServlet.java |  17 +-
 .../struts2/sitemesh/VelocityPageFilter.java       |   4 +-
 ...cityManager.java => StrutsVelocityManager.java} |  10 +-
 .../velocity/VelocityBeanSelectionProvider.java    |   2 +-
 .../struts2/views/velocity/VelocityManager.java    | 372 +--------------------
 .../views/velocity/VelocityManagerInterface.java   |  38 ---
 .../views/velocity/result/VelocityResult.java      |   8 +-
 .../velocity/template/VelocityTemplateEngine.java  |   6 +-
 .../velocity/src/main/resources/struts-plugin.xml  |   7 +-
 ...gerTest.java => StrutsVelocityManagerTest.java} |  64 ++--
 12 files changed, 68 insertions(+), 470 deletions(-)
 copy 
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/{VelocityManager.java
 => StrutsVelocityManager.java} (97%)
 delete mode 100644 
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/VelocityManagerInterface.java
 rename 
plugins/velocity/src/test/java/org/apache/struts2/views/velocity/{VelocityManagerTest.java
 => StrutsVelocityManagerTest.java} (59%)

Reply via email to