You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ki...@apache.org on 2003/05/15 20:45:40 UTC
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Collector.java JspRuntimeContext.java
kinman 2003/05/15 11:45:40
Modified: jasper2/src/share/org/apache/jasper/compiler Collector.java
JspRuntimeContext.java
Log:
- Patch by Michael Walker
1. Set correct class path for tag files.
2. Also include <jsp:element> when checking if a page is scriptless.
Revision Changes Path
1.12 +16 -2 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Collector.java
Index: Collector.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Collector.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Collector.java 7 May 2003 02:05:58 -0000 1.11
+++ Collector.java 15 May 2003 18:45:40 -0000 1.12
@@ -213,6 +213,20 @@
hasScriptingVars = hasScriptingVars || hasScriptingVarsSave;
}
+ public void visit(Node.JspElement n) throws JasperException {
+ if (n.getNameAttribute().isExpression())
+ scriptingElementSeen = true;
+
+ Node.JspAttribute[] attrs = n.getJspAttributes();
+ for (int i = 0; i < attrs.length; i++) {
+ if (attrs[i].isExpression()) {
+ scriptingElementSeen = true;
+ break;
+ }
+ }
+ visitBody(n);
+ }
+
public void visit(Node.JspBody n) throws JasperException {
checkSeen( n.getChildInfo(), n );
}
1.13 +5 -5 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java
Index: JspRuntimeContext.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JspRuntimeContext.java 8 Mar 2003 17:01:54 -0000 1.12
+++ JspRuntimeContext.java 15 May 2003 18:45:40 -0000 1.13
@@ -371,7 +371,7 @@
}
}
- cpath.append(options.getScratchDir() + "/tags" + sep);
+ cpath.append(options.getScratchDir() + sep);
String cp = (String) context.getAttribute(Constants.SERVLET_CLASSPATH);
if (cp == null || cp.equals("")) {
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org