Author: olli
Date: Sun Feb 14 07:01:00 2016
New Revision: 1730289
URL: http://svn.apache.org/viewvc?rev=1730289&view=rev
Log:
SLING-5518 Get resource resolver from bindings by using SlingBindings.RESOLVER
Modified:
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/pom.xml
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/NonCachingTemplateResolver.java
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngine.java
Modified:
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/pom.xml?rev=1730289&r1=1730288&r2=1730289&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/pom.xml
(original)
+++ sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/pom.xml
Sun Feb 14 07:01:00 2016
@@ -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>
Modified:
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/NonCachingTemplateResolver.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/NonCachingTemplateResolver.java?rev=1730289&r1=1730288&r2=1730289&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/NonCachingTemplateResolver.java
(original)
+++
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/NonCachingTemplateResolver.java
Sun Feb 14 07:01:00 2016
@@ -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
@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);
Modified:
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngine.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngine.java?rev=1730289&r1=1730288&r2=1730289&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngine.java
(original)
+++
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngine.java
Sun Feb 14 07:01:00 2016
@@ -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
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);
