incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1348430 - in /sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper: JspCompilationContext.java servlet/JspServletWrapper.java
Date Sat, 09 Jun 2012 15:46:01 GMT
Author: cziegeler
Date: Sat Jun  9 15:46:00 2012
New Revision: 1348430

URL: http://svn.apache.org/viewvc?rev=1348430&view=rev
Log:
SLING-2505 : Don't load class for dependency check

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/servlet/JspServletWrapper.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=1348430&r1=1348429&r2=1348430&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
Sat Jun  9 15:46:00 2012
@@ -36,7 +36,6 @@ import org.apache.sling.scripting.jsp.ja
 import org.apache.sling.scripting.jsp.jasper.compiler.JspUtil;
 import org.apache.sling.scripting.jsp.jasper.compiler.Localizer;
 import org.apache.sling.scripting.jsp.jasper.compiler.ServletWriter;
-import org.apache.sling.scripting.jsp.jasper.servlet.JspServletWrapper;
 
 /**
  * A place holder for various things that are used through out the JSP
@@ -67,7 +66,6 @@ public class JspCompilationContext {
     private String contentType;
     private ServletWriter writer;
     private Options options;
-    private JspServletWrapper jsw;
     private Compiler jspCompiler;
 
     private String baseURI;
@@ -86,13 +84,11 @@ public class JspCompilationContext {
                                  boolean isErrPage,
                                  Options options,
                                  ServletContext context,
-                                 JspServletWrapper jsw,
                                  JspRuntimeContext rctxt) {
 
         this.jspUri = canonicalURI(jspUri);
         this.isErrPage = isErrPage;
         this.options = options;
-        this.jsw = jsw;
         this.context = context;
 
         this.baseURI = jspUri.substring(0, jspUri.lastIndexOf('/') + 1);
@@ -117,10 +113,9 @@ public class JspCompilationContext {
                                  TagInfo tagInfo,
                                  Options options,
                                  ServletContext context,
-                                 JspServletWrapper jsw,
                                  JspRuntimeContext rctxt,
                                  URL tagFileJarUrl) {
-        this(tagfile, false, options, context, jsw, rctxt);
+        this(tagfile, false, options, context, rctxt);
         this.isTagFile = true;
         this.tagInfo = tagInfo;
         this.tagFileJarUrl = tagFileJarUrl;

Modified: sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/servlet/JspServletWrapper.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/servlet/JspServletWrapper.java?rev=1348430&r1=1348429&r2=1348430&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/servlet/JspServletWrapper.java
(original)
+++ sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/servlet/JspServletWrapper.java
Sat Jun  9 15:46:00 2012
@@ -111,7 +111,7 @@ public class JspServletWrapper {
         this.jspUri = jspUri;
         this.ctxt = new JspCompilationContext(jspUri, isErrorPage, options,
 					 config.getServletContext(),
-					 this, rctxt);
+					 rctxt);
         if ( log.isDebugEnabled() ) {
             log.debug("Creating new wrapper for servlet " + jspUri);
         }
@@ -132,7 +132,7 @@ public class JspServletWrapper {
         this.options = options;
         this.jspUri = tagFilePath;
         this.ctxt = new JspCompilationContext(jspUri, tagInfo, options,
-					 servletContext, this, rctxt,
+					 servletContext, rctxt,
 					 tagFileJarUrl);
         if ( log.isDebugEnabled() ) {
             log.debug("Creating new wrapper for tagfile " + jspUri);



Mime
View raw message