Rename FreeMarker templates cache constant to match other caching con…

…stant names git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@555291 13f79535-47bb-0310-9956-ffa450edef68
tqrg-bot · Jul 11, 2007 · cc9fe88 · cc9fe88
1 parent 63d045c
commit cc9fe88
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/core/src/main/java/org/apache/struts2/StrutsConstants.java b/core/src/main/java/org/apache/struts2/StrutsConstants.java
@@ -77,7 +77,7 @@ public final class StrutsConstants {
     public static final String STRUTS_FREEMARKER_MANAGER_CLASSNAME = "struts.freemarker.manager.classname";
 
     /** Cache Freemarker templates */
-    public static final String STRUTS_FREEMARKER_CACHE_TEMPLATES = "struts.freemarker.templatesCache";
+    public static final String STRUTS_FREEMARKER_TEMPLATES_CACHE = "struts.freemarker.templatesCache";
 
     /** Cache model instances at BeanWrapper level */
     public static final String STRUTS_FREEMARKER_BEANWRAPPER_CACHE = "struts.freemarker.beanwrapperCache";

diff --git a/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java b/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
@@ -212,7 +212,7 @@ protected freemarker.template.Template findInCache(String templateName) {
      * @param caching true if the template engine should cache freemarker template
      * internally
      */
-    @Inject(StrutsConstants.STRUTS_FREEMARKER_CACHE_TEMPLATES)
+    @Inject(StrutsConstants.STRUTS_FREEMARKER_TEMPLATES_CACHE)
     public void setCacheTemplates(String cacheTemplates) {
         freemarkerCaching = "true".equals(cacheTemplates);
     }

diff --git a/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java b/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
@@ -163,7 +163,7 @@ public void register(ContainerBuilder builder, LocatableProperties props) {
         if ("true".equalsIgnoreCase(props.getProperty(StrutsConstants.STRUTS_DEVMODE))) {
             props.setProperty(StrutsConstants.STRUTS_I18N_RELOAD, "true");
             props.setProperty(StrutsConstants.STRUTS_CONFIGURATION_XML_RELOAD, "true");
-            props.setProperty(StrutsConstants.STRUTS_FREEMARKER_CACHE_TEMPLATES, "false");
+            props.setProperty(StrutsConstants.STRUTS_FREEMARKER_TEMPLATES_CACHE, "false");
             // Convert struts properties into ones that xwork expects
             props.setProperty("devMode", "true");
         } else {