You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2016/06/12 16:54:21 UTC
[40/50] incubator-freemarker git commit: (Updated
incompatibleImprovements examples to use 2.3.25)
(Updated incompatibleImprovements examples to use 2.3.25)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/b28f69ee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/b28f69ee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/b28f69ee
Branch: refs/heads/2.3
Commit: b28f69ee8b0f466145ef23a99284ed0338452642
Parents: f27c087
Author: ddekany <dd...@apache.org>
Authored: Fri Jun 10 08:57:41 2016 +0200
Committer: ddekany <dd...@apache.org>
Committed: Fri Jun 10 08:57:41 2016 +0200
----------------------------------------------------------------------
src/manual/en_US/book.xml | 41 ++++++++++++++++++++---------------------
1 file changed, 20 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b28f69ee/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 97886d3..f17b4df 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -6220,9 +6220,9 @@ That's all.</programlisting>
beginning of the application (possibly servlet) life-cycle:</para>
<programlisting role="unspecified">// Create your Configuration instance, and specify if up to what FreeMarker
-// version (here 2.3.24) do you want to apply the fixes that are not 100%
+// version (here 2.3.25) do you want to apply the fixes that are not 100%
// backward-compatible. See the Configuration JavaDoc for details.
-Configuration cfg = new Configuration(Configuration.VERSION_2_3_24);
+Configuration cfg = new Configuration(Configuration.VERSION_2_3_25);
// Specify the source where the template files come from. Here I set a
// plain directory for it, but non-file-system sources are possible too:
@@ -6509,7 +6509,7 @@ public class Test {
/* You should do this ONLY ONCE in the whole application life-cycle: */
/* Create and adjust the configuration singleton */
- Configuration cfg = new Configuration(Configuration.VERSION_2_3_24);
+ Configuration cfg = new Configuration(Configuration.VERSION_2_3_25);
cfg.setDirectoryForTemplateLoading(new File("<replaceable>/where/you/store/templates</replaceable>"));
cfg.setDefaultEncoding("UTF-8");
cfg.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
@@ -7611,20 +7611,19 @@ public class RepeatDirective implements TemplateDirectiveModel {
<literal>incompatibleImprovements</literal> independently of
the <literal>Configuration</literal>. Depending on how you
create/set the <literal>ObjectWrapper</literal>, it can be
- done like this (let's assume you want
- <literal>incompatibleImprovements</literal> 2.3.24):</para>
+ done like this:</para>
<itemizedlist>
<listitem>
<para>If you are using the builder API:</para>
- <programlisting role="unspecified">... = new DefaultObjectWrapperBuilder(Configuration.VERSION_2_3_24).build()</programlisting>
+ <programlisting role="unspecified">... = new DefaultObjectWrapperBuilder(Configuration.VERSION_2_3_25).build()</programlisting>
</listitem>
<listitem>
<para>Or, if you are using the constructor:</para>
- <programlisting role="unspecified">... = new DefaultObjectWrapper(Configuration.VERSION_2_3_24)</programlisting>
+ <programlisting role="unspecified">... = new DefaultObjectWrapper(Configuration.VERSION_2_3_25)</programlisting>
</listitem>
<listitem>
@@ -7633,7 +7632,7 @@ public class RepeatDirective implements TemplateDirectiveModel {
(<literal>*.properties</literal> file or
<literal>java.util.Properties</literal> object):</para>
- <programlisting role="unspecified">object_wrapper=DefaultObjectWrapper(2.3.24)</programlisting>
+ <programlisting role="unspecified">object_wrapper=DefaultObjectWrapper(2.3.25)</programlisting>
</listitem>
<listitem>
@@ -7645,7 +7644,7 @@ public class RepeatDirective implements TemplateDirectiveModel {
<programlisting role="unspecified"><init-param>
<param-name>object_wrapper</param-name>
- <param-value>DefaultObjectWrapper(2.3.24)</param-value>
+ <param-value>DefaultObjectWrapper(2.3.25)</param-value>
</init-param></programlisting>
</listitem>
</itemizedlist>
@@ -7806,7 +7805,7 @@ public class MyAppObjectWrapper extends DefaultObjectWrapper {
our object wrapper in:</para>
<programlisting role="unspecified">// Where you initialize the cfg *singleton* (happens just once in the application life-cycle):
-cfg = new Configuration(Configuration.VERSION_2_3_24);
+cfg = new Configuration(Configuration.VERSION_2_3_25);
...
cfg.setObjectWrapper(new MyAppObjectWrapper(cfg.getIncompatibleImprovements()));</programlisting>
@@ -7814,7 +7813,7 @@ cfg.setObjectWrapper(new MyAppObjectWrapper(cfg.getIncompatibleImprovements()));
<literal>java.util.Properties</literal> instead (and let's say it's
also a <literal>.properties</literal> file):</para>
- <programlisting role="unspecified">object_wrapper=com.example.myapp.freemarker.MyAppObjectWrapper(2.3.24)</programlisting>
+ <programlisting role="unspecified">object_wrapper=com.example.myapp.freemarker.MyAppObjectWrapper(2.3.25)</programlisting>
</section>
</section>
</chapter>
@@ -7878,7 +7877,7 @@ cfg.setObjectWrapper(new MyAppObjectWrapper(cfg.getIncompatibleImprovements()));
the configuration with the <literal>setSharedVariable</literal>
methods:</para>
- <programlisting role="unspecified">Configuration cfg = new Configuration(Configuration.VERSION_2_3_24);
+ <programlisting role="unspecified">Configuration cfg = new Configuration(Configuration.VERSION_2_3_25);
<replaceable>..</replaceable>.
cfg.setSharedVariable("warp", new WarpDirective());
cfg.setSharedVariable("company", "Foo Inc.");</programlisting>
@@ -8079,7 +8078,7 @@ cfg.setSharedVariable("company", "Foo Inc.");</programlisting>
the settings with the setter methods of the
<literal>Configuration</literal> object, fore example:</para>
- <programlisting role="unspecified">Configuration myCfg = new Configuration(Configuration.VERSION_2_3_24);
+ <programlisting role="unspecified">Configuration myCfg = new Configuration(Configuration.VERSION_2_3_25);
myCfg.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
myCfg.setDefaultEncoding("UTF-8");</programlisting>
@@ -8104,7 +8103,7 @@ myCfg.setDefaultEncoding("UTF-8");</programlisting>
class="org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer">
<property name="freemarkerSettings">
<props>
- <prop key="incompatible_improvements">2.3.24</prop>
+ <prop key="incompatible_improvements">2.3.25</prop>
<prop key="template_exception_handler">rethrow</prop>
<prop key="default_encoding">UTF-8</prop>
</props>
@@ -9933,7 +9932,7 @@ cfg.setNumberFormat("@ua 0.####;; roundingMode=halfUp");</programlisting>
<para>The incompatible improvements setting exists on the
<literal>Configuration</literal> level. It can be set on multiple
- ways (let's assume that we want to set it to 2.3.22):</para>
+ ways:</para>
<itemizedlist>
<listitem>
@@ -9941,14 +9940,14 @@ cfg.setNumberFormat("@ua 0.####;; roundingMode=halfUp");</programlisting>
<literal>freemarker.template.Configuration</literal> object
like:</para>
- <programlisting role="unspecified">... = new Configuration(Configuration.VERSION_2_3_24)</programlisting>
+ <programlisting role="unspecified">... = new Configuration(Configuration.VERSION_2_3_25)</programlisting>
</listitem>
<listitem>
<para>Or, alter the <literal>Configuration</literal> singleton
where you initialize its other settings like:</para>
- <programlisting role="unspecified">cfg.setIncompatibleImprovements(Configuration.VERSION_2_3_24)</programlisting>
+ <programlisting role="unspecified">cfg.setIncompatibleImprovements(Configuration.VERSION_2_3_25)</programlisting>
</listitem>
<listitem>
@@ -9956,7 +9955,7 @@ cfg.setNumberFormat("@ua 0.####;; roundingMode=halfUp");</programlisting>
(<literal>*.properties</literal> file or
<literal>java.util.Properties</literal> object), add:</para>
- <programlisting role="unspecified">incompatible_improvements=2.3.24</programlisting>
+ <programlisting role="unspecified">incompatible_improvements=2.3.25</programlisting>
</listitem>
<listitem>
@@ -9967,7 +9966,7 @@ cfg.setNumberFormat("@ua 0.####;; roundingMode=halfUp");</programlisting>
<programlisting role="unspecified"><init-param>
<param-name>incompatible_improvements</param-name>
- <param-value>2.3.24</param-value>
+ <param-value>2.3.25</param-value>
</init-param></programlisting>
</listitem>
</itemizedlist>
@@ -11172,7 +11171,7 @@ TemplateHashModel roundingModeEnums =
<!-- FreeMarker engine settings: -->
<init-param>
<param-name>incompatible_improvements</param-name>
- <param-value>2.3.24</param-value>
+ <param-value>2.3.25</param-value>
<!--
Recommended to set to a high value.
See: http://freemarker.org/docs/pgui_config_incompatible_improvements.html
@@ -26616,7 +26615,7 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
from the <literal>Configuration</literal> level down to the more
generic <literal>Configurable</literal> level, and so are
inherited by <literal>TemplateConfigurer</literal> and
- <literal>Environment</literal> too. </para>
+ <literal>Environment</literal> too.</para>
</listitem>
<listitem>