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

[Shane Bryzak]

  User: sbryzak2
  Date: 06/10/08 20:45:00

  Modified:    src/main/org/jboss/seam/contexts  Lifecycle.java
  Log:
  Removed authentication calls from Lifecycle
  
  Revision  Changes    Path
  1.56      +12 -39    jboss-seam/src/main/org/jboss/seam/contexts/Lifecycle.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Lifecycle.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/Lifecycle.java,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -b -r1.55 -r1.56
  --- Lifecycle.java	8 Oct 2006 20:58:03 -0000	1.55
  +++ Lifecycle.java	9 Oct 2006 00:45:00 -0000	1.56
  @@ -6,9 +6,7 @@
    */
   package org.jboss.seam.contexts;
   
  -
   import java.util.Set;
  -
   import javax.faces.context.ExternalContext;
   import javax.faces.event.PhaseId;
   import javax.servlet.ServletContext;
  @@ -25,12 +23,11 @@
   import org.jboss.seam.core.Init;
   import org.jboss.seam.core.Manager;
   import org.jboss.seam.core.ProcessInstance;
  -import org.jboss.seam.security.authenticator.Authenticator;
   
   /**
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.55 $
  + * @version $Revision: 1.56 $
    */
   public class Lifecycle
   {
  @@ -44,11 +41,6 @@
         Contexts.applicationContext.set( new FacesApplicationContext(externalContext) );
         Contexts.conversationContext.set(null); //in case endRequest() was never called
         Events.instance(); //TODO: only for now, until we have a way to do EL outside of JSF!
  -      try
  -      {
  -        Authenticator.instance().beginRequest();
  -      }
  -      catch (Exception ex) {}
      }
   
      public static void beginRequest(ServletContext servletContext, HttpSession session, ServletRequest request) {
  @@ -57,11 +49,6 @@
         Contexts.sessionContext.set( new WebSessionContext( ContextAdaptor.getSession(session) ) );
         Contexts.applicationContext.set( new WebApplicationContext(servletContext) );
         Contexts.conversationContext.set(null); //in case endRequest() was never called
  -      try
  -      {
  -        Authenticator.instance().beginRequest();
  -      }
  -      catch (Exception ex) {}
      }
   
      public static void beginCall()
  @@ -266,11 +253,6 @@
         log.debug("After render response, destroying contexts");
         try
         {
  -        Authenticator.instance().endRequest();
  -      }
  -      catch (Exception ex) {}
  -      try
  -      {
            flushAndDestroyContexts();
   
            if ( Seam.isSessionInvalid() )
  @@ -290,11 +272,6 @@
      public static void endRequest() {
   
         log.debug("After request, destroying contexts");
  -      try
  -      {
  -         Authenticator.instance().endRequest();
  -      }
  -      catch (Exception ex) {  }
   
         try
         {
  @@ -311,11 +288,7 @@
      public static void endRequest(HttpSession session) {
   
         log.debug("After request, destroying contexts");
  -      try
  -      {
  -        Authenticator.instance().endRequest();
  -      }
  -      catch (Exception ex) {}
  +
         try
         {
            flushAndDestroyContexts();