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

[Gavin King]

  User: gavin   
  Date: 07/06/18 00:54:10

  Modified:    src/main/org/jboss/seam/annotations       Begin.java
                        End.java EndTask.java IfInvalid.java
  Added:       src/main/org/jboss/seam/annotations      
                        ApplicationException.java
  Removed:     src/main/org/jboss/seam/annotations       Rollback.java
  Log:
  deprecated ifOutcome() stuffs
  removed @Rollback
  implemented JBSEAM-1031
  
  Revision  Changes    Path
  1.11      +6 -4      jboss-seam/src/main/org/jboss/seam/annotations/Begin.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Begin.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/annotations/Begin.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- Begin.java	16 Feb 2007 16:49:03 -0000	1.10
  +++ Begin.java	18 Jun 2007 04:54:10 -0000	1.11
  @@ -1,4 +1,4 @@
  -//$Id: Begin.java,v 1.10 2007/02/16 16:49:03 gavin Exp $
  +//$Id: Begin.java,v 1.11 2007/06/18 04:54:10 gavin Exp $
   package org.jboss.seam.annotations;
   
   import static java.lang.annotation.ElementType.METHOD;
  @@ -11,9 +11,9 @@
   /**
    * Marks a method as beginning a long-running conversation, 
    * if none exists, and if the method returns a non-null value 
  - * without throwing an exception. If a list of outcomes is 
  - * specified, the conversation begins only if the outcome is 
  - * in the list. A null outcome never begins a conversation.
  + * without throwing an exception.
  + *  
  + * A null outcome never begins a conversation.
    * If the method is of type void, a conversation always
    * begins.
    * 
  @@ -27,6 +27,8 @@
   	/**
   	 * An empty outcome list is interpreted to mean any 
   	 * outcome except for the null (redisplay) outcome.
  +    * 
  +    * @deprecated use Conversation.instance().begin();
   	 */
   	String[] ifOutcome() default {};
      /**
  
  
  
  1.6       +3 -1      jboss-seam/src/main/org/jboss/seam/annotations/End.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: End.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/annotations/End.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- End.java	20 Oct 2006 00:35:34 -0000	1.5
  +++ End.java	18 Jun 2007 04:54:10 -0000	1.6
  @@ -1,4 +1,4 @@
  -//$Id: End.java,v 1.5 2006/10/20 00:35:34 gavin Exp $
  +//$Id: End.java,v 1.6 2007/06/18 04:54:10 gavin Exp $
   package org.jboss.seam.annotations;
   
   import static java.lang.annotation.ElementType.METHOD;
  @@ -26,6 +26,8 @@
   	/**
   	 * An empty outcome list is interpreted to mean any 
   	 * outcome except for the null (redisplay) outcome.
  +    * 
  +    * @deprecated use Conversation.instance().end()
   	 */
   	String[] ifOutcome() default {};
      /**
  
  
  
  1.7       +3 -0      jboss-seam/src/main/org/jboss/seam/annotations/EndTask.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EndTask.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/annotations/EndTask.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- EndTask.java	17 Jun 2007 22:51:00 -0000	1.6
  +++ EndTask.java	18 Jun 2007 04:54:10 -0000	1.7
  @@ -32,6 +32,9 @@
      /**
       * An empty outcome list is interpreted to mean any 
       * outcome except for the null (redisplay) outcome.
  +    * 
  +    * @deprecated use BusinessProcess.instance().end("...") and
  +    *             Conversation.instance().end()
       */
      String[] ifOutcome() default {};
      
  
  
  
  1.8       +2 -2      jboss-seam/src/main/org/jboss/seam/annotations/IfInvalid.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: IfInvalid.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/annotations/IfInvalid.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- IfInvalid.java	10 Oct 2006 04:50:16 -0000	1.7
  +++ IfInvalid.java	18 Jun 2007 04:54:10 -0000	1.8
  @@ -1,4 +1,4 @@
  -//$Id: IfInvalid.java,v 1.7 2006/10/10 04:50:16 gavin Exp $
  +//$Id: IfInvalid.java,v 1.8 2007/06/18 04:54:10 gavin Exp $
   package org.jboss.seam.annotations;
   
   import static java.lang.annotation.ElementType.METHOD;
  @@ -27,7 +27,7 @@
   public @interface IfInvalid
   {
      /**
  -    * The JSF outcome, in the case that the reciever is
  +    * The JSF outcome, in the case that the receiver is
       * in an invalid state.
       */
      String outcome();
  
  
  
  1.1      date: 2007/06/18 04:54:10;  author: gavin;  state: Exp;jboss-seam/src/main/org/jboss/seam/annotations/ApplicationException.java
  
  Index: ApplicationException.java
  ===================================================================
  package org.jboss.seam.annotations;
  
  import static java.lang.annotation.ElementType.TYPE;
  import static java.lang.annotation.RetentionPolicy.RUNTIME;
  
  import java.lang.annotation.Documented;
  import java.lang.annotation.Inherited;
  import java.lang.annotation.Retention;
  import java.lang.annotation.Target;
  
  /**
   * Synonym for javax.interceptors.ApplicationException, 
   * for use in a pre Java EE 5 environment.
   * 
   * @author Gavin King
   */
  @Target(TYPE)
  @Retention(RUNTIME)
  @Documented
  @Inherited
  public @interface ApplicationException
  {
     /**
      * @return true if this exception should set 
      * the transaction to rollback only
      */
     public boolean rollback() default false;
     /**
      * @return true if this exception should end
      * the current long-running conversation
      */
     public boolean end() default false;
  }