[sling-org-apache-sling-scripting-sightly] branch master updated: SLING-9406 - Add bundled script support to the servlets resolver

[pauls]

This is an automated email from the ASF dual-hosted git repository.

pauls pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly.git


The following commit(s) were added to refs/heads/master by this push:
     new 81e27c4  SLING-9406 - Add bundled script support to the servlets 
resolver
81e27c4 is described below

commit 81e27c418ee87ffcf49a6495f7535de84773c382
Author: Karl Pauls <karlpa...@gmail.com>
AuthorDate: Wed May 20 00:21:05 2020 +0200

    SLING-9406 - Add bundled script support to the servlets resolver
    
    * look at the parent of servlet resources for relative dependencies
---
 .../org/apache/sling/scripting/sightly/engine/ResourceResolution.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/src/main/java/org/apache/sling/scripting/sightly/engine/ResourceResolution.java
 
b/src/main/java/org/apache/sling/scripting/sightly/engine/ResourceResolution.java
index 81da971..30d6664 100644
--- 
a/src/main/java/org/apache/sling/scripting/sightly/engine/ResourceResolution.java
+++ 
b/src/main/java/org/apache/sling/scripting/sightly/engine/ResourceResolution.java
@@ -63,7 +63,7 @@ public final class ResourceResolution {
         }
         Resource internalBase = null;
         if (base != null) {
-            if ("nt:file".equals(base.getResourceType())) {
+            if ("nt:file".equals(base.getResourceType()) || 
"true".equalsIgnoreCase((String) 
base.getResourceMetadata().get("sling.servlet.resource"))) {
                 internalBase = retrieveParent(base);
             } else {
                 internalBase = base;