Return-Path: Delivered-To: apmail-struts-commits-archive@locus.apache.org Received: (qmail 42292 invoked from network); 11 Jul 2007 14:48:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 11 Jul 2007 14:48:52 -0000 Received: (qmail 80371 invoked by uid 500); 11 Jul 2007 14:48:52 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 80316 invoked by uid 500); 11 Jul 2007 14:48:51 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 80305 invoked by uid 99); 11 Jul 2007 14:48:51 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Jul 2007 07:48:51 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Jul 2007 07:48:48 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 50FD21A981A; Wed, 11 Jul 2007 07:48:28 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r555291 - in /struts/struts2/trunk/core/src/main/java/org/apache/struts2: StrutsConstants.java components/template/FreemarkerTemplateEngine.java config/BeanSelectionProvider.java Date: Wed, 11 Jul 2007 14:48:28 -0000 To: commits@struts.apache.org From: musachy@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070711144828.50FD21A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 {