You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:13:26 UTC
[sling-org-apache-sling-scripting-thymeleaf] 15/50: SLING-5518 Get
resource resolver from bindings by using SlingBindings.RESOLVER
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.scripting.thymeleaf-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-thymeleaf.git
commit f0e447edc4066a95b2220c86fd432517da31a572
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Feb 14 07:01:00 2016 +0000
SLING-5518 Get resource resolver from bindings by using SlingBindings.RESOLVER
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf@1730289 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
.../scripting/thymeleaf/internal/NonCachingTemplateResolver.java | 4 ++--
.../scripting/thymeleaf/internal/ThymeleafScriptEngine.java | 9 ---------
3 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4199efc..5402766 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,7 +94,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.9.0</version>
+ <version>2.11.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.core</artifactId>
- <version>2.0.34</version>
+ <version>2.0.36</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/sling/scripting/thymeleaf/internal/NonCachingTemplateResolver.java b/src/main/java/org/apache/sling/scripting/thymeleaf/internal/NonCachingTemplateResolver.java
index c763259..4a369e9 100644
--- a/src/main/java/org/apache/sling/scripting/thymeleaf/internal/NonCachingTemplateResolver.java
+++ b/src/main/java/org/apache/sling/scripting/thymeleaf/internal/NonCachingTemplateResolver.java
@@ -22,7 +22,7 @@ import java.util.Map;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.api.scripting.SlingScriptConstants;
+import org.apache.sling.api.scripting.SlingBindings;
import org.apache.sling.scripting.thymeleaf.TemplateModeProvider;
import org.osgi.framework.Constants;
import org.osgi.service.component.annotations.Activate;
@@ -114,7 +114,7 @@ public class NonCachingTemplateResolver implements ITemplateResolver {
@Override
public TemplateResolution resolveTemplate(final IEngineConfiguration engineConfiguration, final IContext context, final String ownerTemplate, final String template, final Map<String, Object> templateResolutionAttributes) {
logger.debug("resolving template '{}'", template);
- final ResourceResolver resourceResolver = (ResourceResolver) context.getVariable(SlingScriptConstants.ATTR_SCRIPT_RESOURCE_RESOLVER); // TODO SlingBindings.RESOLVER
+ final ResourceResolver resourceResolver = (ResourceResolver) context.getVariable(SlingBindings.RESOLVER);
final Resource resource = resourceResolver.getResource(template);
final ITemplateResource templateResource = new SlingTemplateResource(resource);
final TemplateMode templateMode = templateModeProvider.provideTemplateMode(resource);
diff --git a/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngine.java b/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngine.java
index f0fd01c..80ea877 100644
--- a/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngine.java
+++ b/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngine.java
@@ -26,9 +26,7 @@ import javax.script.Bindings;
import javax.script.ScriptContext;
import javax.script.ScriptException;
-import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.scripting.SlingBindings;
-import org.apache.sling.api.scripting.SlingScriptConstants;
import org.apache.sling.api.scripting.SlingScriptHelper;
import org.apache.sling.scripting.api.AbstractSlingScriptEngine;
import org.slf4j.Logger;
@@ -56,17 +54,10 @@ public final class ThymeleafScriptEngine extends AbstractSlingScriptEngine {
throw new ScriptException("SlingScriptHelper missing from bindings");
}
- ResourceResolver resourceResolver = (ResourceResolver) scriptContext.getAttribute(SlingScriptConstants.ATTR_SCRIPT_RESOURCE_RESOLVER, SlingScriptConstants.SLING_SCOPE);
- if (resourceResolver == null) {
- resourceResolver = helper.getScript().getScriptResource().getResourceResolver();
- }
final Locale locale = helper.getResponse().getLocale();
-
final String scriptName = helper.getScript().getScriptResource().getPath();
final Writer writer = scriptContext.getWriter();
- bindings.put(SlingScriptConstants.ATTR_SCRIPT_RESOURCE_RESOLVER, resourceResolver); // TODO SlingBindings.RESOLVER
-
try {
final IContext context = new Context(locale, bindings);
thymeleafScriptEngineFactory.getTemplateEngine().process(scriptName, context, writer);
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.