cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime JspRuntimeLibrary.java PageContextImpl.java
luehe 2004/04/13 15:55:51
Modified:jasper2/src/share/org/apache/jasper/compiler
JspDocumentParser.java
jasper2/src/share/org/apache/jasper/runtime
JspRuntimeLibrary.java PageContextImpl.java
Log:
Added support for exception chaining
Revision ChangesPath
1.78 +4 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java
Index: JspDocumentParser.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- JspDocumentParser.java17 Mar 2004 19:23:03 - 1.77
+++ JspDocumentParser.java13 Apr 2004 22:55:50 - 1.78
@@ -1068,10 +1068,10 @@
ctxt.getClassLoader().loadClass(handlerClassName);
} catch (Exception e) {
throw new SAXException(
-Localizer.getMessage(
-jsp.error.loadclass.taghandler,
-handlerClassName,
-qName));
+Localizer.getMessage(jsp.error.loadclass.taghandler,
+ handlerClassName,
+ qName),
+e);
}
}
1.31 +1 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java
Index: JspRuntimeLibrary.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- JspRuntimeLibrary.java30 Mar 2004 19:18:43 - 1.30
+++ JspRuntimeLibrary.java13 Apr 2004 22:55:50 - 1.31
@@ -528,7 +528,7 @@
method.invoke (bean, new Object[] {tmpval});
}
} catch (Exception ex) {
- throw new JasperException (error in invoking method);
+throw new JasperException (error in invoking method, ex);
}
}
1.60 +5 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java
Index: PageContextImpl.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- PageContextImpl.java 9 Apr 2004 16:35:12 - 1.59
+++ PageContextImpl.java 13 Apr 2004 22:55:50 - 1.60
@@ -645,8 +645,11 @@
try {
out.clear();
} catch (IOException ex) {
-throw new IllegalStateException(
-
Localizer.getMessage(jsp.error.attempt_to_clear_flushed_buffer));
+IllegalStateException ise =
+new IllegalStateException(Localizer.getMessage(
+jsp.error.attempt_to_clear_flushed_buffer));
+ise.initCause(ex);
+throw ise;
}
// Make sure that the response object is not the wrapper for include
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime JspRuntimeLibrary.java
kinman 2004/03/30 11:18:43
Modified:jasper2/src/share/org/apache/jasper/runtime
JspRuntimeLibrary.java
Log:
- Fix bugzilla 28058: JspRuntimeLibrary.getContextRelativePath() can throw
StringIndexOutOfBoundsException
Revision ChangesPath
1.30 +4 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java
Index: JspRuntimeLibrary.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- JspRuntimeLibrary.java17 Mar 2004 19:23:04 - 1.29
+++ JspRuntimeLibrary.java30 Mar 2004 19:18:43 - 1.30
@@ -916,12 +916,14 @@
String pathInfo = (String)
request.getAttribute(javax.servlet.include.path_info);
if (pathInfo == null) {
-uri = uri.substring(0, uri.lastIndexOf('/'));
+if (uri.lastIndexOf('/') = 0)
+uri = uri.substring(0, uri.lastIndexOf('/'));
}
}
else {
uri = hrequest.getServletPath();
-uri = uri.substring(0, uri.lastIndexOf('/'));
+if (uri.lastIndexOf('/') = 0)
+uri = uri.substring(0, uri.lastIndexOf('/'));
}
return uri + '/' + relativePath;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime JspRuntimeLibrary.java
markt 2004/03/14 14:35:49
Modified:jasper2/src/share/org/apache/jasper/runtime Tag:
tomcat_4_branch JspRuntimeLibrary.java
Log:
- Fix bug 18180. jsp:getProperty should return null rather than for null
objects.
- Reported by Morten P.
Revision ChangesPath
No revision
No revision
1.1.1.1.2.3 +4 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java
Index: JspRuntimeLibrary.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- JspRuntimeLibrary.java5 Feb 2004 22:19:08 - 1.1.1.1.2.2
+++ JspRuntimeLibrary.java14 Mar 2004 22:35:49 - 1.1.1.1.2.3
@@ -284,7 +284,7 @@
//---
// __begin toStringMethod
public static String toString(Object o) {
-return (o == null) ? : o.toString();
+return String.valueOf(o);
}
public static String toString(byte b) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime JspRuntimeLibrary.java
--- [EMAIL PROTECTED] wrote:
markt 2004/03/14 14:35:49
Modified:
jasper2/src/share/org/apache/jasper/runtime Tag:
tomcat_4_branch
JspRuntimeLibrary.java
Log:
- Fix bug 18180. jsp:getProperty should return
null rather than for null objects.
- Reported by Morten P.
Revision ChangesPath
No revision
No revision
1.1.1.1.2.3 +4 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java
Index: JspRuntimeLibrary.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- JspRuntimeLibrary.java 5 Feb 2004 22:19:08
- 1.1.1.1.2.2
+++ JspRuntimeLibrary.java 14 Mar 2004 22:35:49
- 1.1.1.1.2.3
@@ -284,7 +284,7 @@
//---
// __begin toStringMethod
public static String toString(Object o) {
-return (o == null) ? : o.toString();
+return String.valueOf(o);
}
public static String toString(byte b) {
-
To unsubscribe, e-mail:
[EMAIL PROTECTED]
For additional commands, e-mail:
[EMAIL PROTECTED]
__
Do you Yahoo!?
Yahoo! Mail - More reliable, more storage, less spam
http://mail.yahoo.com
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime JspRuntimeLibrary.java
kinman 2004/03/04 16:44:03
Modified:jasper2/src/share/org/apache/jasper/runtime
JspRuntimeLibrary.java
Log:
- When a.jsp jsp:includes b.jsp that jsp:includes c.jsp, the context
relative path for c.jsp is computed incorrectly.
Revision ChangesPath
1.27 +7 -6
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java
Index: JspRuntimeLibrary.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- JspRuntimeLibrary.java5 Feb 2004 22:16:47 - 1.26
+++ JspRuntimeLibrary.java5 Mar 2004 00:44:03 - 1.27
@@ -958,10 +958,11 @@
HttpServletRequest hrequest = (HttpServletRequest) request;
String uri = (String)
request.getAttribute(javax.servlet.include.servlet_path);
-if (uri == null)
-uri = hrequest.getServletPath();
+if (uri != null) {
+return uri + '/' + relativePath;
+}
+uri = hrequest.getServletPath();
return (uri.substring(0, uri.lastIndexOf('/')) + '/' + relativePath);
-
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime JspRuntimeLibrary.java
kinman 2004/03/04 18:02:46
Modified:jasper2/src/share/org/apache/jasper/runtime
JspRuntimeLibrary.java
Log:
- The last patch is not quite right: it only works if the path info is non-null.
Revision ChangesPath
1.28 +13 -6
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java
Index: JspRuntimeLibrary.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- JspRuntimeLibrary.java5 Mar 2004 00:44:03 - 1.27
+++ JspRuntimeLibrary.java5 Mar 2004 02:02:46 - 1.28
@@ -959,10 +959,17 @@
String uri = (String)
request.getAttribute(javax.servlet.include.servlet_path);
if (uri != null) {
-return uri + '/' + relativePath;
+String pathInfo = (String)
+request.getAttribute(javax.servlet.include.path_info);
+if (pathInfo == null) {
+uri = uri.substring(0, uri.lastIndexOf('/'));
+}
}
-uri = hrequest.getServletPath();
-return (uri.substring(0, uri.lastIndexOf('/')) + '/' + relativePath);
+else {
+uri = hrequest.getServletPath();
+uri = uri.substring(0, uri.lastIndexOf('/'));
+}
+return uri + '/' + relativePath;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime JspRuntimeLibrary.java
kinman 2003/11/04 11:28:49
Modified:jasper2/src/share/org/apache/jasper/runtime
JspRuntimeLibrary.java
Log:
- Use ISO-8859-1 as the default encoding for jsp:param since it is the
default encoding for the request object.
Revision ChangesPath
1.25 +4 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java
Index: JspRuntimeLibrary.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- JspRuntimeLibrary.java2 Sep 2003 21:39:59 - 1.24
+++ JspRuntimeLibrary.java4 Nov 2003 19:28:49 - 1.25
@@ -1020,7 +1020,7 @@
}
if (enc == null) {
- enc = UTF-8; // Is this right?
+ enc = ISO-8859-1; // The default request encoding
}
StringBuffer out = new StringBuffer(s.length());
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime JspRuntimeLibrary.java
kinman 2003/04/01 18:04:00
Modified:jasper2/src/share/org/apache/jasper/compiler Generator.java
jasper2/src/share/org/apache/jasper/runtime
JspRuntimeLibrary.java
Log:
- Implement an URL encoder with character encoding (Actaully heavily based
on catalina/util/URLEncoder.java.
- URL encode the parameters for jsp:include and jsp:forward with the request
char encoding.
Revision ChangesPath
1.180 +10 -9
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.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- Generator.java31 Mar 2003 21:14:04 - 1.179
+++ Generator.java2 Apr 2003 02:04:00 - 1.180
@@ -62,7 +62,6 @@
import java.util.*;
import java.beans.*;
-import java.net.URLEncoder;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import java.lang.reflect.Method;
@@ -720,14 +719,14 @@
}
}
if (encode) {
- return java.net.URLEncoder.encode(\\ + + v + );
+ return org.apache.jasper.runtime.JspRuntimeLibrary.URLEncode( +
v + , request.getCharacterEncoding());
}
return v;
} else if( attr.isNamedAttribute() ) {
return attr.getNamedAttributeNode().getTemporaryVariableName();
} else {
if (encode) {
- v = URLEncoder.encode(v);
+ return org.apache.jasper.runtime.JspRuntimeLibrary.URLEncode( +
quote(v) + , request.getCharacterEncoding());
}
return quote(v);
}
@@ -753,9 +752,11 @@
out.print( + );
out.print(separator);
- out.print( + \);
- out.print(URLEncoder.encode(n.getTextAttribute(name)));
- out.print(=\ + );
+ out.print( + );
+ out.print(org.apache.jasper.runtime.JspRuntimeLibrary. +
+ URLEncode( + quote(n.getTextAttribute(name)) +
+ , request.getCharacterEncoding()));
+ out.print(+ \=\ + );
out.print(attributeValue(n.getValue(), true, String.class));
// The separator is '' after the second use
1.20 +77 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java
Index: JspRuntimeLibrary.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- JspRuntimeLibrary.java31 Mar 2003 17:54:30 - 1.19
+++ JspRuntimeLibrary.java2 Apr 2003 02:04:00 - 1.20
@@ -992,4 +992,78 @@
}
+/**
+ * URL encodes a string, based on the supplied character encoding.
+ * This performs the same function as java.next.URLEncode.encode
+ * in J2SDK1.4, and should be removed if the only platform supported
+ * is 1.4 or higher.
+ * @param s The String to be URL encoded.
+ * @param enc The character encoding
+ * @return The URL encoded String
+ */
+public static String URLEncode(String s, String enc) {
+
+ if (s == null) {
+ return null;
+ }
+
+ if (enc == null) {
+ enc = UTF-8; // Is this right?
+ }
+
+ StringBuffer out = new StringBuffer(s.length());
+ ByteArrayOutputStream buf = new ByteArrayOutputStream();
+ OutputStreamWriter writer = null;
+ try {
+ writer = new OutputStreamWriter(buf, enc);
+ } catch (java.io.UnsupportedEncodingException ex) {
+ // Use the default encoding?
+ writer = new OutputStreamWriter(buf);
+ }
+
+ for (int i = 0; i s.length(); i++) {
+ int c = s.charAt(i);
+ if (c == ' ') {
+ out.append('+');
+ } else if (isSafeChar(c)) {
+ out.append((char)c);
+ } else {
+ // convert to external encoding before hex conversion
+ try {
+ writer.write(c);
+ writer.flush();
+ } catch(IOException e) {
+ buf.reset();
+ continue;
+ }
+ byte[] ba = buf.toByteArray();
+ for (int j = 0; j ba.length; j++) {
+ out.append('%');
+ // Converting each byte
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime JspRuntimeLibrary.java PageContextImpl.java
kinman 2003/03/31 09:54:31
Modified:jasper2/src/share/org/apache/jasper/compiler Generator.java
JspUtil.java Validator.java
jasper2/src/share/org/apache/jasper/runtime
JspRuntimeLibrary.java PageContextImpl.java
Log:
- Changes to use the new API for EL. Will need patch to jakarta-commons-sandbox/el.
Revision ChangesPath
1.178 +21 -27
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.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- Generator.java28 Mar 2003 23:15:45 - 1.177
+++ Generator.java31 Mar 2003 17:54:30 - 1.178
@@ -699,12 +699,10 @@
* @param encode true if to be URL encoded
* @param expectedType the expected type for an EL evaluation
*(ignored for attributes that aren't EL expressions)
- * @param defaultPrefix the default prefix for any EL functions
*/
private String attributeValue(Node.JspAttribute attr,
boolean encode,
- Class expectedType,
- String defaultPrefix )
+ Class expectedType)
{
String v = attr.getValue();
if (!attr.isNamedAttribute() (v == null))
@@ -714,7 +712,7 @@
if (attr.isELInterpreterInput()) {
boolean replaceESC = v.indexOf(Constants.ESC) 0;
v = JspUtil.interpreterCall(this.isTagFile,
- v, expectedType, defaultPrefix,
+ v, expectedType,
attr.getEL().getMapName(), false );
// XXX ESC replacement hack
if (replaceESC) {
@@ -758,8 +756,7 @@
out.print( + \);
out.print(URLEncoder.encode(n.getTextAttribute(name)));
out.print(=\ + );
- out.print(attributeValue(n.getValue(), true, String.class,
-null ));
+ out.print(attributeValue(n.getValue(), true, String.class));
// The separator is '' after the second use
separator = \\;
@@ -798,7 +795,7 @@
out.write(
+ JspUtil.interpreterCall(this.isTagFile,
${ + new String(n.getText()) + }, String.class,
- null, n.getEL().getMapName(), false )
+ n.getEL().getMapName(), false )
+ ););
} else {
out.printil(out.write( +
@@ -828,7 +825,7 @@
page.getNamedAttributeNode() );
}
else {
-pageParam = attributeValue(page, false, String.class, null);
+pageParam = attributeValue(page, false, String.class);
}
// If any of the params have their values specified by
@@ -919,7 +916,7 @@
page.getNamedAttributeNode() );
}
else {
-pageParam = attributeValue(page, false, String.class, null);
+pageParam = attributeValue(page, false, String.class);
}
// If any of the params have their values specified by
@@ -999,7 +996,7 @@
out.printil(org.apache.jasper.runtime.JspRuntimeLibrary.handleSetProperty( +
pageContext.findAttribute(\ + name + \), \
+ property + \,);
- out.print(attributeValue(value, false, null, null));
+ out.print(attributeValue(value, false, null));
out.println(););
} else if (value.isELInterpreterInput()) {
// We've got to resolve the very call to the interpreter
@@ -1039,7 +1036,7 @@
out.printin(org.apache.jasper.runtime.JspRuntimeLibrary.introspecthelper( +
pageContext.findAttribute(\ + name + \), \
+ property + \, );
- out.print(attributeValue(value, false, null, null));
+ out.print(attributeValue(value, false, null));
out.println(, null, null, false););
}
@@ -1126,7 +1123,7 @@
}
else {
className = attributeValue(beanName, false,
-String.class, null);
+String.class);
}
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime JspRuntimeLibrary.java
luehe 2003/03/24 09:35:26
Modified:jasper2/src/share/org/apache/jasper/compiler Generator.java
jasper2/src/share/org/apache/jasper/runtime
JspRuntimeLibrary.java
Log:
Implemented 'exception' variable clarification:
The 'exception' implicit scripting language variable is set to value
of the 'javax.servlet.error.exception' request attribute value if
present, otherwise to the value of the
'javax.servlet.jsp.jspException' request attribute value (for
backwards compatibility for JSP pages pre-compiled with a JSP 1.2
compiler).
Revision ChangesPath
1.176 +4 -5
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.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- Generator.java21 Mar 2003 00:43:57 - 1.175
+++ Generator.java24 Mar 2003 17:35:26 - 1.176
@@ -539,8 +539,7 @@
out.printil(HttpSession session = null;);
if (pageInfo.isIsErrorPage()) {
-out.printil(Throwable exception = (Throwable)
request.getAttribute(\javax.servlet.jsp.jspException\););
- out.printil(request.setAttribute(\javax.servlet.error.exception\,
exception););
+out.printil(Throwable exception =
org.apache.jasper.runtime.JspRuntimeLibrary.getThrowable(request););
}
out.printil(ServletContext application = null;);
1.18 +22 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java
Index: JspRuntimeLibrary.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JspRuntimeLibrary.java6 Mar 2003 20:21:46 - 1.17
+++ JspRuntimeLibrary.java24 Mar 2003 17:35:26 - 1.18
@@ -100,6 +100,11 @@
* @author Shawn Bayern
*/
public class JspRuntimeLibrary {
+
+private static final String SERVLET_EXCEPTION
+ = javax.servlet.error.exception;
+private static final String JSP_EXCEPTION
+ = javax.servlet.jsp.jspException;
protected static class PrivilegedIntrospectHelper
implements PrivilegedExceptionAction {
@@ -128,6 +133,20 @@
bean,prop,value,request,param,ignoreMethodNF);
return null;
}
+}
+
+/**
+ * Returns the value of the javax.servlet.error.exception request
+ * attribute value, if present, otherwise the value of the
+ * javax.servlet.jsp.jspException request attribute value.
+ */
+public static Throwable getThrowable(ServletRequest request) {
+ Throwable error = (Throwable) request.getAttribute(SERVLET_EXCEPTION);
+ if (error == null) {
+ error = (Throwable) request.getAttribute(JSP_EXCEPTION);
+ }
+
+ return error;
}
public static boolean coerceToBoolean(String s) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime JspRuntimeLibrary.java
luehe 2003/03/06 12:21:47
Modified:jasper2/src/share/org/apache/jasper/compiler Localizer.java
TldLocationsCache.java
jasper2/src/share/org/apache/jasper/resources
messages.properties
jasper2/src/share/org/apache/jasper/runtime
JspRuntimeLibrary.java
Log:
Replaced error messages with localizable error codes
Revision ChangesPath
1.2 +23 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Localizer.java
Index: Localizer.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Localizer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Localizer.java22 Jan 2003 20:08:24 - 1.1
+++ Localizer.java6 Mar 2003 20:21:45 - 1.2
@@ -149,6 +149,26 @@
return getMessage(errCode, new Object[] {arg1, arg2, arg3});
}
+/*
+ * Returns the localized error message corresponding to the given error
+ * code.
+ *
+ * If the given error code is not defined in the resource bundle for
+ * localized error messages, it is used as the error message.
+ *
+ * @param errCode Error code to localize
+ * @param arg1 First argument for parametric replacement
+ * @param arg2 Second argument for parametric replacement
+ * @param arg3 Third argument for parametric replacement
+ * @param arg4 Fourth argument for parametric replacement
+ *
+ * @return Localized error message
+ */
+public static String getMessage(String errCode, String arg1, String arg2,
+ String arg3, String arg4) {
+ return getMessage(errCode, new Object[] {arg1, arg2, arg3, arg4});
+}
+
/*
* Returns the localized error message corresponding to the given error
* code.
1.13 +3 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TldLocationsCache.java
Index: TldLocationsCache.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TldLocationsCache.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TldLocationsCache.java5 Mar 2003 17:58:44 - 1.12
+++ TldLocationsCache.java6 Mar 2003 20:21:45 - 1.13
@@ -319,7 +319,9 @@
* an implicit map entry to the taglib map for any TLD that has a uri
* element.
*/
-private void processTldsInFileSystem(String startPath) throws JasperException {
+private void processTldsInFileSystem(String startPath)
+ throws JasperException {
+
Set dirList = ctxt.getResourcePaths(startPath);
if (dirList != null) {
Iterator it = dirList.iterator();
1.104 +4 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties
Index: messages.properties
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- messages.properties 3 Mar 2003 18:19:59 - 1.103
+++ messages.properties 6 Mar 2003 20:21:46 - 1.104
@@ -97,6 +97,8 @@
jsp.error.beans.nomethod.setproperty=Can''t find a method to write property ''{0}''
of type ''{1}'' in a bean of type ''{2}''
jsp.error.beans.noproperty=Cannot find any information on property ''{0}'' in a
bean of type ''{1}''
jsp.error.beans.setproperty.noindexset=Cannot set indexed property
+jsp.error.beans.property.conversion=Unable to convert string \{0}\ to class
\{1}\ for attribute \{2}\: {3}
+jsp.error.beans.propertyeditor.notregistered=Property Editor not registered with
the PropertyEditorManager
jsp.error.include.tag=Invalid jsp:include tag
jsp.error.include.noflush=jsp:include needs to have \flush=true\
jsp.error.include.badflush=jsp:include page=\...\ flush=\true\ is the only
valid combination in JSP 1.0
@@ -372,3 +374,4 @@
jsp.error.attribute.null_name=Null attribute name
jsp.error.jsptext.badcontent=\'lt;\', when appears in the body of
lt;jsp:textgt;, must be encapsulated within a CDATA
jsp.error.jsproot.version.invalid=Invalid version number: \{0}\, must be \1.2\
or \2.0\
+
1.17 +11 -10
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java
Index: JspRuntimeLibrary.java
===
RCS file:
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime JspRuntimeLibrary.java
luehe 2003/02/07 16:07:32 Modified:jasper2/src/share/org/apache/jasper/runtime JspRuntimeLibrary.java Log: Fixed 16778: jsp:include doesn't work in tag file Revision ChangesPath 1.16 +6 -5 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java Index: JspRuntimeLibrary.java === RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- JspRuntimeLibrary.java22 Jan 2003 20:08:25 - 1.15 +++ JspRuntimeLibrary.java8 Feb 2003 00:07:32 - 1.16 @@ -71,6 +71,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.ServletException; import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -946,8 +947,8 @@ * @exception IOException if thrown by the included servlet * @exception ServletException if thrown by the included servlet */ -public static void include(HttpServletRequest request, - HttpServletResponse response, +public static void include(ServletRequest request, + ServletResponse response, String relativePath, Writer out, boolean flush) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime JspRuntimeLibrary.java
luehe 2003/01/07 12:47:27
Modified:jasper2/src/share/org/apache/jasper/runtime
JspRuntimeLibrary.java
Log:
Undid change that leveraged org.apache.jasper.compiler.ErrorDispatcher,
since this change would have required duplication of a lot of the class files
of jasper-compiler.jar in jasper-runtime.jar
Revision ChangesPath
1.14 +38 -31
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java
Index: JspRuntimeLibrary.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- JspRuntimeLibrary.java6 Jan 2003 18:57:15 - 1.13
+++ JspRuntimeLibrary.java7 Jan 2003 20:47:27 - 1.14
@@ -80,8 +80,8 @@
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.tagext.BodyContent;
+import org.apache.jasper.Constants;
import org.apache.jasper.JasperException;
-import org.apache.jasper.compiler.ErrorDispatcher;
// for JSTL expression interpreter
import javax.servlet.jsp.PageContext;
@@ -100,12 +100,6 @@
*/
public class JspRuntimeLibrary {
-private static ErrorDispatcher err;
-
-static {
- err = new ErrorDispatcher();
-}
-
protected static class PrivilegedIntrospectHelper
implements PrivilegedExceptionAction {
@@ -288,7 +282,7 @@
t, propertyName, s);
}
} catch (Exception ex) {
-throw new JasperException (ex);
+throw new JasperException(ex);
}
}
// __end convertMethod
@@ -354,7 +348,9 @@
if ( method != null ) {
if (type.isArray()) {
if (request == null) {
-err.jspError(jsp.error.beans.setproperty.noindexset);
+ throw new JasperException(Constants.getString(
+jsp.error.beans.setproperty.noindexset,
+ new Object[] {}));
}
Class t = type.getComponentType();
String[] values = request.getParameterValues(param);
@@ -375,15 +371,18 @@
}
}
} catch (Exception ex) {
- throw new JasperException (ex);
+ throw new JasperException(ex);
}
if (!ignoreMethodNF (method == null)) {
if (type == null) {
-err.jspError(jsp.error.beans.noproperty,
- prop, bean.getClass().getName());
+ throw new JasperException(Constants.getString(
+jsp.error.beans.noproperty,
+ new Object[] { prop, bean.getClass().getName() }));
} else {
- err.jspError(jsp.error.beans.nomethod.setproperty,
- prop, type.getName(), bean.getClass().getName());
+ throw new JasperException(Constants.getString(
+jsp.error.beans.nomethod.setproperty,
+ new Object[] { prop, type.getName(),
+bean.getClass().getName() }));
}
}
}
@@ -611,8 +610,9 @@
// __begin lookupReadMethodMethod
public static Object handleGetProperty(Object o, String prop)
throws JasperException {
-if (o == null){
-err.jspError(jsp.error.beans.nullbean);
+if (o == null) {
+ throw new JasperException(Constants.getString(
+ jsp.error.beans.nullbean, new Object[] {}));
}
Object value = null;
try {
@@ -794,19 +794,23 @@
}
} else {
// just in case introspection silently fails.
-err.jspError(jsp.error.beans.nobeaninfo,
- beanClass.getName());
+throw new JasperException(Constants.getString(
+ jsp.error.beans.nobeaninfo,
+ new Object[] { beanClass.getName() }));
}
} catch (Exception ex) {
throw new JasperException (ex);
}
if (method == null) {
if (type == null) {
-err.jspError(jsp.error.beans.noproperty,
- prop, beanClass.getName());
+ throw new JasperException(Constants.getString(
+jsp.error.beans.noproperty,
+ new Object[] { prop, beanClass.getName() }));
} else {
-err.jspError(jsp.error.beans.nomethod.setproperty,
- prop, type.getName(),
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime JspRuntimeLibrary.java
luehe 2003/01/06 10:57:16
Modified:jasper2/src/share/org/apache/jasper/compiler Generator.java
JspUtil.java Node.java Validator.java
jasper2/src/share/org/apache/jasper/runtime
JspRuntimeLibrary.java
Log:
Implemented JSTL EL rules for coercing of empty string and null values
Revision ChangesPath
1.144 +32 -90
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.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- Generator.java16 Dec 2002 23:37:59 - 1.143
+++ Generator.java6 Jan 2003 18:57:14 - 1.144
@@ -2511,7 +2511,19 @@
}
}
- private String convertString(Class c, String s, String attrName,
+ /*
+ * @param c The target class to which to coerce the given string
+ * @param s The string value
+ * @param attrName The name of the attribute whose value is being
+ * supplied
+ * @param propEditorClass The property editor for the given attribute
+ * @param isNamedAttribute true if the given attribute is a named
+ * attribute (that is, specified using the jsp:attribute standard
+ * action), and false otherwise
+ */
+ private String convertString(Class c,
+ String s,
+ String attrName,
Class propEditorClass,
boolean isNamedAttribute)
throws JasperException {
@@ -2530,107 +2542,37 @@
} else if (c == String.class) {
return quoted;
} else if (c == boolean.class) {
- if (isNamedAttribute)
- return Boolean.valueOf( + s + ).booleanValue();
- else
- return Boolean.valueOf(s).toString();
+ return JspUtil.coerceToPrimitiveBoolean(s, isNamedAttribute);
} else if (c == Boolean.class) {
- if (isNamedAttribute)
- return new Boolean( + s + );
- else
- // Detect format error at translation time
- return new Boolean( + Boolean.valueOf(s).toString() + );
+ return JspUtil.coerceToBoolean(s, isNamedAttribute);
} else if (c == byte.class) {
- return ((byte) + Byte.valueOf(s).toString() + );
+ return JspUtil.coerceToPrimitiveByte(s, isNamedAttribute);
} else if (c == Byte.class) {
- if (isNamedAttribute)
- return new Byte( + s + );
- else
- // Detect format error at translation time
- return new Byte((byte) + Byte.valueOf(s).toString() + );
+ return JspUtil.coerceToByte(s, isNamedAttribute);
} else if (c == char.class) {
- if (isNamedAttribute) {
- return org.apache.jasper.runtime.JspRuntimeLibrary.getChar( + s
+ );
- } else {
- // non-normative (normative method would fail to compile)
- if (s.length() 0) {
- char ch = s.charAt(0);
- // this trick avoids escaping issues
- return ((char) + (int) ch + );
- } else {
- throw new NumberFormatException(
-err.getString(jsp.error.bad_string_char));
- }
- }
+ return JspUtil.coerceToChar(s, isNamedAttribute);
} else if (c == Character.class) {
- if (isNamedAttribute) {
- return org.apache.jasper.runtime.JspRuntimeLibrary.getCharacter(
+ s + );
- } else {
- // non-normative (normative method would fail to compile)
- if (s.length() 0) {
- char ch = s.charAt(0);
- // this trick avoids escaping issues
- return new Character((char) + (int) ch + );
- } else {
- throw new NumberFormatException(
- err.getString(jsp.error.bad_string_Character));
- }
- }
+ return JspUtil.coerceToCharacter(s, isNamedAttribute);
} else if (c == double.class) {
- if (isNamedAttribute)
- return Double.valueOf( + s + ).doubleValue();
- else
- return Double.valueOf(s).toString();
+ return JspUtil.coerceToPrimitiveDouble(s, isNamedAttribute);
} else if (c
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime JspRuntimeLibrary.java
kinman 2002/11/26 18:54:46
Modified:jasper2/src/share/org/apache/jasper/runtime
JspRuntimeLibrary.java
Log:
- Oops! Forgot to check in this.
Revision ChangesPath
1.9 +4 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java
Index: JspRuntimeLibrary.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JspRuntimeLibrary.java6 Nov 2002 18:47:14 - 1.8
+++ JspRuntimeLibrary.java27 Nov 2002 02:54:46 - 1.9
@@ -550,7 +550,7 @@
method.getParameterTypes()[0],
pageContext,
functionMapper,
-null )
+null, false )
});
} catch (Exception ex) {
throw new JasperException(ex);
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime JspRuntimeLibrary.java
luehe 2002/10/16 14:54:58
Modified:jasper2/src/share/org/apache/jasper/runtime
JspRuntimeLibrary.java
Log:
Output null instead of empty string for null property values in
jsp:getProperty
Revision ChangesPath
1.7 +4 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java
Index: JspRuntimeLibrary.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JspRuntimeLibrary.java9 Oct 2002 20:21:52 - 1.6
+++ JspRuntimeLibrary.java16 Oct 2002 21:54:58 - 1.7
@@ -285,7 +285,7 @@
//---
// __begin toStringMethod
public static String toString(Object o) {
-return (o == null) ? : o.toString();
+return String.valueOf(o);
}
public static String toString(byte b) {
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime JspRuntimeLibrary.java
luehe 2002/10/09 13:21:52
Modified:jasper2/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_ja.properties
jasper2/src/share/org/apache/jasper/runtime
JspRuntimeLibrary.java
Log:
Fixed 13206: Invalid java bean property error message could be reported better.
Revision ChangesPath
1.45 +2 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties
Index: messages.properties
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- messages.properties 8 Oct 2002 23:22:57 - 1.44
+++ messages.properties 9 Oct 2002 20:21:52 - 1.45
@@ -94,7 +94,7 @@
jsp.error.beans.nobeaninfo=No BeanInfo for the bean of type ''{0}'' could be found,
the class likely does not exist.
jsp.error.beans.introspection=An exception occurred while introspecting the read
method of property ''{0}'' in a bean of type ''{1}'':\n{2}
jsp.error.beans.nomethod=Cannot find a method to read property ''{0}'' in a bean of
type ''{1}''
-jsp.error.beans.nomethod.setproperty=Can''t find a method to write property ''{0}''
in a bean of type ''{1}''
+jsp.error.beans.nomethod.setproperty=Can''t find a method to write property ''{0}''
of type ''{1}'' in a bean of type ''{2}''
jsp.error.beans.noproperty=Cannot find any information on property ''{0}'' in a
bean of type ''{1}''
jsp.error.beans.setproperty.noindexset=Cannot set indexed property
jsp.error.include.tag=Invalid jsp:include tag
1.16 +2 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_es.properties
Index: messages_es.properties
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_es.properties,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- messages_es.properties8 Oct 2002 23:22:57 - 1.15
+++ messages_es.properties9 Oct 2002 20:21:52 - 1.16
@@ -73,7 +73,7 @@
jsp.error.beans.nobeaninfo=No se puede encontrar BeanInfo para el bean ''{0}''
seguramente la clase no existe
jsp.error.beans.introspection=Una excepcion a ocurrido mientras se leia el metodo
de lectura de la propiedad ''{0}'' en un bean del tipo ''{1}'':\n{2}
jsp.error.beans.nomethod=No puedo encontrar un metodo para leer la propiedad
''{0}'' en un bean del tipo ''{1}''
-jsp.error.beans.nomethod.setproperty=No puedo encontrar un metodo para write de la
propiedad ''{0}'' en un bean del tipo ''{1}''
+jsp.error.beans.nomethod.setproperty=No puedo encontrar un metodo para write de la
propiedad ''{0}'' en un bean del tipo ''{2}''
jsp.error.beans.noproperty=No puedo encontrar informacion de la propiedad ''{0}''
en un bean del tipo ''{1}''
jsp.error.beans.setproperty.noindexset=No puedo hacer set de la propiedad indexada
jsp.error.include.tag=Tag jsp:include no valido
1.16 +2 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_ja.properties
Index: messages_ja.properties
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_ja.properties,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- messages_ja.properties8 Oct 2002 23:22:57 - 1.15
+++ messages_ja.properties9 Oct 2002 20:21:52 - 1.16
@@ -84,7 +84,7 @@
jsp.error.beans.nobeaninfo=\u30bf\u30a4\u30d7 ''{0}''
\u306eBean\u306bBeanInfo\u304c\u306a\u3044\u306e\u3092\u691c\u51fa\u3057\u307e\u3057\u305f,
\u30af\u30e9\u30b9\u304c\u5b58\u5728\u3057\u306a\u3044\u304b\u3082\u3057\u308c\u307e\u305b\u3093
jsp.error.beans.introspection=\u30bf\u30a4\u30d7 ''{1}''
\u306eBean\u4e2d\u306e\u5c5e\u6027 ''{0}''
\u306eread\u30e1\u30bd\u30c3\u30c9\u3092\u5185\u7701\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f:\n{2}
jsp.error.beans.nomethod=\u30bf\u30a4\u30d7 ''{1}''
\u306eBean\u4e2d\u306e\u5c5e\u6027 ''{0}''
\u3092\u8aad\u307f\u8fbc\u3080\u30e1\u30bd\u30c3\u30c9\u3092\u767a\u898b\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
-jsp.error.beans.nomethod.setproperty=\u30bf\u30a4\u30d7 ''{1}''
\u306eBean\u4e2d\u306e\u5c5e\u6027 ''{0}''
\u3092\u66f8\u304d\u8fbc\u3080\u30e1\u30bd\u30c3\u30c9\u3092\u767a\u898b\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
+jsp.error.beans.nomethod.setproperty=\u30bf\u30a4\u30d7 ''{2}''
\u306eBean\u4e2d\u306e\u5c5e\u6027 ''{0}''
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime JspRuntimeLibrary.java
luehe 2002/10/09 14:59:08
Modified:jasper2/src/share/org/apache/jasper/resources Tag:
tomcat_4_branch messages.properties
messages_es.properties messages_ja.properties
jasper2/src/share/org/apache/jasper/runtime Tag:
tomcat_4_branch JspRuntimeLibrary.java
Log:
Fixed 13206: Invalid java bean property error message could be reported better.
Revision ChangesPath
No revision
No revision
1.9.2.4 +2 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties
Index: messages.properties
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties,v
retrieving revision 1.9.2.3
retrieving revision 1.9.2.4
diff -u -r1.9.2.3 -r1.9.2.4
--- messages.properties 8 Oct 2002 23:42:06 - 1.9.2.3
+++ messages.properties 9 Oct 2002 21:59:08 - 1.9.2.4
@@ -88,7 +88,7 @@
jsp.error.beans.nobeaninfo=No BeanInfo for the bean of type ''{0}'' could be found,
the class likely does not exist.
jsp.error.beans.introspection=An exception occurred while introspecting the read
method of property ''{0}'' in a bean of type ''{1}'':\n{2}
jsp.error.beans.nomethod=Cannot find a method to read property ''{0}'' in a bean of
type ''{1}''
-jsp.error.beans.nomethod.setproperty=Can''t find a method to write property ''{0}''
in a bean of type ''{1}''
+jsp.error.beans.nomethod.setproperty=Can''t find a method to write property ''{0}''
of type ''{1}'' in a bean of type ''{2}''
jsp.error.beans.noproperty=Cannot find any information on property ''{0}'' in a
bean of type ''{1}''
jsp.error.beans.setproperty.noindexset=Cannot set indexed property
jsp.error.include.tag=Invalid jsp:include tag
1.3.2.3 +2 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_es.properties
Index: messages_es.properties
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_es.properties,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- messages_es.properties8 Oct 2002 23:42:06 - 1.3.2.2
+++ messages_es.properties9 Oct 2002 21:59:08 - 1.3.2.3
@@ -73,7 +73,7 @@
jsp.error.beans.nobeaninfo=No se puede encontrar BeanInfo para el bean ''{0}''
seguramente la clase no existe
jsp.error.beans.introspection=Una excepcion a ocurrido mientras se leia el metodo
de lectura de la propiedad ''{0}'' en un bean del tipo ''{1}'':\n{2}
jsp.error.beans.nomethod=No puedo encontrar un metodo para leer la propiedad
''{0}'' en un bean del tipo ''{1}''
-jsp.error.beans.nomethod.setproperty=No puedo encontrar un metodo para write de la
propiedad ''{0}'' en un bean del tipo ''{1}''
+jsp.error.beans.nomethod.setproperty=No puedo encontrar un metodo para write de la
propiedad ''{0}'' en un bean del tipo ''{2}''
jsp.error.beans.noproperty=No puedo encontrar informacion de la propiedad ''{0}''
en un bean del tipo ''{1}''
jsp.error.beans.setproperty.noindexset=No puedo hacer set de la propiedad indexada
jsp.error.include.tag=Tag jsp:include no valido
1.2.2.2 +2 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_ja.properties
Index: messages_ja.properties
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_ja.properties,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- messages_ja.properties8 Oct 2002 23:42:06 - 1.2.2.1
+++ messages_ja.properties9 Oct 2002 21:59:08 - 1.2.2.2
@@ -84,7 +84,7 @@
jsp.error.beans.nobeaninfo=\u30bf\u30a4\u30d7 ''{0}''
\u306eBean\u306bBeanInfo\u304c\u306a\u3044\u306e\u3092\u691c\u51fa\u3057\u307e\u3057\u305f,
\u30af\u30e9\u30b9\u304c\u5b58\u5728\u3057\u306a\u3044\u304b\u3082\u3057\u308c\u307e\u305b\u3093
jsp.error.beans.introspection=\u30bf\u30a4\u30d7 ''{1}''
\u306eBean\u4e2d\u306e\u5c5e\u6027 ''{0}''
\u306eread\u30e1\u30bd\u30c3\u30c9\u3092\u5185\u7701\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f:\n{2}
jsp.error.beans.nomethod=\u30bf\u30a4\u30d7 ''{1}''
\u306eBean\u4e2d\u306e\u5c5e\u6027 ''{0}''
\u3092\u8aad\u307f\u8fbc\u3080\u30e1\u30bd\u30c3\u30c9\u3092\u767a\u898b\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
-jsp.error.beans.nomethod.setproperty=\u30bf\u30a4\u30d7 ''{1}''
\u306eBean\u4e2d\u306e\u5c5e\u6027 ''{0}''
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime JspRuntimeLibrary.java ServletResponseWrapperInclude.java
luehe 2002/08/27 15:24:42
Modified:jasper2/src/share/org/apache/jasper/runtime
JspRuntimeLibrary.java
ServletResponseWrapperInclude.java
Log:
Fixed 12003 (Unable to use jsp:include in a fragment)
Revision ChangesPath
1.5 +9 -23
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java
Index: JspRuntimeLibrary.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JspRuntimeLibrary.java21 Aug 2002 16:21:56 - 1.4
+++ JspRuntimeLibrary.java27 Aug 2002 22:24:42 - 1.5
@@ -62,26 +62,12 @@
package org.apache.jasper.runtime;
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.Map;
-
+import java.util.*;
+import java.io.*;
+import java.beans.*;
+import java.security.*;
import java.lang.reflect.Method;
-import java.io.Writer;
-import java.io.Reader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-import java.beans.PropertyDescriptor;
-import java.beans.IndexedPropertyDescriptor;
-import java.beans.PropertyEditor;
-import java.beans.PropertyEditorManager;
-
-import java.security.AccessController;
-import java.security.PrivilegedExceptionAction;
-import java.security.PrivilegedActionException;
-
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
@@ -818,7 +804,7 @@
* @param request The servlet request we are processing
* @param response The servlet response we are processing
* @param relativePath The relative path of the resource to be included
- * @param out The JspWriter to whom we are currently writing
+ * @param out The Writer to whom we are currently writing
* @param flush Should we flush before the include is processed?
*
* @exception IOException if thrown by the included servlet
@@ -827,7 +813,7 @@
public static void include(HttpServletRequest request,
HttpServletResponse response,
String relativePath,
- JspWriter out,
+ Writer out,
boolean flush)
throws IOException, ServletException {
1.2 +8 -7
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/ServletResponseWrapperInclude.java
Index: ServletResponseWrapperInclude.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/ServletResponseWrapperInclude.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServletResponseWrapperInclude.java28 Mar 2002 18:46:20 - 1.1
+++ ServletResponseWrapperInclude.java27 Aug 2002 22:24:42 - 1.2
@@ -62,6 +62,7 @@
package org.apache.jasper.runtime;
import java.lang.IllegalStateException;
+import java.io.Writer;
import java.io.PrintWriter;
import javax.servlet.*;
@@ -73,7 +74,7 @@
*
* This 'wrapped' response object is passed as the second argument
* to the internal RequestDispatcher.include(). It channels
- * all output text into the current JspWriter.
+ * all output text into the current Writer.
*
* @author Pierre Delisle
*/
@@ -82,20 +83,20 @@
extends HttpServletResponseWrapper
{
/**
- * The PrintWriter writes all output to the JspWriter of the
+ * The PrintWriter writes all output to the Writer of the
* including page.
*/
PrintWriter printWriter;
public ServletResponseWrapperInclude(ServletResponse response,
- JspWriter jspWriter)
+ Writer writer)
{
super((HttpServletResponse)response);
- this.printWriter = new PrintWriter(jspWriter);
+ this.printWriter = new PrintWriter(writer);
}
/**
- * Returns a wrapper around the JspWriter of the including page.
+ * Returns a wrapper around the Writer of the including page.
*/
public java.io.PrintWriter getWriter()
throws java.io.IOException
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
