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

[Gavin King]

  User: gavin   
  Date: 07/03/29 12:00:50

  Modified:    src/main/org/jboss/seam/annotations    BeginTask.java
                        ResumeProcess.java StartTask.java
  Log:
  use EL to determine task/process id
  
  Revision  Changes    Path
  1.10      +6 -1      jboss-seam/src/main/org/jboss/seam/annotations/BeginTask.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BeginTask.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/annotations/BeginTask.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- BeginTask.java	13 Jul 2006 00:58:55 -0000	1.9
  +++ BeginTask.java	29 Mar 2007 16:00:49 -0000	1.10
  @@ -35,7 +35,12 @@
       * The name of the request parameter under which we should locate the
       * the id of task to be resumed.
       */
  -   String taskIdParameter() default "taskId";
  +   String taskIdParameter() default "";
  +   /**
  +    * An EL expression that evaluates to the task id.
  +    * @return an EL expression
  +    */
  +   String taskId() default "#{param.taskId}";
      /**
       * The name of the jBPM process definition defining the page flow for 
       * this conversation.
  
  
  
  1.7       +6 -1      jboss-seam/src/main/org/jboss/seam/annotations/ResumeProcess.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ResumeProcess.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/annotations/ResumeProcess.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- ResumeProcess.java	22 May 2006 09:52:29 -0000	1.6
  +++ ResumeProcess.java	29 Mar 2007 16:00:50 -0000	1.7
  @@ -28,5 +28,10 @@
       * The name of the request parameter under which we should locate the
       * the id of process to be resumed.
       */
  -   String processIdParameter() default "processId";
  +   String processIdParameter() default "";
  +   /**
  +    * An EL expression that evaluates to the process id.
  +    * @return an EL expression
  +    */
  +   String processId() default "#{param.processId}";
   }
  
  
  
  1.18      +6 -1      jboss-seam/src/main/org/jboss/seam/annotations/StartTask.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: StartTask.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/annotations/StartTask.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -b -r1.17 -r1.18
  --- StartTask.java	13 Jul 2006 00:58:55 -0000	1.17
  +++ StartTask.java	29 Mar 2007 16:00:50 -0000	1.18
  @@ -38,7 +38,12 @@
       * The name of the request parameter under which we should locate the
       * the id of task to be started.
       */
  -   String taskIdParameter() default "taskId";
  +   String taskIdParameter() default "";
  +   /**
  +    * An EL expression that evaluates to the task id.
  +    * @return an EL expression
  +    */
  +   String taskId() default "#{param.taskId}";
      /**
       * The name of the jBPM process definition defining 
       * the page flow for this conversation.