Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-05 22:56:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #570 from apache/WW-5187-velocity

Browse Source 
[WW-5187] Comments out Velocity based PageFilter
This commit is contained in:
Yasser Zamani
2022-06-17 11:15:21 +04:30
committed by GitHub
parent e6bc93daf2 fc2aebd10a
commit dc4e403d30
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
+1 -1
View File
@@ -50,7 +50,7 @@ public class VelocityPageFilter extends SiteMeshFilter {
// TODO: Remove heavy coupling on horrible SM2 Factory
Factory factory = Factory.getInstance(new Config(filterConfig));
factory.refresh();
return new FreemarkerMapper2DecoratorSelector(factory.getDecoratorMapper());
return new VelocityMapper2DecoratorSelector(factory.getDecoratorMapper());
}
}
plugins/sitemesh/src/main/resources/struts-plugin.xml
+3 -2
View File
@@ -22,8 +22,9 @@
<!DOCTYPE struts PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
"http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<bean class="org.apache.struts2.sitemesh.FreemarkerPageFilter" static="true" optional="true"/>
<bean class="org.apache.struts2.sitemesh.VelocityPageFilter" static="true" optional="true"/>
<!-- if you want to use Velocity with Sitemesh, please define this bean in your struts.xml -->
<!-- bean class="org.apache.struts2.sitemesh.VelocityPageFilter" static="true" optional="true"/ -->
</struts>