Author: cziegeler Date: Mon Aug 14 08:59:51 2017 New Revision: 1804958 URL: http://svn.apache.org/viewvc?rev=1804958&view=rev Log: SLING-7044 : Scripted tag files are not found
Modified: sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/JspCompilationContext.java sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/TagFileProcessor.java Modified: sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/JspCompilationContext.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/JspCompilationContext.java?rev=1804958&r1=1804957&r2=1804958&view=diff ============================================================================== --- sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/JspCompilationContext.java (original) +++ sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/JspCompilationContext.java Mon Aug 14 08:59:51 2017 @@ -287,6 +287,9 @@ public class JspCompilationContext { return this.tagFileJarUrl; } + public void setTagFileUrls(final JspCompilationContext ctxt) { + this.tagFileJarUrls.putAll(ctxt.tagFileJarUrls); + } /* ==================== Common implementation ==================== */ /** @@ -626,5 +629,6 @@ public class JspCompilationContext { } return result.toString(); } + } Modified: sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/TagFileProcessor.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/TagFileProcessor.java?rev=1804958&r1=1804957&r2=1804958&view=diff ============================================================================== --- sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/TagFileProcessor.java (original) +++ sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/TagFileProcessor.java Mon Aug 14 08:59:51 2017 @@ -546,6 +546,7 @@ class TagFileProcessor { .getOptions(), tagFilePath, n.getTagInfo(), ctxt .getRuntimeContext(), compiler.getDefaultIsSession(), ctxt.getTagFileJarUrl(tagFilePath)); + wrapper.getJspEngineContext().setTagFileUrls(ctxt); wrapper = rctxt.addWrapper(tagFilePath, wrapper); // Use same classloader and classpath for compiling tag files @@ -591,6 +592,7 @@ class TagFileProcessor { ctxt.getRuntimeContext(), compiler.getDefaultIsSession(), ctxt.getTagFileJarUrl(tempTagFilePath)); + tempWrapper.getJspEngineContext().setTagFileUrls(ctxt); tagClazz = tempWrapper.loadTagFilePrototype(); tempVector.add(tempWrapper.getJspEngineContext().getCompiler()); String name = JspUtil.getCanonicalName(tagClazz);