You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2014/05/06 15:18:20 UTC
svn commit: r1592740 - in
/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp:
SlingIOProvider.java jasper/IOProvider.java jasper/compiler/JDTCompiler.java
Author: cziegeler
Date: Tue May 6 13:18:19 2014
New Revision: 1592740
URL: http://svn.apache.org/r1592740
Log:
SLING-3545 : SlingJSPTaglibTest fails due to missing ELContextWrapper/JspValueExpression
Modified:
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/SlingIOProvider.java
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/IOProvider.java
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/JDTCompiler.java
Modified: sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/SlingIOProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/SlingIOProvider.java?rev=1592740&r1=1592739&r2=1592740&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/SlingIOProvider.java (original)
+++ sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/SlingIOProvider.java Tue May 6 13:18:19 2014
@@ -238,4 +238,11 @@ class SlingIOProvider implements IOProvi
public JavaCompiler getJavaCompiler() {
return this.javaCompiler;
}
+
+ /**
+ * @see org.apache.sling.scripting.jsp.jasper.IOProvider#getClassLoaderWriter()
+ */
+ public ClassLoaderWriter getClassLoaderWriter() {
+ return this.classLoaderWriter;
+ }
}
Modified: sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/IOProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/IOProvider.java?rev=1592740&r1=1592739&r2=1592740&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/IOProvider.java (original)
+++ sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/IOProvider.java Tue May 6 13:18:19 2014
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import org.apache.sling.commons.classloader.ClassLoaderWriter;
import org.apache.sling.commons.compiler.JavaCompiler;
/**
@@ -113,4 +114,9 @@ public interface IOProvider {
* Return the Java Compiler
*/
JavaCompiler getJavaCompiler();
+
+ /**
+ * Return the class loader writer
+ */
+ ClassLoaderWriter getClassLoaderWriter();
}
Modified: sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/JDTCompiler.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/JDTCompiler.java?rev=1592740&r1=1592739&r2=1592740&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/JDTCompiler.java (original)
+++ sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/JDTCompiler.java Tue May 6 13:18:19 2014
@@ -92,6 +92,7 @@ public class JDTCompiler extends org.apa
};
final Options options = new Options();
+ options.put(Options.KEY_CLASS_LOADER_WRITER, ctxt.getRuntimeContext().getIOProvider().getClassLoaderWriter());
options.put(Options.KEY_GENERATE_DEBUG_INFO, ctxt.getOptions().getClassDebugInfo());
// Source JVM