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

[Shane Bryzak]

  User: sbryzak2
  Date: 07/01/26 00:28:51

  Modified:    src/main/org/jboss/seam/jsf  AbstractSeamPhaseListener.java
  Log:
  security filter replaced by security check in Page
  
  Revision  Changes    Path
  1.37      +313 -332  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.36
  retrieving revision 1.37
  diff -u -b -r1.36 -r1.37
  --- AbstractSeamPhaseListener.java	26 Jan 2007 02:15:56 -0000	1.36
  +++ AbstractSeamPhaseListener.java	26 Jan 2007 05:28:51 -0000	1.37
  @@ -1,9 +1,6 @@
   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;
  @@ -11,7 +8,6 @@
   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;
  @@ -31,7 +27,6 @@
   import org.jboss.seam.core.Switcher;
   import org.jboss.seam.core.Validation;
   import org.jboss.seam.util.Transactions;
  -
   public abstract class AbstractSeamPhaseListener implements PhaseListener
   {
      
  @@ -41,7 +36,6 @@
      {
         return ANY_PHASE;
      }
  -
      /**
       * Restore the page and conversation contexts during a JSF request
       */
  @@ -138,7 +132,6 @@
            Pageflow.instance().processEvents(name);
         }
      }
  -
      public void afterPhase(PhaseEvent event)
      {
         if ( Contexts.isApplicationContextActive() )
  @@ -146,18 +139,15 @@
            Events.instance().raiseEvent("org.jboss.seam.afterPhase", event);
         }
      }
  -
      protected void beforeUpdateModelValues(PhaseEvent event)
      {
         Pages.instance().applyViewRootValues( event.getFacesContext() );
         Manager.instance().setUpdateModelValuesCalled(true);
      }
  -
      /**
       * Give the subclasses an opportunity to do stuff
       */
      protected void afterInvokeApplication() {}
  -
      /**
       * Add a faces message when Seam-managed transactions fail.
       */
  @@ -176,12 +166,10 @@
         }
         catch (Exception e) {} //swallow silently, not important
      }
  -
      protected void beforeRender(PhaseEvent event)
      {  
         
         FacesContext facesContext = event.getFacesContext();
  -
         if ( !Manager.instance().isUpdateModelValuesCalled() )
         {
            Pages.instance().applyRequestParameterValues(facesContext);
  @@ -199,7 +187,6 @@
            pageContext.remove( Seam.getComponentName(Switcher.class) );
            pageContext.remove( Seam.getComponentName(ConversationStack.class) );
         }
  -
         selectDataModelRow( facesContext.getExternalContext().getRequestParameterMap() );
         
         enterPage(event);
  @@ -235,7 +222,6 @@
         Manager.instance().endRequest( ContextAdaptor.getSession(externalContext) );
         Lifecycle.endRequest(externalContext);
      }
  -
      protected void afterResponseComplete(FacesContext facesContext)
      {
         //responseComplete() was called by one of the other phases, 
  @@ -246,7 +232,6 @@
         Manager.instance().endRequest( ContextAdaptor.getSession(externalContext) );
         Lifecycle.endRequest( facesContext.getExternalContext() );
      }
  -
      private boolean enterPage(PhaseEvent event)
      {
         Lifecycle.setPhaseId( PhaseId.INVOKE_APPLICATION );
  @@ -284,7 +269,6 @@
         if (exists) log.warn("There should only be one Seam phase listener per application");
         exists=true;
      }
  -
      /////////Do not really belong here:
      
      void begin(PhaseId phaseId) {
  @@ -302,7 +286,6 @@
            throw new IllegalStateException("Could not start transaction", e);
         }
      }
  -
      void commitOrRollback(PhaseId phaseId) {
         try 
         {
  @@ -323,10 +306,8 @@
            throw new IllegalStateException("Could not commit transaction", e);
         }
      }
  -
      protected void afterProcessValidations(FacesContext facesContext)
      {
         Validation.instance().afterProcessValidations(facesContext);
      }
  -
   }