[jboss-cvs] jboss-seam/src/main/org/jboss/seam ...

[Gavin King]

  User: gavin   
  Date: 07/02/03 20:13:18

  Modified:    src/main/org/jboss/seam     Component.java
                        components-1.1.dtd pages-1.1.dtd
  Removed:     src/main/org/jboss/seam     exceptions-1.1.dtd
  Log:
  redesigned exception handling
  
  Revision  Changes    Path
  1.228     +1 -3      jboss-seam/src/main/org/jboss/seam/Component.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Component.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/Component.java,v
  retrieving revision 1.227
  retrieving revision 1.228
  diff -u -b -r1.227 -r1.228
  --- Component.java	1 Feb 2007 19:38:41 -0000	1.227
  +++ Component.java	4 Feb 2007 01:13:18 -0000	1.228
  @@ -98,7 +98,6 @@
   import org.jboss.seam.interceptors.ConversationInterceptor;
   import org.jboss.seam.interceptors.ConversationalInterceptor;
   import org.jboss.seam.interceptors.EventInterceptor;
  -import org.jboss.seam.interceptors.ExceptionInterceptor;
   import org.jboss.seam.interceptors.ManagedEntityIdentityInterceptor;
   import org.jboss.seam.interceptors.MethodContextInterceptor;
   import org.jboss.seam.interceptors.OutcomeInterceptor;
  @@ -124,7 +123,7 @@
    *
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
    * @author Gavin King
  - * @version $Revision: 1.227 $
  + * @version $Revision: 1.228 $
    */
   @Scope(ScopeType.APPLICATION)
   @SuppressWarnings("deprecation")
  @@ -764,7 +763,6 @@
         {
            addInterceptor( new Interceptor( new AsynchronousInterceptor(), this ) );
         }
  -      addInterceptor( new Interceptor( new ExceptionInterceptor(), this ) );
         if ( getType()==STATEFUL_SESSION_BEAN )
         {
            addInterceptor( new Interceptor( new RemoveInterceptor(), this ) );
  
  
  
  1.6       +8 -0      jboss-seam/src/main/org/jboss/seam/components-1.1.dtd
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: components-1.1.dtd
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/components-1.1.dtd,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- components-1.1.dtd	2 Feb 2007 14:04:48 -0000	1.5
  +++ components-1.1.dtd	4 Feb 2007 01:13:18 -0000	1.6
  @@ -29,3 +29,11 @@
   
   <!ELEMENT key (#PCDATA)>
   <!ELEMENT value (#PCDATA)>
  +
  +<!-- event handling -->
  +
  +<!ELEMENT event (action*)>
  +<!ATTLIST event type CDATA #REQUIRED>
  +
  +<!ELEMENT action EMPTY>
  +<!ATTLIST action expression CDATA #REQUIRED>
  
  
  
  1.18      +1 -5      jboss-seam/src/main/org/jboss/seam/pages-1.1.dtd
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: pages-1.1.dtd
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/pages-1.1.dtd,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -b -r1.17 -r1.18
  --- pages-1.1.dtd	2 Feb 2007 07:44:31 -0000	1.17
  +++ pages-1.1.dtd	4 Feb 2007 01:13:18 -0000	1.18
  @@ -67,17 +67,13 @@
   
   <!-- exception handling -->
   
  -<!ELEMENT exception ((http-error|redirect|render),end-conversation?,rollback?)>
  +<!ELEMENT exception ((http-error|redirect),end-conversation?)>
   <!ATTLIST exception class CDATA #IMPLIED>
   
   <!ELEMENT redirect (#PCDATA)>
   <!ATTLIST redirect view-id CDATA #IMPLIED>
   
  -<!ELEMENT render (#PCDATA)>
  -<!ATTLIST render view-id CDATA #IMPLIED>
  -
   <!ELEMENT http-error (#PCDATA)>
   <!ATTLIST http-error error-code CDATA #IMPLIED>
   
   <!ELEMENT end-conversation EMPTY>
  -<!ELEMENT rollback EMPTY>
  \ No newline at end of file