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

[Gavin King]

  User: gavin   
  Date: 07/02/03 20:13:19

  Modified:    src/main/org/jboss/seam/mock  MockExternalContext.java
  Log:
  redesigned exception handling
  
  Revision  Changes    Path
  1.10      +54 -13    jboss-seam/src/main/org/jboss/seam/mock/MockExternalContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MockExternalContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/mock/MockExternalContext.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- MockExternalContext.java	17 Jun 2006 19:42:00 -0000	1.9
  +++ MockExternalContext.java	4 Feb 2007 01:13:19 -0000	1.10
  @@ -20,18 +20,22 @@
   import java.util.Set;
   
   import javax.faces.context.ExternalContext;
  +import javax.faces.context.FacesContext;
  +import javax.servlet.ServletContext;
   import javax.servlet.http.HttpServletRequest;
  +import javax.servlet.http.HttpServletResponse;
   import javax.servlet.http.HttpSession;
   
   /**
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.9 $
  + * @version $Revision: 1.10 $
    */
   public class MockExternalContext extends ExternalContext
   {
  -   private MockServletContext context;
  +   private ServletContext context;
      private HttpServletRequest request;
  +   private HttpServletResponse response;
      
      
      public MockExternalContext()
  @@ -40,24 +44,31 @@
         this.request = new MockHttpServletRequest( new MockHttpSession(context) );
      }
   
  -   public MockExternalContext(MockServletContext context)
  +   public MockExternalContext(ServletContext context)
      {
         this.context = context;
         this.request = new MockHttpServletRequest( new MockHttpSession(context) );
      }
   
  -   public MockExternalContext(MockServletContext context, HttpSession session)
  +   public MockExternalContext(ServletContext context, HttpSession session)
      {
         this.context = context;
         this.request = new MockHttpServletRequest(session);
      }
   
  -   public MockExternalContext(MockServletContext context, HttpServletRequest request)
  +   public MockExternalContext(ServletContext context, HttpServletRequest request)
      {
         this.context = context;
         this.request = request;
      }
      
  +   public MockExternalContext(ServletContext context, HttpServletRequest request, HttpServletResponse response)
  +   {
  +      this.context = context;
  +      this.request = request;
  +      this.response = response;
  +   }
  +   
      @Override
      public void dispatch(String url) throws IOException
      {
  @@ -85,7 +96,14 @@
      @Override
      public Map getApplicationMap()
      {
  -      return context.getAttributes();
  +      Map result = new HashMap();
  +      Enumeration e = context.getAttributeNames();
  +      while ( e.hasMoreElements() )
  +      {
  +         String name = (String) e.nextElement();
  +         result.put( name, context.getAttribute(name) );
  +      }
  +      return result;
      }
   
      @Override
  @@ -109,7 +127,14 @@
      @Override
      public Map getInitParameterMap()
      {
  -      return context.getInitParameters();
  +      Map result = new HashMap();
  +      Enumeration e = context.getInitParameterNames();
  +      while ( e.hasMoreElements() )
  +      {
  +         String name = (String) e.nextElement();
  +         result.put( name, context.getInitParameter(name) );
  +      }
  +      return result;
      }
   
      @Override
  @@ -176,7 +201,14 @@
      @Override
      public Map getRequestMap()
      {
  -      return ( (MockHttpServletRequest) request ).getAttributes();
  +      Map result = new HashMap();
  +      Enumeration e = request.getAttributeNames();
  +      while ( e.hasMoreElements() )
  +      {
  +         String name = (String) e.nextElement();
  +         result.put( name, request.getAttribute(name) );
  +      }
  +      return result;
      }
   
      @Override
  @@ -237,7 +269,7 @@
      @Override
      public Object getResponse()
      {
  -      return null;
  +      return response;
      }
   
      @Override
  @@ -249,7 +281,15 @@
      @Override
      public Map getSessionMap()
      {
  -      return ( (MockHttpSession) request.getSession() ).getAttributes();
  +      Map result = new HashMap();
  +      HttpSession session = request.getSession(true);
  +      Enumeration e = session.getAttributeNames();
  +      while ( e.hasMoreElements() )
  +      {
  +         String name = (String) e.nextElement();
  +         result.put( name, session.getAttribute(name) );
  +      }
  +      return result;
      }
   
      @Override
  @@ -265,20 +305,21 @@
      }
   
      @Override
  -   public void log(String arg0, Throwable arg1)
  +   public void log(String message, Throwable t)
      {
         
      }
   
      @Override
  -   public void log(String arg0)
  +   public void log(String t)
      {
      }
   
      @Override
      public void redirect(String url) throws IOException
      {
  -      
  +      response.sendRedirect(url);
  +      FacesContext.getCurrentInstance().responseComplete(); 
      }
   
   }