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 2017/01/25 00:09:18 UTC

svn commit: r1780128 - in /sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal: ThymeleafScriptEngineFactory.java resourceresolver/

Author: olli
Date: Wed Jan 25 00:09:18 2017
New Revision: 1780128

URL: http://svn.apache.org/viewvc?rev=1780128&view=rev
Log:
SLING-5928 Use Service ResourceResolver in SlingResourceTemplateResolver

use RequestScopedResourceResolver

Removed:
    sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/resourceresolver/
Modified:
    sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java

Modified: sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.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/ThymeleafScriptEngineFactory.java?rev=1780128&r1=1780127&r2=1780128&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java (original)
+++ sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java Wed Jan 25 00:09:18 2017
@@ -30,7 +30,7 @@ import javax.script.ScriptEngineFactory;
 
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.scripting.api.AbstractScriptEngineFactory;
-import org.apache.sling.scripting.thymeleaf.internal.resourceresolver.RequestScopedResourceResolverProvider;
+import org.apache.sling.scripting.api.resource.ScriptingResourceResolverProvider;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceRegistration;
@@ -133,7 +133,7 @@ public final class ThymeleafScriptEngine
         policy = ReferencePolicy.DYNAMIC,
         policyOption = ReferencePolicyOption.GREEDY
     )
-    private volatile RequestScopedResourceResolverProvider resourceResolverProvider;
+    private volatile ScriptingResourceResolverProvider scriptingResourceResolverProvider;
 
     private ThymeleafScriptEngineFactoryConfiguration configuration;
 
@@ -429,7 +429,7 @@ public final class ThymeleafScriptEngine
     }
 
     ResourceResolver getRequestScopedResourceResolver() {
-        return resourceResolverProvider.getResourceResolver();
+        return scriptingResourceResolverProvider.getRequestScopedResourceResolver();
     }
 
 }