[seam-commits] Seam SVN: r7528 - in trunk: doc/reference/en/modules and 2 other directories.

[seam-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2008-03-11 11:12:00 -0400 (Tue, 11 Mar 2008)
New Revision: 7528

Modified:
   trunk/doc/reference/en/modules/events.xml
   trunk/seam21migration.txt
   trunk/src/debug/org/jboss/seam/debug/Contexts.java
   trunk/src/main/org/jboss/seam/exception/Exceptions.java
Log:
JBSEAM-2660

Modified: trunk/doc/reference/en/modules/events.xml
===================================================================
--- trunk/doc/reference/en/modules/events.xml	2008-03-11 15:10:30 UTC (rev 7527)
+++ trunk/doc/reference/en/modules/events.xml	2008-03-11 15:12:00 UTC (rev 7528)
@@ -983,7 +983,7 @@
          <para>
            <literal>org.jboss.seam.handledException</literal> holds the nested exception that
            was actually handled by an exception handler. The outermost (wrapper) exception is 
-           also available, as <literal>org.jboss.seam.exception</literal>.
+           also available, as <literal>org.jboss.seam.caughtException</literal>.
          </para>
          
          <sect3>

Modified: trunk/seam21migration.txt
===================================================================
--- trunk/seam21migration.txt	2008-03-11 15:10:30 UTC (rev 7527)
+++ trunk/seam21migration.txt	2008-03-11 15:12:00 UTC (rev 7528)
@@ -7,9 +7,17 @@
 This migration guide assumes you are using Seam 2.0, if you are migrating from
 Seam 1.2, see the seam2migration guide as well.
 
+
 Testing
 -------
 
 SeamTest now boots Seam at the start of each suite, rather than the start of
 each class. This is much faster. See the reference manual for how to alter the
-default.
\ No newline at end of file
+default.
+
+
+Exception Handling
+------------------
+
+The caught exception is now available in EL as #{org.jboss.seam.caughtException}
+rather than #{org.jboss.seam.exception}
\ No newline at end of file

Modified: trunk/src/debug/org/jboss/seam/debug/Contexts.java
===================================================================
--- trunk/src/debug/org/jboss/seam/debug/Contexts.java	2008-03-11 15:10:30 UTC (rev 7527)
+++ trunk/src/debug/org/jboss/seam/debug/Contexts.java	2008-03-11 15:12:00 UTC (rev 7528)
@@ -61,7 +61,7 @@
 
    public Exception getException()
    {
-      return (Exception) org.jboss.seam.contexts.Contexts.getConversationContext().get("org.jboss.seam.exception");
+      return (Exception) org.jboss.seam.contexts.Contexts.getConversationContext().get("org.jboss.seam.caughtException");
    }
    
    public List<Exception> getExceptionCauses()

Modified: trunk/src/main/org/jboss/seam/exception/Exceptions.java
===================================================================
--- trunk/src/main/org/jboss/seam/exception/Exceptions.java	2008-03-11 15:10:30 UTC (rev 7527)
+++ trunk/src/main/org/jboss/seam/exception/Exceptions.java	2008-03-11 15:12:00 UTC (rev 7528)
@@ -51,7 +51,7 @@
    {
       if ( Contexts.isConversationContextActive() )
       {
-         Contexts.getConversationContext().set("org.jboss.seam.exception", e);
+         Contexts.getConversationContext().set("org.jboss.seam.caughtException", e);
       }
       
       //build a list of the nested exceptions