Author: pbenedict
Date: Thu Jul 19 22:00:07 2007
New Revision: 557865
URL: http://svn.apache.org/viewvc?view=rev&rev=557865
Log:
STR-2437: Add root cause to JspException
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/TagUtils.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/IncludeTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/ResourceTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/BaseHandlerTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/BaseTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/ImgTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/JavascriptValidatorTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/LinkTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/MultiboxTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/OptionsTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/RewriteTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/SelectTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/CompareTagBase.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/ForwardTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/RedirectTag.java
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/TagUtils.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/TagUtils.java?view=diff&rev=557865&r1=557864&r2=557865
==============================================================================
---
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/TagUtils.java
(original)
+++
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/TagUtils.java
Thu Jul 19 22:00:07 2007
@@ -884,11 +884,11 @@
} catch (IllegalAccessException e) {
saveException(pageContext, e);
throw new JspException(messages.getMessage("lookup.access",
- property, name));
+ property, name), e);
} catch (IllegalArgumentException e) {
saveException(pageContext, e);
throw new JspException(messages.getMessage("lookup.argument",
- property, name));
+ property, name), e);
} catch (InvocationTargetException e) {
Throwable t = e.getTargetException();
@@ -898,7 +898,7 @@
saveException(pageContext, t);
throw new JspException(messages.getMessage("lookup.target",
- property, name));
+ property, name), e);
} catch (NoSuchMethodException e) {
saveException(pageContext, e);
@@ -916,7 +916,7 @@
}
throw new JspException(messages.getMessage("lookup.method",
- property, beanName));
+ property, beanName), e);
}
}
@@ -1152,7 +1152,7 @@
writer.print(text);
} catch (IOException e) {
saveException(pageContext, e);
- throw new JspException(messages.getMessage("write.io",
e.toString()));
+ throw new JspException(messages.getMessage("write.io",
e.toString()), e);
}
}
@@ -1176,7 +1176,7 @@
writer.print(text);
} catch (IOException e) {
saveException(pageContext, e);
- throw new JspException(messages.getMessage("write.io",
e.toString()));
+ throw new JspException(messages.getMessage("write.io",
e.toString()), e);
}
}
}
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/IncludeTag.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/IncludeTag.java?view=diff&rev=557865&r1=557864&r2=557865
==============================================================================
---
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/IncludeTag.java
(original)
+++
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/IncludeTag.java
Thu Jul 19 22:00:07 2007
@@ -188,7 +188,7 @@
} catch (MalformedURLException e) {
TagUtils.getInstance().saveException(pageContext, e);
throw new JspException(messages.getMessage("include.url",
- e.toString()));
+ e.toString()), e);
}
URLConnection conn = null;
@@ -211,7 +211,7 @@
} catch (Exception e) {
TagUtils.getInstance().saveException(pageContext, e);
throw new JspException(messages.getMessage("include.open",
- url.toString(), e.toString()));
+ url.toString(), e.toString()), e);
}
// Copy the contents of this URL
@@ -238,7 +238,7 @@
} catch (Exception e) {
TagUtils.getInstance().saveException(pageContext, e);
throw new JspException(messages.getMessage("include.read",
- url.toString(), e.toString()));
+ url.toString(), e.toString()), e);
}
// Define the retrieved content as a page scope attribute
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/ResourceTag.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/ResourceTag.java?view=diff&rev=557865&r1=557864&r2=557865
==============================================================================
---
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/ResourceTag.java
(original)
+++
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/ResourceTag.java
Thu Jul 19 22:00:07 2007
@@ -141,7 +141,7 @@
pageContext.setAttribute(id, sb.toString());
} catch (IOException e) {
TagUtils.getInstance().saveException(pageContext, e);
- throw new JspException(messages.getMessage("resource.get", name));
+ throw new JspException(messages.getMessage("resource.get", name),
e);
}
return (SKIP_BODY);
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/BaseHandlerTag.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/BaseHandlerTag.java?view=diff&rev=557865&r1=557864&r2=557865
==============================================================================
---
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/BaseHandlerTag.java
(original)
+++
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/BaseHandlerTag.java
Thu Jul 19 22:00:07 2007
@@ -1210,15 +1210,15 @@
return BeanUtils.getProperty(bean, property);
} catch (IllegalAccessException e) {
throw new JspException(messages.getMessage("getter.access",
- property, beanName));
+ property, beanName), e);
} catch (InvocationTargetException e) {
Throwable t = e.getTargetException();
throw new JspException(messages.getMessage("getter.result",
- property, t.toString()));
+ property, t.toString()), e);
} catch (NoSuchMethodException e) {
throw new JspException(messages.getMessage("getter.method",
- property, beanName));
+ property, beanName), e);
}
}
}
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/BaseTag.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/BaseTag.java?view=diff&rev=557865&r1=557864&r2=557865
==============================================================================
---
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/BaseTag.java
(original)
+++
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/BaseTag.java
Thu Jul 19 22:00:07 2007
@@ -149,7 +149,7 @@
} catch (IOException e) {
pageContext.setAttribute(Globals.EXCEPTION_KEY, e,
PageContext.REQUEST_SCOPE);
- throw new JspException(messages.getMessage("common.io",
e.toString()));
+ throw new JspException(messages.getMessage("common.io",
e.toString()), e);
}
return EVAL_BODY_INCLUDE;
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java?view=diff&rev=557865&r1=557864&r2=557865
==============================================================================
---
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java
(original)
+++
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java
Thu Jul 19 22:00:07 2007
@@ -672,7 +672,7 @@
try {
writer.print(results.toString());
} catch (IOException e) {
- throw new JspException(messages.getMessage("common.io",
e.toString()));
+ throw new JspException(messages.getMessage("common.io",
e.toString()), e);
}
postbackAction = null;
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/ImgTag.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/ImgTag.java?view=diff&rev=557865&r1=557864&r2=557865
==============================================================================
---
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/ImgTag.java
(original)
+++
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/ImgTag.java
Thu Jul 19 22:00:07 2007
@@ -618,7 +618,7 @@
map = (Map) mapObject;
} catch (ClassCastException e) {
TagUtils.getInstance().saveException(pageContext, e);
- throw new JspException(messages.getMessage("imgTag.type"));
+ throw new JspException(messages.getMessage("imgTag.type"), e);
}
// Append the required query parameters
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/JavascriptValidatorTag.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/JavascriptValidatorTag.java?view=diff&rev=557865&r1=557864&r2=557865
==============================================================================
---
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/JavascriptValidatorTag.java
(original)
+++
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/JavascriptValidatorTag.java
Thu Jul 19 22:00:07 2007
@@ -348,7 +348,7 @@
try {
writer.print(this.renderJavascript());
} catch (IOException e) {
- throw new JspException(e.getMessage());
+ throw new JspException(e.getMessage(), e);
}
return EVAL_BODY_TAG;
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/LinkTag.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/LinkTag.java?view=diff&rev=557865&r1=557864&r2=557865
==============================================================================
---
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/LinkTag.java
(original)
+++
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/LinkTag.java
Thu Jul 19 22:00:07 2007
@@ -448,7 +448,7 @@
} catch (MalformedURLException e) {
TagUtils.getInstance().saveException(pageContext, e);
throw new JspException(messages.getMessage("rewrite.url",
- e.toString()));
+ e.toString()), e);
}
return (url);
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/MultiboxTag.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/MultiboxTag.java?view=diff&rev=557865&r1=557864&r2=557865
==============================================================================
---
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/MultiboxTag.java
(original)
+++
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/MultiboxTag.java
Thu Jul 19 22:00:07 2007
@@ -227,15 +227,15 @@
}
} catch (IllegalAccessException e) {
throw new JspException(messages.getMessage("getter.access",
- property, name));
+ property, name), e);
} catch (InvocationTargetException e) {
Throwable t = e.getTargetException();
throw new JspException(messages.getMessage("getter.result",
- property, t.toString()));
+ property, t.toString()), e);
} catch (NoSuchMethodException e) {
throw new JspException(messages.getMessage("getter.method",
- property, name));
+ property, name), e);
}
for (int i = 0; i < values.length; i++) {
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/OptionsTag.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/OptionsTag.java?view=diff&rev=557865&r1=557864&r2=557865
==============================================================================
---
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/OptionsTag.java
(original)
+++
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/OptionsTag.java
Thu Jul 19 22:00:07 2007
@@ -200,15 +200,15 @@
}
} catch (IllegalAccessException e) {
throw new JspException(messages.getMessage(
- "getter.access", property, collection));
+ "getter.access", property, collection), e);
} catch (InvocationTargetException e) {
Throwable t = e.getTargetException();
throw new JspException(messages.getMessage(
- "getter.result", property, t.toString()));
+ "getter.result", property, t.toString()), e);
} catch (NoSuchMethodException e) {
throw new JspException(messages.getMessage(
- "getter.method", property, collection));
+ "getter.method", property, collection), e);
}
try {
@@ -223,15 +223,15 @@
}
} catch (IllegalAccessException e) {
throw new JspException(messages.getMessage(
- "getter.access", labelProperty, collection));
+ "getter.access", labelProperty, collection), e);
} catch (InvocationTargetException e) {
Throwable t = e.getTargetException();
throw new JspException(messages.getMessage(
- "getter.result", labelProperty, t.toString()));
+ "getter.result", labelProperty, t.toString()), e);
} catch (NoSuchMethodException e) {
throw new JspException(messages.getMessage(
- "getter.method", labelProperty, collection));
+ "getter.method", labelProperty, collection), e);
}
String stringValue = value.toString();
@@ -390,15 +390,15 @@
}
} catch (IllegalAccessException e) {
throw new JspException(messages.getMessage("getter.access",
- property, name));
+ property, name), e);
} catch (InvocationTargetException e) {
Throwable t = e.getTargetException();
throw new JspException(messages.getMessage("getter.result",
- property, t.toString()));
+ property, t.toString()), e);
} catch (NoSuchMethodException e) {
throw new JspException(messages.getMessage("getter.method",
- property, name));
+ property, name), e);
}
}
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/RewriteTag.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/RewriteTag.java?view=diff&rev=557865&r1=557864&r2=557865
==============================================================================
---
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/RewriteTag.java
(original)
+++
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/RewriteTag.java
Thu Jul 19 22:00:07 2007
@@ -69,7 +69,7 @@
} catch (MalformedURLException e) {
TagUtils.getInstance().saveException(pageContext, e);
throw new JspException(messages.getMessage("rewrite.url",
- e.toString()));
+ e.toString()), e);
}
TagUtils.getInstance().write(pageContext, url);
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/SelectTag.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/SelectTag.java?view=diff&rev=557865&r1=557864&r2=557865
==============================================================================
---
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/SelectTag.java
(original)
+++
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/SelectTag.java
Thu Jul 19 22:00:07 2007
@@ -237,17 +237,17 @@
} catch (IllegalAccessException e) {
TagUtils.getInstance().saveException(pageContext, e);
throw new JspException(messages.getMessage("getter.access",
- property, name));
+ property, name), e);
} catch (InvocationTargetException e) {
Throwable t = e.getTargetException();
TagUtils.getInstance().saveException(pageContext, t);
throw new JspException(messages.getMessage("getter.result",
- property, t.toString()));
+ property, t.toString()), e);
} catch (NoSuchMethodException e) {
TagUtils.getInstance().saveException(pageContext, e);
throw new JspException(messages.getMessage("getter.method",
- property, name));
+ property, name), e);
}
}
}
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/CompareTagBase.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/CompareTagBase.java?view=diff&rev=557865&r1=557864&r2=557865
==============================================================================
---
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/CompareTagBase.java
(original)
+++
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/CompareTagBase.java
Thu Jul 19 22:00:07 2007
@@ -185,11 +185,11 @@
TagUtils.getInstance().saveException(pageContext, t);
throw new JspException(messages.getMessage(
- "logic.property", name, property, t.toString()));
+ "logic.property", name, property, t.toString()),
t);
} catch (Throwable t) {
TagUtils.getInstance().saveException(pageContext, t);
throw new JspException(messages.getMessage(
- "logic.property", name, property, t.toString()));
+ "logic.property", name, property, t.toString()),
t);
}
} else {
variable = bean;
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/ForwardTag.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/ForwardTag.java?view=diff&rev=557865&r1=557864&r2=557865
==============================================================================
---
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/ForwardTag.java
(original)
+++
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/ForwardTag.java
Thu Jul 19 22:00:07 2007
@@ -125,7 +125,7 @@
} catch (Exception e) {
TagUtils.getInstance().saveException(pageContext, e);
throw new JspException(messages.getMessage("forward.forward", name,
- e.toString()));
+ e.toString()), e);
}
}
@@ -153,7 +153,7 @@
} catch (Exception e) {
TagUtils.getInstance().saveException(pageContext, e);
throw new JspException(messages.getMessage("forward.redirect",
- name, e.toString()));
+ name, e.toString()), e);
}
}
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/RedirectTag.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/RedirectTag.java?view=diff&rev=557865&r1=557864&r2=557865
==============================================================================
---
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/RedirectTag.java
(original)
+++
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/RedirectTag.java
Thu Jul 19 22:00:07 2007
@@ -292,7 +292,7 @@
} catch (MalformedURLException e) {
TagUtils.getInstance().saveException(pageContext, e);
throw new JspException(messages.getMessage("redirect.url",
- e.toString()));
+ e.toString()), e);
}
return url;
@@ -314,7 +314,7 @@
response.sendRedirect(url);
} catch (IOException e) {
TagUtils.getInstance().saveException(pageContext, e);
- throw new JspException(e.getMessage());
+ throw new JspException(e.getMessage(), e);
}
}
