You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2016/04/26 06:11:30 UTC

svn commit: r1740942 - /sling/trunk/contrib/scripting/freemarker/src/main/java/org/apache/sling/scripting/freemarker/internal/FreemarkerScriptEngine.java

Author: olli
Date: Tue Apr 26 04:11:29 2016
New Revision: 1740942

URL: http://svn.apache.org/viewvc?rev=1740942&view=rev
Log:
SLING-5689 Use Version (incompatible improvements)

Modified:
    sling/trunk/contrib/scripting/freemarker/src/main/java/org/apache/sling/scripting/freemarker/internal/FreemarkerScriptEngine.java

Modified: sling/trunk/contrib/scripting/freemarker/src/main/java/org/apache/sling/scripting/freemarker/internal/FreemarkerScriptEngine.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/freemarker/src/main/java/org/apache/sling/scripting/freemarker/internal/FreemarkerScriptEngine.java?rev=1740942&r1=1740941&r2=1740942&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/freemarker/src/main/java/org/apache/sling/scripting/freemarker/internal/FreemarkerScriptEngine.java (original)
+++ sling/trunk/contrib/scripting/freemarker/src/main/java/org/apache/sling/scripting/freemarker/internal/FreemarkerScriptEngine.java Tue Apr 26 04:11:29 2016
@@ -27,6 +27,7 @@ import javax.jcr.Node;
 import freemarker.ext.beans.BeansWrapper;
 import freemarker.log.Logger;
 import freemarker.template.TemplateHashModel;
+import freemarker.template.Version;
 import org.apache.sling.api.scripting.SlingBindings;
 import org.apache.sling.api.scripting.SlingScriptHelper;
 import org.apache.sling.scripting.api.AbstractSlingScriptEngine;
@@ -42,6 +43,8 @@ import freemarker.template.Template;
 public class FreemarkerScriptEngine extends AbstractSlingScriptEngine {
     private static final Logger log = Logger.getLogger(FreemarkerScriptEngine.class.getName());
 
+    private final Version version = new Version(2, 3, 24);
+
     private final Configuration configuration;
 
     private final BeansWrapper beansWrapper;
@@ -50,8 +53,8 @@ public class FreemarkerScriptEngine exte
 
     public FreemarkerScriptEngine(ScriptEngineFactory factory) {
         super(factory);
-        configuration = new Configuration();
-        beansWrapper = new BeansWrapper();
+        configuration = new Configuration(version);
+        beansWrapper = new BeansWrapper(version);
         statics = beansWrapper.getStaticModels();
     }