svn commit: r555291 - in /struts/struts2/trunk/core/src/main/java/org/apache/struts2: StrutsConstants.java components/template/FreemarkerTemplateEngine.java config/BeanSelectionProvider.java

[musachy]

Author: musachy
Date: Wed Jul 11 07:48:26 2007
New Revision: 555291

URL: http://svn.apache.org/viewvc?view=rev&rev=555291
Log:
Rename FreeMarker templates cache constant to match other caching constant names

Modified:
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java?view=diff&rev=555291&r1=555290&r2=555291
==============================================================================
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java 
(original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java 
Wed Jul 11 07:48:26 2007
@@ -77,7 +77,7 @@
     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";

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java?view=diff&rev=555291&r1=555290&r2=555291
==============================================================================
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
 Wed Jul 11 07:48:26 2007
@@ -212,7 +212,7 @@
      * @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);
     }

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java?view=diff&rev=555291&r1=555290&r2=555291
==============================================================================
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
 Wed Jul 11 07:48:26 2007
@@ -163,7 +163,7 @@
         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 {