jholmes     2004/06/29 07:57:18

  Modified:    contrib/struts-faces/src/java/org/apache/struts/faces/application
                        FacesRequestProcessor.java
                        FacesTilesRequestProcessor.java
  Log:
  Updated files to use new HttpServletRequestWrapper to comply with spec.
  
  patch is from bugzilla #29809
  
  Revision  Changes    Path
  1.10      +4 -2      
jakarta-struts/contrib/struts-faces/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java
  
  Index: FacesRequestProcessor.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-struts/contrib/struts-faces/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- FacesRequestProcessor.java        9 Jun 2004 02:28:28 -0000       1.9
  +++ FacesRequestProcessor.java        29 Jun 2004 14:57:18 -0000      1.10
  @@ -42,6 +42,7 @@
   import org.apache.struts.config.ForwardConfig;
   import org.apache.struts.faces.Constants;
   import org.apache.struts.faces.component.FormComponent;
  +import org.apache.struts.faces.util.HttpServletRequestWrapper;
   
   
   
  @@ -126,7 +127,8 @@
               }
               FacesContextFactory fcf = (FacesContextFactory)
                   FactoryFinder.getFactory(FactoryFinder.FACES_CONTEXT_FACTORY);
  -            context = fcf.getFacesContext(servlet.getServletContext(), request,
  +            HttpServletRequestWrapper wrapper = new 
HttpServletRequestWrapper(request, uri);
  +            context = fcf.getFacesContext(servlet.getServletContext(), wrapper,
                                             response, lifecycle); 
           }
   
  
  
  
  1.6       +4 -2      
jakarta-struts/contrib/struts-faces/src/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java
  
  Index: FacesTilesRequestProcessor.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-struts/contrib/struts-faces/src/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FacesTilesRequestProcessor.java   9 Jun 2004 02:28:28 -0000       1.5
  +++ FacesTilesRequestProcessor.java   29 Jun 2004 14:57:18 -0000      1.6
  @@ -41,6 +41,7 @@
   import org.apache.struts.config.ForwardConfig;
   import org.apache.struts.faces.Constants;
   import org.apache.struts.faces.component.FormComponent;
  +import org.apache.struts.faces.util.HttpServletRequestWrapper;
   import org.apache.struts.tiles.TilesRequestProcessor;
   
   
  @@ -126,7 +127,8 @@
               }
               FacesContextFactory fcf = (FacesContextFactory)
                   FactoryFinder.getFactory(FactoryFinder.FACES_CONTEXT_FACTORY);
  -            context = fcf.getFacesContext(servlet.getServletContext(), request,
  +            HttpServletRequestWrapper wrapper = new 
HttpServletRequestWrapper(request, uri);
  +            context = fcf.getFacesContext(servlet.getServletContext(), wrapper,
                                             response, lifecycle); 
           }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to