You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2003/03/31 23:45:05 UTC
cvs commit: jakarta-tapestry/framework/src/org/apache/tapestry/wml/pages WMLException.wml WMLException.java WMLException.page
hlship 2003/03/31 13:45:05
Modified: framework/src/org/apache/tapestry/wml/pages WMLException.wml
WMLException.java WMLException.page
Log:
Upgrade to OGNL 2.4.2
Revision Changes Path
1.2 +3 -3 jakarta-tapestry/framework/src/org/apache/tapestry/wml/pages/WMLException.wml
Index: WMLException.wml
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/wml/pages/WMLException.wml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WMLException.wml 25 Mar 2003 04:37:50 -0000 1.1
+++ WMLException.wml 31 Mar 2003 21:45:05 -0000 1.2
@@ -13,9 +13,9 @@
An exception has occured.
You may continue by <b><a jwcid="restart">restarting</a></b> the session.<br/>
<table columns="1">
- <p jwcid="@Foreach" source="ognl:exceptions" value="ognl:exception">
- <tr><td><b jwcid="@Insert" value="ognl:exception.exceptionClassName">some.exception.Class</b></td></tr>
- <tr><td><b jwcid="@Insert" value="ognl:exception.message">A message describing the exception.</b></td></tr>
+ <p jwcid="@Foreach" source="ognl:exceptions" value="ognl:current">
+ <tr><td><b jwcid="@Insert" value="ognl:current.exceptionClassName">some.exception.Class</b></td></tr>
+ <tr><td><b jwcid="@Insert" value="ognl:current.message">A message describing the exception.</b></td></tr>
<tr jwcid="foreachProperty">
<td><b jwcid="@Insert" value="ognl:components.foreachProperty.value.name">Property Name</b>:<b jwcid="@Insert" value="ognl:components.foreachProperty.value.value">Property Value</b></td>
</tr>
1.3 +1 -12 jakarta-tapestry/framework/src/org/apache/tapestry/wml/pages/WMLException.java
Index: WMLException.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/wml/pages/WMLException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WMLException.java 26 Mar 2003 20:10:36 -0000 1.2
+++ WMLException.java 31 Mar 2003 21:45:05 -0000 1.3
@@ -70,7 +70,6 @@
public class WMLException extends Deck
{
private ExceptionDescription[] _exceptions;
- private ExceptionDescription _exception;
public void initialize()
{
@@ -89,15 +88,5 @@
analyzer = new ExceptionAnalyzer();
_exceptions = analyzer.analyze(value);
- }
-
- public void setException(ExceptionDescription value)
- {
- _exception = value;
- }
-
- public ExceptionDescription getException()
- {
- return _exception;
}
}
1.2 +4 -2 jakarta-tapestry/framework/src/org/apache/tapestry/wml/pages/WMLException.page
Index: WMLException.page
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/wml/pages/WMLException.page,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WMLException.page 25 Mar 2003 04:37:50 -0000 1.1
+++ WMLException.page 31 Mar 2003 21:45:05 -0000 1.2
@@ -7,6 +7,8 @@
<page-specification class="org.apache.tapestry.wml.pages.WMLException">
<property name="org.apache.tapestry.template-extension" value="wml"/>
+
+ <property-specification name="current" type="org.apache.tapestry.util.exception.ExceptionDescription"/>
<component id="restart" type="ServiceLink">
<binding name="service" expression="@org.apache.tapestry.Tapestry@RESTART_SERVICE"/>
@@ -14,7 +16,7 @@
<component id="foreachProperty" type="Foreach">
<static-binding name="element" value="tr"/>
- <binding name="source" expression="exception.properties"/>
+ <binding name="source" expression="current.properties"/>
</component>
</page-specification>