Author: cjdelisle Date: 2010-06-15 15:27:18 +0200 (Tue, 15 Jun 2010) New Revision: 29480 Modified: platform/xwiki-tools/trunk/xwiki-configuration-resources/src/main/resources/xwiki.cfg.vm Log: XWIKI-5273: In syntax 1.0 allow changing order of renderers, set default in configuration file to execute groovy before velocity. Make groovy be rendered before velocity by default. Modified: platform/xwiki-tools/trunk/xwiki-configuration-resources/src/main/resources/xwiki.cfg.vm =================================================================== --- platform/xwiki-tools/trunk/xwiki-configuration-resources/src/main/resources/xwiki.cfg.vm 2010-06-15 13:24:58 UTC (rev 29479) +++ platform/xwiki-tools/trunk/xwiki-configuration-resources/src/main/resources/xwiki.cfg.vm 2010-06-15 13:27:18 UTC (rev 29480) @@ -307,6 +307,11 @@ #-# Simple wiki syntax rendering # xwiki.render.wikiwiki=0 +#-# Rendering order: content will be rendered by the first renderer on the list, output rendered by the second, etc. +#-# Default: macromapping, velocity, groovy, plugin, wiki, wikiwiki +#-# To protect against velocity content becoming groovy code, it is recommended to leave the following line active. +xwiki.render.renderingorder=macromapping, groovy, velocity, plugin, wiki, wikiwiki

+ #-# Maximum number of documents to keep in the rendered cache # xwiki.render.cache.capacity=100