[jboss-cvs] jboss-seam/ui/src/main/java/org/jboss/seam/ui/resource ...

[Peter Muir]

  User: pmuir   
  Date: 07/06/20 04:40:19

  Modified:    ui/src/main/java/org/jboss/seam/ui/resource 
                        StyleResource.java
  Log:
  JBSEAM-1013 - CDK port - actually commit it
  
  Revision  Changes    Path
  1.2       +25 -23    jboss-seam/ui/src/main/java/org/jboss/seam/ui/resource/StyleResource.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: StyleResource.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/resource/StyleResource.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- StyleResource.java	15 Jun 2007 17:07:07 -0000	1.1
  +++ StyleResource.java	20 Jun 2007 08:40:19 -0000	1.2
  @@ -11,6 +11,7 @@
   import java.util.regex.Matcher;
   import java.util.regex.Pattern;
   
  +import javax.servlet.ServletException;
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
   
  @@ -19,7 +20,7 @@
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Startup;
  -import org.jboss.seam.contexts.Lifecycle;
  +import org.jboss.seam.contexts.ContextualHttpServletRequest;
   import org.jboss.seam.core.Expressions;
   import org.jboss.seam.servlet.AbstractResource;
   import org.jboss.seam.util.Resources;
  @@ -49,35 +50,36 @@
      private static final String RESOURCE_PATH = "/style";
   
      @Override
  -   public void getResource(HttpServletRequest request, HttpServletResponse response)
  +   public void getResource(final HttpServletRequest request, final HttpServletResponse response)
  +      throws ServletException, IOException
  +   {
  +
  +      new ContextualHttpServletRequest(request)
  +      {
  +         @Override
  +         public void process() throws IOException 
  +         {
  +            doWork(request, response);
  +         }
  +      }.run();
  +      
  +   }  
  +   
  +   public void doWork(HttpServletRequest request, HttpServletResponse response)
               throws IOException
      {
         String pathInfo = request.getPathInfo().substring(getResourcePath().length());
  -
         InputStream in = Resources.getResourceAsStream(pathInfo);
   
         if (in != null)
         {
  -         try
  -         {
  -            Lifecycle.beginRequest( getServletContext(), request );
  -            
               CharSequence css = readFile(in);
  -            
               css = parseEL(css);
  -            
               String idPrefix = request.getParameter("idPrefix");
               css = addIdPrefix(idPrefix, css);
  -
               response.getWriter().write(css.toString());
  -
               response.getWriter().flush();
            }
  -         finally
  -         {
  -            Lifecycle.endRequest();
  -         }
  -      }
         else
         {
            response.sendError(HttpServletResponse.SC_NOT_FOUND);