Author: olli
Date: Sat Mar 4 11:53:32 2017
New Revision: 1785469
URL: http://svn.apache.org/viewvc?rev=1785469&view=rev
Log:
SLING-6606 Use TemplateModels provided as OSGi services
remove static models
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=1785469&r1=1785468&r2=1785469&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
Sat Mar 4 11:53:32 2017
@@ -21,12 +21,9 @@ import java.nio.charset.StandardCharsets
import javax.script.Bindings;
import javax.script.ScriptContext;
-import javax.script.ScriptEngineFactory;
import javax.script.ScriptException;
-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;
@@ -46,10 +43,6 @@ public class FreemarkerScriptEngine exte
private final Configuration configuration;
- private final BeansWrapper beansWrapper;
-
- private final TemplateHashModel statics;
-
private final FreemarkerScriptEngineFactory freemarkerScriptEngineFactory;
public FreemarkerScriptEngine(final FreemarkerScriptEngineFactory
freemarkerScriptEngineFactory) {
@@ -57,8 +50,6 @@ public class FreemarkerScriptEngine exte
this.freemarkerScriptEngineFactory = freemarkerScriptEngineFactory;
configuration = new Configuration(version);
configuration.setDefaultEncoding(StandardCharsets.UTF_8.name());
- beansWrapper = new BeansWrapper(version);
- statics = beansWrapper.getStaticModels();
}
public Object eval(Reader reader, ScriptContext scriptContext)
@@ -79,7 +70,6 @@ public class FreemarkerScriptEngine exte
try {
Template tmpl = new Template(scriptName, reader, configuration);
- bindings.put("statics", statics);
freemarkerScriptEngineFactory.getTemplateModels().forEach(bindings::put);
tmpl.process(bindings, scriptContext.getWriter());
} catch (Throwable t) {
