luehe 2002/09/20 11:06:38
Modified: jasper2/src/share/org/apache/jasper Constants.java
jasper2/src/share/org/apache/jasper/compiler Generator.java
Log:
Fixed 12461: Jasper imports classes it shouldn't
Revision Changes Path
1.8 +2 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Constants.java
Index: Constants.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Constants.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Constants.java 21 Aug 2002 16:21:56 -0000 1.7
+++ Constants.java 20 Sep 2002 18:06:38 -0000 1.8
@@ -74,7 +74,7 @@
/**
* The base class of the generated servlets.
*/
- public static final String JSP_SERVLET_BASE = "HttpJspBase";
+ public static final String JSP_SERVLET_BASE =
"org.apache.jasper.runtime.HttpJspBase";
/**
* _jspService is the name of the method that is called by
@@ -95,8 +95,7 @@
public static final String[] STANDARD_IMPORTS = {
"javax.servlet.*",
"javax.servlet.http.*",
- "javax.servlet.jsp.*",
- "org.apache.jasper.runtime.*",
+ "javax.servlet.jsp.*"
};
/**
1.103 +16 -16
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
Index: Generator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- Generator.java 19 Sep 2002 23:21:39 -0000 1.102
+++ Generator.java 20 Sep 2002 18:06:38 -0000 1.103
@@ -870,7 +870,7 @@
prepareParams(n);
}
- out.printin("JspRuntimeLibrary.include(request, response, " +
+
out.printin("org.apache.jasper.runtime.JspRuntimeLibrary.include(request, response, " +
pageParam );
printParams(n, pageParam, page.isLiteral());
out.println(", out, " + isFlush + ");");
@@ -990,15 +990,15 @@
java.lang.reflect.Method meth =
JspRuntimeLibrary.getReadMethod(bean, property);
String methodName = meth.getName();
- out.printil("out.write(JspRuntimeLibrary.toString(" +
+
out.printil("out.write(org.apache.jasper.runtime.JspRuntimeLibrary.toString(" +
"(((" + beanName + ")pageContext.findAttribute(" +
"\"" + name + "\"))." + methodName + "())));");
} else {
// The object could be a custom action with an associated
// VariableInfo entry for this name.
// Get the class name and then introspect at runtime.
- out.printil("out.write(JspRuntimeLibrary.toString" +
- "(JspRuntimeLibrary.handleGetProperty" +
+
out.printil("out.write(org.apache.jasper.runtime.JspRuntimeLibrary.toString" +
+
"(org.apache.jasper.runtime.JspRuntimeLibrary.handleGetProperty" +
"(pageContext.findAttribute(\"" +
name + "\"), \"" + property + "\")));");
}
@@ -1015,18 +1015,18 @@
n.setBeginJavaLine(out.getJavaLine());
if ("*".equals(property)){
- out.printil("JspRuntimeLibrary.introspect(" +
+ out.printil("org.apache.jasper.runtime.JspRuntimeLibrary.introspect(" +
"pageContext.findAttribute(" +
"\"" + name + "\"), request);");
} else if (value == null) {
if (param == null)
param = property; // default to same as property
- out.printil("JspRuntimeLibrary.introspecthelper(" +
+
out.printil("org.apache.jasper.runtime.JspRuntimeLibrary.introspecthelper(" +
"pageContext.findAttribute(\"" + name + "\"), \"" +
property + "\", request.getParameter(\"" + param +
"\"), " + "request, \"" + param + "\", false);");
} else if (value.isExpression()) {
- out.printil("JspRuntimeLibrary.handleSetProperty(" +
+
out.printil("org.apache.jasper.runtime.JspRuntimeLibrary.handleSetProperty(" +
"pageContext.findAttribute(\"" + name + "\"), \""
+ property + "\",");
out.print(attributeValue(value, false, null, "null"));
@@ -1045,7 +1045,7 @@
// - 'pageContext' is a VariableResolver.
// - 'this' (either the generated Servlet or the generated tag
// handler for Tag files) is a FunctionMapper.
- out.printil("JspRuntimeLibrary.handleSetPropertyExpression(" +
+
out.printil("org.apache.jasper.runtime.JspRuntimeLibrary.handleSetPropertyExpression("
+
"pageContext.findAttribute(\"" + name + "\"), \""
+ property + "\", "
+ quote(value.getValue()) + ", "
@@ -1058,13 +1058,13 @@
// that body.
String valueVarName = generateNamedAttributeValue(
value.getNamedAttributeNode() );
- out.printil("JspRuntimeLibrary.introspecthelper(" +
+
out.printil("org.apache.jasper.runtime.JspRuntimeLibrary.introspecthelper(" +
"pageContext.findAttribute(\"" + name + "\"), \""
+ property + "\", "
+ valueVarName
+ ", null, null, false);");
} else {
- out.printin("JspRuntimeLibrary.introspecthelper(" +
+
out.printin("org.apache.jasper.runtime.JspRuntimeLibrary.introspecthelper(" +
"pageContext.findAttribute(\"" + name + "\"), \""
+ property + "\", ");
out.print(attributeValue(value, false, null, "null"));
@@ -2612,7 +2612,7 @@
if (propEditorClass != null) {
return "(" + c.getName()
- + ")JspRuntimeLibrary.getValueFromBeanInfoPropertyEditor("
+ +
")org.apache.jasper.runtime.JspRuntimeLibrary.getValueFromBeanInfoPropertyEditor("
+ c.getName() + ".class, \"" + attrName + "\", "
+ quoted + ", "
+ propEditorClass.getName() + ".class)";
@@ -2670,7 +2670,7 @@
return "new String(" + quoted + ")";
} else {
return "(" + c.getName()
- + ")JspRuntimeLibrary.getValueFromPropertyEditorManager("
+ +
")org.apache.jasper.runtime.JspRuntimeLibrary.getValueFromPropertyEditorManager("
+ c.getName() + ".class, \"" + attrName + "\", "
+ quoted + ")";
}
@@ -3208,7 +3208,7 @@
out.printil( "public void setJspContext( JspContext ctx ) {" );
out.pushIndent();
out.printil( "super.setJspContext( ctx );" );
- out.printil( "this.jspContext = new JspContextWrapper( ctx );" );
+ out.printil( "this.jspContext = new
org.apache.jasper.runtime.JspContextWrapper( ctx );" );
out.popIndent();
out.printil( "}" );
out.println();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
