luehe 2003/02/05 15:35:22
Modified: jasper2/src/share/org/apache/jasper/compiler
ErrorDispatcher.java Generator.java JspConfig.java
TagFileProcessor.java
Log:
Changed default for rtexprvalue for tag files from 'false' to 'true',
as agreed by JSR-152-EG
Revision Changes Path
1.10 +4 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorDispatcher.java
Index: ErrorDispatcher.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorDispatcher.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ErrorDispatcher.java 22 Jan 2003 20:08:24 -0000 1.9
+++ ErrorDispatcher.java 5 Feb 2003 23:35:21 -0000 1.10
@@ -303,6 +303,7 @@
*/
public void javacError(String errMsg, String fname, Node.Nodes page)
throws JasperException, IOException {
+ System.out.println("LLL: " + errMsg);
JavacErrorDetail[] errDetails = parseJavacMessage(errMsg, fname, page);
errHandler.javacError(errDetails);
}
1.159 +5 -3
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.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- Generator.java 31 Jan 2003 03:34:44 -0000 1.158
+++ Generator.java 5 Feb 2003 23:35:21 -0000 1.159
@@ -3123,6 +3123,8 @@
out.printil( " throw (java.io.IOException) t;" );
out.printil( "if( t instanceof javax.servlet.jsp.JspException )" );
out.printil( " throw (javax.servlet.jsp.JspException) t;" );
+ out.printil( "if( t instanceof IllegalArgumentException )" );
+ out.printil( " throw (IllegalArgumentException) t;" );
out.printil("throw new javax.servlet.jsp.JspException(t);" );
out.popIndent();
out.printil( "} finally {" );
1.7 +4 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspConfig.java
Index: JspConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspConfig.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JspConfig.java 22 Jan 2003 20:08:24 -0000 1.6
+++ JspConfig.java 5 Feb 2003 23:35:21 -0000 1.7
@@ -208,7 +208,7 @@
}
/**
- * Find a property that best match the supplied resource.
+ * Find a property that best matches the supplied resource.
* @param uri the resource supplied.
* @return a JspProperty if a match is found, null otherwise
*/
1.39 +6 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagFileProcessor.java
Index: TagFileProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagFileProcessor.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- TagFileProcessor.java 28 Jan 2003 00:13:37 -0000 1.38
+++ TagFileProcessor.java 5 Feb 2003 23:35:21 -0000 1.39
@@ -179,8 +179,11 @@
String attrName = n.getAttributeValue("name");
boolean required = JspUtil.booleanValue(
n.getAttributeValue("required"));
+ boolean rtexprvalue = true;
String rtexprvalueString = n.getAttributeValue("rtexprvalue");
- boolean rtexprvalue = JspUtil.booleanValue( rtexprvalueString );
+ if (rtexprvalueString != null) {
+ rtexprvalue = JspUtil.booleanValue( rtexprvalueString );
+ }
boolean fragment = JspUtil.booleanValue(
n.getAttributeValue("fragment"));
String type = n.getAttributeValue("type");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
