You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by gm...@apache.org on 2013/08/22 13:30:20 UTC
svn commit: r1516417 -
/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/PropertyReader.java
Author: gmazza
Date: Thu Aug 22 11:30:20 2013
New Revision: 1516417
URL: http://svn.apache.org/r1516417
Log:
Switch to jspwiki.custom.cascade in trunk to emphasize cascading is on the custom file if provided and not the internal property file.
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/PropertyReader.java
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/PropertyReader.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/PropertyReader.java?rev=1516417&r1=1516416&r2=1516417&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/PropertyReader.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/PropertyReader.java Thu Aug 22 11:30:20 2013
@@ -59,7 +59,7 @@ public final class PropertyReader
*
* @see #loadWebAppProps(ServletContext)
*/
- public static final String PARAM_PROPERTYFILE_CASCADEPREFIX = "jspwiki.propertyfile.cascade.";
+ public static final String PARAM_PROPERTYFILE_CASCADEPREFIX = "jspwiki.custom.cascade.";
public static final String CUSTOM_JSPWIKI_CONFIG = "/jspwiki-custom.properties";