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

[Gavin King]

  User: gavin   
  Date: 07/03/08 02:48:20

  Modified:    src/main/org/jboss/seam/jsf   AbstractSeamPhaseListener.java
                        TransactionalSeamPhaseListener.java
  Log:
  JBSEAM-954
  
  Revision  Changes    Path
  1.41      +15 -4     jboss-seam/src/main/org/jboss/seam/jsf/AbstractSeamPhaseListener.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AbstractSeamPhaseListener.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/AbstractSeamPhaseListener.java,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -b -r1.40 -r1.41
  --- AbstractSeamPhaseListener.java	13 Feb 2007 06:50:45 -0000	1.40
  +++ AbstractSeamPhaseListener.java	8 Mar 2007 07:48:20 -0000	1.41
  @@ -1,6 +1,9 @@
   package org.jboss.seam.jsf;
  +
   import static javax.faces.event.PhaseId.ANY_PHASE;
  +
   import java.util.Map;
  +
   import javax.faces.application.FacesMessage;
   import javax.faces.context.ExternalContext;
   import javax.faces.context.FacesContext;
  @@ -8,8 +11,7 @@
   import javax.faces.event.PhaseId;
   import javax.faces.event.PhaseListener;
   import javax.faces.model.DataModel;
  -import org.jboss.seam.log.LogProvider;
  -import org.jboss.seam.log.Logging;
  +
   import org.jboss.seam.Seam;
   import org.jboss.seam.TransactionException;
   import org.jboss.seam.contexts.Context;
  @@ -27,7 +29,10 @@
   import org.jboss.seam.core.Pages;
   import org.jboss.seam.core.Switcher;
   import org.jboss.seam.core.Validation;
  +import org.jboss.seam.log.LogProvider;
  +import org.jboss.seam.log.Logging;
   import org.jboss.seam.util.Transactions;
  +
   public abstract class AbstractSeamPhaseListener implements PhaseListener
   {
      
  @@ -223,6 +228,7 @@
         Manager.instance().endRequest( ContextAdaptor.getSession(externalContext) );
         Lifecycle.endRequest(externalContext);
      }
  +   
      protected void afterResponseComplete(FacesContext facesContext)
      {
         //responseComplete() was called by one of the other phases, 
  @@ -233,6 +239,7 @@
         Manager.instance().endRequest( ContextAdaptor.getSession(externalContext) );
         Lifecycle.endRequest( facesContext.getExternalContext() );
      }
  +   
      private boolean enterPage(PhaseEvent event)
      {
         Lifecycle.setPhaseId( PhaseId.INVOKE_APPLICATION );
  @@ -264,7 +271,8 @@
      }
      /////////Do not really belong here:
      
  -   void begin(PhaseId phaseId) {
  +   void begin(PhaseId phaseId) 
  +   {
         try 
         {
            if ( !Transactions.isTransactionActiveOrMarkedRollback() )
  @@ -278,7 +286,9 @@
            throw new TransactionException("Could not start transaction", e);
         }
      }
  -   void commitOrRollback(PhaseId phaseId) {
  +   
  +   void commitOrRollback(PhaseId phaseId) 
  +   {
         try 
         {
            if ( Transactions.isTransactionActive() )
  @@ -297,6 +307,7 @@
            throw new TransactionException("Could not commit transaction", e);
         }
      }
  +   
      protected void afterProcessValidations(FacesContext facesContext)
      {
         Validation.instance().afterProcessValidations(facesContext);
  
  
  
  1.4       +6 -1      jboss-seam/src/main/org/jboss/seam/jsf/TransactionalSeamPhaseListener.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TransactionalSeamPhaseListener.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/TransactionalSeamPhaseListener.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- TransactionalSeamPhaseListener.java	21 Dec 2006 02:38:27 -0000	1.3
  +++ TransactionalSeamPhaseListener.java	8 Mar 2007 07:48:20 -0000	1.4
  @@ -1,8 +1,10 @@
  -//$Id: TransactionalSeamPhaseListener.java,v 1.3 2006/12/21 02:38:27 sbryzak2 Exp $
  +//$Id: TransactionalSeamPhaseListener.java,v 1.4 2007/03/08 07:48:20 gavin Exp $
   package org.jboss.seam.jsf;
  +
   import javax.faces.event.PhaseEvent;
   import javax.faces.event.PhaseId;
   import org.jboss.seam.core.Init;
  +
   /**
    * Transaction management for extended persistence contexts.
    * A transaction spans the restore view, apply request values, process validations,
  @@ -15,6 +17,7 @@
   public class TransactionalSeamPhaseListener extends SeamPhaseListener
   {
      private static final long serialVersionUID = -1069952157355781194L;
  +   
      @Override
      public void handleTransactionsBeforePhase(PhaseEvent event)
      {
  @@ -27,6 +30,7 @@
            begin(phaseId);
         }
      }
  +   
      @Override
      public void handleTransactionsAfterPhase(PhaseEvent event)
      {
  @@ -41,6 +45,7 @@
            commitOrRollback(phaseId); //we commit before destroying contexts, cos the contexts have the PC in them
         }     
      }
  +   
      @Override
      protected void handleTransactionsAfterPageActions(PhaseEvent event)
      {